enlightenment/ephoto
enlightenment
/
ephoto
7
0
Fork 3
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Ephoto: Go the next image when space bar is pressed. 

This fixes T4783
This commit is contained in:
Stephen okra Houston 2016-11-07 14:02:09 -06:00
parent 65c727fa9a
commit edd58aa3a6
3 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/bin/ephoto_config.c
View File

@ -409,6 +409,7 @@ _config_bindings(Evas_Object *parent)
"<b>Home:</b> Navigate First<br/>" "<b>Home:</b> Navigate First<br/>"
"<b>Left Arrow:</b> Navigate Previous<br/>" "<b>Left Arrow:</b> Navigate Previous<br/>"
"<b>Right Arrow:</b> Navigate Next<br/>" "<b>Right Arrow:</b> Navigate Next<br/>"
"<b>Space:</b> Navigate Next<br />"
"<b>End:</b> Navigate Last<br/>" "<b>End:</b> Navigate Last<br/>"
"<b>Ctrl+Delete:</b> Delete Image<br/>" "<b>Ctrl+Delete:</b> Delete Image<br/>"
"<b>F2</b> Rename Image<br/>" "<b>F2</b> Rename Image<br/>"

2
src/bin/ephoto_single_browser.c
View File

@ -1984,6 +1984,8 @@ _ephoto_main_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNU
_prev_entry(sb); _prev_entry(sb);
else if (!strcmp(k, "Right") && !sb->editing) else if (!strcmp(k, "Right") && !sb->editing)
_next_entry(sb); _next_entry(sb);
else if (!strcmp(k, "space") && !sb->editing)
_next_entry(sb);
else if (!strcmp(k, "Home") && !sb->editing) else if (!strcmp(k, "Home") && !sb->editing)
_first_entry(sb); _first_entry(sb);
else if (!strcmp(k, "End") && !sb->editing) else if (!strcmp(k, "End") && !sb->editing)

26
src/bin/ephoto_thumb_browser.c
View File

@ -1531,9 +1531,7 @@ static Eina_Bool
_ephoto_thumb_populate_start(void *data, int type EINA_UNUSED, _ephoto_thumb_populate_start(void *data, int type EINA_UNUSED,
void *event EINA_UNUSED) void *event EINA_UNUSED)
{ {
Ephoto *ephoto = data; Ephoto_Thumb_Browser *tb = data;
Ephoto_Thumb_Browser *tb =
evas_object_data_get(ephoto->thumb_browser, "thumb_browser");
if (tb->dirs_only) if (tb->dirs_only)
return ECORE_CALLBACK_PASS_ON; return ECORE_CALLBACK_PASS_ON;
@ -1545,7 +1543,7 @@ _ephoto_thumb_populate_start(void *data, int type EINA_UNUSED,
if (tb->searching) if (tb->searching)
_ephoto_thumb_search_cancel(tb->search, NULL, NULL); _ephoto_thumb_search_cancel(tb->search, NULL, NULL);
_todo_items_free(tb); _todo_items_free(tb);
ephoto_thumb_browser_clear(ephoto); ephoto_thumb_browser_clear(tb->ephoto);
tb->totimages = 0; tb->totimages = 0;
tb->totsize = 0; tb->totsize = 0;
@ -1556,9 +1554,7 @@ static Eina_Bool
_ephoto_thumb_populate_end(void *data, int type EINA_UNUSED, _ephoto_thumb_populate_end(void *data, int type EINA_UNUSED,
void *event EINA_UNUSED) void *event EINA_UNUSED)
{ {
Ephoto *ephoto = data; Ephoto_Thumb_Browser *tb = data;
Ephoto_Thumb_Browser *tb =
evas_object_data_get(ephoto->thumb_browser, "thumb_browser");
if (tb->dirs_only) if (tb->dirs_only)
return ECORE_CALLBACK_PASS_ON; return ECORE_CALLBACK_PASS_ON;
@ -1596,9 +1592,7 @@ static Eina_Bool
_ephoto_thumb_populate_error(void *data, int type EINA_UNUSED, _ephoto_thumb_populate_error(void *data, int type EINA_UNUSED,
void *event EINA_UNUSED) void *event EINA_UNUSED)
{ {
Ephoto *ephoto = data; Ephoto_Thumb_Browser *tb = data;
Ephoto_Thumb_Browser *tb =
evas_object_data_get(ephoto->thumb_browser, "thumb_browser");
if (tb->dirs_only) if (tb->dirs_only)
return ECORE_CALLBACK_PASS_ON; return ECORE_CALLBACK_PASS_ON;
@ -1612,9 +1606,7 @@ _ephoto_thumb_populate_error(void *data, int type EINA_UNUSED,
static Eina_Bool static Eina_Bool
_ephoto_thumb_entry_create(void *data, int type EINA_UNUSED, void *event) _ephoto_thumb_entry_create(void *data, int type EINA_UNUSED, void *event)
{ {
Ephoto *ephoto = data; Ephoto_Thumb_Browser *tb = data;
Ephoto_Thumb_Browser *tb =
evas_object_data_get(ephoto->thumb_browser, "thumb_browser");
Ephoto_Event_Entry_Create *ev = event; Ephoto_Event_Entry_Create *ev = event;
Ephoto_Entry *e; Ephoto_Entry *e;
@ -2198,22 +2190,22 @@ ephoto_thumb_browser_add(Ephoto *ephoto, Evas_Object *parent)
tb->handlers = tb->handlers =
eina_list_append(tb->handlers, eina_list_append(tb->handlers,
ecore_event_handler_add(EPHOTO_EVENT_POPULATE_START, ecore_event_handler_add(EPHOTO_EVENT_POPULATE_START,
_ephoto_thumb_populate_start, ephoto)); _ephoto_thumb_populate_start, tb));
tb->handlers = tb->handlers =
eina_list_append(tb->handlers, eina_list_append(tb->handlers,
ecore_event_handler_add(EPHOTO_EVENT_POPULATE_END, ecore_event_handler_add(EPHOTO_EVENT_POPULATE_END,
_ephoto_thumb_populate_end, ephoto)); _ephoto_thumb_populate_end, tb));
tb->handlers = tb->handlers =
eina_list_append(tb->handlers, eina_list_append(tb->handlers,
ecore_event_handler_add(EPHOTO_EVENT_POPULATE_ERROR, ecore_event_handler_add(EPHOTO_EVENT_POPULATE_ERROR,
_ephoto_thumb_populate_error, ephoto)); _ephoto_thumb_populate_error, tb));
tb->handlers = tb->handlers =
eina_list_append(tb->handlers, eina_list_append(tb->handlers,
ecore_event_handler_add(EPHOTO_EVENT_ENTRY_CREATE, ecore_event_handler_add(EPHOTO_EVENT_ENTRY_CREATE,
_ephoto_thumb_entry_create, ephoto)); _ephoto_thumb_entry_create, tb));
return tb->main; return tb->main;