rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=f88d6b1de027d4f955e3d37775b61d8dccf8fdc9
commit f88d6b1de027d4f955e3d37775b61d8dccf8fdc9
Author: Vitalii Vorobiov <vi.vorob...@samsung.com>
Date: Thu Feb 4 11:44:25 2016 +0000
style_editor.edc: apply color_classes
---
data/themes/default/widgets/layouts/property.edc | 10 +--
.../default/widgets/layouts/style_editor.edc | 71 +++++++++++-----------
2 files changed, 39 insertions(+), 42 deletions(-)
diff --git a/data/themes/default/widgets/layouts/property.edc
b/data/themes/default/widgets/layouts/property.edc
index 5421901..5598dde 100644
--- a/data/themes/default/widgets/layouts/property.edc
+++ b/data/themes/default/widgets/layouts/property.edc
@@ -252,7 +252,7 @@ group { name: "elm/layout/property/2swallow";
type: TEXT;
description { state: "default" 0.0;
align: 0.0 0.5;
- color: 214 214 214 255;
+ color_class: "main";
rel1 {
to_y: "area.content";
}
@@ -275,7 +275,7 @@ group { name: "elm/layout/property/2swallow";
align: 1.0 0.5;
min: 52 0;
max: 52 -1;
- color: 214 214 214 255;
+ color_class: "main";
rel1 {
to: "area.swallow1";
}
@@ -311,7 +311,7 @@ group { name: "elm/layout/property/2swallow";
type: TEXT;
description { state: "default" 0.0;
align: 0.0 0.5;
- color: 214 214 214 255;
+ color_class: "main";
rel1 {
relative: 1.0 0.0;
offset: 3 0;
@@ -334,7 +334,7 @@ group { name: "elm/layout/property/2swallow";
align: 1.0 0.5;
min: 52 0;
max: 52 -1;
- color: 214 214 214 255;
+ color_class: "main";
rel1 {
to: "area.swallow2";
}
@@ -370,7 +370,7 @@ group { name: "elm/layout/property/2swallow";
type: TEXT;
description { state: "default" 0.0;
align: 0.0 0.5;
- color: 214 214 214 255;
+ color_class: "main";
rel1 {
relative: 1.0 0.0;
offset: 3 0;
diff --git a/data/themes/default/widgets/layouts/style_editor.edc
b/data/themes/default/widgets/layouts/style_editor.edc
index 93b559c..93e5feb 100644
--- a/data/themes/default/widgets/layouts/style_editor.edc
+++ b/data/themes/default/widgets/layouts/style_editor.edc
@@ -133,12 +133,10 @@ group { name: "elm/layout/style_editor/property";
parts {
part {
name: "bg_menu";
- type: RECT;
+ type: SPACER;
scale: 1;
- mouse_events: 1;
description {
state: "default" 0.0;
- color: 255 255 255 0;
align: 0.0 0.0;
max: -1 40;
}
@@ -159,7 +157,7 @@ group { name: "elm/layout/style_editor/property";
}
part {
name: "offset_end";
- type: RECT;
+ type: SPACER;
description {
state: "default" 0.0;
min: 0 0;
@@ -167,7 +165,6 @@ group { name: "elm/layout/style_editor/property";
rel1.relative: 0.0 0.0;
rel2.relative: 1.0 1.0;
align: 1.0 1.0;
- color: 0 0 0 0;
}
}
part {
@@ -175,7 +172,7 @@ group { name: "elm/layout/style_editor/property";
type: TEXT;
description {
state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
text {
text: "Styles";
font: FN;
@@ -283,7 +280,7 @@ group { name: "elm/layout/style_editor/text";
type: TEXT;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
text {
font: FN;
size: 12;
@@ -314,7 +311,7 @@ group { name: "elm/layout/style_editor/text";
type: TEXT;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
text {
font: FN;
size: 12;
@@ -345,7 +342,7 @@ group { name: "elm/layout/style_editor/text";
type: TEXT;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
text {
font: FN;
size: 12;
@@ -376,7 +373,7 @@ group { name: "elm/layout/style_editor/text";
type: TEXT;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
text {
font: FN;
size: 12;
@@ -423,7 +420,7 @@ group { name: "elm/layout/style_editor/text";
type: TEXT;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
align: 0.0 0.5;
text {
font: FN;
@@ -465,7 +462,7 @@ group { name: "elm/layout/style_editor/text";
type: TEXT;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
align: 0.0 0.5;
text {
font: FN;
@@ -609,7 +606,7 @@ group { name: "elm/layout/style_editor/format1";
type: TEXT;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
rel1.to: "area.align";
rel2.to: "area.align";
text {
@@ -638,7 +635,7 @@ group { name: "elm/layout/style_editor/format1";
type: TEXT;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
align: 1.0 0;
rel1.to: "area.valign";
rel2.to: "area.valign";
@@ -670,7 +667,7 @@ group { name: "elm/layout/style_editor/format1";
type: TEXT;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
align: 0.0 0.5;
rel1.to: "area.after1";
rel2.to: "area.after1";
@@ -734,7 +731,7 @@ group { name: "elm/layout/style_editor/format1";
part { name: "label.left1";
type: TEXT;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
text {
font: FN;
size: 12;
@@ -748,7 +745,7 @@ group { name: "elm/layout/style_editor/format1";
type: TEXT;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
align: 0.0 0.5;
text {
font: FN;
@@ -795,7 +792,7 @@ group { name: "elm/layout/style_editor/format1";
type: TEXT;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
align: 0.0 0.5;
text {
font: FN;
@@ -843,7 +840,7 @@ group { name: "elm/layout/style_editor/format1";
type: TEXT;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
text {
font: FN;
size: 12;
@@ -889,7 +886,7 @@ group { name: "elm/layout/style_editor/format1";
type: TEXT;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
text {
font: FN;
size: 12;
@@ -903,7 +900,7 @@ group { name: "elm/layout/style_editor/format1";
type: TEXT;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
align: 0.0 0.5;
text {
font: FN;
@@ -952,7 +949,7 @@ group { name: "elm/layout/style_editor/format1";
type: TEXT;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
align: 0.0 0.5;
text {
font: FN;
@@ -1036,7 +1033,7 @@ group { name: "elm/layout/style_editor/format2";
mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
align: 0.0 0.0;
max: -1 ITEM_HEIGHT;
text {
@@ -1052,7 +1049,7 @@ group { name: "elm/layout/style_editor/format2";
type: TEXT;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
text {
font: FN;
size: 12;
@@ -1164,7 +1161,7 @@ group { name: "elm/layout/style_editor/format2";
type: TEXT;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
text {
font: FN;
size: 12;
@@ -1207,7 +1204,7 @@ group { name: "elm/layout/style_editor/format2";
type: TEXT;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
align: 0.0 0.5;
text {
font: FN;
@@ -1265,7 +1262,7 @@ group { name: "elm/layout/style_editor/format2";
type: TEXT;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
text {
font: FN;
size: 12;
@@ -1279,7 +1276,7 @@ group { name: "elm/layout/style_editor/format2";
type: TEXT;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
text {
font: FN;
size: 12;
@@ -1293,7 +1290,7 @@ group { name: "elm/layout/style_editor/format2";
type: TEXT;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
text {
font: FN;
size: 12;
@@ -1372,7 +1369,7 @@ group { name: "elm/layout/style_editor/format2";
type: TEXT;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
text {
font: FN;
size: 12;
@@ -1385,7 +1382,7 @@ group { name: "elm/layout/style_editor/format2";
part { name: "label.end2";
type: TEXT;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
text {
font: FN;
size: 12;
@@ -1456,7 +1453,7 @@ group { name: "elm/layout/style_editor/glow";
type: TEXT;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
rel1.to: "area.style";
rel2.to: "area.style";
text {
@@ -1487,7 +1484,7 @@ group { name: "elm/layout/style_editor/glow";
type: TEXT;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
rel1.to: "area.glow_color";
rel2.to: "area.glow_color";
text {
@@ -1518,7 +1515,7 @@ group { name: "elm/layout/style_editor/glow";
type: TEXT;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
rel1.to: "area.glow2_color";
rel2.to: "area.glow2_color";
text {
@@ -1780,7 +1777,7 @@ group { name: "elm/layout/style_editor/lines";
type: TEXT;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
rel1.to: "area.strikethroug";
rel2 {
offset: 0 0;
@@ -1814,7 +1811,7 @@ group { name: "elm/layout/style_editor/lines";
type: TEXT;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
rel1.to: "area.underline";
rel2.to: "area.underline";
text {
@@ -1845,7 +1842,7 @@ group { name: "elm/layout/style_editor/lines";
type: TEXT;
scale: 1;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
rel1.to: "area.underline_color";
rel2.to: "area.underline_color";
text {
--
