From e5b8c1cea9e8df0983a1a79303f17329e096507d Mon Sep 17 00:00:00 2001 From: titan Date: Fri, 14 Sep 2007 18:23:38 +0000 Subject: [PATCH] More cleanups and work. Also the About window now looks much better thanks to an image from tokyo. SVN revision: 31715 --- configure.in | 12 ++++++++++++ data/images/Makefile.am | 1 + data/images/photo_lens.png | Bin 0 -> 37237 bytes src/bin/ephoto_browser.c | 12 ++++++++---- src/bin/ephoto_dialogs.c | 17 ++++++++++------- src/bin/ephoto_edit_view.c | 2 +- src/bin/ephoto_main.c | 13 ++++++++----- 7 files changed, 40 insertions(+), 17 deletions(-) create mode 100644 data/images/photo_lens.png diff --git a/configure.in b/configure.in index b24fa11..01431ea 100644 --- a/configure.in +++ b/configure.in @@ -132,6 +132,17 @@ PKG_CHECK_MODULES([EWL], ewl, ] ) +PKG_CHECK_MODULES([EFREET_MIME], efreet-mime, + [ + have_efreet_mime="Yes" + ], + [ + have_efreet_mime="No" + echo "Efreet_Mime was not found by pkg-config!"; + AC_MSG_ERROR([Ephoto needs efreet_mime to compile.]) + ] +) + PKG_CHECK_MODULES([EPSILON], epsilon, [ have_epsilon="Yes" @@ -178,6 +189,7 @@ echo echo " Evas ............: $have_evas" echo " Ecore ...........: $have_ecore" echo " Edje ............: $have_edje" +echo " Efreet_Mime .....: $have_efreet_mime" echo " Epsilon .........: $have_epsilon" echo " Ewl .............: $have_ewl" echo " Libexif .........: $have_exif" diff --git a/data/images/Makefile.am b/data/images/Makefile.am index ffffcc8..6ac0712 100644 --- a/data/images/Makefile.am +++ b/data/images/Makefile.am @@ -19,6 +19,7 @@ FILES = add.png \ media-seek-backward.png \ media-seek-forward.png \ normal_view.png \ + photo_lens.png \ preferences-system.png \ redo.png \ remove.png \ diff --git a/data/images/photo_lens.png b/data/images/photo_lens.png new file mode 100644 index 0000000000000000000000000000000000000000..ee4e32358f7c586045e001d360d87c89d9983458 GIT binary patch literal 37237 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%0ACB7q;cQmN5}hBw(y& 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 = NULL; } void show_browser(Ewl_Widget *w, void *event, void *data) { - em->bwin = add_window("Browser!", 200, 400, destroy, NULL); + if (!em->bwin) + { + em->bwin = add_window("Browser!", 200, 400, destroy, NULL); - em->dtree = add_dtree(em->bwin); - ewl_object_maximum_w_set(EWL_OBJECT(em->dtree), 200); + em->dtree = add_dtree(em->bwin); + ewl_object_maximum_w_set(EWL_OBJECT(em->dtree), 200); - populate_directories(NULL, NULL, NULL); + populate_directories(NULL, NULL, NULL); + } } /*Create and Add a Tree to the Container c*/ diff --git a/src/bin/ephoto_dialogs.c b/src/bin/ephoto_dialogs.c index 0dd94a3..7bd1f23 100644 --- a/src/bin/ephoto_dialogs.c +++ b/src/bin/ephoto_dialogs.c @@ -17,31 +17,34 @@ static void close_dialog(Ewl_Widget *w, void *event, void *data) /*Add an About Dialog*/ void about_dialog(Ewl_Widget *w, void *event, void *data) { - Ewl_Widget *window, *button, *vbox, *text; + Ewl_Widget *window, *button, *image, *vbox, *text; - window = add_window("About Ephoto", 200, 100, NULL, NULL); + window = add_window("About Ephoto", 300, 400, NULL, NULL); ewl_callback_append(window, EWL_CALLBACK_DELETE_WINDOW, close_dialog, window); vbox = add_box(window, EWL_ORIENTATION_VERTICAL, 3); ewl_object_fill_policy_set(EWL_OBJECT(vbox), EWL_FLAG_FILL_ALL); + image = add_image(vbox, PACKAGE_DATA_DIR "/images/photo_lens.png", 0, NULL, NULL); + ewl_object_alignment_set(EWL_OBJECT(image), EWL_FLAG_ALIGN_CENTER); + text = add_text(vbox, "Ephoto is an advanced image viewer that allows\n" - "you to view images in several methods. They\n" + "you to view images using several methods. They\n" "include an icon view, a list view, and a single\n" "image view. You can also view exif data, view\n" "images in a fullscreen mode, and view images in a\n" "slideshow. The edit view offers simple and advanced\n" - "editing options including rotations, flips, blurs,\n" - "sharpens, conversion to black and white, and\n" - "conversions to sepia."); + "editing options."); ewl_text_wrap_set(EWL_TEXT(text), EWL_TEXT_WRAP_WORD); + ewl_object_alignment_set(EWL_OBJECT(text), EWL_FLAG_ALIGN_CENTER); button = add_button(vbox, "Close", PACKAGE_DATA_DIR "/images/dialog-close.png", close_dialog, window); ewl_button_image_size_set(EWL_BUTTON(button), 25, 25); - + ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_CENTER); + return; } diff --git a/src/bin/ephoto_edit_view.c b/src/bin/ephoto_edit_view.c index 7a11c70..699e690 100644 --- a/src/bin/ephoto_edit_view.c +++ b/src/bin/ephoto_edit_view.c @@ -83,7 +83,7 @@ void show_edit_view(Ewl_Widget *w, void *event, void *data) { ewl_notebook_visible_page_set(EWL_NOTEBOOK(em->view_box), em->edit_vbox); ewl_image_file_path_set(EWL_IMAGE(em->eimage), ecore_dlist_current(em->images)); - ewl_widget_enable(em->smi); + return; } diff --git a/src/bin/ephoto_main.c b/src/bin/ephoto_main.c index d260f33..59a96e9 100644 --- a/src/bin/ephoto_main.c +++ b/src/bin/ephoto_main.c @@ -63,22 +63,25 @@ void create_main(void) buf[sizeof(buf)-1] = '\0'; em->current_directory = strdup(buf); - em->win = add_window("Ephoto!", 800, 600, destroy, NULL); + em->bwin = NULL; + + em->win = add_window("Ephoto!", 600, 475, destroy, NULL); vbox = add_box(em->win, EWL_ORIENTATION_VERTICAL, 5); ewl_object_fill_policy_set(EWL_OBJECT(vbox), EWL_FLAG_FILL_ALL); mb = add_menubar(vbox); + menu = add_menu(mb, "File"); - em->smi = add_menu_item(menu, "Save Image As", - PACKAGE_DATA_DIR "/images/stock_save-as.png", - save_dialog, NULL); - ewl_widget_disable(em->smi); mi = add_menu_item(menu, "Exit", PACKAGE_DATA_DIR "/images/exit.png", destroy, NULL); menu = add_menu(mb, "Albums"); + menu = add_menu(mb, "View"); + mi = add_menu_item(menu, "Browser", + NULL, show_browser, NULL); + menu = add_menu(mb, "Help"); mi = add_menu_item(menu, "About", PACKAGE_DATA_DIR "/images/stock_help.png",