jaehyun pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=cf4c9ffb94386ec1c1c6cb9a8520ba78a0b5d146
commit cf4c9ffb94386ec1c1c6cb9a8520ba78a0b5d146 Author: Jaehyun Cho <[email protected]> Date: Fri May 20 05:46:13 2016 +0900 tools: Add template insert button. Add template insert button in tools to let users know how to use template insert function. --- data/themes/default/images.edc | 2 ++ data/themes/default/images/Makefile.am | 3 +- data/themes/default/images/template.png | Bin 0 -> 3062 bytes data/themes/default/layout_common.edc | 59 +++++++++++++++++++++++--------- src/bin/main.c | 29 +--------------- src/bin/tools.c | 42 +++++++++++++++++++++++ src/include/tools.h | 1 + 7 files changed, 90 insertions(+), 46 deletions(-) diff --git a/data/themes/default/images.edc b/data/themes/default/images.edc index d5ccd53..8e91b69 100644 --- a/data/themes/default/images.edc +++ b/data/themes/default/images.edc @@ -45,6 +45,7 @@ images { image: "brows_image.png" COMP; image: "brows_sound.png" COMP; image: "brows_font.png" COMP; + image: "template.png" COMP; } #define ICON_GROUP(_group_name, _image_path) \ @@ -103,5 +104,6 @@ ICON_GROUP("brows_logo", "brows_logo.png") ICON_GROUP("brows_image", "brows_image.png") ICON_GROUP("brows_sound", "brows_sound.png") ICON_GROUP("brows_font", "brows_font.png") +ICON_GROUP("template", "template.png") #undef ICON_GROUP diff --git a/data/themes/default/images/Makefile.am b/data/themes/default/images/Makefile.am index 563c471..e6d3ff2 100644 --- a/data/themes/default/images/Makefile.am +++ b/data/themes/default/images/Makefile.am @@ -93,4 +93,5 @@ EXTRA_DIST = \ brows_logo.png \ brows_image.png \ brows_sound.png \ - brows_font.png + brows_font.png \ + template.png diff --git a/data/themes/default/images/template.png b/data/themes/default/images/template.png new file mode 100644 index 0000000..d74bd0e Binary files /dev/null and b/data/themes/default/images/template.png differ diff --git a/data/themes/default/layout_common.edc b/data/themes/default/layout_common.edc index c8b520c..96e64a7 100644 --- a/data/themes/default/layout_common.edc +++ b/data/themes/default/layout_common.edc @@ -3169,6 +3169,31 @@ group { "text_editor_tools_layout"; scale: 1; desc { "default"; rel1 { + to_x: "elm.swallow.lines"; + relative: 1.0 0.0; + } + rel2.to_x: "elm.swallow.lines"; + min: 8 0; + fixed: 1 0; + align: 0.0 0.5; + } + } + swallow { "elm.swallow.template"; + scale: 1; + desc { "default"; + rel1 { + to_x: "padding7"; + relative: 1.0 0.0; + } + rel2.to_x: "padding7"; + fixed: 1 0; + align: 0.0 0.5; + } + } + spacer { "padding8"; + scale: 1; + desc { "default"; + rel1 { to_x: "base"; relative: 1.0 0.0; } @@ -3181,16 +3206,16 @@ group { "text_editor_tools_layout"; swallow { "elm.swallow.menu"; scale: 1; desc { "default"; - rel1.to_x: "padding7"; + rel1.to_x: "padding8"; rel2 { - to_x: "padding7"; + to_x: "padding8"; relative: 0.0 1.0; } fixed: 1 0; align: 1.0 0.5; } } - spacer { "padding8"; + spacer { "padding9"; scale: 1; desc { "default"; rel1.to_x: "elm.swallow.menu"; @@ -3207,11 +3232,11 @@ group { "text_editor_tools_layout"; scale: 1; desc { "default"; rel1 { - to_x: "padding8"; + to_x: "padding9"; relative: 0.0 0.5; } rel2 { - to_x: "padding8"; + to_x: "padding9"; relative: 0.0 0.5; } min: 1 18; @@ -3220,7 +3245,7 @@ group { "text_editor_tools_layout"; color: 48 48 48 255; } } - spacer { "padding9"; + spacer { "padding10"; scale: 1; desc { "default"; rel1.to_x: "separator"; @@ -3236,16 +3261,16 @@ group { "text_editor_tools_layout"; swallow { "elm.swallow.status"; scale: 1; desc { "default"; - rel1.to_x: "padding9"; + rel1.to_x: "padding10"; rel2 { - to_x: "padding9"; + to_x: "padding10"; relative: 0.0 1.0; } fixed: 1 0; align: 1.0 0.5; } } - spacer { "padding10"; + spacer { "padding11"; scale: 1; desc { "default"; rel1.to_x: "elm.swallow.status"; @@ -3261,16 +3286,16 @@ group { "text_editor_tools_layout"; swallow { "elm.swallow.edc_navigator"; scale: 1; desc { "default"; - rel1.to_x: "padding10"; + rel1.to_x: "padding11"; rel2 { - to_x: "padding10"; + to_x: "padding11"; relative: 0.0 1.0; } fixed: 1 0; align: 1.0 0.5; } } - spacer { "padding11"; + spacer { "padding12"; scale: 1; desc { "default"; rel1.to_x: "elm.swallow.edc_navigator"; @@ -3286,16 +3311,16 @@ group { "text_editor_tools_layout"; swallow { "elm.swallow.file_browser"; scale: 1; desc { "default"; - rel1.to_x: "padding11"; + rel1.to_x: "padding12"; rel2 { - to_x: "padding11"; + to_x: "padding12"; relative: 0.0 1.0; } fixed: 1 0; align: 1.0 0.5; } } - spacer { "padding12"; + spacer { "padding13"; scale: 1; desc { "default"; rel1.to_x: "elm.swallow.file_browser"; @@ -3311,9 +3336,9 @@ group { "text_editor_tools_layout"; swallow { "elm.swallow.console"; scale: 1; desc { "default"; - rel1.to_x: "padding12"; + rel1.to_x: "padding13"; rel2 { - to_x: "padding12"; + to_x: "padding13"; relative: 0.0 1.0; } fixed: 1 0; diff --git a/src/bin/main.c b/src/bin/main.c index cfe3ac2..ad6383b 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -574,33 +574,6 @@ enventor_setup(app_data *ad) base_live_view_set(enventor_object_live_view_get(enventor)); } -static void -default_template_insert(void) -{ - if (live_edit_get()) - { - stats_info_msg_update(_("Insertion of template code is disabled while in Live Edit mode")); - return; - } - - char syntax[12]; - if (enventor_object_template_insert(base_enventor_get(), - ENVENTOR_TEMPLATE_INSERT_DEFAULT, - syntax, sizeof(syntax))) - { - char msg[64]; - snprintf(msg, sizeof(msg), _("Template code inserted, (%s)"), syntax); - stats_info_msg_update(msg); - enventor_object_save(base_enventor_get(), config_input_path_get()); - } - else - { - stats_info_msg_update(_("Can't insert template code here. Move the " - "cursor inside the \"Collections,Images,Parts," - "Part,Programs\" scope.")); - } -} - static Eina_Bool alt_func(Evas_Event_Key_Down *event) { @@ -690,7 +663,7 @@ ctrl_func(Evas_Event_Key_Down *event) //Template Code if (!strcmp(event->key, "t") || !strcmp(event->key, "T")) { - default_template_insert(); + tools_template_insert(); return EINA_TRUE; } //Auto Indentation diff --git a/src/bin/tools.c b/src/bin/tools.c index ab7fb77..ef185bb 100644 --- a/src/bin/tools.c +++ b/src/bin/tools.c @@ -11,6 +11,7 @@ typedef struct tools_s Evas_Object *file_browser_btn; Evas_Object *edc_navigator_btn; Evas_Object *lines_btn; + Evas_Object *template_btn; Evas_Object *highlight_btn; Evas_Object *mirror_btn; Evas_Object *goto_btn; @@ -63,6 +64,13 @@ lines_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, } static void +template_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) +{ + tools_template_insert(); +} + +static void file_browser_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { @@ -278,6 +286,13 @@ tools_init(Evas_Object *parent) elm_object_part_content_set(text_editor_ly, "elm.swallow.lines", btn); td->lines_btn = btn; + btn = tools_btn_create(text_editor_ly, "template", + _("Insert Template (Ctrl + T)"), template_cb); + evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL); + elm_object_part_content_set(text_editor_ly, "elm.swallow.template", btn); + td->template_btn = btn; + btn = tools_btn_create(text_editor_ly, "console", _("Console Box (Alt + Down)"), console_cb); evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -516,6 +531,33 @@ tools_search_update(void) } void +tools_template_insert(void) +{ + if (live_edit_get()) + { + stats_info_msg_update(_("Insertion of template code is disabled while in Live Edit mode")); + return; + } + + char syntax[12]; + if (enventor_object_template_insert(base_enventor_get(), + ENVENTOR_TEMPLATE_INSERT_DEFAULT, + syntax, sizeof(syntax))) + { + char msg[64]; + snprintf(msg, sizeof(msg), _("Template code inserted, (%s)"), syntax); + stats_info_msg_update(msg); + enventor_object_save(base_enventor_get(), config_input_path_get()); + } + else + { + stats_info_msg_update(_("Can't insert template code here. Move the " + "cursor inside the \"Collections,Images,Parts," + "Part,Programs\" scope.")); + } +} + +void tools_console_update(Eina_Bool on) { tools_data *td = g_td; diff --git a/src/include/tools.h b/src/include/tools.h index 6177853..17e77da 100644 --- a/src/include/tools.h +++ b/src/include/tools.h @@ -9,6 +9,7 @@ void tools_file_browser_update(Eina_Bool toggle); void tools_edc_navigator_update(Eina_Bool toggle); void tools_goto_update(void); void tools_search_update(void); +void tools_template_insert(void); void tools_live_update(Eina_Bool on); void tools_console_update(Eina_Bool on); void tools_menu_update(Eina_Bool on); --
