hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=a565c48f24183d61db1fa0f9a61a1f3d1d2870f7
commit a565c48f24183d61db1fa0f9a61a1f3d1d2870f7 Author: ChunEon Park <[email protected]> Date: Sun Mar 9 01:12:28 2014 +0900 statusbar - updated statusbar reset shortcut key from f6 to f10 refactored internal function. --- README | 2 +- src/bin/base_gui.c | 4 +++- src/bin/hotkeys.c | 7 +++---- src/bin/main.c | 9 ++++----- src/include/base_gui.h | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README b/README index 233b3d0..d1233e4 100644 --- a/README +++ b/README @@ -41,7 +41,7 @@ F2 = New F3 = Save F4 = Load F5 = Show/Hide Line Number -F6 = Show/Hide Status +F10 = Show/Hide Status F12 = Setting Ctrl+S = Quick Save + Compile EDC diff --git a/src/bin/base_gui.c b/src/bin/base_gui.c index dc706fd..c3c9849 100644 --- a/src/bin/base_gui.c +++ b/src/bin/base_gui.c @@ -26,10 +26,12 @@ base_title_set(const char *path) } void -base_statusbar_toggle() +base_statusbar_toggle(Eina_Bool config) { base_data *bd = g_bd; + if (config) config_stats_bar_set(!config_stats_bar_get()); + if (config_stats_bar_get()) elm_object_signal_emit(bd->layout, "elm,state,statusbar,show", ""); else diff --git a/src/bin/hotkeys.c b/src/bin/hotkeys.c index 57053a5..708da7d 100644 --- a/src/bin/hotkeys.c +++ b/src/bin/hotkeys.c @@ -67,8 +67,7 @@ f9_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) static void f10_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) { - config_stats_bar_set(!config_stats_bar_get()); - base_statusbar_toggle(); + base_statusbar_toggle(EINA_TRUE); item_unselect((Elm_Object_Item *)event_info); } @@ -118,10 +117,10 @@ hotkeys_create(Evas_Object *parent, edit_data *ed) it = elm_toolbar_item_append(toolbar, buf, "Swallow", f6_cb, NULL); snprintf(buf, sizeof(buf), "%s/images/lines.png", elm_app_data_dir_get()); it = elm_toolbar_item_append(toolbar, buf, "Lines", f9_cb, ed); - snprintf(buf, sizeof(buf), "%s/images/status.png", elm_app_data_dir_get()); - it = elm_toolbar_item_append(toolbar, buf, "Status", f10_cb, NULL); snprintf(buf, sizeof(buf), "%s/images/find.png", elm_app_data_dir_get()); it = elm_toolbar_item_append(toolbar, buf, "Find", f11_cb, NULL); + snprintf(buf, sizeof(buf), "%s/images/status.png", elm_app_data_dir_get()); + it = elm_toolbar_item_append(toolbar, buf, "Status", f10_cb, NULL); snprintf(buf, sizeof(buf), "%s/images/setting.png", elm_app_data_dir_get()); it = elm_toolbar_item_append(toolbar, buf, "Setting", f12_cb, NULL); diff --git a/src/bin/main.c b/src/bin/main.c index 0fd9bf9..8db54ea 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -282,10 +282,9 @@ main_key_down_cb(void *data, int type EINA_UNUSED, void *ev) return ECORE_CALLBACK_DONE; } //Statusbar - if (!strcmp(event->key, "F6")) + if (!strcmp(event->key, "F10")) { - config_stats_bar_set(!config_stats_bar_get()); - base_statusbar_toggle(); + base_statusbar_toggle(EINA_TRUE); return ECORE_CALLBACK_DONE; } //Tools @@ -367,7 +366,7 @@ statusbar_set() Evas_Object *obj = stats_init(base_layout_get()); elm_object_part_content_set(base_layout_get(), "elm.swallow.statusbar", obj); - base_statusbar_toggle(); + base_statusbar_toggle(EINA_TRUE); } static void @@ -379,7 +378,7 @@ config_update_cb(void *data) edit_font_size_update(ad->ed, EINA_FALSE); base_hotkey_toggle(EINA_FALSE); - base_statusbar_toggle(); + base_statusbar_toggle(EINA_FALSE); edit_part_highlight_toggle(ad->ed, EINA_TRUE); view_dummy_toggle(VIEW_DATA, EINA_FALSE); diff --git a/src/include/base_gui.h b/src/include/base_gui.h index e4ddd61..c5d3e70 100644 --- a/src/include/base_gui.h +++ b/src/include/base_gui.h @@ -5,7 +5,7 @@ Evas_Object *base_win_get(); Evas_Object *base_layout_get(); void base_win_resize_object_add(Evas_Object *resize_obj); void base_title_set(const char *path); -void base_statusbar_toggle(); +void base_statusbar_toggle(Eina_Bool config); void base_hotkey_toggle(Eina_Bool config); void base_hotkeys_set(Evas_Object *hotkeys); void base_full_view_left(); --
