Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto.c ephoto_callbacks.c ephoto_slideshow.c
Log Message:
Add proper support for closing the slideshow window.. If fullscreen, just click
it to close it. Move the current_thumbs list to ecore_dlist. It will save
problems in the future.
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -3 -r1.77 -r1.78
--- ephoto.c 8 Sep 2006 02:52:19 -0000 1.77
+++ ephoto.c 8 Sep 2006 02:59:43 -0000 1.78
@@ -15,7 +15,7 @@
return 1;
}
- current_thumbs = ecore_list_new();
+ current_thumbs = ecore_dlist_new();
current_directory = strdup(getenv("HOME"));
m = calloc(1, sizeof(Main));
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_callbacks.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- ephoto_callbacks.c 8 Sep 2006 02:52:19 -0000 1.19
+++ ephoto_callbacks.c 8 Sep 2006 02:59:43 -0000 1.20
@@ -196,15 +196,15 @@
fclose(file_ptr);
}
}
- if(!ecore_list_is_empty(current_thumbs))
+ if(!ecore_dlist_is_empty(current_thumbs))
{
- ecore_list_destroy(current_thumbs);
- current_thumbs = ecore_list_new();
+ ecore_dlist_destroy(current_thumbs);
+ current_thumbs = ecore_dlist_new();
}
while(!ecore_list_is_empty(images))
{
image = ecore_list_remove_first(images);
- ecore_list_append(current_thumbs, image);
+ ecore_dlist_append(current_thumbs, image);
m->icon = ewl_image_thumbnail_new();
ewl_image_thumbnail_request(EWL_IMAGE_THUMBNAIL(m->icon), image);
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_slideshow.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ephoto_slideshow.c 8 Sep 2006 02:52:19 -0000 1.1
+++ ephoto_slideshow.c 8 Sep 2006 02:59:43 -0000 1.2
@@ -1,14 +1,20 @@
#include "ephoto.h"
Ecore_Timer *timer;
+void destroy_slideshow(Ewl_Widget *w, void *event, void *data)
+{
+ ecore_timer_del(timer);
+ ewl_widget_destroy(w);
+}
+
int change_picture(void *data)
{
char *image_path;
Ewl_Widget *w;
w = data;
- ecore_list_next(current_thumbs);
- image_path = ecore_list_current(current_thumbs);
+ 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);
@@ -27,12 +33,14 @@
Ewl_Widget *image;
char *image_path;
- image_path = ecore_list_goto_first(current_thumbs);
+ image_path = ecore_dlist_goto_first(current_thumbs);
if (!image_path) return;
window = ewl_window_new();
ewl_window_fullscreen_set(EWL_WINDOW(window), 1);
+ ewl_callback_append(window, EWL_CALLBACK_DELETE_WINDOW, destroy_slideshow,
NULL);
+ ewl_callback_append(window, EWL_CALLBACK_CLICKED, destroy_slideshow, NULL);
ewl_widget_show(window);
vbox = ewl_vbox_new();
-------------------------------------------------------------------------
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
