Enlightenment CVS committal
Author : titan
Project : e17
Module : apps/ephoto
Dir : e17/apps/ephoto/src/bin
Modified Files:
ephoto_imaging.c ephoto_main.c ephoto_slideshow.c
Log Message:
Cleanups. Fix slideshow segv.
===================================================================
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_imaging.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ephoto_imaging.c 14 May 2007 17:05:29 -0000 1.6
+++ ephoto_imaging.c 15 May 2007 16:44:07 -0000 1.7
@@ -3,7 +3,7 @@
static void close_dialog(Ewl_Widget *w, void *event, void *data);
static void save_image(Ewl_Widget *w, void *event, void *data);
-static Ewl_Widget *save_win, *qseek, *cseek;
+static Ewl_Widget *save_win, *qseek;
unsigned int *flip_horizontal(Ewl_Widget *image)
{
@@ -305,8 +305,7 @@
pid_t pid;
file = ewl_text_text_get(EWL_TEXT(data));
- snprintf(flags, PATH_MAX, "quality=%i compress=%i",
(int)ewl_range_value_get(EWL_RANGE(qseek)),
-
(int)ewl_range_value_get(EWL_RANGE(cseek)));
+ snprintf(flags, PATH_MAX, "quality=%i",
(int)ewl_range_value_get(EWL_RANGE(qseek)));
if(!file) return;
@@ -338,7 +337,7 @@
entry = add_entry(vbox, "default.jpg", NULL, NULL);
- add_label(vbox, "Quality:");
+ add_label(vbox, "Quality/Compression:");
qseek = ewl_hseeker_new();
ewl_range_minimum_value_set(EWL_RANGE(qseek), 0);
@@ -348,16 +347,6 @@
ewl_container_child_append(EWL_CONTAINER(vbox), qseek);
ewl_widget_show(qseek);
- add_label(vbox, "Compression:");
-
- cseek = ewl_hseeker_new();
- ewl_range_minimum_value_set(EWL_RANGE(cseek), 0);
- ewl_range_maximum_value_set(EWL_RANGE(cseek), 9);
- ewl_range_step_set(EWL_RANGE(cseek), 1);
- ewl_range_value_set(EWL_RANGE(cseek), 9);
- ewl_container_child_append(EWL_CONTAINER(vbox), cseek);
- ewl_widget_show(cseek);
-
hbox = add_box(vbox, EWL_ORIENTATION_HORIZONTAL, 5);
ewl_object_alignment_set(EWL_OBJECT(hbox), EWL_FLAG_ALIGN_CENTER);
ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_SHRINK);
===================================================================
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_main.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- ephoto_main.c 14 May 2007 17:05:29 -0000 1.32
+++ ephoto_main.c 15 May 2007 16:44:07 -0000 1.33
@@ -324,6 +324,7 @@
em->images = ephoto_db_list_images(em->db, em->current_album);
ecore_dlist_goto_first(em->images);
+
ewl_container_reset(EWL_CONTAINER(em->fbox));
while (ecore_dlist_current(em->images))
{
@@ -337,7 +338,7 @@
}
ecore_dlist_next(em->images);
}
- ewl_widget_reparent(em->fbox);
+ ewl_widget_configure(em->fbox);
ecore_dlist_goto_first(em->images);
if(ecore_dlist_current(em->images))
{
@@ -398,7 +399,7 @@
}
ecore_dlist_next(em->images);
}
- ewl_widget_reparent(em->fbox);
+ ewl_widget_configure(em->fbox);
ecore_dlist_goto_first(em->images);
if(ecore_dlist_current(em->images))
{
===================================================================
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_slideshow.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ephoto_slideshow.c 30 Mar 2007 02:47:16 -0000 1.4
+++ ephoto_slideshow.c 15 May 2007 16:44:07 -0000 1.5
@@ -31,6 +31,7 @@
static void destroy(Ewl_Widget *w, void *event, void *data)
{
ewl_widget_destroy(win);
+ ecore_timer_del(change);
}
static void show_first_image(Ewl_Widget *w, void *event, void *data)
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
