rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=11cb09ccabc4d0b791775a3fb36058f6b1ddcb68
commit 11cb09ccabc4d0b791775a3fb36058f6b1ddcb68 Author: Andrii Kroitor <an.kroi...@samsung.com> Date: Mon Nov 9 11:35:46 2015 +0200 use same layout for both navigators --- data/themes/default/widgets/layout.edc | 136 +++------------------------------ src/bin/ui/group_navigator.c | 14 ++-- src/bin/ui/project_navigator.c | 4 +- 3 files changed, 18 insertions(+), 136 deletions(-) diff --git a/data/themes/default/widgets/layout.edc b/data/themes/default/widgets/layout.edc index e64d001..acc1a6c 100644 --- a/data/themes/default/widgets/layout.edc +++ b/data/themes/default/widgets/layout.edc @@ -401,7 +401,7 @@ group { name: "elm/layout/navigator/default"; rel2 { relative: 0.0 1.0; offset: -4 -1; - to_x: "elm.swallow.bt1"; + to_x: "elm.swallow.btn3"; to_y: "area.top"; } text { @@ -421,7 +421,7 @@ group { name: "elm/layout/navigator/default"; rel2 { relative: 0.0 1.0; offset: -4 -1; - to_x: "elm.swallow.bt1"; + to_x: "elm.swallow.btn3"; to_y: "area.top"; } text { @@ -442,7 +442,7 @@ group { name: "elm/layout/navigator/default"; rel2.offset: -4 -4; } } - part { name: "elm.swallow.bt0"; + part { name: "elm.swallow.btn0"; type: SWALLOW; description { state: "default" 0.0; align: 1.0 0.5; @@ -456,7 +456,7 @@ group { name: "elm/layout/navigator/default"; } } } - part { name: "elm.swallow.bt1"; + part { name: "elm.swallow.btn1"; type: SWALLOW; description { state: "default" 0.0; align: 1.0 0.5; @@ -467,130 +467,12 @@ group { name: "elm/layout/navigator/default"; rel2 { relative: 0.0 1.0; offset: -4 0; - to_x: "elm.swallow.bt0"; + to_x: "elm.swallow.btn0"; to_y: "area.top"; } } } - } - programs { - program { name: "enabled"; - signal: "elm,state,enabled"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.text"; - } - program { name: "disabled"; - signal: "elm,state,disabled"; - source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "elm.text"; - } - } -} - -group { name: "elm/layout/group_navigator/default"; - parts { - part { name: "bg"; - type: RECT; - description { state: "default" 0.0; - color: 80 82 83 255; - } - } - part { name: "area.top"; - type: SPACER; - description { state: "default" 0.0; - align: 0.5 0.0; - fixed: 0 1; - min: 0 23; - max: -1 23; - } - } - part { name: "elm.text"; - type: TEXT; - description { state: "default" 0.0; - align: 0.5 0.5; - fixed: 1 1; - color_class: "main"; - rel1 { - offset: 20 0; - to: "area.top"; - } - rel2 { - relative: 0.0 1.0; - offset: -4 -1; - to_x: "elm.swallow.btn_add"; - to_y: "area.top"; - } - text { - font: "PT"; - size: 13; - align: 0.0 0.5; - } - } - description { state: "disabled" 0.0; - align: 0.5 0.5; - fixed: 1 1; - color_class: "main_disabled"; - rel1 { - offset: 20 0; - to: "area.top"; - } - rel2 { - relative: 0.0 1.0; - offset: -4 -1; - to_x: "elm.swallow.btn_add"; - to_y: "area.top"; - } - text { - font: "pt"; - size: 15; - align: 0.0 0.5; - } - } - } - part { name: "elm.swallow.content"; - type: SWALLOW; - description { state: "default" 0.0; - rel1 { - relative: 0.0 1.0; - offset: 3 3; - to_y: "area.top"; - } - rel2.offset: -4 -4; - } - } - part { name: "elm.swallow.btn_up"; - type: SWALLOW; - description { state: "default" 0.0; - align: 1.0 0.5; - fixed: 1 1; - min: 18 19; - max: 18 19; - rel1.to_y: "area.top"; - rel2 { - offset: -4 -1; - to_y: "area.top"; - } - } - } - part { name: "elm.swallow.btn_down"; - type: SWALLOW; - description { state: "default" 0.0; - align: 1.0 0.5; - fixed: 1 1; - min: 18 19; - max: 18 19; - rel1.to_y: "area.top"; - rel2 { - relative: 0.0 1.0; - offset: -4 0; - to_x: "elm.swallow.btn_up"; - to_y: "area.top"; - } - } - } - part { name: "elm.swallow.btn_del"; + part { name: "elm.swallow.btn2"; type: SWALLOW; description { state: "default" 0.0; align: 1.0 0.5; @@ -601,12 +483,12 @@ group { name: "elm/layout/group_navigator/default"; rel2 { relative: 0.0 1.0; offset: -4 0; - to_x: "elm.swallow.btn_down"; + to_x: "elm.swallow.btn1"; to_y: "area.top"; } } } - part { name: "elm.swallow.btn_add"; + part { name: "elm.swallow.btn3"; type: SWALLOW; description { state: "default" 0.0; align: 1.0 0.5; @@ -617,7 +499,7 @@ group { name: "elm/layout/group_navigator/default"; rel2 { relative: 0.0 1.0; offset: -4 0; - to_x: "elm.swallow.btn_del"; + to_x: "elm.swallow.btn2"; to_y: "area.top"; } } diff --git a/src/bin/ui/group_navigator.c b/src/bin/ui/group_navigator.c index 8ab867c..0fc101c 100644 --- a/src/bin/ui/group_navigator.c +++ b/src/bin/ui/group_navigator.c @@ -830,25 +830,25 @@ group_navigator_add(Group *group) pl = mem_calloc(1, sizeof(Part_List)); pl->layout = elm_layout_add(ap.win); - elm_layout_theme_set(pl->layout, "layout", "group_navigator", "default"); + elm_layout_theme_set(pl->layout, "layout", "navigator", "default"); evas_object_show(pl->layout); evas_object_data_set(pl->layout, GROUP_NAVIGATOR_DATA, pl); pl->group = group; -#define BTN_ADD(BTN, ICON_NAME, CALLBACK) \ +#define BTN_ADD(BTN, SWALLOW, ICON_NAME, CALLBACK) \ pl->BTN = elm_button_add(pl->layout); \ ICON_STANDARD_ADD(pl->BTN, icon, true, ICON_NAME); \ elm_object_part_content_set(pl->BTN, NULL, icon); \ evas_object_smart_callback_add(pl->BTN, "clicked", CALLBACK, pl); \ elm_object_style_set(pl->BTN, "anchor"); \ - elm_object_part_content_set(pl->layout, "elm.swallow." #BTN, pl->BTN); + elm_object_part_content_set(pl->layout, SWALLOW, pl->BTN); - BTN_ADD(btn_add, "plus", _on_btn_plus_clicked); - BTN_ADD(btn_del, "minus", _on_btn_minus_clicked); - BTN_ADD(btn_up, "arrow_up", NULL); - BTN_ADD(btn_down, "arrow_down", NULL); + BTN_ADD(btn_add, "elm.swallow.btn3", "plus", _on_btn_plus_clicked); + BTN_ADD(btn_del, "elm.swallow.btn2", "minus", _on_btn_minus_clicked); + BTN_ADD(btn_down, "elm.swallow.btn1", "arrow_down", NULL); + BTN_ADD(btn_up, "elm.swallow.btn0", "arrow_up", NULL); elm_object_disabled_set(pl->btn_del, true); diff --git a/src/bin/ui/project_navigator.c b/src/bin/ui/project_navigator.c index 18f0cbe..e0bf7a8 100644 --- a/src/bin/ui/project_navigator.c +++ b/src/bin/ui/project_navigator.c @@ -647,14 +647,14 @@ project_navigator_add(void) elm_object_part_content_set(project_navigator.btn_add, NULL, icon); evas_object_smart_callback_add(project_navigator.btn_add, "clicked", _btn_add_group_cb, NULL); elm_object_style_set(project_navigator.btn_add, "anchor"); - elm_object_part_content_set(project_navigator.layout, "elm.swallow.bt1", project_navigator.btn_add); + elm_object_part_content_set(project_navigator.layout, "elm.swallow.btn1", project_navigator.btn_add); project_navigator.btn_del = elm_button_add(project_navigator.layout); ICON_STANDARD_ADD(project_navigator.btn_del, icon, true, "minus"); elm_object_part_content_set(project_navigator.btn_del, NULL, icon); evas_object_smart_callback_add (project_navigator.btn_del, "clicked", _btn_del_group_cb, NULL); elm_object_style_set(project_navigator.btn_del, "anchor"); - elm_object_part_content_set(project_navigator.layout, "elm.swallow.bt0", project_navigator.btn_del); + elm_object_part_content_set(project_navigator.layout, "elm.swallow.btn0", project_navigator.btn_del); elm_object_disabled_set(project_navigator.btn_del, true); project_navigator.genlist = elm_genlist_add(project_navigator.layout); --