Enlightenment CVS committal

Author  : titan
Project : e17
Module  : proto

Dir     : e17/proto/ephoto/src


Modified Files:
        ephoto_callbacks.c ephoto_viewer.c 


Log Message:
Make the viewer use shadow as well. Fix a callback naming issue.

===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_callbacks.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- ephoto_callbacks.c  7 Oct 2006 18:08:47 -0000       1.32
+++ ephoto_callbacks.c  7 Oct 2006 21:15:45 -0000       1.33
@@ -142,7 +142,7 @@
  Ecore_List *ls;
  Ecore_List *images;
  Ewl_Widget *image;
- Ewl_Widget *cell;
+ Ewl_Widget *shadow;
  
  ls = ecore_list_new();
  images = ecore_list_new();
@@ -207,16 +207,16 @@
   image_path = ecore_list_remove_first(images);
   ecore_dlist_append(current_thumbs, image_path);
 
-  cell = ewl_shadow_new();
-  ewl_container_child_append(EWL_CONTAINER(m->viewer_freebox), cell);
-  ewl_object_minimum_size_set(EWL_OBJECT(cell), 115, 95);
-  ewl_object_maximum_size_set(EWL_OBJECT(cell), 115, 95);
-  ewl_callback_append(cell, EWL_CALLBACK_CLICKED, view_images, image_path);
-  ewl_widget_show(cell);
+  shadow = ewl_shadow_new();
+  ewl_container_child_append(EWL_CONTAINER(m->viewer_freebox), shadow);
+  ewl_object_minimum_size_set(EWL_OBJECT(shadow), 115, 95);
+  ewl_object_maximum_size_set(EWL_OBJECT(shadow), 115, 95);
+  ewl_callback_append(shadow, EWL_CALLBACK_CLICKED, view_images, image_path);
+  ewl_widget_show(shadow);
   
   image = ewl_image_thumbnail_new();
   ewl_image_thumbnail_request(EWL_IMAGE_THUMBNAIL(image), image_path);
-  ewl_container_child_append(EWL_CONTAINER(cell), image);
+  ewl_container_child_append(EWL_CONTAINER(shadow), image);
   ewl_image_size_set(EWL_IMAGE(image), 97, 83);
   ewl_image_proportional_set(EWL_IMAGE(image), TRUE);
   ewl_theme_data_str_set(image, "/image_thumbnail/group",
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_viewer.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- ephoto_viewer.c     6 Oct 2006 22:23:04 -0000       1.19
+++ ephoto_viewer.c     7 Oct 2006 21:15:45 -0000       1.20
@@ -218,8 +218,8 @@
 void view_images(Ewl_Widget *w, void *event, void *data)
 {
  char *current_image;
- Ewl_Widget *button, *vbox, *scrollpane, *freebox, *icon;
- Ewl_Widget *image, *hbox, *cell, *menubar, *menu, *menu_item;
+ Ewl_Widget *button, *vbox, *scrollpane, *freebox, *image;
+ Ewl_Widget *hbox, *shadow, *menubar, *menu, *menu_item;
  Ecore_List *view_thumbs;
  
  view_thumbs = current_thumbs;
@@ -317,7 +317,7 @@
  ewl_button_label_set(EWL_BUTTON(menu_item), gettext("Zoom 1:1"));
  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, zoom_out, NULL);
+ ewl_callback_append(menu_item, EWL_CALLBACK_CLICKED, original_size, NULL);
  ewl_object_fill_policy_set(EWL_OBJECT(menu_item), EWL_FLAG_FILL_ALL);
  ewl_widget_show(menu_item);
 
@@ -458,21 +458,21 @@
  {
   current_image = ecore_dlist_current(view_thumbs);    
 
-  cell = ewl_cell_new();
-  ewl_container_child_append(EWL_CONTAINER(freebox), cell);
-  ewl_object_minimum_size_set(EWL_OBJECT(cell), 50, 50);
-  ewl_object_maximum_size_set(EWL_OBJECT(cell), 50, 50);
-  ewl_theme_data_str_set(cell, "/cell/group",
-                         ewl_theme_data_str_get(m->entry, "group"));
-  ewl_callback_append(cell, EWL_CALLBACK_CLICKED, change_image, current_image);
-  ewl_widget_show(cell);
+  shadow = ewl_shadow_new();
+  ewl_container_child_append(EWL_CONTAINER(freebox), shadow);
+  ewl_object_minimum_size_set(EWL_OBJECT(shadow), 60, 60);
+  ewl_object_maximum_size_set(EWL_OBJECT(shadow), 60, 60);
+  ewl_callback_append(shadow, EWL_CALLBACK_CLICKED, change_image, 
current_image);
+  ewl_widget_show(shadow);
   
   image = ewl_image_thumbnail_new();
   ewl_image_thumbnail_request(EWL_IMAGE_THUMBNAIL(image), current_image);
-  ewl_container_child_append(EWL_CONTAINER(cell), image);
+  ewl_container_child_append(EWL_CONTAINER(shadow), image);
   ewl_image_size_set(EWL_IMAGE(image), 48, 48);
   ewl_image_proportional_set(EWL_IMAGE(image), TRUE);
   ewl_object_alignment_set(EWL_OBJECT(image), EWL_FLAG_ALIGN_CENTER);
+  ewl_theme_data_str_set(image, "/image_thumbnail/group", 
+                        ewl_theme_data_str_get(m->win, "group"));
   ewl_widget_show(image);
   
   ecore_dlist_next(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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to