Enlightenment CVS committal
Author : titan
Project : e17
Module : apps/ephoto
Dir : e17/apps/ephoto/src/bin
Modified Files:
ephoto_main.c ephoto_normal_view.c
Log Message:
Various cleanups and fixes.
===================================================================
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_main.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- ephoto_main.c 31 May 2007 07:11:28 -0000 1.40
+++ ephoto_main.c 1 Jun 2007 21:46:19 -0000 1.41
@@ -58,7 +58,6 @@
{
ewl_notebook_visible_page_set(EWL_NOTEBOOK(em->main_nb), em->main_vbox);
ewl_widget_disable(em->smi);
- ecore_dlist_goto_first(em->images);
}
/*Update the images based on the current tab*/
@@ -169,12 +168,9 @@
add_list_view(em->view_box);
- em->toolbar = ewl_hbox_new();
- ewl_box_spacing_set(EWL_BOX(em->toolbar), 5);
+ em->toolbar = add_box(vbox, EWL_ORIENTATION_HORIZONTAL, 5);
ewl_object_alignment_set(EWL_OBJECT(em->toolbar),
EWL_FLAG_ALIGN_CENTER);
ewl_object_fill_policy_set(EWL_OBJECT(em->toolbar),
EWL_FLAG_FILL_SHRINK);
- ewl_container_child_append(EWL_CONTAINER(vbox), em->toolbar);
- ewl_widget_show(em->toolbar);
button = add_button(em->toolbar, NULL,
PACKAGE_DATA_DIR "/images/normal_view.png",
@@ -248,12 +244,14 @@
em->db = ephoto_db_init();
em->current_album = strdup(_("Complete Library"));
- em->current_directory = strdup(getcwd(buf, PATH_MAX));
+
+ getcwd(buf, PATH_MAX);
+ buf[sizeof(buf)-1] = '\0';
+ em->current_directory = strdup(buf);
populate_albums(NULL, NULL, NULL);
ewl_callback_append(em->browser, EWL_CALLBACK_VALUE_CHANGED,
update_view, NULL);
-
return;
}
@@ -275,14 +273,15 @@
{
ecore_list_destroy(em->albums);
}
- if (!ecore_list_is_empty(em->images))
- {
- ecore_dlist_destroy(em->images);
- }
em->albums = ecore_list_new();
em->albums = ephoto_db_list_albums(em->db);
ewl_mvc_data_set(EWL_MVC(em->atree), em->albums);
+
+ if (!ecore_dlist_is_empty(em->images))
+ {
+ ecore_dlist_destroy(em->images);
+ }
em->images = ecore_dlist_new();
em->images = ephoto_db_list_images(em->db, em->current_album);
@@ -297,19 +296,25 @@
{
thumb = add_image(em->fbox, imagef, 1,
freebox_image_clicked, NULL);
- ewl_image_constrain_set(EWL_IMAGE(thumb),
-
ewl_range_value_get(EWL_RANGE(em->fthumb_size)));
+ ewl_image_constrain_set(EWL_IMAGE(thumb), 81);
ewl_object_alignment_set(EWL_OBJECT(thumb),
EWL_FLAG_ALIGN_CENTER);
ewl_widget_name_set(thumb, imagef);
}
ecore_dlist_next(em->images);
}
- ewl_widget_configure(em->fbox);
- ecore_dlist_goto_first(em->images);
- ewl_mvc_data_set(EWL_MVC(em->ltree), em->images);
+ ewl_widget_configure(em->fbox_vbox);
+
+ ewl_mvc_data_set(EWL_MVC(em->ltree), em->images);
ecore_dlist_goto_first(em->images);
+ if (ecore_dlist_current(em->images))
+ {
+ ewl_image_file_path_set(EWL_IMAGE(em->simage),
+ ecore_dlist_current(em->images));
+ }
+
+
return;
}
@@ -356,8 +361,7 @@
{
thumb = add_image(em->fbox, imagef, 1,
freebox_image_clicked, NULL);
- ewl_image_size_set(EWL_IMAGE(thumb),
-
ewl_range_value_get(EWL_RANGE(em->fthumb_size)),
+ ewl_image_constrain_set(EWL_IMAGE(thumb),
ewl_range_value_get(EWL_RANGE(em->fthumb_size)));
ewl_object_alignment_set(EWL_OBJECT(thumb),
EWL_FLAG_ALIGN_CENTER);
@@ -365,10 +369,16 @@
}
ecore_dlist_next(em->images);
}
- ewl_widget_configure(em->fbox);
- ecore_dlist_goto_first(em->images);
+ ewl_widget_configure(em->fbox_vbox);
+
ewl_mvc_data_set(EWL_MVC(em->ltree), em->images);
ecore_dlist_goto_first(em->images);
+
+ if (ecore_dlist_current(em->images))
+ {
+ ewl_image_file_path_set(EWL_IMAGE(em->simage),
+ ecore_dlist_current(em->images));
+ }
return;
}
===================================================================
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_normal_view.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ephoto_normal_view.c 31 May 2007 07:11:28 -0000 1.15
+++ ephoto_normal_view.c 1 Jun 2007 21:46:19 -0000 1.16
@@ -16,6 +16,7 @@
ewl_range_value_get(EWL_RANGE(em->fthumb_size)));
ewl_widget_reparent(child);
}
+ ewl_widget_configure(em->fbox_vbox);
return;
}
@@ -42,7 +43,7 @@
em->fthumb_size = ewl_hseeker_new();
ewl_range_minimum_value_set(EWL_RANGE(em->fthumb_size), 8);
ewl_range_maximum_value_set(EWL_RANGE(em->fthumb_size), 128);
- ewl_range_step_set(EWL_RANGE(em->fthumb_size), 8);
+ ewl_range_step_set(EWL_RANGE(em->fthumb_size), 16);
ewl_range_value_set(EWL_RANGE(em->fthumb_size), 64);
ewl_container_child_append(EWL_CONTAINER(em->fbox_vbox),
em->fthumb_size);
ewl_callback_append(em->fthumb_size, EWL_CALLBACK_VALUE_CHANGED,
change_size, NULL);
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
