rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=7fd6114dd3822f0e4e5e409a2c4a732cb9283b4c
commit 7fd6114dd3822f0e4e5e409a2c4a732cb9283b4c Author: Andrii Kroitor <[email protected]> Date: Mon Jul 25 14:03:47 2016 +0300 shortcuts: change shortcuts F1 now shows shortcuts help window F2-F4 switch to normal/code/demo modes --- src/bin/common/signals.h | 1 + src/bin/ui/main_window.c | 18 ++++++++++++++---- src/bin/ui/menu.c | 2 +- src/bin/ui/shortcuts/shortcuts.c | 10 +++++++--- src/bin/ui/shortcuts/shortcuts.h | 1 + 5 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/bin/common/signals.h b/src/bin/common/signals.h index a0ffe72..59b3b6c 100644 --- a/src/bin/common/signals.h +++ b/src/bin/common/signals.h @@ -489,6 +489,7 @@ typedef struct { #define SIGNAL_SHORTCUT_RULERS_SHOW "SIGNAL_SHORTCUT_RULERS_SHOW" #define SIGNAL_SHORTCUT_CANCEL "SIGNAL_SHORTCUT_POPUP_CANCEL" #define SIGNAL_SHORTCUT_DONE "SIGNAL_SHORTCUT_POPUP_DONE" +#define SIGNAL_SHORTCUT_HELP "SIGNAL_SHORTCUT_POPUP_HELP" /** * emited when shortcut is pressed. diff --git a/src/bin/ui/main_window.c b/src/bin/ui/main_window.c index 01788a2..6f31123 100644 --- a/src/bin/ui/main_window.c +++ b/src/bin/ui/main_window.c @@ -46,6 +46,14 @@ _close_request(void *data __UNUSED__, ui_main_window_del(); } +static void +_help(void *data __UNUSED__, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) +{ + shortcuts_window_add(); +} + Eina_Bool ui_main_window_del(void) { @@ -93,6 +101,7 @@ ui_main_window_add(void) evas_object_smart_callback_add(ap.win, "delete,request", _close_request, NULL); evas_object_smart_callback_add(ap.win, SIGNAL_SHORTCUT_QUIT, _close_request, NULL); + evas_object_smart_callback_add(ap.win, SIGNAL_SHORTCUT_HELP, _help, NULL); #if 0 // turn off the eflete main cursor, while not used elementary combobox, and not fixed bug with double cursors if (!cursor_main_set(ap.win, CURSOR_ARROW)) @@ -216,9 +225,10 @@ _shortcuts_window_content_get(void *data, Evas_Object **to_focus __UNUSED__) Evas_Object *label = elm_label_add(scroller); elm_object_text_set(label, _( "Global:<br>" - "<b>F1</b> - normal mode<br>" - "<b>F2</b> - code mode<br>" - "<b>F3</b> - demo mode<br>" + "<b>F1</b> - show shortcuts list (this dialog)<br>" + "<b>F2</b> - normal mode<br>" + "<b>F3</b> - code mode<br>" + "<b>F4</b> - demo mode<br>" "<b>F7</b> - open image manager<br>" "<b>F8</b> - open sound manager<br>" "<b>F9</b> - open style manager<br>" @@ -273,7 +283,7 @@ shortcuts_window_add(void) evas_object_size_hint_min_set(content, 0, 300); - popup_want_action(_("Shortcuts"), NULL, _shortcuts_window_content_get, BTN_OK, NULL, content); + popup_want_action(_("Help: shortcuts"), NULL, _shortcuts_window_content_get, BTN_OK, NULL, content); evas_object_del(content); return NULL; } diff --git a/src/bin/ui/menu.c b/src/bin/ui/menu.c index 29f280d..0824bc9 100644 --- a/src/bin/ui/menu.c +++ b/src/bin/ui/menu.c @@ -330,7 +330,7 @@ ui_menu_add(void) ITEM_MENU_ADD(MENU_WINDOW, MENU_WINDOW_MANAGER_COLORCLASS, "color", _("Color class manager"), "F10") ITEM_MENU_ADD(MENU_NULL, MENU_HELP, NULL, _("Help"), NULL) - ITEM_MENU_ADD(MENU_HELP, MENU_HELP_SHORTCUTS, NULL, _("Shortcuts"), NULL) + ITEM_MENU_ADD(MENU_HELP, MENU_HELP_SHORTCUTS, NULL, _("Shortcuts"), "F1") ITEM_MENU_ADD(MENU_HELP, MENU_HELP_ABOUT, NULL, _("About"), NULL) elm_menu_item_separator_add(window_menu, menu->items[MENU_FILE_IMPORT_EDC]); diff --git a/src/bin/ui/shortcuts/shortcuts.c b/src/bin/ui/shortcuts/shortcuts.c index cdb178d..abeb5a2 100644 --- a/src/bin/ui/shortcuts/shortcuts.c +++ b/src/bin/ui/shortcuts/shortcuts.c @@ -86,6 +86,7 @@ _keycode_convert(unsigned int keycode) KEY(122, 67) /* F1 */ KEY(120, 68) /* F2 */ KEY(99, 69) /* F3 */ + KEY(118, 70) /* F4 */ KEY(98, 73) /* F7 */ KEY(100, 74) /* F8 */ KEY(101, 75) /* F9 */ @@ -201,6 +202,7 @@ _shortcut_handle(Shortcut_Type type) SHORTCUT(OBJECT_AREA); SHORTCUT(CANCEL); SHORTCUT(DONE); + SHORTCUT(HELP); case SHORTCUT_TYPE_NONE: break; @@ -465,12 +467,14 @@ _default_shortcuts_add() _add_shortcut(SHORTCUT_TYPE_TAB_CLOSE, SHORTCUT_TYPE_NONE, MOD_CTRL, 25/*w*/); - _add_shortcut(SHORTCUT_TYPE_MODE_NORMAL, SHORTCUT_TYPE_NONE, + _add_shortcut(SHORTCUT_TYPE_HELP, SHORTCUT_TYPE_NONE, MOD_NONE, 67/*F1*/); - _add_shortcut(SHORTCUT_TYPE_MODE_CODE, SHORTCUT_TYPE_NONE, + _add_shortcut(SHORTCUT_TYPE_MODE_NORMAL, SHORTCUT_TYPE_NONE, MOD_NONE, 68/*F2*/); - _add_shortcut(SHORTCUT_TYPE_MODE_DEMO, SHORTCUT_TYPE_NONE, + _add_shortcut(SHORTCUT_TYPE_MODE_CODE, SHORTCUT_TYPE_NONE, MOD_NONE, 69/*F3*/); + _add_shortcut(SHORTCUT_TYPE_MODE_DEMO, SHORTCUT_TYPE_NONE, + MOD_NONE, 70/*F4*/); _add_shortcut(SHORTCUT_TYPE_TAB_IMAGE_MANAGER, SHORTCUT_TYPE_NONE, MOD_NONE, 73/*F7*/); diff --git a/src/bin/ui/shortcuts/shortcuts.h b/src/bin/ui/shortcuts/shortcuts.h index 7233bb6..59810f9 100644 --- a/src/bin/ui/shortcuts/shortcuts.h +++ b/src/bin/ui/shortcuts/shortcuts.h @@ -82,6 +82,7 @@ typedef enum { SHORTCUT_TYPE_TAB_COLOR_CLASS_MANAGER, SHORTCUT_TYPE_TAB_STYLE_MANAGER, SHORTCUT_TYPE_QUIT, + SHORTCUT_TYPE_HELP, SHORTCUT_TYPE_MODE_NORMAL, SHORTCUT_TYPE_MODE_CODE, SHORTCUT_TYPE_MODE_DEMO, --
