From 60a74d46763be0f831cebcd9c59d581fc3e2ee46 Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Sun, 9 Mar 2014 01:05:26 +0900 Subject: [PATCH] hotkeys - redesign ui. migrate toggle key to setting menu --- data/themes/default/images.edc | 23 --------------- data/themes/default/images/Makefile.am | 2 -- data/themes/default/images/hotkeys_close.png | Bin 486 -> 0 bytes data/themes/default/images/hotkeys_open.png | Bin 481 -> 0 bytes data/themes/default/theme_ext.edc | 12 -------- src/bin/base_gui.c | 4 +-- src/bin/main.c | 7 +++++ src/bin/menu.c | 11 ++++--- src/bin/panes.c | 29 ------------------- src/include/base_gui.h | 2 +- 10 files changed, 17 insertions(+), 73 deletions(-) delete mode 100644 data/themes/default/images/hotkeys_close.png delete mode 100644 data/themes/default/images/hotkeys_open.png diff --git a/data/themes/default/images.edc b/data/themes/default/images.edc index cb6c372..53aa2eb 100644 --- a/data/themes/default/images.edc +++ b/data/themes/default/images.edc @@ -4,29 +4,6 @@ images { image: "panes_left_arrow.png" COMP; image: "panes_right_arrow.png" COMP; image: "panes_recover_arrow.png" COMP; - image: "hotkeys_open.png" COMP; - image: "hotkeys_close.png" COMP; -} -group { name: "hotkeys_open"; - parts { - part { name: "img"; - type: IMAGE; - description { state: "default" 0.0; - image.normal: "hotkeys_open.png"; - } - } - } -} - -group { name: "hotkeys_close"; - parts { - part { name: "img"; - type: IMAGE; - description { state: "default" 0.0; - image.normal: "hotkeys_close.png"; - } - } - } } group { name: "plus"; diff --git a/data/themes/default/images/Makefile.am b/data/themes/default/images/Makefile.am index f68ed49..9fc3470 100644 --- a/data/themes/default/images/Makefile.am +++ b/data/themes/default/images/Makefile.am @@ -46,6 +46,4 @@ EXTRA_DIST = \ panes_left_arrow.png \ panes_right_arrow.png \ panes_recover_arrow.png \ - hotkeys_close.png \ - hotkeys_open.png \ pm_fill.png diff --git a/data/themes/default/images/hotkeys_close.png b/data/themes/default/images/hotkeys_close.png deleted file mode 100644 index 4492f91ebcf88df9556f57cc92c34ac7957e85ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 486 zcmV@P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L00VXa00VXbebs`@00007bV*G`2i^f5 z0}Uwa8@3Gq00Cx6L_t(2&z+LJZc{-JM$gRMySA?bC~>SrvLzZi8fc*9CEz9U5a9{v zQoAQ@9w06B>1ZOb5HZ#jG4}o2-AQ4gNRWWUspr#Z=6r&gyncf&o+A8%@dbAJo+Phk z)?Zc(iX0yjdSAdPY17e;22`%B8TCAqHZfA@nf$p?3~P<1=UJ9DbLTV0De^&Y2kt}- zEP~H?uKWkCjV$t1@;{*WXBpDMI@kLHmUa>yEq*acwW)BI< zFbY#KX1{%I7KLe0hRq(rF{S|HLo{`G;Ow5;&r*jUA8tK5fNO|ZVwHKGY2d(wp(e7V zL^0OM@h!HjYKYsAh+Vw3@Z<$Q9(|_i5?_0LG_^>UV@*xU1I_9&^{0;nMC{i7Upn}! cbI4Zx4V+t~em{lJ$^ZZW07*qoM6N<$g8lBz-T(jq diff --git a/data/themes/default/images/hotkeys_open.png b/data/themes/default/images/hotkeys_open.png deleted file mode 100644 index bd18568dbea930581612016524c83254ab18ac77..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 481 zcmeAS@N?(olHy`uVBq!ia0vp@Ak4uAB#T}@sR2@q#X;^)4C~IxyaaOClDyqr82*Fc zg1yTp14TFsJR*x37?{gIn6dV1(;1*3dx@v7EBierDF$sWb47Jwpec!-E{-7@=jTqc z^`4z5(YpS3-F_iK?~b%WkM^?6Wqz@nONx7U&wjA}gZquGyJzmY7Ozky*y+7+vf#tq zNv@wis=P0j5z$(!^d;(C5ubT`vGk;`Wgj;+f8>g0zGANy^?h~LV#%*tdul{KPG?#v zyxiMq^EsWlXEMbsZ!2CZ(Mb6pXR=U1%=KJ`QTmK$oY5N}UHLCD?9rYYt}%vtw0ysvumWjoXRQ_@Ne#T}x_Pb3*{R4zQ$m)?@pV{v59Z8fu~ z7L%gs9omxB{&$VO2^CItdncvqwB6T4#j4iBZNifYE_U8~++`AFW_&EReVSs^zKXM1 z&LWLRFYy*zykkV+BgyzDH4&jTt95@eURjna5ySMYq_*>(-juoN^?m<7Ix{?wlayout, "elm,state,hotkeys,show", ""); diff --git a/src/bin/main.c b/src/bin/main.c index 1541fbd..0fd9bf9 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -288,6 +288,12 @@ main_key_down_cb(void *data, int type EINA_UNUSED, void *ev) base_statusbar_toggle(); return ECORE_CALLBACK_DONE; } + //Tools + if (!strcmp(event->key, "F11")) + { + base_hotkey_toggle(EINA_TRUE); + return ECORE_CALLBACK_DONE; + } //Setting if (!strcmp(event->key, "F12")) { @@ -372,6 +378,7 @@ config_update_cb(void *data) edit_line_number_toggle(ad->ed); edit_font_size_update(ad->ed, EINA_FALSE); + base_hotkey_toggle(EINA_FALSE); base_statusbar_toggle(); edit_part_highlight_toggle(ad->ed, EINA_TRUE); view_dummy_toggle(VIEW_DATA, EINA_FALSE); diff --git a/src/bin/menu.c b/src/bin/menu.c index d03dd3f..7e161a4 100644 --- a/src/bin/menu.c +++ b/src/bin/menu.c @@ -14,6 +14,7 @@ struct menu_s Evas_Object *data_path_entry; Evas_Object *slider_font; Evas_Object *slider_view; + Evas_Object *toggle_tools; Evas_Object *toggle_stats; Evas_Object *toggle_linenum; Evas_Object *toggle_highlight; @@ -200,6 +201,7 @@ setting_apply_btn_cb(void *data, Evas_Object *obj EINA_UNUSED, config_edc_data_path_set(elm_object_text_get(md->data_path_entry)); config_font_size_set((float) elm_slider_value_get(md->slider_font)); config_view_scale_set(elm_slider_value_get(md->slider_view)); + config_hotkeys_set(elm_check_state_get(md->toggle_tools)); config_stats_bar_set(elm_check_state_get(md->toggle_stats)); config_linenumber_set(elm_check_state_get(md->toggle_linenum)); config_part_highlight_set(elm_check_state_get(md->toggle_highlight)); @@ -442,10 +444,10 @@ setting_open(menu_data *md) elm_box_pack_end(box2, slider_view); - //Toggle (File Tab) - Evas_Object *toggle_filetab = toggle_create(box, "File Tab", EINA_FALSE); - elm_object_disabled_set(toggle_filetab, EINA_TRUE); - elm_box_pack_end(box, toggle_filetab); + //Toggle (Tool bar) + Evas_Object *toggle_tools = toggle_create(box, "Tools", + config_hotkeys_get()); + elm_box_pack_end(box, toggle_tools); //Toggle (Status bar) Evas_Object *toggle_stats = toggle_create(box, "Status Bar", @@ -502,6 +504,7 @@ setting_open(menu_data *md) md->data_path_entry = data_path_entry; md->slider_font = slider_font; md->slider_view = slider_view; + md->toggle_tools = toggle_tools; md->toggle_stats = toggle_stats; md->toggle_linenum = toggle_linenum; md->toggle_highlight = toggle_highlight; diff --git a/src/bin/panes.c b/src/bin/panes.c index 7da74fa..2523bb7 100644 --- a/src/bin/panes.c +++ b/src/bin/panes.c @@ -66,20 +66,6 @@ panes_full_view_cancel(panes_data *pd) pd->state = PANES_SPLIT_VIEW; } -static void -hotkeys_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj, - void *event_info EINA_UNUSED) -{ - base_hotkey_toggle(); - - Evas_Object *img = elm_object_content_get(obj); - - if (config_hotkeys_get()) - elm_image_file_set(img, EDJE_PATH, "hotkeys_close"); - else - elm_image_file_set(img, EDJE_PATH, "hotkeys_open"); -} - static void left_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) { @@ -197,21 +183,6 @@ panes_init(Evas_Object *parent) press_cb, NULL); evas_object_smart_callback_add(panes, "unpress", unpress_cb, NULL); - //Hotkey Button - Evas_Object *hotkeys_btn = elm_button_add(panes); - elm_object_focus_allow_set(hotkeys_btn, EINA_FALSE); - evas_object_smart_callback_add(hotkeys_btn, "clicked", hotkeys_clicked_cb, - NULL); - elm_object_part_content_set(panes, "elm.swallow.hotkeys", hotkeys_btn); - - //Hotkey Image - img = elm_image_add(hotkeys_btn); - if (config_hotkeys_get()) - elm_image_file_set(img, EDJE_PATH, "hotkeys_close"); - else - elm_image_file_set(img, EDJE_PATH, "hotkeys_open"); - elm_object_content_set(hotkeys_btn, img); - //Left Button Evas_Object *left_arrow = elm_button_add(panes); elm_object_focus_allow_set(left_arrow, EINA_FALSE); diff --git a/src/include/base_gui.h b/src/include/base_gui.h index 166130f..e4ddd61 100644 --- a/src/include/base_gui.h +++ b/src/include/base_gui.h @@ -6,7 +6,7 @@ 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_hotkey_toggle(); +void base_hotkey_toggle(Eina_Bool config); void base_hotkeys_set(Evas_Object *hotkeys); void base_full_view_left(); void base_full_view_right();