Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto.c ephoto_viewer.c
Log Message:
New images and make ephoto use these images
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -3 -r1.83 -r1.84
--- ephoto.c 24 Sep 2006 23:30:19 -0000 1.83
+++ ephoto.c 30 Sep 2006 21:26:29 -0000 1.84
@@ -62,12 +62,39 @@
ewl_widget_show(menu);
menu_item = ewl_menu_item_new();
+ ewl_button_image_set(EWL_BUTTON(menu_item),
+ PACKAGE_DATA_DIR "/images/add.png", NULL);
ewl_button_label_set(EWL_BUTTON(menu_item), "Add Album");
ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(menu), menu_item);
ewl_object_fill_policy_set(EWL_OBJECT(menu_item), EWL_FLAG_FILL_ALL);
ewl_widget_show(menu_item);
+
+ menu_item = ewl_menu_item_new();
+ ewl_button_image_set(EWL_BUTTON(menu_item),
+ PACKAGE_DATA_DIR "/images/remove.png", NULL);
+ ewl_button_label_set(EWL_BUTTON(menu_item), "Remove Album");
+ ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(menu), menu_item);
+ ewl_object_fill_policy_set(EWL_OBJECT(menu_item), EWL_FLAG_FILL_ALL);
+ ewl_widget_show(menu_item);
+
+ menu = ewl_menu_new();
+ ewl_button_label_set(EWL_BUTTON(menu), "Viewer");
+ ewl_container_child_append(EWL_CONTAINER(menubar), menu);
+ ewl_object_fill_policy_set(EWL_OBJECT(menu), EWL_FLAG_FILL_NONE);
+ ewl_widget_show(menu);
+ menu_item = ewl_menu_item_new();
+ ewl_button_image_set(EWL_BUTTON(menu_item),
+ PACKAGE_DATA_DIR "/images/emblem-photos.png", NULL);
+ ewl_button_label_set(EWL_BUTTON(menu_item), "Image Viewer");
+ ewl_object_alignment_set(EWL_OBJECT(menu_item), EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(menu), menu_item);
+ ewl_callback_append(menu_item, EWL_CALLBACK_CLICKED, view_images, NULL);
+ ewl_object_fill_policy_set(EWL_OBJECT(menu_item), EWL_FLAG_FILL_ALL);
+ ewl_widget_show(menu_item);
+
menu = ewl_menu_new();
ewl_button_label_set(EWL_BUTTON(menu), "Slideshow");
ewl_container_child_append(EWL_CONTAINER(menubar), menu);
@@ -84,7 +111,6 @@
ewl_object_fill_policy_set(EWL_OBJECT(menu_item), EWL_FLAG_FILL_ALL);
ewl_widget_show(menu_item);
-
menu_item = ewl_menu_item_new();
ewl_button_image_set(EWL_BUTTON(menu_item),
PACKAGE_DATA_DIR "/images/x-office-presentation.png",
NULL);
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_viewer.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ephoto_viewer.c 30 Sep 2006 19:38:07 -0000 1.7
+++ ephoto_viewer.c 30 Sep 2006 21:26:29 -0000 1.8
@@ -73,12 +73,65 @@
ewl_widget_show(ibox);
image_view = ewl_image_new();
+ ewl_theme_data_str_set(image_view, "/image/group",
+ ewl_theme_data_str_get(m->entry, "group"));
ewl_container_child_append(EWL_CONTAINER(ibox), image_view);
ewl_image_proportional_set(EWL_IMAGE(image_view), TRUE);
ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_SHRINK);
ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_CENTER);
ewl_widget_show(image_view);
+
+ hbox = ewl_hbox_new();
+ ewl_container_child_append(EWL_CONTAINER(vbox), hbox);
+ ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_SHRINK);
+ ewl_object_alignment_set(EWL_OBJECT(hbox), EWL_FLAG_ALIGN_CENTER);
+ ewl_widget_show(hbox);
+
+ button = ewl_button_new();
+ ewl_button_image_set(EWL_BUTTON(button),
+ PACKAGE_DATA_DIR "/images/search.png", NULL);
+ ewl_button_label_set(EWL_BUTTON(button), "In");
+ ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_SHRINK);
+ ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(hbox), button);
+ ewl_widget_show(button);
+ button = ewl_button_new();
+ ewl_button_image_set(EWL_BUTTON(button),
+ PACKAGE_DATA_DIR "/images/search.png", NULL);
+ ewl_button_label_set(EWL_BUTTON(button), "Out");
+ ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_SHRINK);
+ ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(hbox), button);
+ ewl_widget_show(button);
+
+ button = ewl_button_new();
+ ewl_button_image_set(EWL_BUTTON(button),
+ PACKAGE_DATA_DIR "/images/search.png", NULL);
+ ewl_button_label_set(EWL_BUTTON(button), "1:1");
+ ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_SHRINK);
+ ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(hbox), button);
+ ewl_widget_show(button);
+
+ button = ewl_button_new();
+ ewl_button_image_set(EWL_BUTTON(button),
+ PACKAGE_DATA_DIR "/images/undo.png", NULL);
+ ewl_button_label_set(EWL_BUTTON(button), "Left");
+ ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_SHRINK);
+ ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(hbox), button);
+ ewl_widget_show(button);
+
+ button = ewl_button_new();
+ ewl_button_image_set(EWL_BUTTON(button),
+ PACKAGE_DATA_DIR "/images/redo.png", NULL);
+ ewl_button_label_set(EWL_BUTTON(button), "Right");
+ ewl_object_fill_policy_set(EWL_OBJECT(button), EWL_FLAG_FILL_SHRINK);
+ ewl_object_alignment_set(EWL_OBJECT(button), EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(hbox), button);
+ ewl_widget_show(button);
+
ecore_dlist_goto_first(view_thumbs);
while (ecore_dlist_current(view_thumbs))
{
@@ -102,6 +155,10 @@
ewl_widget_show(image);
ecore_dlist_next(view_thumbs);
- }
- ewl_callback_append(vbox, EWL_CALLBACK_SHOW, change_image, data);
+ }
+ if (data)
+ ewl_callback_append(vbox, EWL_CALLBACK_SHOW, change_image, data);
+ if (!data)
+ ewl_callback_append(vbox, EWL_CALLBACK_SHOW, change_image,
+ (char *)ecore_dlist_goto_first(view_thumbs));
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
