rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=e7f2e34df85267992b466e92b0ded835570e4eef
commit e7f2e34df85267992b466e92b0ded835570e4eef Author: Tetiana Naumenko <[email protected]> Date: Thu Mar 23 15:53:34 2017 +0200 script_manager: change view of script manager window 1. Change style of script manager window from search entry to label 2. Implement showing in label name of group or program Change-Id: Ib9c42544fcd03eeff8304bb07e38dfaeb088412f --- data/themes/default/widgets/layout.edc | 6 ++++-- data/themes/tizen/widgets/layout.edc | 6 ++++-- src/bin/ui/script_manager.c | 18 ++++++------------ 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/data/themes/default/widgets/layout.edc b/data/themes/default/widgets/layout.edc index 0643d23..f59265f 100644 --- a/data/themes/default/widgets/layout.edc +++ b/data/themes/default/widgets/layout.edc @@ -746,7 +746,6 @@ group { name: "elm/layout/animator/program_area"; group { name: "elm/layout/image_manager/default"; alias: "elm/layout/sound_manager/default"; - alias: "elm/layout/script_manager/default"; parts { part { name: "area.edit"; type: SPACER; @@ -850,7 +849,8 @@ group { name: "elm/layout/image_manager/default"; } } -group { name: "elm/layout/script_manager/build_log"; +group { name: "elm/layout/script_manager/default"; + alias: "elm/layout/script_manager/build_log"; parts { part { name: "area.edit"; type: SPACER; @@ -884,10 +884,12 @@ group { name: "elm/layout/script_manager/build_log"; text { font: FN; size: 13; + align: 0.0 0.5; } rel1 { relative: 0.0 0.0; to_y: "area.edit"; + offset: 20 0; } rel2 { relative: 1.0 0.0; diff --git a/data/themes/tizen/widgets/layout.edc b/data/themes/tizen/widgets/layout.edc index 5087d76..db4d0da 100644 --- a/data/themes/tizen/widgets/layout.edc +++ b/data/themes/tizen/widgets/layout.edc @@ -909,7 +909,6 @@ group { name: "elm/layout/animator/program_area"; group { name: "elm/layout/image_manager/default"; alias: "elm/layout/sound_manager/default"; - alias: "elm/layout/script_manager/default"; parts { part { name: "area.edit"; type: SPACER; @@ -1013,7 +1012,8 @@ group { name: "elm/layout/image_manager/default"; } } -group { name: "elm/layout/script_manager/build_log"; +group { name: "elm/layout/script_manager/default"; + alias: "elm/layout/script_manager/build_log"; parts { part { name: "area.edit"; type: SPACER; @@ -1048,10 +1048,12 @@ group { name: "elm/layout/script_manager/build_log"; text { font: FN_B; size: 13; + align: 0.0 0.5; } rel1 { relative: 0.0 0.0; to_y: "area.edit"; + offset: 20 0; } rel2 { relative: 1.0 0.0; diff --git a/src/bin/ui/script_manager.c b/src/bin/ui/script_manager.c index ab9040e..64394c3 100644 --- a/src/bin/ui/script_manager.c +++ b/src/bin/ui/script_manager.c @@ -139,8 +139,9 @@ _btn_save_cb(void *data, Evas_Object * script_manager_add(Resource2 *res) { - Evas_Object *ic, *search_entry, *btn_save; + Evas_Object *ic, *btn_save; char *code; + char buf[BUFF_MAX]; Group2 *group; Program2 *program; @@ -200,29 +201,22 @@ script_manager_add(Resource2 *res) if (res->common.type == RESOURCE2_TYPE_GROUP) { code = edje_edit_script_get(group->edit_object); + snprintf(buf, sizeof(buf), _("Group: %s"), res->common.name); } else { code = edje_edit_script_program_get(group->edit_object, program->common.name); + snprintf(buf, sizeof(buf), _("Program: %s"), res->common.name); } + elm_layout_text_set(mng.script_layout, "elm.text", buf); + property_color_entry_set(mng.script_entry, code, ap.color_data); BUTTON_ADD(mng.win, btn_save, _("Save")) evas_object_smart_callback_add(btn_save, signals.elm.button.clicked, _btn_save_cb, res); elm_object_part_content_set(mng.win, "eflete.swallow.btn_ok", btn_save); - ENTRY_ADD(mng.script_layout, search_entry, true); - elm_object_part_text_set(search_entry, "guide", _("Search")); -#if !HAVE_TIZEN - Evas_Object *icon; - ICON_STANDARD_ADD(search_entry, icon, true, "search"); - elm_object_part_content_set(search_entry, "elm.swallow.end", icon); -#else - elm_object_style_set(search_entry, "search"); -#endif - elm_layout_content_set(mng.script_layout, "elm.swallow.search", search_entry); - elm_object_content_set(mng.win, mng.panes); evas_object_show(mng.win); free(code); --
