enlightenment
/
enlightenment-module-photo
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* restart timer when manually change the current picture 

* reorganise the menu


SVN revision: 26121
This commit is contained in:
kiwi 2006-09-24 21:48:46 +00:00 committed by kiwi
parent 4df8b76cc7
commit 7515f486d7
3 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/module/photo_item.c
View File

@ -13,9 +13,15 @@ if (UTIL_TEST_PARENT(var, parent, ITEM_ACTION_LABEL , ITEM_ACTION_PARENT)) \
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)) \

26
src/module/photo_menu.c
View File

@ -23,18 +23,6 @@ int photo_menu_show(Photo_Item *pi)
mn = e_menu_new();
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)
{
@ -47,12 +35,24 @@ int photo_menu_show(Photo_Item *pi)
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);
mi = e_menu_item_new(mn);
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);
@ -131,6 +131,7 @@ _cb_picture_next(void *data, E_Menu *m, E_Menu_Item *mi)
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 @@ _cb_picture_prev(void *data, E_Menu *m, E_Menu_Item *mi)
if (!pi) return;
photo_item_action_change(pi, -1);
photo_item_timer_set(pi, pi->config->timer_active, 0);
}
static void

1
src/module/photo_picture_histo.c
View File

@ -202,6 +202,7 @@ _cb_menu_select(void *data, E_Menu *m, E_Menu_Item *mi)
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