From 7da833e9ee1278f6ed3a95bc7711029992155bd6 Mon Sep 17 00:00:00 2001 From: titan Date: Wed, 21 Feb 2007 04:49:09 +0000 Subject: [PATCH] For Zgold SVN revision: 28416 --- src/bin/ephoto_list_view.c | 2 +- src/bin/ephoto_main.c | 26 +++++++++++++++++++++----- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/bin/ephoto_list_view.c b/src/bin/ephoto_list_view.c index 58c3f7a..8c7af23 100644 --- a/src/bin/ephoto_list_view.c +++ b/src/bin/ephoto_list_view.c @@ -15,7 +15,7 @@ Ewl_Widget *add_list_view(Ewl_Widget *c) ewl_widget_show(em->list_vbox); ewl_notebook_page_tab_text_set(EWL_NOTEBOOK(c), em->list_vbox, "List"); - em->ltree = add_ltree(em->list_vbox); + em->ltree = add_ltree(em->list_vbox); return em->list_vbox; } diff --git a/src/bin/ephoto_main.c b/src/bin/ephoto_main.c index 84bf16a..825ebe9 100644 --- a/src/bin/ephoto_main.c +++ b/src/bin/ephoto_main.c @@ -122,7 +122,7 @@ void create_main_gui(void) add_edit_view(em->view_box); add_list_view(em->view_box); - + hsep = ewl_hseparator_new(); ewl_container_child_append(EWL_CONTAINER(vbox), hsep); ewl_widget_show(hsep); @@ -138,10 +138,18 @@ void create_main_gui(void) image = add_image(em->toolbar, PACKAGE_DATA_DIR "/images/normal_view.png", 0, show_normal_view, NULL); ewl_image_constrain_set(EWL_IMAGE(image), 30); - image = add_image(em->toolbar, PACKAGE_DATA_DIR "/images/edit_view.png", 0, show_edit_view, NULL); - ewl_image_constrain_set(EWL_IMAGE(image), 30); + vsep = ewl_vseparator_new(); + ewl_container_child_append(EWL_CONTAINER(em->toolbar), vsep); + ewl_widget_show(vsep); image = add_image(em->toolbar, PACKAGE_DATA_DIR "/images/list_view.png", 0, show_list_view, NULL); + ewl_image_constrain_set(EWL_IMAGE(image), 30); + + vsep = ewl_vseparator_new(); + ewl_container_child_append(EWL_CONTAINER(em->toolbar), vsep); + ewl_widget_show(vsep); + + image = add_image(em->toolbar, PACKAGE_DATA_DIR "/images/edit_view.png", 0, show_edit_view, NULL); ewl_image_constrain_set(EWL_IMAGE(image), 30); vsep = ewl_vseparator_new(); @@ -151,9 +159,17 @@ void create_main_gui(void) image = add_image(em->toolbar, PACKAGE_DATA_DIR "/images/get_exif.png", 0, display_exif_dialog, NULL); ewl_image_constrain_set(EWL_IMAGE(image), 30); + vsep = ewl_vseparator_new(); + ewl_container_child_append(EWL_CONTAINER(em->toolbar), vsep); + ewl_widget_show(vsep); + image = add_image(em->toolbar, PACKAGE_DATA_DIR "/images/stock_fullscreen.png", 0, window_fullscreen, NULL); ewl_image_constrain_set(EWL_IMAGE(image), 30); + vsep = ewl_vseparator_new(); + ewl_container_child_append(EWL_CONTAINER(em->toolbar), vsep); + ewl_widget_show(vsep); + image = add_image(em->toolbar, PACKAGE_DATA_DIR "/images/x-office-presentation.png", 0, NULL, NULL); ewl_image_constrain_set(EWL_IMAGE(image), 30); @@ -245,8 +261,8 @@ static Ewl_Widget *add_vcombo(Ewl_Widget *c) em->views = calloc(3, sizeof(char *)); em->views[0] = strdup("Normal"); - em->views[1] = strdup("Edit"); - em->views[2] = strdup("List"); + em->views[1] = strdup("List"); + em->views[2] = strdup("Edit"); model = ewl_model_new(); ewl_model_fetch_set(model, views_data_fetch);