Enlightenment CVS committal
Author : titan
Project : e17
Module : apps/ephoto
Dir : e17/apps/ephoto/src/bin
Modified Files:
ephoto_browser.c ephoto_dialogs.c ephoto_edit_view.c
ephoto_main.c
Log Message:
More cleanups and work. Also the About window now looks much better thanks to
an image from tokyo.
===================================================================
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_browser.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ephoto_browser.c 14 Sep 2007 18:02:27 -0000 1.1
+++ ephoto_browser.c 14 Sep 2007 18:23:38 -0000 1.2
@@ -14,16 +14,20 @@
static void destroy(Ewl_Widget *w, void *event, void *data)
{
ewl_widget_destroy(w);
+ em->bwin = 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*/
===================================================================
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_dialogs.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ephoto_dialogs.c 14 Sep 2007 18:02:27 -0000 1.2
+++ ephoto_dialogs.c 14 Sep 2007 18:23:38 -0000 1.3
@@ -17,31 +17,34 @@
/*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;
}
===================================================================
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_edit_view.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- ephoto_edit_view.c 14 Sep 2007 18:02:27 -0000 1.27
+++ ephoto_edit_view.c 14 Sep 2007 18:23:38 -0000 1.28
@@ -83,7 +83,7 @@
{
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;
}
===================================================================
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_main.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- ephoto_main.c 14 Sep 2007 18:02:27 -0000 1.45
+++ ephoto_main.c 14 Sep 2007 18:23:38 -0000 1.46
@@ -63,21 +63,24 @@
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",
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
