hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=1fda44ae6d280cdf4f30ee9298b2ed530505df81
commit 1fda44ae6d280cdf4f30ee9298b2ed530505df81 Author: Hermet Park <[email protected]> Date: Mon Aug 8 17:50:40 2016 +0900 theme layout_setting: code refactoring. use default state names explicitly. --- data/themes/default/layout_setting.edc | 104 ++++++++++++++++----------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/data/themes/default/layout_setting.edc b/data/themes/default/layout_setting.edc index d75b6fd..7e98ade 100644 --- a/data/themes/default/layout_setting.edc +++ b/data/themes/default/layout_setting.edc @@ -8,23 +8,23 @@ images { group { "setting_layout"; parts { rect { "clipper"; - desc { state: "default"; + desc { "default"; color: 127 127 127 127; } - desc { state: "show"; + desc { "show"; color: 255 255 255 255; } } rect { "bg"; clip_to: "clipper"; - desc { state: "default"; + desc { "default"; color: 0 0 0 175; } } image { "base_frame_img"; scale: 1; clip_to: "clipper"; - desc { + desc { "default"; min: 650 435; max: 600 435; fixed: 1 1; @@ -36,7 +36,7 @@ group { "setting_layout"; image { "shine_img"; scale: 1; clip_to: "clipper"; - desc { + desc { "default"; rel1 { to: "base_frame_img"; relative: 0 0; } rel2 { to: "base_frame_img"; relative: 1 0; } align: 0.5 0; @@ -46,7 +46,7 @@ group { "setting_layout"; } } spacer { "base_frame"; - desc { + desc { "default"; rel1 {to: "base_frame_img"; offset: 10 10;} rel2 {to: "base_frame_img"; offset: -11 -11;} } @@ -54,7 +54,7 @@ group { "setting_layout"; rect { "title_frame"; clip_to: "clipper"; scale: 1; - desc { + desc { "default"; rel1 { to: "base_frame"; relative: 0 0; } rel2 { to: "base_frame"; relative: 1 0; } align: 0.5 0; @@ -66,7 +66,7 @@ group { "setting_layout"; image { "title_icon"; scale: 1; clip_to: "clipper"; - desc { + desc { "default"; align: 0 0.5; min: 20 20; max: 20 20; @@ -80,7 +80,7 @@ group { "setting_layout"; scale: 1; clip_to: "clipper"; effect: GLOW; - desc { + desc { "default"; rel1.to: "title_frame"; rel2.to: "title_frame"; align: 0.5 0.5; @@ -99,7 +99,7 @@ group { "setting_layout"; swallow { "elm.swallow.toolbar"; scale: 1; clip_to: "clipper"; - desc { state: "default"; + desc { "default"; min: 0 25; max: -1 25; align: 0.5 0.0; @@ -111,7 +111,7 @@ group { "setting_layout"; swallow { "elm.swallow.content"; scale: 1; clip_to: "clipper"; - desc { state: "default"; + desc { "default"; rel1 { to: "elm.swallow.toolbar"; relative: 0.0 1.0; @@ -126,7 +126,7 @@ group { "setting_layout"; } swallow { "elm.swallow.apply_btn"; scale: 1; - desc { + desc { "default"; align: 1 0.5; min: 50 25; fixed: 1 1; @@ -138,7 +138,7 @@ group { "setting_layout"; } swallow { "elm.swallow.reset_btn"; scale: 1; - desc { + desc { "default"; align: 0.5 1; min: 50 25; fixed: 1 1; @@ -150,7 +150,7 @@ group { "setting_layout"; } swallow { "elm.swallow.cancel_btn"; scale: 1; - desc { + desc { "default"; align: 0 0.5; min: 50 25; fixed: 1 1; @@ -161,11 +161,11 @@ group { "setting_layout"; } } rect { "event_blocker"; - desc { state: "default"; + desc { "default"; color: 0 0 0 0; visible: 1; } - desc { state: "hide"; + desc { "hide"; inherit: "default"; visible: 0; } @@ -174,7 +174,7 @@ group { "setting_layout"; scale: 1; clip_to: "clipper"; nomouse; - desc { + desc { "default"; rel1 { to: "base_frame_img"; } rel2 { to: "base_frame_img"; } image.normal: "bub_over_bot.png"; @@ -212,7 +212,7 @@ group { "setting_layout"; group { "build_setting_layout"; parts { spacer { "main_edc_frame"; - desc { + desc { "default"; rel1 { relative: 0 0; } rel2 { relative: 1 0; } align: 0.5 0; @@ -221,7 +221,7 @@ group { "build_setting_layout"; } } spacer { "img_path_frame"; - desc { + desc { "default"; rel1 { to: "main_edc_frame"; relative: 0 1; } rel2 { to: "main_edc_frame"; relative: 1 1; } align: 0.5 0; @@ -231,7 +231,7 @@ group { "build_setting_layout"; } spacer { "snd_path_frame"; scale: 1; - desc { + desc { "default"; rel1 { to: "img_path_frame"; relative: 0 1; } rel2 { to: "img_path_frame"; relative: 1 1; } align: 0.5 0; @@ -241,7 +241,7 @@ group { "build_setting_layout"; } spacer { "fnt_path_frame"; scale: 1; - desc { + desc { "default"; rel1 { to: "snd_path_frame"; relative: 0 1; } rel2 { to: "snd_path_frame"; relative: 1 1; } align: 0.5 0; @@ -251,7 +251,7 @@ group { "build_setting_layout"; } spacer { "dat_path_frame"; scale: 1; - desc { + desc { "default"; rel1 { to: "fnt_path_frame"; relative: 0 1; } rel2 { to: "fnt_path_frame"; relative: 1 1; } align: 0.5 0; @@ -261,7 +261,7 @@ group { "build_setting_layout"; } spacer { "preference_frame"; scale: 1; - desc { + desc { "default"; rel1 { to: "dat_path_frame"; relative: 0 1; offset: 0 5; } rel2 { to: "dat_path_frame"; relative: 1 1; } align: 0.5 0; @@ -271,7 +271,7 @@ group { "build_setting_layout"; } image { "main_edc_icon"; scale: 1; - desc { + desc { "default"; align: 0 0.5; min: 20 20; max: 20 20; @@ -284,7 +284,7 @@ group { "build_setting_layout"; text { "main_edc_guide"; scale: 1; effect: SHADOW BOTTOM; - desc { + desc { "default"; rel1 { to: "main_edc_icon"; relative: 1 0; offset: 5 1; } rel2 { to: "main_edc_icon"; relative: 1 1; } color: COL_NM; @@ -302,7 +302,7 @@ group { "build_setting_layout"; } swallow { "elm.swallow.main_edc_entry"; scale: 1; - desc { + desc { "default"; align: 0 0; fixed: 1 1; rel1.to_x: "main_edc_guide"; @@ -314,7 +314,7 @@ group { "build_setting_layout"; } swallow { "main_edc_tooltip"; repeat_events: 1; - desc { + desc { "default"; rel1.to: "main_edc_frame"; rel2.to: "main_edc_frame"; fixed: 1 1; @@ -322,7 +322,7 @@ group { "build_setting_layout"; } image { "img_path_icon"; scale: 1; - desc { + desc { "default"; align: 0 0.5; min: 20 20; max: 20 20; @@ -335,7 +335,7 @@ group { "build_setting_layout"; text { "img_path_guide"; scale: 1; effect: SHADOW BOTTOM; - desc { + desc { "default"; rel1 { to: "img_path_icon"; relative: 1 0; offset: 5 1; } rel2 { to: "img_path_icon"; relative: 1 1; } color: COL_NM; @@ -353,7 +353,7 @@ group { "build_setting_layout"; } swallow { "elm.swallow.img_path_entry"; scale: 1; - desc { + desc { "default"; align: 0 0; fixed: 1 1; rel1.to_x: "img_path_guide"; @@ -365,7 +365,7 @@ group { "build_setting_layout"; } swallow { "img_path_tooltip"; repeat_events: 1; - desc { + desc { "default"; rel1.to: "img_path_frame"; rel2.to: "img_path_frame"; fixed: 1 1; @@ -373,7 +373,7 @@ group { "build_setting_layout"; } image { "snd_path_icon"; scale: 1; - desc { + desc { "default"; align: 0 0.5; min: 20 20; max: 20 20; @@ -386,7 +386,7 @@ group { "build_setting_layout"; text { "snd_path_guide"; effect: SHADOW BOTTOM; scale: 1; - desc { + desc { "default"; rel1 { to: "snd_path_icon"; relative: 1 0; offset: 5 1; } rel2 { to: "snd_path_icon"; relative: 1 1; } color: COL_NM; @@ -404,7 +404,7 @@ group { "build_setting_layout"; } swallow { "elm.swallow.snd_path_entry"; scale: 1; - desc { + desc { "default"; align: 0 0; fixed: 1 1; rel1.to_x: "snd_path_guide"; @@ -416,7 +416,7 @@ group { "build_setting_layout"; } swallow { "snd_path_tooltip"; repeat_events: 1; - desc { + desc { "default"; rel1.to: "snd_path_frame"; rel2.to: "snd_path_frame"; fixed: 1 1; @@ -424,7 +424,7 @@ group { "build_setting_layout"; } image { "fnt_path_icon"; scale: 1; - desc { + desc { "default"; align: 0 0.5; min: 20 20; max: 20 20; @@ -437,7 +437,7 @@ group { "build_setting_layout"; text { "fnt_path_guide"; effect: SHADOW BOTTOM; scale: 1; - desc { + desc { "default"; rel1 { to: "fnt_path_icon"; relative: 1 0; offset: 5 1; } rel2 { to: "fnt_path_icon"; relative: 1 1; } color: COL_NM; @@ -455,7 +455,7 @@ group { "build_setting_layout"; } swallow { "elm.swallow.fnt_path_entry"; scale: 1; - desc { + desc { "default"; align: 0 0; fixed: 1 1; rel1.to_x: "fnt_path_guide"; @@ -467,7 +467,7 @@ group { "build_setting_layout"; } swallow { "fnt_path_tooltip"; repeat_events: 1; - desc { + desc { "default"; rel1.to: "fnt_path_frame"; rel2.to: "fnt_path_frame"; fixed: 1 1; @@ -475,7 +475,7 @@ group { "build_setting_layout"; } image { "dat_path_icon"; scale: 1; - desc { + desc { "default"; align: 0 0.5; min: 20 20; max: 20 20; @@ -488,7 +488,7 @@ group { "build_setting_layout"; text { "dat_path_guide"; effect: SHADOW BOTTOM; scale: 1; - desc { + desc { "default"; rel1 { to: "dat_path_icon"; relative: 1 0; offset: 5 1; } rel2 { to: "dat_path_icon"; relative: 1 1; } color: COL_NM; @@ -506,7 +506,7 @@ group { "build_setting_layout"; } swallow { "elm.swallow.dat_path_entry"; scale: 1; - desc { + desc { "default"; align: 0 0; fixed: 1 1; rel1.to_x: "dat_path_guide"; @@ -518,7 +518,7 @@ group { "build_setting_layout"; } swallow { "data_path_tooltip"; repeat_events: 1; - desc { + desc { "default"; rel1.to: "dat_path_frame"; rel2.to: "dat_path_frame"; fixed: 1 1; @@ -531,7 +531,7 @@ group { "text_setting_layout"; parts { spacer { "preference_frame"; scale: 1; - desc { + desc { "default"; rel1.relative: 0 0; rel2.relative: 1 0; rel1.offset: 0 3; @@ -542,7 +542,7 @@ group { "text_setting_layout"; } text { "text_font_size"; scale: 1; - desc { + desc { "default"; rel1.to: "preference_frame"; rel2 { to: "preference_frame"; relative: 0.0 1.0; } rel1.offset: 2 0; @@ -560,7 +560,7 @@ group { "text_setting_layout"; } swallow { "elm.swallow.font_size"; scale: 1; - desc { + desc { "default"; align: 0.0 0.5; rel1 { to: "text_font_size"; relative: 1.0 0.0; } rel2 { to_x: "preference_frame"; to_y: "text_font_size"; } @@ -578,7 +578,7 @@ group { "text_setting_layout"; text { "text_setting_guide"; scale: 1; effect: SHADOW BOTTOM; - desc { + desc { "default"; rel1 { to: "padding1"; relative: 0 1; offset: 2 0; } rel2 { to: "padding1"; relative: 0.65 1; } color: COL_NM; @@ -597,21 +597,21 @@ group { "text_setting_layout"; } spacer { "text_setting_frame"; scale: 1; - desc { + desc { "default"; rel1 { to_y: "text_setting_guide"; relative: 0 1; } rel2 { to_x: "text_setting_guide"; } } } swallow { "elm.swallow.text_setting"; scale: 1; - desc { state: "default"; + desc { "default"; fixed: 0 1; rel1.to: "text_setting_frame"; rel2.to: "text_setting_frame"; } } spacer { "padding2"; - desc { + desc { "default"; rel1 { to: "text_setting_guide"; relative: 1 0; } rel2 { to: "text_setting_frame"; } align: 0 0.5; @@ -621,13 +621,13 @@ group { "text_setting_layout"; } spacer { "font_frame"; scale: 1; - desc { + desc { "default"; rel1 { to: "padding2"; relative: 1 0; } } } swallow { "elm.swallow.font"; scale: 1; - desc { + desc { "default"; rel1.to: "font_frame"; rel2.to: "font_frame"; } --
