Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir     : e17/apps/ephoto/src/bin


Modified Files:
        ephoto_edit_view.c ephoto_main.c 


Log Message:
Keep the toolbar when switching to edit view.

===================================================================
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_edit_view.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ephoto_edit_view.c  19 Apr 2007 04:09:15 -0000      1.13
+++ ephoto_edit_view.c  22 Apr 2007 18:58:52 -0000      1.14
@@ -12,7 +12,8 @@
 /*Add the edit view*/
 Ewl_Widget *add_edit_view(Ewl_Widget *c)
 {
-       Ewl_Widget *button, *vbox, *hbox, *nb, *standard, *enhance, *advanced;
+       Ewl_Widget *button, *vbox, *ivbox, *hbox, *bhbox, *nb;
+       Ewl_Widget *standard, *enhance, *advanced;
 
         vbox = add_box(c, EWL_ORIENTATION_VERTICAL, 5);
         ewl_object_fill_policy_set(EWL_OBJECT(vbox), EWL_FLAG_FILL_ALL);
@@ -44,22 +45,22 @@
         ewl_object_minimum_w_set(EWL_OBJECT(advanced), 172);
         ewl_object_fill_policy_set(EWL_OBJECT(advanced), EWL_FLAG_FILL_VFILL);
         ewl_notebook_page_tab_text_set(EWL_NOTEBOOK(nb), advanced, "Advanced 
Tools");
+       ivbox = add_box(hbox, EWL_ORIENTATION_VERTICAL, 2);
+       ewl_object_alignment_set(EWL_OBJECT(ivbox), EWL_FLAG_ALIGN_CENTER);
+       ewl_object_fill_policy_set(EWL_OBJECT(ivbox), EWL_FLAG_FILL_ALL);
 
-        em->eimage = add_image(hbox, NULL, 0, NULL, NULL);
+        em->eimage = add_image(ivbox, NULL, 0, NULL, NULL);
         ewl_object_alignment_set(EWL_OBJECT(em->eimage), 
EWL_FLAG_ALIGN_CENTER);
         ewl_object_fill_policy_set(EWL_OBJECT(em->eimage), 
EWL_FLAG_FILL_SHRINK);
+       bhbox = add_box(ivbox, EWL_ORIENTATION_HORIZONTAL, 2);
+       ewl_object_alignment_set(EWL_OBJECT(bhbox), EWL_FLAG_ALIGN_CENTER);
+       ewl_object_fill_policy_set(EWL_OBJECT(bhbox), EWL_FLAG_FILL_SHRINK);
 
-       hbox = add_box(vbox, EWL_ORIENTATION_HORIZONTAL, 2);
-       ewl_object_alignment_set(EWL_OBJECT(hbox), EWL_FLAG_ALIGN_CENTER);
-       ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_SHRINK);
-
-       button = add_button(hbox, "Return to main view", NULL, show_main_view, 
NULL);
-
-        button = add_button(hbox, NULL, PACKAGE_DATA_DIR 
"/images/media-seek-backward.png", previous_image, NULL);
+        button = add_button(bhbox, NULL, PACKAGE_DATA_DIR 
"/images/media-seek-backward.png", previous_image, NULL);
         ewl_button_image_size_set(EWL_BUTTON(button), 25, 25);
         ewl_attach_tooltip_text_set(button, "Previous Image");
 
-        button = add_button(hbox, NULL, PACKAGE_DATA_DIR 
"/images/media-seek-forward.png", next_image, NULL);
+        button = add_button(bhbox, NULL, PACKAGE_DATA_DIR 
"/images/media-seek-forward.png", next_image, NULL);
         ewl_button_image_size_set(EWL_BUTTON(button), 25, 25);
         ewl_attach_tooltip_text_set(button, "Next Image");
 
@@ -125,7 +126,7 @@
                image = ecore_dlist_current(em->images);
        }
         ewl_image_file_path_set(EWL_IMAGE(em->eimage), image);
-        ewl_widget_configure(em->eimage->parent);
+        ewl_widget_configure(em->eimage->parent->parent);
 
         return;
 }
===================================================================
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_main.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- ephoto_main.c       19 Apr 2007 04:09:15 -0000      1.24
+++ ephoto_main.c       22 Apr 2007 18:58:52 -0000      1.25
@@ -131,7 +131,7 @@
        ewl_box_spacing_set(EWL_BOX(em->toolbar), 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(em->main_vbox), em->toolbar);
+       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", show_normal_view, 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
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to