Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto.c ephoto.h ephoto_browsing.c
Log Message:
Ok. Now adding tons of large images to the slideshow should no longer be
resourceful or slow.
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- ephoto.c 4 Apr 2006 00:04:27 -0000 1.28
+++ ephoto.c 4 Apr 2006 18:16:41 -0000 1.29
@@ -418,10 +418,14 @@
ewl_object_alignment_set(EWL_OBJECT(m->content),
EWL_FLAG_ALIGN_CENTER);
ewl_widget_show(m->content);
- m->ib = ewl_iconbox_new();
- ewl_iconbox_editable_set(EWL_ICONBOX(m->ib), 1);
- ewl_object_size_request(EWL_OBJECT(m->ib), 520, 400);
- ewl_container_child_append(EWL_CONTAINER(m->content), m->ib);
+ m->iscroll = ewl_scrollpane_new();
+ ewl_object_size_request(EWL_OBJECT(m->iscroll), 520, 400);
+ ewl_container_child_append(EWL_CONTAINER(m->content),
m->iscroll);
+ ewl_widget_show(m->iscroll);
+
+ m->ib = ewl_freebox_new();
+ ewl_freebox_layout_type_set(EWL_FREEBOX(m->ib),
EWL_FREEBOX_LAYOUT_AUTO);
+ ewl_container_child_append(EWL_CONTAINER(m->iscroll), m->ib);
ewl_widget_show(m->ib);
m->settings = ewl_border_new();
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ephoto.h 1 Apr 2006 05:17:27 -0000 1.11
+++ ephoto.h 4 Apr 2006 18:16:41 -0000 1.12
@@ -65,6 +65,7 @@
Ewl_Widget *children[2];
Ewl_Widget *row;
Ewl_Widget *ib;
+ Ewl_Widget *iscroll;
Ewl_Widget *slideshow;
Ewl_Widget *presentation;
Ewl_Widget *text;
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_browsing.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ephoto_browsing.c 4 Apr 2006 00:04:28 -0000 1.16
+++ ephoto_browsing.c 4 Apr 2006 18:16:41 -0000 1.17
@@ -289,8 +289,7 @@
name = ewl_widget_name_get(w);
- ewl_iconbox_icon_remove(EWL_ICONBOX(m->ib), EWL_ICONBOX_ICON(w));
- ewl_iconbox_icon_arrange(EWL_ICONBOX(m->ib));
+ ewl_container_child_remove(EWL_CONTAINER(m->ib), w);
/*********Lets remove the image from the list*********/
name2 = ecore_dlist_goto_first(m->imagelist);
@@ -334,11 +333,13 @@
/**********Add the images to the iconbox and list**********/
if ( page == m->vbox2 || w == m->vbutton ) {
- m->i = ewl_iconbox_icon_add(EWL_ICONBOX(m->ib), name, pathi);
- ewl_callback_append(m->i, EWL_CALLBACK_CLICKED, iremove_cb,
NULL);
- ewl_widget_name_set(m->i, pathi);
-
- ewl_iconbox_icon_arrange(EWL_ICONBOX(m->ib));
+ m->i = ewl_image_thumbnail_new();
+ ewl_image_constrain_set(EWL_IMAGE(m->i), 64);
+ ewl_image_proportional_set(EWL_IMAGE(m->i), TRUE);
+ ewl_image_thumbnail_request(EWL_IMAGE(m->i), pathi);
+ ewl_image_file_set(EWL_IMAGE(m->i), PACKAGE_DATA_DIR
"images/camera.png", NULL);
+ ewl_container_child_append(EWL_CONTAINER(m->ib), m->i);
+ ewl_widget_show(m->i);
ecore_dlist_append(m->imagelist, strdup(pathi));
slidenum++;
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
