Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto_viewer.c
Log Message:
Image viewer just got perfect!
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_viewer.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ephoto_viewer.c 24 Sep 2006 23:30:19 -0000 1.5
+++ ephoto_viewer.c 30 Sep 2006 18:42:50 -0000 1.6
@@ -1,7 +1,6 @@
#include "ephoto.h"
Ewl_Widget *vwin;
Ewl_Widget *image_view;
-Ewl_Widget *image_vbox;
void destroy_vwin(Ewl_Widget *w, void *event, void *data)
{
@@ -14,26 +13,21 @@
path = data;
- ewl_widget_destroy(image_view);
-
- image_view = ewl_image_new();
- ewl_image_file_set(EWL_IMAGE(image_view), (char *)data, NULL);
- ewl_container_child_append(EWL_CONTAINER(image_vbox), image_view);
- ewl_image_size_set(EWL_IMAGE(image_view), 400, 200);
- ewl_image_proportional_set(EWL_IMAGE(image_view), TRUE);
- ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_ALL);
- ewl_object_alignment_set(EWL_OBJECT(image_view), EWL_FLAG_ALIGN_CENTER);
- ewl_widget_show(image_view);
+ ewl_container_reset(EWL_CONTAINER(image_view));
+ ewl_image_file_set(EWL_IMAGE(image_view), path, NULL);
}
void view_images(Ewl_Widget *w, void *event, void *data)
{
char *current_image;
+ Ewl_Widget *button;
Ewl_Widget *scrollpane;
Ewl_Widget *freebox;
Ewl_Widget *icon;
Ewl_Widget *image;
Ewl_Widget *vbox;
+ Ewl_Widget *ibox;
+ Ewl_Widget *hbox;
Ewl_Widget *cell;
Ecore_List *view_thumbs;
@@ -71,20 +65,19 @@
ewl_object_fill_policy_set(EWL_OBJECT(freebox), EWL_FLAG_FILL_ALL);
ewl_object_maximum_size_set(EWL_OBJECT(freebox), 99999, 75);
ewl_widget_show(freebox);
-
- image_vbox = ewl_vbox_new();
- ewl_theme_data_str_set(image_vbox, "/image/group",
- ewl_theme_data_str_get(m->entry, "group"));
- ewl_container_child_append(EWL_CONTAINER(vbox), image_vbox);
- ewl_object_fill_policy_set(EWL_OBJECT(image_vbox), EWL_FLAG_FILL_ALL);
- ewl_widget_show(image_vbox);
+
+ ibox = ewl_cell_new();
+ ewl_object_fill_policy_set(EWL_OBJECT(ibox), EWL_FLAG_FILL_ALL);
+ ewl_object_alignment_set(EWL_OBJECT(ibox), EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(vbox), ibox);
+ ewl_widget_show(ibox);
image_view = ewl_image_new();
- ewl_image_file_set(EWL_IMAGE(image_view), (char *)data, NULL);
- ewl_container_child_append(EWL_CONTAINER(image_vbox), image_view);
- ewl_image_size_set(EWL_IMAGE(image_view), 400, 200);
+ ewl_container_child_append(EWL_CONTAINER(ibox), image_view);
+ ewl_theme_data_str_set(image_view, "/image/group",
+ ewl_theme_data_str_get(m->entry, "group"));
ewl_image_proportional_set(EWL_IMAGE(image_view), TRUE);
- ewl_object_fill_policy_set(EWL_OBJECT(image_view), EWL_FLAG_FILL_ALL);
+ 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);
@@ -112,4 +105,5 @@
ecore_dlist_next(view_thumbs);
}
+ ewl_callback_append(vbox, EWL_CALLBACK_SHOW, change_image, data);
}
-------------------------------------------------------------------------
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
