From 3a60e771a685a2587fdaf49e3825d841dd922b74 Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Thu, 26 Feb 2015 14:22:30 +0900 Subject: [PATCH] bin/tools: add save button. --- data/themes/default/images.edc | 12 ++++ data/themes/default/images/Makefile.am | 3 +- data/themes/default/images/save.png | Bin 0 -> 2978 bytes src/bin/file_mgr.c | 26 ++++++++ src/bin/main.c | 27 +------- src/bin/tools.c | 82 ++++++++++++++----------- src/include/file_mgr.h | 1 + 7 files changed, 88 insertions(+), 63 deletions(-) create mode 100755 data/themes/default/images/save.png diff --git a/data/themes/default/images.edc b/data/themes/default/images.edc index 1a1c4f1..a38f963 100644 --- a/data/themes/default/images.edc +++ b/data/themes/default/images.edc @@ -9,6 +9,7 @@ images { image: "status.png" COMP; image: "swallow_s.png" COMP; image: "goto.png" COMP; + image: "save.png" COMP; image: "live_image.png" COMP; image: "live_rectangle.png" COMP; image: "live_swallow.png" COMP; @@ -139,6 +140,17 @@ group { name: "live_edit"; } } +group { name: "save"; + parts { + part { name: "img"; + type: IMAGE; + description { state: "default" 0.0; + image.normal: "save.png"; + } + } + } +} + #define ADD_LIVE_EDIT_ICON_GROUP(_group_name, _image_path) \ group { name: _group_name; \ parts { \ diff --git a/data/themes/default/images/Makefile.am b/data/themes/default/images/Makefile.am index 4181434..e0307d2 100644 --- a/data/themes/default/images/Makefile.am +++ b/data/themes/default/images/Makefile.am @@ -64,4 +64,5 @@ EXTRA_DIST = \ live_edit.png \ new.png \ slider_up.png \ - slider_down.png + slider_down.png \ + save.png diff --git a/data/themes/default/images/save.png b/data/themes/default/images/save.png new file mode 100755 index 0000000000000000000000000000000000000000..25ca6da15889cb8d01ba33c9f1ac0fafa2377a40 GIT binary patch literal 2978 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 == 2) ? EINA_TRUE : EINA_FALSE); } +void +file_mgr_edc_save(void) +{ + char buf[PATH_MAX]; + file_mgr_data *fmd = g_fmd; + + if (enventor_object_save(fmd->enventor, config_edc_path_get())) + { + if (config_stats_bar_get()) + { + snprintf(buf, sizeof(buf), "File saved. \"%s\"", + config_edc_path_get()); + } + } + else + { + if (config_stats_bar_get()) + { + snprintf(buf, sizeof(buf), "Already saved. \"%s\"", + config_edc_path_get()); + } + + } + stats_info_msg_update(buf); +} + Eina_Bool file_mgr_warning_is_opened(void) { diff --git a/src/bin/main.c b/src/bin/main.c index 72bd64c..7d5ad00 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -571,31 +571,6 @@ enventor_setup(app_data *ad) ad->enventor = enventor; } -static void -edc_save(app_data *ad) -{ - char buf[PATH_MAX]; - - if (enventor_object_save(ad->enventor, config_edc_path_get())) - { - if (config_stats_bar_get()) - { - snprintf(buf, sizeof(buf), "File saved. \"%s\"", - config_edc_path_get()); - } - } - else - { - if (config_stats_bar_get()) - { - snprintf(buf, sizeof(buf), "Already saved. \"%s\"", - config_edc_path_get()); - } - - } - stats_info_msg_update(buf); -} - static void part_highlight_toggle(app_data *ad) { @@ -651,7 +626,7 @@ ctrl_func(app_data *ad, const char *key) //Save if (!strcmp(key, "s") || !strcmp(key, "S")) { - edc_save(ad); + file_mgr_edc_save(); return ECORE_CALLBACK_DONE; } //Delete Line diff --git a/src/bin/tools.c b/src/bin/tools.c index 840e051..a93d077 100644 --- a/src/bin/tools.c +++ b/src/bin/tools.c @@ -93,8 +93,15 @@ live_edit_cb(void *data, Evas_Object *obj, void *event_info) live_edit_toggle(); } +static void +save_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) +{ + file_mgr_edc_save(); +} + static Evas_Object * -tools_btn_create(Evas_Object *parent, const char *icon, const char *label, +tools_btn_create(Evas_Object *parent, const char *icon, const char *tooltip_msg, Evas_Smart_Cb func, void *data) { Evas_Object *btn = elm_button_add(parent); @@ -107,7 +114,6 @@ tools_btn_create(Evas_Object *parent, const char *icon, const char *label, elm_image_file_set(img, EDJE_PATH, icon); elm_object_content_set(btn, img); - elm_object_text_set(btn, label); evas_object_smart_callback_add(btn, "clicked", func, data); evas_object_show(btn); @@ -125,7 +131,7 @@ tools_create(Evas_Object *parent, Evas_Object *enventor) evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL); Evas_Object *btn; - btn = tools_btn_create(box, "menu", "Menu", "Enventor Menu (Esc)", + btn = tools_btn_create(box, "menu", "Enventor Menu (Esc)", menu_cb, enventor); elm_object_tooltip_orient_set(btn, ELM_TOOLTIP_ORIENT_BOTTOM_RIGHT); evas_object_size_hint_weight_set(btn, 0, EVAS_HINT_EXPAND); @@ -137,22 +143,49 @@ tools_create(Evas_Object *parent, Evas_Object *enventor) evas_object_show(sp); elm_box_pack_end(box, sp); - btn = tools_btn_create(box, "highlight", "Highlight", - "Part Highlighting (Ctrl + H)", + btn = tools_btn_create(box, "save","Save File (Ctrl + S)", + save_cb, enventor); + evas_object_size_hint_weight_set(btn, 0, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(btn, 0.0, EVAS_HINT_FILL); + elm_box_pack_end(box, btn); + + btn = tools_btn_create(box, "find", "Find/Replace (Ctrl + F)", + find_cb, enventor); + evas_object_size_hint_weight_set(btn, 0, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(btn, 0.0, EVAS_HINT_FILL); + elm_box_pack_end(box, btn); + + btn = tools_btn_create(box, "line", "Goto Lines (Ctrl + L)", + goto_cb, enventor); + evas_object_size_hint_weight_set(btn, 0, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(btn, 0.0, EVAS_HINT_FILL); + elm_box_pack_end(box, btn); + + btn = tools_btn_create(box, "lines", "Line Numbers (F5)", + lines_cb, enventor); + evas_object_size_hint_weight_set(btn, 0, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(btn, 0.0, EVAS_HINT_FILL); + elm_box_pack_end(box, btn); + + sp = elm_separator_add(box); + evas_object_show(sp); + elm_box_pack_end(box, sp); + + btn = tools_btn_create(box, "highlight", "Part Highlighting (Ctrl + H)", highlight_cb, enventor); evas_object_size_hint_weight_set(btn, 0, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(btn, 0.0, EVAS_HINT_FILL); elm_box_pack_end(box, btn); - btn = tools_btn_create(box, "swallow_s", "Swallow", - "Dummy Swallow (Ctrl + W)", swallow_cb, enventor); + btn = tools_btn_create(box, "swallow_s", "Dummy Swallow (Ctrl + W)", + swallow_cb, enventor); evas_object_size_hint_weight_set(btn, 0, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(btn, 0.0, EVAS_HINT_FILL); elm_box_pack_end(box, btn); - btn = tools_btn_create(box, "live_edit", "LiveEdit", - "Live View Edit (Ctrl + E)", live_edit_cb, NULL); - evas_object_size_hint_weight_set(btn, 0, EVAS_HINT_EXPAND); + btn = tools_btn_create(box, "live_edit", "Live View Edit (Ctrl + E)", + live_edit_cb, NULL); + evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(btn, 0.0, EVAS_HINT_FILL); elm_box_pack_end(box, btn); evas_object_data_set(box, "live_edit", btn); @@ -161,36 +194,13 @@ tools_create(Evas_Object *parent, Evas_Object *enventor) evas_object_show(sp); elm_box_pack_end(box, sp); - btn = tools_btn_create(box, "lines", "Lines", "Line Numbers (F5)", - lines_cb, enventor); - evas_object_size_hint_weight_set(btn, 0, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(btn, 0.0, EVAS_HINT_FILL); - elm_box_pack_end(box, btn); - - btn = tools_btn_create(box, "find", "Find", "Find/Replace (Ctrl + F)", - find_cb, enventor); - evas_object_size_hint_weight_set(btn, 0, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(btn, 0.0, EVAS_HINT_FILL); - elm_box_pack_end(box, btn); - - btn = tools_btn_create(box, "line", "Goto", "Goto Lines (Ctrl + L)", - goto_cb, enventor); - evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(btn, 0.0, EVAS_HINT_FILL); - elm_box_pack_end(box, btn); - - sp = elm_separator_add(box); - evas_object_show(sp); - elm_box_pack_end(box, sp); - - btn = tools_btn_create(box, "console", "Console", - "Console Box (Ctrl + Down)", console_cb, NULL); + btn = tools_btn_create(box, "console", "Console Box (Ctrl + Down)", + console_cb, NULL); evas_object_size_hint_weight_set(btn, 0, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(btn, 1.0, EVAS_HINT_FILL); elm_box_pack_end(box, btn); - btn = tools_btn_create(box, "status", "Status", "Status (F11)", status_cb, - NULL); + btn = tools_btn_create(box, "status", "Status (F11)", status_cb, NULL); elm_object_tooltip_orient_set(btn, ELM_TOOLTIP_ORIENT_BOTTOM_LEFT); evas_object_size_hint_weight_set(btn, 0, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(btn, 1.0, EVAS_HINT_FILL); diff --git a/src/include/file_mgr.h b/src/include/file_mgr.h index 72395c2..1ddc859 100644 --- a/src/include/file_mgr.h +++ b/src/include/file_mgr.h @@ -5,3 +5,4 @@ void file_mgr_init(Evas_Object *enventor); void file_mgr_term(void); int file_mgr_edc_modified_get(void); void file_mgr_reset(void); +void file_mgr_edc_save(void);