rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=44d58d7214d9f75808dce4a61a88a3a9c4904afa
commit 44d58d7214d9f75808dce4a61a88a3a9c4904afa Author: Vyacheslav Reutskiy <v.reuts...@samsung.com> Date: Wed Jul 15 09:16:17 2015 +0300 Styles: update the wizard 'New proejct' layout Change-Id: Ia2836204342daa85e5e8adac135aae249bdbd4e5 --- data/themes/default/widgets/layout.edc | 382 +++++++++++++++++++++------------ 1 file changed, 250 insertions(+), 132 deletions(-) diff --git a/data/themes/default/widgets/layout.edc b/data/themes/default/widgets/layout.edc index 5c836c3..15683f8 100644 --- a/data/themes/default/widgets/layout.edc +++ b/data/themes/default/widgets/layout.edc @@ -958,30 +958,17 @@ group { name: "elm/layout/wizard/directories_item"; group { name: "elm/layout/wizard/new_project"; images { image: "separator-vertical.png" COMP; - image: "separator-horizontal.png" COMP; } parts { - part { name: "separator.block"; - type: SPACER; - description { state: "default" 0.0; - align: 1.0 0.5; - min: 10 10; - max: 10 -1; - rel2 { - relative: 0.6 1.0; - } - } - } part { name: "block_separator_deco"; + type: IMAGE; description { state: "default" 0.0; min: 2 0; max: 2 -1; - image.normal: "separator-vertical.png"; - rel1 { - relative: 0.0 0.0; - to: "separator.block"; + image { + normal: "separator-vertical.png"; + middle: DEFAULT; } - rel2.to: "separator.block"; } } part { name: "area.project_info"; @@ -989,7 +976,8 @@ group { name: "elm/layout/wizard/new_project"; description { state: "default" 0.0; rel2 { relative: 0.0 1.0; - to: "separator.block"; + offset: -7 -1; + to_x: "block_separator_deco"; } } } @@ -998,178 +986,308 @@ group { name: "elm/layout/wizard/new_project"; description { state: "default" 0.0; rel1 { relative: 1.0 0.0; - to: "separator.block"; + offset: 6 0; + to_x: "block_separator_deco"; } - rel2.to_y: "separator.block"; } } - part { name: "area.widgets_label"; - type: SPACER; + part { name: "swallow.all_widgets_check"; + type: SWALLOW; description { state: "default" 0.0; align: 0.0 0.0; - min: 0 26; - max: -1 26; - rel1.to: "area.widgets_info"; - rel2.to: "area.widgets_info"; + min: 20 20; + max: 20 20; + rel1 { + to_x: "swallow.widgets"; + to_y: "area.widgets_info"; + offset: 6 0; + } + rel2 { + to: "area.widgets_info"; + } } } - part { name: "padding.all_widgets_check.left"; - type: SPACER; + part { name: "label.widgets"; + type: TEXT; description { state: "default" 0.0; - align: 0.0 0.0; - SET_SIZE(9, 9); - rel1.to: "area.widgets_label"; - rel2.to: "area.widgets_label"; + align: 0.0 0.5; + color_class: "main"; + rel1 { + relative: 1.0 0.0; + offset: 6 0; + to: "swallow.all_widgets_check"; + } + rel2 { + to_x: "area.widgets_info"; + to_y: "swallow.all_widgets_check"; + } + text { + font: "PT"; + size: 12; + align: 0.0 0.5; + } } } - part { name: "swallow.all_widgets_check"; + part { name: "swallow.widgets"; type: SWALLOW; description { state: "default" 0.0; - align: 0.0 1.0; - SET_SIZE(20, 20); rel1 { - to_x: "padding.all_widgets_check.left"; - relative: 1.0 0.0; + relative: 0.0 1.0; + offset: 0 6; + to_x: "area.widgets_info"; + to_y: "swallow.all_widgets_check"; + } + rel2 { + to: "area.widgets_info"; } - rel2.to: "area.widgets_label"; } } - part { name: "padding.all_widgets_check.right"; + part { name: "area.large_items"; type: SPACER; + scale: 1; description { state: "default" 0.0; align: 0.0 0.0; - SET_SIZE(5, 5); rel1 { - to_x: "swallow.all_widgets_check"; - relative: 1.0 0.0; + relative: 0.0 1.0; + offset: 0 6; + to_y: "label.meta_version"; + } + rel2 { + to: "area.project_info"; } - rel2.to: "area.widgets_label"; } } - part { name: "label.widgets"; + part { name: "label.name"; type: TEXT; + scale: 1; description { state: "default" 0.0; - align: 0.0 0.5; + color_class: "main"; + rel1 { + to_x: "area.project_info"; + to_y: "swallow.name"; + } + rel2 { + relative: 0.3 1.0; + to_x: "area.project_info"; + to_y: "swallow.name"; + } text { - font: FN; + font: "PT"; size: 12; - max: 1 1; + align: 0.0 0.5; } + } + } + part { name: "swallow.name"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + align: 0.5 0.0; + fixed: 1 1; + max: -1 19; rel1 { - to: "padding.all_widgets_check.right"; - relative: 1.0 1.0; + relative: 0.3 0.0; + to: "area.project_info"; + } + rel2 { + to_x: "area.project_info"; } - rel2.to: "area.widgets_label"; } } - part { name: "padding.widgets_top_left"; - type: SPACER; + part { name: "label.path"; + type: TEXT; + scale: 1; description { state: "default" 0.0; align: 0.0 0.0; - SET_SIZE(3, 3); + color_class: "main"; rel1 { - to: "area.widgets_label"; - relative: 0.0 1.0; + to_x: "area.project_info"; + to_y: "swallow.path"; + } + rel2 { + relative: 0.3 1.0; + to_x: "area.project_info"; + to_y: "swallow.path"; + } + text { + font: "PT"; + size: 12; + align: 0.0 0.5; } - rel2.to: "area.widgets_info"; } } - part { name: "padding.widgets_right_bottom"; - type: SPACER; + part { name: "swallow.path"; + type: SWALLOW; + scale: 1; description { state: "default" 0.0; - align: 1.0 1.0; - SET_SIZE(3, 3); + align: 0.5 0.0; + fixed: 1 1; + max: -1 19; rel1 { - to: "area.widgets_label"; - relative: 0.0 1.0; + relative: 0.3 1.0; + offset: 0 6; + to_x: "area.project_info"; + to_y: "swallow.name"; + } + rel2 { + to_x: "area.project_info"; } - rel2.to: "area.widgets_info"; } } - part { name: "swallow.widgets"; + part { name: "label.meta_version"; + type: TEXT; + scale: 1; + description { state: "default" 0.0; + align: 0.0 0.0; + color_class: "main"; + rel1 { + to_x: "area.project_info"; + to_y: "swallow.meta_version"; + } + rel2 { + relative: 0.3 1.0; + to_x: "area.project_info"; + to_y: "swallow.meta_version"; + } + text { + font: "PT"; + size: 12; + align: 0.0 0.5; + } + } + } + part { name: "swallow.meta_version"; type: SWALLOW; + scale: 1; description { state: "default" 0.0; + align: 0.5 0.0; + fixed: 1 1; + max: -1 19; rel1 { - to: "padding.widgets_top_left"; - relative: 1.0 1.0; + relative: 0.3 1.0; + offset: 0 6; + to_x: "area.project_info"; + to_y: "swallow.path"; } rel2 { - to: "padding.widgets_right_bottom"; - relative: 0.0 0.0; + to_x: "area.project_info"; } } } - -#define ITEM_AREA_ADD(_name, _rel1_to, _rel1_relative) \ - part { name: "area."#_name; \ - type: SPACER; \ - scale: 1; \ - description { state: "default" 0.0; \ - align: 0.0 0.0; \ - min: 0 ITEM_H; \ - max: -1 ITEM_H; \ - rel1 { \ - to: _rel1_to; \ - relative: 0.0 _rel1_relative; \ - } \ - rel2.to: "area.project_info"; \ - } \ - } - -ITEM_AREA_ADD(name, "area.project_info", 0.0); -ITEM_AREA_ADD(path, "area.name", 1.0); -ITEM_AREA_ADD(meta_version, "area.path", 1.0); -ITEM_AREA_ADD(meta_authors, "area.meta_version", 1.0); - -#undef ITEM_AREA_ADD - - part { name: "area.large_items"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - align: 0.0 0.0; - rel1 { - to: area.meta_authors; - relative: 0.0 1.0; + part { name: "label.meta_authors"; + type: TEXT; + scale: 1; + description { state: "default" 0.0; + align: 0.0 0.0; + color_class: "main"; + rel1 { + to_x: "area.large_items"; + to_y: "swallow.meta_authors"; + } + rel2 { + relative: 0.3 1.0; + to_x: "area.large_items"; + to_y: "swallow.meta_authors"; + } + text { + font: "PT"; + size: 12; + align: 0.0 0.0; + } } - rel2 { - to: "area.project_info"; - relative: 1.0 1.0; + } + part { name: "swallow.meta_authors"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + fixed: 1 1; + rel1 { + relative: 0.3 0.0; + to: "area.large_items"; + } + rel2 { + relative: 1.0 0.33; + to: "area.large_items"; + } } } - } - part { name: "area.meta_licenses"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - align: 0.0 0.0; - rel1.to: "area.large_items"; - rel2 { - to: "area.large_items"; - relative: 1.0 0.5; + part { name: "label.meta_licenses"; + type: TEXT; + scale: 1; + description { state: "default" 0.0; + align: 0.0 0.0; + color_class: "main"; + rel1 { + to_x: "area.large_items"; + to_y: "swallow.meta_licenses"; + } + rel2 { + relative: 0.3 1.0; + to_x: "area.large_items"; + to_y: "swallow.meta_licenses"; + } + text { + font: "PT"; + size: 12; + align: 0.0 0.0; + } } } - } - part { name: "area.meta_comment"; - type: SPACER; - scale: 1; - description { state: "default" 0.0; - align: 0.0 0.0; - rel1 { - to: "area.meta_licenses"; - relative: 0.0 1.0; + part { name: "swallow.meta_licenses"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + fixed: 1 1; + rel1 { + relative: 0.3 1.0; + offset: 0 6; + to_x: "area.large_items"; + to_y: "swallow.meta_authors"; + } + rel2 { + relative: 1.0 0.66; + to: "area.large_items"; + } + } + } + part { name: "label.meta_comment"; + type: TEXT; + scale: 1; + description { state: "default" 0.0; + align: 0.0 0.0; + color_class: "main"; + rel1 { + to_x: "area.large_items"; + to_y: "swallow.meta_comment"; + } + rel2 { + relative: 0.3 1.0; + to_x: "area.large_items"; + to_y: "swallow.meta_comment"; + } + text { + font: "PT"; + size: 12; + align: 0.0 0.0; + } + } + } + part { name: "swallow.meta_comment"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + fixed: 1 1; + rel1 { + relative: 0.3 1.0; + offset: 0 6; + to_x: "area.large_items"; + to_y: "swallow.meta_licenses"; + } + rel2 { + to: "area.large_items"; + } } - rel2.to: "area.large_items"; } - } - -ITEM_ADD(name) -ITEM_ADD(path) -ITEM_ADD(meta_version) -ITEM_ADD(meta_authors) -ITEM_ADD(meta_licenses) -ITEM_ADD(meta_comment) - } } --