Enlightenment CVS committal
Author : kiwi
Project : e_modules
Module : photo
Dir : e_modules/photo/src/module
Modified Files:
photo_item.c photo_menu.c photo_picture_histo.c
Log Message:
* restart timer when manually change the current picture
* reorganise the menu
===================================================================
RCS file: /cvs/e/e_modules/photo/src/module/photo_item.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- photo_item.c 13 Jul 2006 03:28:19 -0000 1.4
+++ photo_item.c 24 Sep 2006 21:48:46 -0000 1.5
@@ -13,9 +13,15 @@
if (UTIL_TEST_PARENT(var, parent, ITEM_ACTION_INFOS , ITEM_ACTION_PARENT)) \
photo_item_action_infos(pi); \
if (UTIL_TEST_PARENT(var, parent, ITEM_ACTION_PREV , ITEM_ACTION_PARENT)) \
- photo_item_action_change(pi, -1); \
+{ \
+ photo_item_action_change(pi, -1); \
+ photo_item_timer_set(pi, pi->config->timer_active, 0); \
+} \
if (UTIL_TEST_PARENT(var, parent, ITEM_ACTION_NEXT , ITEM_ACTION_PARENT)) \
- photo_item_action_change(pi, 1); \
+{ \
+ photo_item_action_change(pi, 1); \
+ photo_item_timer_set(pi, pi->config->timer_active, 0); \
+} \
if (UTIL_TEST_PARENT(var, parent, ITEM_ACTION_PAUSE , ITEM_ACTION_PARENT)) \
photo_item_action_pause_toggle(pi); \
if (UTIL_TEST_PARENT(var, parent, ITEM_ACTION_SETBG , ITEM_ACTION_PARENT)) \
===================================================================
RCS file: /cvs/e/e_modules/photo/src/module/photo_menu.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- photo_menu.c 12 Jul 2006 06:11:39 -0000 1.2
+++ photo_menu.c 24 Sep 2006 21:48:46 -0000 1.3
@@ -24,18 +24,6 @@
e_menu_post_deactivate_callback_set(mn, _cb_deactivate_post, pi);
mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Picture informations"));
- photo_util_menu_icon_set(mi, PHOTO_THEME_ICON_INFOS);
- e_menu_item_callback_set(mi, _cb_picture_info, pi);
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Next picture"));
- photo_util_menu_icon_set(mi, PHOTO_THEME_ICON_NEXT);
- e_menu_item_callback_set(mi, _cb_picture_next, pi);
- mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, _("Previous picture"));
- photo_util_menu_icon_set(mi, PHOTO_THEME_ICON_PREVIOUS);
- e_menu_item_callback_set(mi, _cb_picture_prev, pi);
- mi = e_menu_item_new(mn);
if (pi->config->timer_active)
{
e_menu_item_label_set(mi, _("Pause slideshow"));
@@ -47,6 +35,14 @@
photo_util_menu_icon_set(mi, PHOTO_THEME_ICON_RESUME);
}
e_menu_item_callback_set(mi, _cb_pause_toggle, pi);
+ mi = e_menu_item_new(mn);
+ e_menu_item_label_set(mi, _("Next picture"));
+ photo_util_menu_icon_set(mi, PHOTO_THEME_ICON_NEXT);
+ e_menu_item_callback_set(mi, _cb_picture_next, pi);
+ mi = e_menu_item_new(mn);
+ e_menu_item_label_set(mi, _("Previous picture"));
+ photo_util_menu_icon_set(mi, PHOTO_THEME_ICON_PREVIOUS);
+ e_menu_item_callback_set(mi, _cb_picture_prev, pi);
photo_picture_histo_menu_append(pi, mn);
@@ -54,6 +50,10 @@
e_menu_item_separator_set(mi, 1);
mi = e_menu_item_new(mn);
+ e_menu_item_label_set(mi, _("Picture informations"));
+ photo_util_menu_icon_set(mi, PHOTO_THEME_ICON_INFOS);
+ e_menu_item_callback_set(mi, _cb_picture_info, pi);
+ mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Set picture as background"));
photo_util_menu_icon_set(mi, PHOTO_THEME_ICON_SETBG);
e_menu_item_callback_set(mi, _cb_picture_setbg, pi);
@@ -131,6 +131,7 @@
if (!pi) return;
photo_item_action_change(pi, 1);
+ photo_item_timer_set(pi, pi->config->timer_active, 0);
}
static void
@@ -142,6 +143,7 @@
if (!pi) return;
photo_item_action_change(pi, -1);
+ photo_item_timer_set(pi, pi->config->timer_active, 0);
}
static void
===================================================================
RCS file: /cvs/e/e_modules/photo/src/module/photo_picture_histo.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- photo_picture_histo.c 2 Sep 2006 19:20:11 -0000 1.7
+++ photo_picture_histo.c 24 Sep 2006 21:48:46 -0000 1.8
@@ -202,6 +202,7 @@
photo_item_action_change(pi,
pi->histo.pos -
(evas_list_count(pi->histo.list) - (no+1)));
+ photo_item_timer_set(pi, pi->config->timer_active, 0);
}
static void
-------------------------------------------------------------------------
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
