hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=11750600550ef05b9e38b8b0b4799d799ebf3fdb
commit 11750600550ef05b9e38b8b0b4799d799ebf3fdb Author: ChunEon Park <[email protected]> Date: Sun Mar 2 03:17:07 2014 +0900 search - on implementing find/replace --- data/themes/default/layout.edc | 58 +++++++++++++++++++++++++++++++++++++----- src/bin/search.c | 28 +++++++++++++++++--- 2 files changed, 76 insertions(+), 10 deletions(-) diff --git a/data/themes/default/layout.edc b/data/themes/default/layout.edc index 54f6eff..19f197d 100644 --- a/data/themes/default/layout.edc +++ b/data/themes/default/layout.edc @@ -13,7 +13,7 @@ group { name: "search"; part { name: "base"; type: SPACER; description { state: "default" 0.0; - min: 300 100; + min: 285 90; } } part { name: "left_top_padding"; @@ -96,18 +96,64 @@ group { name: "search"; fixed: 1 1; } } -/* part { name: "elm.swallow.find"; + part { name: "elm.swallow.find"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + rel1.relative: 0 1; + rel2.relative: 0 1; + rel1.to_x: "elm.swallow.replace_entry"; + rel1.to_y: "elm.swallow.replace_entry"; + rel2.to_x: "elm.swallow.replace_entry"; + rel2.to_y: "elm.swallow.replace_entry"; + rel1.offset: 0 10; + min: 50 25; + align: 0 0; + fixed: 1 1; + } + } + part { name: "elm.swallow.replace/find"; type: SWALLOW; scale: 1; description { state: "default" 0.0; rel1.relative: 1 0; rel2.relative: 1 1; - rel1.to: "elm.text.replace"; - rel2.to_y: "elm.text.replace"; - rel2.offset: -5 -1; + rel1.to: "elm.swallow.find"; + rel2.to: "elm.swallow.find"; + rel1.offset: 5 0; + min: 50 25; + align: 0 0; + fixed: 1 1; + } + } + part { name: "elm.swallow.replace"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + rel1.relative: 1 0; + rel2.relative: 1 1; + rel1.to: "elm.swallow.replace/find"; + rel2.to: "elm.swallow.replace/find"; + rel1.offset: 5 0; + min: 50 25; + align: 0 0; + fixed: 1 1; + } + } + part { name: "elm.swallow.replace_all"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + rel1.relative: 1 0; + rel2.relative: 1 1; + rel1.to: "elm.swallow.replace"; + rel2.to: "elm.swallow.replace"; + rel1.offset: 5 0; + min: 50 25; + align: 0 0; fixed: 1 1; } - } */ + } } } diff --git a/src/bin/search.c b/src/bin/search.c index 926b68e..9b9a596 100644 --- a/src/bin/search.c +++ b/src/bin/search.c @@ -10,8 +10,8 @@ typedef struct search_s static search_data *g_sd = NULL; static Evas_Coord win_x = -1; static Evas_Coord win_y = -1; -static Evas_Coord win_w = 300; -static Evas_Coord win_h = 100; +static Evas_Coord win_w = 285; +static Evas_Coord win_h = 90; static void win_delete_request_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) @@ -64,7 +64,6 @@ search_open() //Entry (find) Evas_Object *entry_find = elm_entry_add(layout); - elm_object_style_set(entry_find, elm_app_name_get()); elm_entry_single_line_set(entry_find, EINA_TRUE); elm_entry_scrollable_set(entry_find, EINA_TRUE); evas_object_size_hint_weight_set(entry_find, EVAS_HINT_EXPAND, 0); @@ -74,7 +73,6 @@ search_open() //Entry (replace) Evas_Object *entry_replace = elm_entry_add(layout); - elm_object_style_set(entry_replace, elm_app_name_get()); elm_entry_single_line_set(entry_replace, EINA_TRUE); elm_entry_scrollable_set(entry_replace, EINA_TRUE); evas_object_size_hint_weight_set(entry_replace, EVAS_HINT_EXPAND,0); @@ -82,6 +80,28 @@ search_open() evas_object_show(entry_replace); elm_object_part_content_set(layout, "elm.swallow.replace_entry", entry_replace); + //Button (find) + Evas_Object *btn_find = elm_button_add(layout); + elm_object_text_set(btn_find, "Find"); + evas_object_show(btn_find); + elm_object_part_content_set(layout, "elm.swallow.find", btn_find); + + //Button (find/replace) + Evas_Object *btn_replace_find = elm_button_add(layout); + elm_object_text_set(btn_replace_find, "Find/Replace"); + evas_object_show(btn_replace_find); + elm_object_part_content_set(layout, "elm.swallow.replace/find", + btn_replace_find); + + //Button (replace) + Evas_Object *btn_replace = elm_button_add(layout); + elm_object_text_set(btn_replace, "Replace"); + evas_object_show(btn_replace); + elm_object_part_content_set(layout, "elm.swallow.replace", btn_replace); + + sd->win = win; + + sd->win = win; } --
