* ephoto: simplify code and make it easy to add new keys.

SVN revision: 50430
This commit is contained in:
Cedric BAIL 2010-07-22 16:09:31 +00:00
parent a6e087843a
commit a1af3e8605
1 changed files with 32 additions and 37 deletions

View File

@ -12,6 +12,14 @@ static void _ephoto_key_pressed(void *data, Evas *e, Evas_Object *obj, void *eve
static Eina_List *iter; static Eina_List *iter;
static Evas_Object *image, *image2, *toolbar; static Evas_Object *image, *image2, *toolbar;
static const char *toolbar_items[] = {
"First",
"Previous",
"Next",
"Last",
"Slideshow"
};
/*Create the flow browser*/ /*Create the flow browser*/
void void
ephoto_create_flow_browser(void) ephoto_create_flow_browser(void)
@ -72,40 +80,16 @@ ephoto_show_flow_browser(const char *current_image)
{ {
const char *file_type; const char *file_type;
Elm_Toolbar_Item *o; Elm_Toolbar_Item *o;
int i;
if(!evas_object_key_grab(em->flow_browser, "Left", 0, 0, 1))
printf("Couldn't grab key: Left\n");
if(!evas_object_key_grab(em->flow_browser, "Right", 0, 0, 1))
printf("Couldn't grab key: Right\n");
evas_object_event_callback_add(em->flow_browser, EVAS_CALLBACK_KEY_UP, evas_object_event_callback_add(em->flow_browser, EVAS_CALLBACK_KEY_UP,
_ephoto_key_pressed, NULL); _ephoto_key_pressed, NULL);
iter = eina_list_data_find_list(em->images, current_image); iter = eina_list_data_find_list(em->images, current_image);
if (iter == NULL) for (i = 0; i < (sizeof (toolbar_items) / sizeof (char*)); ++i)
{ {
o = elm_toolbar_item_find_by_label(toolbar, "First"); o = elm_toolbar_item_find_by_label(toolbar, toolbar_items[i]);
elm_toolbar_item_disabled_set(o, EINA_TRUE); elm_toolbar_item_disabled_set(o, iter == NULL ? EINA_TRUE : EINA_FALSE);
o = elm_toolbar_item_find_by_label(toolbar, "Previous");
elm_toolbar_item_disabled_set(o, EINA_TRUE);
o = elm_toolbar_item_find_by_label(toolbar, "Next");
elm_toolbar_item_disabled_set(o, EINA_TRUE);
o = elm_toolbar_item_find_by_label(toolbar, "Last");
elm_toolbar_item_disabled_set(o, EINA_TRUE);
o = elm_toolbar_item_find_by_label(toolbar, "Slideshow");
elm_toolbar_item_disabled_set(o, EINA_TRUE);
}
else
{
o = elm_toolbar_item_find_by_label(toolbar, "First");
elm_toolbar_item_disabled_set(o, EINA_FALSE);
o = elm_toolbar_item_find_by_label(toolbar, "Previous");
elm_toolbar_item_disabled_set(o, EINA_FALSE);
o = elm_toolbar_item_find_by_label(toolbar, "Next");
elm_toolbar_item_disabled_set(o, EINA_FALSE);
o = elm_toolbar_item_find_by_label(toolbar, "Last");
elm_toolbar_item_disabled_set(o, EINA_FALSE);
o = elm_toolbar_item_find_by_label(toolbar, "Slideshow");
elm_toolbar_item_disabled_set(o, EINA_FALSE);
} }
elm_box_unpack(em->flow_browser, image); elm_box_unpack(em->flow_browser, image);
@ -129,14 +113,13 @@ ephoto_show_flow_browser(const char *current_image)
elm_box_pack_end(em->flow_browser, toolbar); elm_box_pack_end(em->flow_browser, toolbar);
evas_object_show(toolbar); evas_object_show(toolbar);
evas_object_show(em->flow_browser); evas_object_show(em->flow_browser);
evas_object_focus_set(em->flow_browser, 1);
} }
/*Hide the flow browser*/ /*Hide the flow browser*/
void void
ephoto_hide_flow_browser(void) ephoto_hide_flow_browser(void)
{ {
evas_object_key_ungrab(em->flow_browser, "Left", 0, 0);
evas_object_key_ungrab(em->flow_browser, "Right", 0, 0);
evas_object_hide(image); evas_object_hide(image);
evas_object_hide(image2); evas_object_hide(image2);
evas_object_hide(toolbar); evas_object_hide(toolbar);
@ -163,16 +146,28 @@ ephoto_delete_flow_browser(void)
} }
/*A key has been pressed*/ /*A key has been pressed*/
static const struct
{
const char *name;
void (*func)(void *data, Evas_Object *obj, void *event_info);
} keys[] = {
{ "Left", _ephoto_go_previous },
{ "Right", _ephoto_go_next },
{ "space", _ephoto_go_next },
{ "Escape", _ephoto_go_back },
{ NULL, NULL }
};
static void static void
_ephoto_key_pressed(void *data, Evas *e, Evas_Object *obj, void *event_data) _ephoto_key_pressed(void *data, Evas *e, Evas_Object *obj, void *event_data)
{ {
Evas_Event_Key_Up *eku; Evas_Event_Key_Up *eku;
int i;
eku = (Evas_Event_Key_Up *)event_data; eku = (Evas_Event_Key_Up *)event_data;
if (!strncmp(eku->keyname, "Left", 4)) for (i = 0; keys[i].name != NULL; ++i)
_ephoto_go_previous(NULL, NULL, NULL); if (!strcmp(eku->keyname, keys[i].name))
if (!strncmp(eku->keyname, "Right", 5)) keys[i].func(NULL, NULL, NULL);
_ephoto_go_next(NULL, NULL, NULL);
printf("%s\n", eku->keyname); printf("%s\n", eku->keyname);
} }