Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto_slideshow.c
Log Message:
More config dialog tie in and cleanup.
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_slideshow.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ephoto_slideshow.c 16 Sep 2006 02:53:33 -0000 1.8
+++ ephoto_slideshow.c 16 Sep 2006 03:36:49 -0000 1.9
@@ -17,6 +17,7 @@
Ewl_Widget *hentry;
Ewl_Widget *zoom_image;
Ewl_Widget *aspect_image;
+ Ewl_Widget *image;
int full_size;
int custom_size;
int length;
@@ -38,19 +39,36 @@
int change_picture(void *data)
{
char *image_path;
- Ewl_Widget *w;
+ Slide_Config *sc;
- w = data;
+ sc = data;
ecore_dlist_next(current_thumbs);
image_path = ecore_dlist_current(current_thumbs);
if(image_path)
{
- ewl_image_file_set(EWL_IMAGE(w), image_path, NULL);
+ ewl_image_file_set(EWL_IMAGE(sc->image), image_path, NULL);
}
- else
+ else
{
- ecore_timer_del(timer);
- ewl_widget_destroy(w->parent->parent);
+ if (sc->loop_slide)
+ {
+ ecore_list_goto_first(current_thumbs);
+ image_path = ecore_dlist_current(current_thumbs);
+ if(image_path)
+ {
+ ewl_image_file_set(EWL_IMAGE(sc->image), image_path, NULL);
+ }
+ else
+ {
+ ecore_timer_del(time);
+ ewl_widget_destroy(sc->image->parent->parent);
+ }
+ }
+ else
+ {
+ ecore_timer_del(timer);
+ ewl_widget_destroy(sc->image->parent->parent);
+ }
}
}
@@ -101,7 +119,8 @@
ewl_container_child_append(EWL_CONTAINER(cell), image);
ewl_widget_show(image);
- timer = ecore_timer_add(4, change_picture, image);
+ sc->image = image;
+ timer = ecore_timer_add(4, change_picture, sc);
}
Slide_Config *parse_slideshow_config()
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
