hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=0f873f5f1771926964a74c64372230a450d616fa
commit 0f873f5f1771926964a74c64372230a450d616fa Author: ChunEon Park <[email protected]> Date: Thu Jan 30 01:46:02 2014 +0900 menu - code refactoring. arrange the functions position from static to external in a file. --- src/bin/menu.c | 128 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 64 insertions(+), 64 deletions(-) diff --git a/src/bin/menu.c b/src/bin/menu.c index 494c782..343673e 100644 --- a/src/bin/menu.c +++ b/src/bin/menu.c @@ -685,16 +685,6 @@ exit_save_btn_cb(void *data, Evas_Object *obj EINA_UNUSED, elm_exit(); } -void -menu_exit() -{ - menu_data *md = g_md; - if (edit_changed_get(md->ed)) - warning_layout_create(md, exit_yes_btn_cb, exit_save_btn_cb); - else - elm_exit(); -} - static void exit_btn_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) @@ -990,52 +980,6 @@ load_save_btn_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, warning_close(md); } -void -menu_about() -{ - menu_data *md = g_md; - about_open(md); -} - -void -menu_setting() -{ - menu_data *md = g_md; - setting_open(md); -} - -Eina_Bool -menu_edc_new() -{ - menu_data *md = g_md; - if (edit_changed_get(md->ed)) - { - warning_layout_create(md, new_yes_btn_cb, new_save_btn_cb); - return EINA_TRUE; - } - edc_reload(md, PROTO_EDC_PATH); - menu_close(md); - - return EINA_FALSE; -} - -void -menu_edc_save() -{ - menu_data *md = g_md; - edc_file_save(md); -} - -void -menu_edc_load() -{ - menu_data *md = g_md; - if (edit_changed_get(md->ed)) - warning_layout_create(md, load_yes_btn_cb, load_save_btn_cb); - else - edc_file_load(md); -} - static void load_btn_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) @@ -1093,6 +1037,14 @@ menu_open(menu_data *md) md->open_depth++; } +static void +ctxpopup_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) +{ + menu_data *md = data; + md->ctxpopup = NULL; +} + void menu_init(Evas_Object *win, edit_data *ed, config_data *cd) { @@ -1112,6 +1064,52 @@ menu_term() } void +menu_about() +{ + menu_data *md = g_md; + about_open(md); +} + +void +menu_setting() +{ + menu_data *md = g_md; + setting_open(md); +} + +Eina_Bool +menu_edc_new() +{ + menu_data *md = g_md; + if (edit_changed_get(md->ed)) + { + warning_layout_create(md, new_yes_btn_cb, new_save_btn_cb); + return EINA_TRUE; + } + edc_reload(md, PROTO_EDC_PATH); + menu_close(md); + + return EINA_FALSE; +} + +void +menu_edc_save() +{ + menu_data *md = g_md; + edc_file_save(md); +} + +void +menu_edc_load() +{ + menu_data *md = g_md; + if (edit_changed_get(md->ed)) + warning_layout_create(md, load_yes_btn_cb, load_save_btn_cb); + else + edc_file_load(md); +} + +void menu_toggle() { menu_data *md = g_md; @@ -1147,14 +1145,6 @@ menu_toggle() else menu_open(md); } -static void -ctxpopup_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, - void *event_info EINA_UNUSED) -{ - menu_data *md = data; - md->ctxpopup = NULL; -} - void menu_ctxpopup_unregister(Evas_Object *ctxpopup) { @@ -1179,3 +1169,13 @@ menu_open_depth() menu_data *md = g_md; return md->open_depth; } + +void +menu_exit() +{ + menu_data *md = g_md; + if (edit_changed_get(md->ed)) + warning_layout_create(md, exit_yes_btn_cb, exit_save_btn_cb); + else + elm_exit(); +} --
