rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=634400acfb27af8ebedc94616082d0b6f30d73b5
commit 634400acfb27af8ebedc94616082d0b6f30d73b5 Author: Vyacheslav Reutskiy <v.reuts...@samsung.com> Date: Wed Jul 15 16:34:01 2015 +0300 Styles: update the import edc layout Change-Id: I6616c2a6addfdd073f636eb5cd5d109a4155739a --- data/themes/default/widgets/layout.edc | 687 ++++++++++++++++++++++++++++----- 1 file changed, 592 insertions(+), 95 deletions(-) diff --git a/data/themes/default/widgets/layout.edc b/data/themes/default/widgets/layout.edc index 15683f8..7673340 100644 --- a/data/themes/default/widgets/layout.edc +++ b/data/themes/default/widgets/layout.edc @@ -687,21 +687,316 @@ group { name: "elm/layout/wizard/import_edj"; } group { name: "elm/layout/wizard/import_edc"; - inherit: "elm/layout/wizard/import_edj"; parts { - part { name: "padding.directories_top"; + part { name: "separator"; + type: IMAGE; + description { state: "default" 0.0; + min: 2 0; + max: 2 -1; + image { + normal: "separator-vertical.png"; + middle: DEFAULT; + } + } + } + part { name: "area.project_info"; type: SPACER; + scale: 1; description { state: "default" 0.0; - min: 15 15; - max: -1 15; align: 0.0 0.0; + rel2 { + relative: 0.0 1.0; + offset: -7 -1; + to_x: "separator"; + } + } + } + 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: "PT"; + size: 12; + align: 0.0 0.0; + } + } + } + part { name: "swallow.name"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + align: 0.5 0.0; + fixed: 1 1; + min: 0 19; + max: -1 19; + rel1 { + relative: 0.3 0.0; + to: "area.project_info"; + } + rel2 { + to: "area.project_info"; + } + } + } + part { name: "label.path"; + 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.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; + } + } + } + part { name: "swallow.path"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + align: 0.5 0.0; + min: 0 19; + max: -1 19; + rel1 { + relative: 0.3 1.0; + offset: 0 6; + to_x: "area.project_info"; + to_y: "swallow.name"; + } + rel2 { + to_x: "area.project_info"; + } + } + } + part { name: "label.edj"; + 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.edj"; + } + rel2 { + relative: 0.3 1.0; + to_x: "area.project_info"; + to_y: "swallow.edj"; + } + text { + font: "PT"; + size: 12; + align: 0.0 0.0; + } + } + } + part { name: "swallow.edj"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + align: 0.5 0.0; + min: 0 19; + max: -1 19; + rel1 { + relative: 0.3 1.0; + offset: 0 6; + to_x: "area.project_info"; + to_y: "swallow.path"; + } + rel2 { + to_x: "area.project_info"; + } + } + } + part { name: "area.project_details"; + type: SPACER; + scale: 1; + description { state: "default" 0.0; + align: 0.0 0.0; + rel1 { + relative: 1.0 0.0; + offset: 6 0; + to_x: "separator"; + } + } + } + part { name: "label.meta_version"; + type: TEXT; + scale: 1; + description { state: "default" 0.0; + align: 0.0 0.5; + color_class: "main"; + rel1 { + to_x: "area.project_details"; + to_y: "swallow.meta_version"; + } + rel2 { + relative: 0.3 1.0; + to_x: "area.project_details"; + 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; + min: 0 19; + max: -1 19; + rel1 { + relative: 0.3 0.0; + to: "area.project_details"; + } + rel2 { + to: "area.project_details"; + } + } + } + part { name: "area.big_fields"; + type: SPACER; + scale: 1; + description { state: "default" 0.0; rel1 { - to: "area.edj"; relative: 0.0 1.0; + offset: 0 6; + to_x: "area.project_details"; + to_y: "swallow.meta_version"; + } + } + } + part { name: "label.meta_authors"; + type: TEXT; + scale: 1; + description { state: "default" 0.0; + align: 0.0 0.0; + color_class: "main"; + rel1 { + to: "area.big_fields"; } rel2 { - to_x: "area.separator1"; + relative: 0.3 0.33; + to: "area.big_fields"; + } + text { + font: "PT"; + size: 12; + align: 0.0 0.0; + } + } + } + part { name: "swallow.meta_authors"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + rel1 { + relative: 0.3 0.0; + to: "area.big_fields"; + } + rel2 { + relative: 1.0 0.33; + to: "area.big_fields"; + } + } + } + part { name: "label.meta_licenses"; + type: TEXT; + scale: 1; + description { state: "default" 0.0; + align: 0.0 0.0; + color_class: "main"; + rel1 { relative: 0.0 1.0; + offset: 0 6; + to_x: "area.big_fields"; + to_y: "swallow.meta_authors"; + } + rel2 { + relative: 0.3 0.66; + to: "area.big_fields"; + } + text { + font: "PT"; + size: 12; + align: 0.0 0.0; + } + } + } + part { name: "swallow.meta_licenses"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + rel1 { + relative: 0.3 1.0; + offset: 0 6; + to_x: "area.big_fields"; + to_y: "swallow.meta_authors"; + } + rel2 { + relative: 1.0 0.66; + to_y: "area.big_fields"; + } + } + } + part { name: "label.meta_comment"; + type: TEXT; + scale: 1; + description { state: "default" 0.0; + align: 0.0 0.0; + color_class: "main"; + rel1 { + relative: 0.0 1.0; + offset: 0 6; + to_x: "area.big_fields"; + to_y: "swallow.meta_licenses"; + } + rel2 { + relative: 0.3 1.0; + to_x: "area.big_fields"; + } + text { + font: "PT"; + size: 12; + align: 0.0 0.0; + } + } + } + part { name: "swallow.meta_comment"; + type: SWALLOW; + scale: 1; + description { state: "default" 0.0; + rel1 { + relative: 0.3 1.0; + offset: 0 6; + to_x: "area.big_fields"; + to_y: "label.meta_licenses"; } } } @@ -709,104 +1004,306 @@ group { name: "elm/layout/wizard/import_edc"; type: SPACER; description { state: "default" 0.0; rel1 { - to:"padding.directories_top"; relative: 0.0 1.0; + offset: 0 6; + to_x: "area.project_info"; + to_y: "swallow.edj"; } rel2 { - to_x: "area.separator1"; + to_x: "area.project_info"; + } + } + } + part { name: "separator_img"; + type: IMAGE; + description { state: "default" 0.0; + align: 0.5 0.0; + min: 2 2; + max: -1 2; + rel1 { + to: "area.directories"; + } + rel2 { + to: "area.directories"; + } + image { + normal: "separator-horizontal.png"; + middle: DEFAULT; + } + } + } + part { name: "separator_fnt"; + type: IMAGE; + description { state: "default" 0.0; + align: 0.5 1.0; + min: 2 2; + max: -1 2; + rel1 { + to: "area.directories"; + } + rel2 { + relative: 1.0 0.2; + to: "area.directories"; + } + image { + normal: "separator-horizontal.png"; + middle: DEFAULT; + } + } + } + part { name: "separator_snd"; + type: IMAGE; + description { state: "default" 0.0; + align: 0.5 1.0; + min: 2 2; + max: -1 2; + rel1 { + to: "area.directories"; + } + rel2 { + relative: 1.0 0.4; + to: "area.directories"; + } + image { + normal: "separator-horizontal.png"; + middle: DEFAULT; + } + } + } + part { name: "separator_data"; + type: IMAGE; + description { state: "default" 0.0; + align: 0.5 1.0; + min: 2 2; + max: -1 2; + rel1 { + to: "area.directories"; + } + rel2 { + relative: 1.0 0.6; + to: "area.directories"; + } + image { + normal: "separator-horizontal.png"; + middle: DEFAULT; + } + } + } + part { name: "separator_vbr"; + type: IMAGE; + description { state: "default" 0.0; + align: 0.5 1.0; + min: 2 2; + max: -1 2; + rel1 { + to: "area.directories"; + } + rel2 { + relative: 1.0 0.8; + to: "area.directories"; + } + image { + normal: "separator-horizontal.png"; + middle: DEFAULT; + } + } + } + part { name: "label.directories_img"; + type: TEXT; + scale: 1; + description { state: "default" 0.0; + align: 0.0 0.0; + color_class: "main"; + rel1 { relative: 0.0 1.0; + offset: 0 6; + to_x: "area.directories"; + to_y: "separator_img"; + } + rel2 { + relative: 0.3 0.0; + offset: -1 -7; + to_x: "area.directories"; + to_y: "separator_fnt"; + } + text { + font: "PT"; + size: 12; + align: 0.0 0.0; } } } -#define SEPARATOR_ADD(_name, _from, _to, _rel_to) \ - part { name: "separator."#_name; \ - type: SPACER; \ - description { state: "default" 0.0; \ - align: 0.5 1.0; \ - min: 10 10; \ - max: -1 10; \ - rel1 { \ - to: _rel_to; \ - relative: 0.0 _from; \ - } \ - rel2 { \ - to: _rel_to; \ - relative: 1.0 _to; \ - } \ - } \ - } \ - part { name: #_name; \ - type: IMAGE; \ - description { state: "default" 0.0; \ - align: 0.5 0.5; \ - min: 2 2; \ - max: -1 2; \ - rel1.to: "separator."#_name; \ - rel2.to: "separator."#_name; \ - image { \ - normal: "separator-horizontal.png"; \ - middle: DEFAULT; \ - } \ - } \ + part { name: "swallow.directories_img"; + type: SWALLOW; + description { state: "default" 0.0; + rel1 { + relative: 0.3 0.0; + offset: 0 6; + to_x: "area.directories"; + to_y: "separator_img"; + } + rel2 { + offset: -1 -7; + to_x: "area.directories"; + to_y: "separator_fnt"; + } + } } - - SEPARATOR_ADD(directories_img, 0.0, 1.0, "padding.directories_top"); - SEPARATOR_ADD(directories_fnt, 0.0, 0.2, "area.directories"); - SEPARATOR_ADD(directories_snd, 0.2, 0.4, "area.directories"); - SEPARATOR_ADD(directories_vbr, 0.4, 0.6, "area.directories"); - SEPARATOR_ADD(directories_data, 0.6, 0.8, "area.directories"); - -#undef SEPARATOR_ADD - -#define SWALLOW_ADD(_name, _to, _relative) \ - part { name: "area."#_name; \ - type: SWALLOW; \ - description { state: "default" 0.0; \ - rel1 { \ - to: "separator."#_name; \ - relative: 0.0 1.0; \ - } \ - rel2 { \ - to: _to; \ - relative: 1.0 _relative; \ - } \ - } \ - } \ - part { name: "label."#_name; \ - type: TEXT; \ - scale: 1; \ - description { state: "default" 0.0; \ - align: 0.0 0.0; \ - rel1.to: "area."#_name; \ - rel2 { \ - relative: 0.3 1.0; \ - to: "area."#_name; \ - } \ - text { \ - font: FN; \ - size: 12; \ - max: 1 1; \ - } \ - } \ - } \ - part { name: "swallow."#_name; \ - type: SWALLOW; \ - description { state: "default" 0.0; \ - rel1 { \ - relative: 0.3 0.0; \ - to: "area."#_name; \ - } \ - rel2.to: "area."#_name; \ - } \ + part { name: "label.directories_fnt"; + type: TEXT; + scale: 1; + description { state: "default" 0.0; + align: 0.0 0.0; + color_class: "main"; + rel1 { + offset: 0 6; + to_x: "area.directories"; + to_y: "separator_fnt"; + } + rel2 { + relative: 0.3 1.0; + offset: -1 -7; + to_x: "area.directories"; + to_y: "separator_snd"; + } + text { + font: "PT"; + size: 12; + align: 0.0 0.0; + } + } + } + part { name: "swallow.directories_fnt"; + type: SWALLOW; + description { state: "default" 0.0; + rel1 { + relative: 0.3 0.0; + offset: 0 6; + to_x: "area.directories"; + to_y: "separator_fnt"; + } + rel2 { + offset: -1 -7; + to_x: "area.directories"; + to_y: "separator_snd"; + } + } + } + part { name: "label.directories_snd"; + type: TEXT; + scale: 1; + description { state: "default" 0.0; + align: 0.0 0.0; + color_class: "main"; + rel1 { + offset: 0 6; + to_x: "area.directories"; + to_y: "separator_snd"; + } + rel2 { + relative: 0.3 1.0; + offset: -1 -7; + to_x: "area.directories"; + to_y: "separator_data"; + } + text { + font: "PT"; + size: 12; + align: 0.0 0.0; + } + } + } + part { name: "swallow.directories_snd"; + type: SWALLOW; + description { state: "default" 0.0; + rel1 { + relative: 0.3 0.0; + offset: 0 6; + to_x: "area.directories"; + to_y: "separator_snd"; + } + rel2 { + offset: -1 -7; + to_x: "area.directories"; + to_y: "separator_data"; + } + } + } + part { name: "label.directories_data"; + type: TEXT; + scale: 1; + description { state: "default" 0.0; + align: 0.0 0.0; + color_class: "main"; + rel1 { + offset: 0 6; + to_y: "separator_data"; + } + rel2 { + relative: 0.3 1.0; + offset: -1 -7; + to_x: "area.directories"; + to_y: "separator_vbr"; + } + text { + font: "PT"; + size: 12; + align: 0.0 0.0; + } + } + } + part { name: "swallow.directories_data"; + type: SWALLOW; + description { state: "default" 0.0; + rel1 { + relative: 0.3 0.0; + offset: 0 6; + to_x: "area.directories"; + to_y: "separator_data"; + } + rel2 { + offset: -1 -7; + to_x: "area.directories"; + to_y: "separator_vbr"; + } + } + } + part { name: "label.directories_vbr"; + type: TEXT; + scale: 1; + description { state: "default" 0.0; + align: 0.0 0.0; + color_class: "main"; + rel1 { + offset: 0 6; + to_x: "area.directories"; + to_y: "separator_vbr"; + } + rel2 { + relative: 0.3 1.0; + to: "area.directories"; + } + text { + font: "PT"; + size: 12; + align: 0.0 0.0; + } + } + } + part { name: "swallow.directories_vbr"; + type: SWALLOW; + description { state: "default" 0.0; + rel1 { + relative: 0.3 0.0; + offset: 0 6; + to_x: "area.directories"; + to_y: "separator_vbr"; + } + rel2 { + to: "area.directories"; + } + } } - - SWALLOW_ADD(directories_img, "separator.directories_fnt", 0.0); - SWALLOW_ADD(directories_fnt, "separator.directories_snd", 0.0); - SWALLOW_ADD(directories_snd, "separator.directories_vbr", 0.0); - SWALLOW_ADD(directories_vbr, "separator.directories_data", 0.0); - SWALLOW_ADD(directories_data, "area.directories", 1.0); - -#undef SWALLOW_ADD } } --