rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=d90a8509f3970e51b50fe212fbd557e1a74e63a3
commit d90a8509f3970e51b50fe212fbd557e1a74e63a3
Author: Vitalii Vorobiov <vi.vorob...@samsung.com>
Date: Wed Feb 10 11:17:30 2016 +0000
styles.edc: apply colorclasses
---
data/macros.edc | 20 +--
data/themes/default/default.edc | 2 -
data/themes/default/widgets/bg.edc | 2 +-
data/themes/default/widgets/button.edc | 12 +-
data/themes/default/widgets/check.edc | 22 ++-
data/themes/default/widgets/colorselector.edc | 10 +-
data/themes/default/widgets/ctxpopup.edc | 8 +-
data/themes/default/widgets/entry.edc | 41 +++--
data/themes/default/widgets/genlist.edc | 10 +-
data/themes/default/widgets/inwin.edc | 8 +-
data/themes/default/widgets/layout.edc | 169 ++-------------------
.../default/widgets/layouts/colorclass_manager.edc | 6 +-
data/themes/default/widgets/layouts/tabs.edc | 7 +-
data/themes/default/widgets/radio.edc | 6 +-
data/themes/default/widgets/separator.edc | 2 +-
data/themes/default/widgets/spinner.edc | 8 +-
data/themes/default/widgets/styles.edc | 6 +-
data/themes/default/widgets/toolbar.edc | 26 ++--
18 files changed, 106 insertions(+), 259 deletions(-)
diff --git a/data/macros.edc b/data/macros.edc
index f7a9bf7..91ae9ae 100644
--- a/data/macros.edc
+++ b/data/macros.edc
@@ -106,10 +106,20 @@ color_classes {
color3: 0 0 0 0;
}
color_class { name: "bg_main";
+ color: 80 82 83 255;
+ color2: 0 0 0 0;
+ color3: 0 0 0 0;
+ }
+ color_class { name: "bg_scroller";
color: 52 53 54 255;
color2: 0 0 0 0;
color3: 0 0 0 0;
}
+ color_class { name: "bg_scroller_disabled";
+ color: 100 102 104 146;
+ color2: 0 0 0 0;
+ color3: 0 0 0 0;
+ }
color_class { name: "bg_entry";
color: 46 48 49 255;
color2: 0 0 0 0;
@@ -155,7 +165,6 @@ color_classes {
/*
* [ colors ]
*/
-#define LIGHT_GREY_BG_COLOR 80 82 83 255
#define DARK_GREY_BG_COLOR 48 48 48 255
#define DARK_GREY_BG_DISABLED_COLOR 64 64 64 255
@@ -175,24 +184,15 @@ color_classes {
#define LIST_DARK_BG_COLOR 39 42 43 255;
#define HIGHLIGHT_BLUE 51 153 255 255;
-#define HIGHLIGHT_TOOLBAR_BLUE 58 110 155 255;
#define TOOLBAR_GREY_SEPARATOR 89 93 95 255;
#define FN_COL_DEFAULT 223 219 210 255; color3: 255 255 255 25
#define FN_COL_LIGHT_GREY 200 190 185 255; color3: 255 255 255 25
-#define FN_COL_LIGHTER_GREY 214 214 214 255; color3: 255 255 255 25
#define FN_COL_GREY 176 176 176 255;
#define FN_COL_HIGHLIGHT 51 53 255 255; color2: 51 153 255 24; color3: 51 153
255 18
#define FN_COL_DISABLE 21 21 21 255; color3: 255 255 255 25;
-#define FN_COL_SPINNER_MAIN 182 182 182 255
#define FN_COL_CHECK_MAIN 181 181 181 255
#define FN_COL_CHECK_DISABLED 128 128 128 255
#define CTXPOPUP_BG_COLOR 34 34 34 34
-#define WHITE_VISIBLE_COLOR 255 255 255 255
-#define WHITE_INVISIBLE_COLOR 255 255 255 0
-
-#define LIGHT_GREY_FONT_COLOR 214 214 214 255
-#define LIGHT_GREY_FONT_DISABLE_COLOR 118 119 120 255
-#define INVISIBLE_COLOR 0 0 0 0
#define TREEPAD 15
diff --git a/data/themes/default/default.edc b/data/themes/default/default.edc
index 0728a82..9cd5ae1 100644
--- a/data/themes/default/default.edc
+++ b/data/themes/default/default.edc
@@ -5,11 +5,9 @@ collections {
#include "widgets/styles.edc"
#include "widgets/bg.edc"
#include "widgets/panes.edc"
- #include "widgets/panel.edc"
#include "widgets/frame.edc"
#include "widgets/scroller.edc"
#include "widgets/inwin.edc"
- #include "widgets/naviframe.edc"
#include "widgets/genlist.edc"
#include "widgets/gengrid.edc"
#include "widgets/entry.edc"
diff --git a/data/themes/default/widgets/bg.edc
b/data/themes/default/widgets/bg.edc
index a9c50d3..d55f911 100644
--- a/data/themes/default/widgets/bg.edc
+++ b/data/themes/default/widgets/bg.edc
@@ -2,7 +2,7 @@ group { name: "elm/bg/base/default";
parts {
part { name: "base"; type: RECT;
description { state: "default" 0.0;
- color_class: "bg_main";
+ color_class: "bg_scroller";
}
}
part { name: "elm.swallow.rectangle"; type: SWALLOW;
diff --git a/data/themes/default/widgets/button.edc
b/data/themes/default/widgets/button.edc
index d7015cb..6eb493a 100644
--- a/data/themes/default/widgets/button.edc
+++ b/data/themes/default/widgets/button.edc
@@ -135,7 +135,7 @@ group { name: "elm/button/base/default";
type: RECT;
repeat_events: 1;
description { state: "default" 0.0;
- color: 214 214 214 255;
+ color_class: "main";
rel1 {
offset: 2 2;
}
@@ -144,7 +144,7 @@ group { name: "elm/button/base/default";
}
}
description { state: "disabled" 0.0;
- color: 118 119 120 255;
+ color_class: "main_alternative";
rel1 {
offset: 2 2;
}
@@ -156,7 +156,7 @@ group { name: "elm/button/base/default";
part { name: "event";
type: RECT;
description { state: "default" 0.0;
- color: 255 255 255 0;
+ color: 0 0 0 0;
}
description { state: "disabled" 0.0;
visible: 0;
@@ -399,7 +399,7 @@ group { name: "elm/button/base/anchor";
type: RECT;
repeat_events: 1;
description { state: "default" 0.0;
- color: LIGHT_GREY_FONT_COLOR;
+ color_class: "main";
rel1 {
offset: 2 2;
}
@@ -408,7 +408,7 @@ group { name: "elm/button/base/anchor";
}
}
description { state: "disabled" 0.0;
- color: LIGHT_GREY_FONT_DISABLE_COLOR;
+ color_class: "main_disabled";
rel1 {
offset: 2 2;
}
@@ -420,7 +420,7 @@ group { name: "elm/button/base/anchor";
part { name: "event";
type: RECT;
description { state: "default" 0.0;
- color: 255 255 255 0;
+ color: 0 0 0 0;
}
description { state: "disabled" 0.0;
visible: 0;
diff --git a/data/themes/default/widgets/check.edc
b/data/themes/default/widgets/check.edc
index b7fbe2e..5f592e0 100644
--- a/data/themes/default/widgets/check.edc
+++ b/data/themes/default/widgets/check.edc
@@ -115,7 +115,7 @@ group { name: "elm/check/base/toggle";
visible: 0;
align: 0.0 0.5;
max: 0 -1;
- color: FN_COL_SPINNER_MAIN;
+ color_class: "main";
rel1 {
to_x: "padding.icon";
relative: 1.0 0.0;
@@ -128,7 +128,7 @@ group { name: "elm/check/base/toggle";
}
description { state: "visible" 0.0;
align: 0.0 0.5;
- color: FN_COL_SPINNER_MAIN;
+ color_class: "main";
rel1 {
relative: 1.0 0.0;
to_x: "padding.icon";
@@ -269,7 +269,7 @@ group { name: "elm/check/base/toggle";
type: RECT;
repeat_events: 1;
description { state: "default" 0.0;
- color: INVISIBLE_COLOR;
+ color: 0 0 0 0;
rel1 {
to_x: "elm.swallow.content";
to_y: "base";
@@ -412,7 +412,8 @@ group { name: "elm/check/base/default";
scale: 1;
clip_to: "clipper";
description { state: "default" 0.0;
- color: 255 255 255 0;
+ visible: 0;
+ color_class: "main_alternative";
rel1 {
offset: 2 2;
to: "bg";
@@ -427,7 +428,8 @@ group { name: "elm/check/base/default";
}
}
description { state: "visible" 0.0;
- color: 255 255 255 255;
+ visible: 1;
+ color_class: "main_alternative";
rel1 {
offset: 0 0;
to: "bg";
@@ -442,7 +444,8 @@ group { name: "elm/check/base/default";
}
}
description { state: "visible" 1.0;
- color: 255 255 255 255;
+ visible: 1;
+ color_class: "main_alternative";
rel1 {
offset: 1 1;
to: "bg";
@@ -698,7 +701,8 @@ group { name: "elm/check/base/eye";
scale: 1;
clip_to: "clipper";
description { state: "default" 0.0;
- color: 255 255 255 0;
+ visible: 0;
+ color_class: "main_alternative";
rel1 {
offset: 2 2;
to: "bg";
@@ -713,6 +717,8 @@ group { name: "elm/check/base/eye";
}
}
description { state: "visible" 0.0;
+ visible: 1;
+ color_class: "main_alternative";
rel1 {
offset: 0 0;
to: "bg";
@@ -727,6 +733,8 @@ group { name: "elm/check/base/eye";
}
}
description { state: "visible" 1.0;
+ visible: 1;
+ color_class: "main_alternative";
rel1 {
offset: 1 1;
to: "bg";
diff --git a/data/themes/default/widgets/colorselector.edc
b/data/themes/default/widgets/colorselector.edc
index d573670..ac93376 100644
--- a/data/themes/default/widgets/colorselector.edc
+++ b/data/themes/default/widgets/colorselector.edc
@@ -281,7 +281,6 @@ group { name: "elm/colorselector/picker/default";
type: IMAGE;
mouse_events: 0;
description { state: "default" 0.0;
- color: 255 255 255 128;
rel1 {
to: "elm.picker";
}
@@ -347,7 +346,7 @@ group { name: "elm/colorselector/item/default";
description { state: "default" 0.0;
min: 27 28;
max: 27 28;
- color: 255 255 255 0;
+ visible: 0;
}
}
part { name: "bg";
@@ -393,7 +392,7 @@ group { name: "elm/colorselector/item/default";
description { state: "default" 0.0;
min: 18 19;
max: 18 19;
- color: 255 255 255 0;
+ visible: 0;
rel1.to: "bg";
rel2.to: "bg";
image {
@@ -423,7 +422,7 @@ group { name: "elm/colorselector/item/default";
rel2.to: "color_obj";
}
description { state: "disabled" 0.0;
- color: 64 64 64 255;
+ color_class: "main_disabled";
rel1.to: "color_obj";
rel2.to: "color_obj";
}
@@ -431,7 +430,6 @@ group { name: "elm/colorselector/item/default";
part { name: "disabler";
type: RECT;
description { state: "default" 0.0;
- color: WHITE_INVISIBLE_COLOR;
visible: 0;
}
description { state: "disabled" 0.0;
@@ -525,7 +523,6 @@ group { name: "elm/button/base/colorselector/left/default";
part { name: "disabler";
type: RECT;
description { state: "default" 0.0;
- color: WHITE_INVISIBLE_COLOR;
visible: 0;
}
description { state: "disabled" 0.0;
@@ -635,7 +632,6 @@ group { name: "elm/button/base/colorselector/right/default";
part { name: "disabler";
type: RECT;
description { state: "default" 0.0;
- color: WHITE_INVISIBLE_COLOR;
visible: 0;
}
description { state: "disabled" 0.0;
diff --git a/data/themes/default/widgets/ctxpopup.edc
b/data/themes/default/widgets/ctxpopup.edc
index ee83122..67aa39e 100644
--- a/data/themes/default/widgets/ctxpopup.edc
+++ b/data/themes/default/widgets/ctxpopup.edc
@@ -83,14 +83,14 @@ group { name: "elm/ctxpopup/base/colorsel";
part { name: "clip";
type: RECT;
description { state: "default" 0.0;
- color: WHITE_INVISIBLE_COLOR;
+ color: 0 0 0 0;
visible: 0;
rel1.offset: -20 -20;
rel2.offset: 19 19;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
- color: WHITE_VISIBLE_COLOR;
+ color: 255 255 255 255;
visible: 1;
}
}
@@ -337,14 +337,14 @@ group { name: "elm/ctxpopup/base/info";
part { name: "clip";
type: RECT;
description { state: "default" 0.0;
- color: WHITE_INVISIBLE_COLOR;
+ color: 0 0 0 0;
visible: 0;
rel1.offset: -20 -20;
rel2.offset: 19 19;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
- color: WHITE_VISIBLE_COLOR;
+ color: 255 255 255 255;
visible: 1;
}
}
diff --git a/data/themes/default/widgets/entry.edc
b/data/themes/default/widgets/entry.edc
index 669a5f3..36f2cb8 100644
--- a/data/themes/default/widgets/entry.edc
+++ b/data/themes/default/widgets/entry.edc
@@ -139,10 +139,8 @@ group { name: "elm/scroller/entry/default";
}
}
part { name: "sb_vbar_p1";
- type: RECT;
- clip_to: "sb_vbar";
+ type: SPACER;
description { state: "default" 0.0;
- color: 0 0 0 0;
rel1 {
to: "sb_vbar";
}
@@ -153,10 +151,8 @@ group { name: "elm/scroller/entry/default";
}
}
part { name: "sb_vbar_p2";
- type: RECT;
- clip_to: "sb_vbar";
+ type: SPACER;
description { state: "default" 0.0;
- color: 0 0 0 0;
rel1 {
relative: 0.0 1.0;
to: "elm.dragable.vbar";
@@ -169,7 +165,6 @@ group { name: "elm/scroller/entry/default";
part { name: "elm.dragable.vbar";
type: RECT;
scale: 1;
- clip_to: "sb_vbar";
dragable {
x: 0 0 0;
y: 1 1 0;
@@ -225,11 +220,9 @@ group { name: "elm/scroller/entry/default";
}
}
part { name: "sb_hbar_p1";
- type: RECT;
- clip_to: "sb_hbar";
+ type: SPACER;
description { state: "default" 0.0;
fixed: 1 1;
- color: 0 0 0 0;
rel1 {
to: "sb_hbar";
}
@@ -240,10 +233,8 @@ group { name: "elm/scroller/entry/default";
}
}
part { name: "sb_hbar_p2";
- type: RECT;
- clip_to: "sb_hbar";
+ type: SPACER;
description { state: "default" 0.0;
- color: 0 0 0 0;
rel1 {
relative: 1.0 0.0;
to: "elm.dragable.hbar";
@@ -536,7 +527,7 @@ group { name: "elm/scroller/entry/default";
type: IMAGE;
repeat_events: 1;
description { state: "default" 0.0;
- color: 255 255 255 0;
+ color: 0 0 0 0;
rel1 {
to: "bg";
}
@@ -1048,7 +1039,7 @@ group { name: "elm/scroller/entry_single/default";
type: IMAGE;
repeat_events: 1;
description { state: "default" 0.0;
- color: 255 255 255 0;
+ color: 0 0 0 0;
rel1 {
to: "bg";
}
@@ -1239,29 +1230,30 @@ group { name: "elm/entry/base-single/default";
}
}
-group { name: "elm/entry/base-single/spinner/live_view";
+group { name: "elm/entry/base-single/spinner/default";
inherit: "elm/entry/base-single/default";
parts {
part { name: "elm.text";
description { state: "default" 0.0;
- text.style: "eflete_spinner_live_view_style";
- }
- description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- text.style: "eflete_spinner_live_view_disabled_style";
+ min: 0 19;
+ text {
+ style: "entry_main_spinner_text";
+ min: 1 1;
+ ellipsis: -1;
+ }
}
}
}
}
+
group { name: "elm/entry/selection/default";
parts {
part { name: "bg";
type: RECT;
mouse_events: 0;
description { state: "default" 0.0;
- color_class: "select_light";
- color: 255 255 255 128;
+ color_class: "select";
}
}
}
@@ -1290,7 +1282,7 @@ group { name: "elm/entry/cursor/default";
description { state: "default" 0.0;
min: 5 15;
max: 5 15;
- color: 255 255 255 0;
+ visible: 0;
rel1 {
offset: -2 -2;
}
@@ -1304,6 +1296,7 @@ group { name: "elm/entry/cursor/default";
description { state: "visible" 0.0;
min: 5 15;
max: 5 15;
+ visible: 1;
rel1 {
offset: -2 -2;
}
diff --git a/data/themes/default/widgets/genlist.edc
b/data/themes/default/widgets/genlist.edc
index bf68040..801e362 100644
--- a/data/themes/default/widgets/genlist.edc
+++ b/data/themes/default/widgets/genlist.edc
@@ -2,7 +2,6 @@
#define BORDER_COLOR 34 35 36 255
#define LIGHT_BORDER_COLOR 70 72 73 255
#define LIST_BORDER_COLOR 45 46 47 255
-#define LIST_ITEM_SELECTED_COLOR 58 110 155 255
#define LIST_ITEM_INACTIVE_COLOR 112 121 129 255
#define BG_COLOR 39 42 43 255
#define LIST_ITEM_REORDERED_COLOR 200 150 0 255
@@ -1623,7 +1622,7 @@ group { name: "elm/genlist/item/mode/default";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- color: WHITE_VISIBLE_COLOR;
+ color: 255 255 255 255;
}
}
}
@@ -1639,12 +1638,12 @@ group { name:
"elm/genlist/item_compress/history/default";
type: RECT;
scale: 1;
description { state: "default" 0.0;
- color: LIGHT_GREY_BG_COLOR;
+ color_class: "bg_main";
rel2.offset: 0 -2;
}
description { state: "selected" 0.0;
inherit: "default" 0.0;
- color: LIST_ITEM_SELECTED_COLOR;
+ color_class: "select";
}
description { state: "reverted" 0.0;
inherit: "default" 0.0;
@@ -1743,7 +1742,7 @@ group { name: "elm/genlist/base/default";
part { name: "bg";
type: RECT;
description { state: "default" 0.0;
- color_class: "bg_main";
+ color_class: "bg_scroller";
}
description { state: "disabled" 0.0;
color: 0 0 0 0;
@@ -2349,6 +2348,5 @@ group { name: "elm/genlist/base/default";
#undef ITEM_HEIGHT
#ungef BORDER_COLOR
#undef LIST_BORDER_COLOR
-#undef LIST_ITEM_SELECTED_COLOR
#undef LIGHT_BORDER_COLOR
#undef BG_COLOR
diff --git a/data/themes/default/widgets/inwin.edc
b/data/themes/default/widgets/inwin.edc
index 90e4de7..a11de11 100644
--- a/data/themes/default/widgets/inwin.edc
+++ b/data/themes/default/widgets/inwin.edc
@@ -123,8 +123,7 @@ group { name: "elm/win/inwin/default";
part { name: "elm.text.title";
type: TEXT;
description { state: "default" 0.0;
- color: 223 219 210 255;
- color3: 255 255 255 25;
+ color_class: "main";
rel1 {
relative: 1.0 1.0;
offset: 22 0;
@@ -185,7 +184,7 @@ group { name: "elm/win/inwin/dialog";
part { name: "block_events";
type: RECT;
description { state: "default" 0.0;
- color: 255 0 0 0;
+ color: 0 0 0 0;
}
description { state: "clicked" 0.0;
color: 255 0 0 50;
@@ -305,8 +304,7 @@ group { name: "elm/win/inwin/dialog";
part { name: "elm.text.title";
type: TEXT;
description { state: "default" 0.0;
- color: 223 219 210 255;
- color3: 255 255 255 25;
+ color_class: "main_alternative";
rel1 {
relative: 1.0 1.0;
offset: 22 0;
diff --git a/data/themes/default/widgets/layout.edc
b/data/themes/default/widgets/layout.edc
index 8490a2c..c23035d 100644
--- a/data/themes/default/widgets/layout.edc
+++ b/data/themes/default/widgets/layout.edc
@@ -227,7 +227,7 @@ group { name: "elm/layout/property/default";
part { name: "bg_content";
type: RECT;
description { state: "default" 0.0;
- color: LIGHT_GREY_BG_COLOR;
+ color_class: "bg_main";
}
}
part { name: "elm.swallow.content";
@@ -239,153 +239,6 @@ group { name: "elm/layout/property/default";
}
}
-group { name: "elm/layout/block/default";
- parts {
- part { name: "header";
- type: RECT;
- description { state: "default" 0.0;
- align: 1.0 0.0;
- min: 0 26;
- max: -1 26;
- color: 46 46 46 255;
- }
- description { state: "hide" 0.0;
- align: 1.0 0.0;
- max: -1 0;
- }
- }
- part { name: "text.area";
- type: SPACER;
- description { state: "default" 0.0;
- align: 0.0 0.5;
- fixed: 1 1;
- max: 112 -1;
- rel1 {
- to_x: "header";
- }
- rel2 {
- relative: 0.0 1.0;
- to_x: "elm.swallow.title";
- to_y: "header";
- }
- }
- }
- part { name: "elm.text";
- type: TEXT;
- description { state: "default" 0.0;
- align: 0.0 0.5;
- color: 223 219 210 255;
- rel1.to: "text.area";
- rel2.to: "text.area";
- text {
- font: PT;
- size: 13;
- }
- }
- description { state: "hide" 0.0;
- visible: 0;
- align: 0.0 0.5;
- fixed: 1 1;
- max: 112 -1;
- color: 223 219 210 255;
- rel1 {
- to_x: "header";
- }
- rel2 {
- to_y: "header";
- }
- text {
- font: PT;
- size: 13;
- }
- }
- }
- part { name: "elm.swallow.title";
- type: SWALLOW;
- description { state: "default" 0.0;
- align: 1.0 0.5;
- fixed: 1 1;
- rel1 {
- relative: 1.0 0.5;
- to: "header";
- }
- rel2 {
- relative: 1.0 0.5;
- offset: -25 -1;
- to: "header";
- }
- }
- description { state: "hide" 0.0;
- visible: 0;
- align: 1.0 0.5;
- fixed: 1 1;
- rel1 {
- relative: 1.0 0.5;
- to: "header";
- }
- rel2 {
- relative: 1.0 0.5;
- offset: -25 -1;
- to: "header";
- }
- }
- }
- part { name: "elm.swallow.content";
- type: SWALLOW;
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1 {
- relative: 0.0 1.0;
- to: "header";
- }
- }
- description { state: "hidden" 0.0;
- visible: 0;
- }
- }
- }
- programs {
- program { name: "block_content_hide";
- signal: "content,hide";
- source: "eflete";
- action: STATE_SET "hidden" 0.00;
- target: "elm.swallow.content";
- }
- program { name: "block_content_show";
- signal: "content,show";
- source: "eflete";
- action: STATE_SET "default" 0.00;
- target: "elm.swallow.content";
- }
- program { name: "block_title_show";
- signal: "title,show";
- source: "eflete";
- action: STATE_SET "default" 0.00;
- target: "header";
- target: "elm.text";
- }
- program { name: "block_title_hide";
- signal: "title,hide";
- source: "eflete";
- action: STATE_SET "hide" 0.00;
- target: "header";
- target: "elm.text";
- }
- program { name: "block_title_content_show";
- signal: "title,content,show";
- source: "eflete";
- action: STATE_SET "show" 0.00;
- target: "elm.swallow.title";
- }
- program { name: "block_title_content_hide";
- signal: "title,content,hide";
- source: "eflete";
- action: STATE_SET "hide" 0.00;
- target: "elm.swallow.title";
- }
- }
-}
-
group{ name: "elm/layout/colorclass_editor/preview";
parts {
part { name: "swallow.entry.bg";
@@ -518,7 +371,7 @@ group { name: "elm/layout/navigator/default";
part { name: "bg";
type: RECT;
description { state: "default" 0.0;
- color: 80 82 83 255;
+ color_class: "bg_main";
}
}
part { name: "area.top";
@@ -1431,7 +1284,7 @@ group { name: "elm/layout/sound_editor/item";
description { state: "default" 0.0;
align: 0.0 0.5;
fixed: 1 0;
- color: 223 219 210 255;
+ color_class: "main";
text {
align: 0.0 0.5;
elipsis: -1;
@@ -1468,7 +1321,7 @@ group { name: "elm/layout/sound_editor/item";
description { state: "default" 0.0;
align: 0.0 0.5;
fixed: 1 0;
- color: 223 219 210 255;
+ color_class: "main";
text {
align: 0.0 0.5;
font: FN;
@@ -1515,7 +1368,7 @@ group { name: "elm/layout/sound_editor/item";
mouse_events: 0;
description { state: "default" 0.0;
align: 0.0 0.5;
- color: 223 219 210 255;
+ color_class: "main";
fixed: 1 0;
text {
align: 0.0 0.5;
@@ -1595,7 +1448,7 @@ group { name: "elm/layout/preferences/general";
part { name: "label.general";
type: TEXT;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
rel1.to: "area.general";
rel2.to: "area.general";
text {
@@ -1608,7 +1461,7 @@ group { name: "elm/layout/preferences/general";
part { name: "label.profile";
type: TEXT;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
align: 1.0 0.5;
rel1.to: "area.profile";
rel2.to: "area.profile";
@@ -1661,7 +1514,7 @@ group { name: "elm/layout/preferences/general";
part { name: "label.home";
type: TEXT;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
align: 0.0 0.5;
rel1.to: "area.home";
rel2.to: "area.home";
@@ -1675,7 +1528,7 @@ group { name: "elm/layout/preferences/general";
part { name: "label.swap";
type: TEXT;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
align: 0.0 0.5;
rel1.to: "area.swap";
rel2.to: "area.swap";
@@ -1788,7 +1641,7 @@ group { name: "elm/layout/preferences/frame";
part { name: "label.first";
type: TEXT;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
rel1.to: "area.first";
rel2.to: "area.first";
text {
@@ -1802,7 +1655,7 @@ group { name: "elm/layout/preferences/frame";
part { name: "label.second";
type: TEXT;
description { state: "default" 0.0;
- color: FN_COL_DEFAULT;
+ color_class: "main";
rel1.to: "area.second";
rel2.to: "area.second";
text {
diff --git a/data/themes/default/widgets/layouts/colorclass_manager.edc
b/data/themes/default/widgets/layouts/colorclass_manager.edc
index 8c5e0c7..6fd4176 100644
--- a/data/themes/default/widgets/layouts/colorclass_manager.edc
+++ b/data/themes/default/widgets/layouts/colorclass_manager.edc
@@ -337,9 +337,9 @@ group {
mouse_events: 0;
description {
state: "default" 0.0;
- color: WHITE_VISIBLE_COLOR;
- color2: WHITE_VISIBLE_COLOR;
- color3: WHITE_VISIBLE_COLOR;
+ color: 255 255 255 255;
+ color2: 255 255 255 255;
+ color3: 255 255 255 255;
color_class: "colorclass_manager/text_example_colorclass";
text {
size: 29;
diff --git a/data/themes/default/widgets/layouts/tabs.edc
b/data/themes/default/widgets/layouts/tabs.edc
index 60690b6..6d470ed 100644
--- a/data/themes/default/widgets/layouts/tabs.edc
+++ b/data/themes/default/widgets/layouts/tabs.edc
@@ -10,7 +10,7 @@ group { name: "elm/layout/tabs/default";
part { name: "bg_content";
type: RECT;
description {
- color: 81 82 84 255;
+ color_class: "bg_main";
rel1 {
relative: 0.0 1.0;
to: "elm.swallow.toolbar";
@@ -45,7 +45,7 @@ group { name: "elm/layout/tabs/property";
part { name: "bg_content";
type: RECT;
description {
- color: 81 82 84 255;
+ color_class: "bg_main";
rel1 {
relative: 0.0 1.0;
to: "elm.swallow.toolbar";
@@ -123,7 +123,7 @@ group { name: "elm/layout/tab_home/default";
part { name: "bg";
type: RECT;
description { state: "default" 0.0;
- color_class: "bg_main";
+ color_class: "bg_scroller";
rel1 {
to: "border";
}
@@ -135,7 +135,6 @@ group { name: "elm/layout/tab_home/default";
part { name: "border";
type: IMAGE;
description { state: "default" 0.0;
- color: 255 255 255 150;
image {
normal: "section-border.png";
border: 10 10 10 11;
diff --git a/data/themes/default/widgets/radio.edc
b/data/themes/default/widgets/radio.edc
index 4f47fd8..e70b914 100644
--- a/data/themes/default/widgets/radio.edc
+++ b/data/themes/default/widgets/radio.edc
@@ -324,7 +324,7 @@ group { name: "elm/radio/base/radio_"STYLE; \
visible: 0; \
min: 24 24; \
max: 24 24; \
- color: 56 111 152 0; \
+ color_class: "select"; \
image { \
normal: "icon_select.png"; \
middle: DEFAULT; \
@@ -333,7 +333,7 @@ group { name: "elm/radio/base/radio_"STYLE; \
description { state: "visible" 0.0; \
min: 24 24; \
max: 24 24; \
- color: 56 111 152 255; \
+ color_class: "select"; \
image { \
normal: "icon_select.png"; \
middle: DEFAULT; \
@@ -347,7 +347,7 @@ group { name: "elm/radio/base/radio_"STYLE; \
description { state: "default" 0.0; \
min: 24 24; \
max: 24 24; \
- color: 182 182 182 255; \
+ color_class: "main_alternative"; \
rel1.to: "radio"; \
rel2.to: "radio"; \
align: 0.5 0.5; \
diff --git a/data/themes/default/widgets/separator.edc
b/data/themes/default/widgets/separator.edc
index 82329ef..cab414d 100644
--- a/data/themes/default/widgets/separator.edc
+++ b/data/themes/default/widgets/separator.edc
@@ -86,7 +86,7 @@ group { name: "elm/separator/horizontal/icon";
type: TEXT;
description { state: "default" 0.0;
align: 0.0 0.5;
- color: LIGHT_GREY_FONT_COLOR;
+ color_class: "main";
rel1 {
relative: 1.0 0.0;
to: "padding_icon_right";
diff --git a/data/themes/default/widgets/spinner.edc
b/data/themes/default/widgets/spinner.edc
index 1851063..13746f8 100644
--- a/data/themes/default/widgets/spinner.edc
+++ b/data/themes/default/widgets/spinner.edc
@@ -56,7 +56,7 @@ group { name: "elm/spinner/base/default";
scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
- color: FN_COL_SPINNER_MAIN;
+ color_class: "main_alternative";
rel1 {
relative: 1.0 0.0;
to_x: "button.down";
@@ -75,7 +75,7 @@ group { name: "elm/spinner/base/default";
description { state: "active" 0.0;
visible: 0;
fixed: 1 1;
- color: FN_COL_SPINNER_MAIN;
+ color_class: "main_alternative";
rel1 {
relative: 1.0 0.0;
to_x: "button.down";
@@ -271,7 +271,7 @@ group { name: "elm/spinner/base/default";
threshold: "bg";
}
description { state: "default" 0.0;
- color: WHITE_INVISIBLE_COLOR;
+ color: 0 0 0 0;
rel1 {
to_x: "button.down";
to_y: "bg";
@@ -287,7 +287,7 @@ group { name: "elm/spinner/base/default";
part { name: "disabler";
type: RECT;
description { state: "default" 0.0;
- color: WHITE_INVISIBLE_COLOR;
+ color: 0 0 0 0;
visible: 0;
rel1.to: "bg";
rel2.to: "bg";
diff --git a/data/themes/default/widgets/styles.edc
b/data/themes/default/widgets/styles.edc
index fb7038f..217e7a7 100644
--- a/data/themes/default/widgets/styles.edc
+++ b/data/themes/default/widgets/styles.edc
@@ -10,7 +10,11 @@ styles {
style { name: "entry_main_text";
base: "font="FN" font_size=12 color=#d6d6d6 wrap=word text_class=entry
ellipsis=-1.0";
TEXTBLOCK_TAGS_ENABLED
- }
+ }
+ style { name: "entry_main_spinner_text";
+ base: "font="FN" align=middle font_size=12 color=#d6d6d6 wrap=word
text_class=entry ellipsis=-1.0";
+ TEXTBLOCK_TAGS_ENABLED
+ }
style { name: "entry_main_text_disabled";
base: "font="FN" font_size=12 color=#767778 wrap=word text_class=entry
ellipsis=-1.0";
TEXTBLOCK_TAGS_DISABLED
diff --git a/data/themes/default/widgets/toolbar.edc
b/data/themes/default/widgets/toolbar.edc
index bb1d71e..4750fe4 100644
--- a/data/themes/default/widgets/toolbar.edc
+++ b/data/themes/default/widgets/toolbar.edc
@@ -6,7 +6,7 @@ group { name: "elm/toolbar/base/default";
part { name: "base";
type: RECT;
description { state: "default" 0.0;
- color: 80 82 83 255;
+ color_class: "bg_main";
}
}
part { name: "clipper";
@@ -30,7 +30,7 @@ group { name: "elm/toolbar/base/default";
align: 0.5 1.0;
min: 0 1;
max: -1 1;
- color: 53 55 56 255;
+ color_class: "bg_scroller";
}
}
}
@@ -42,13 +42,13 @@ group { name: "elm/toolbar/item/default";
type: RECT;
description { state: "default" 0.0;
visible: 0;
- color: 58 110 155 255;
+ color_class: "select";
}
description { state: "selected" 0.0;
- color: 58 110 155 255;
+ color_class: "select";
}
description { state: "hilighted" 0.0;
- color: 58 110 155 255;
+ color_class: "select";
}
}
part { name: "elm.swallow.icon";
@@ -236,7 +236,7 @@ group { name: "elm/toolbar/base/tabs_horizontal";
description { state: "default" 0.0;
min: 0 27;
max: -1 27;
- color: 46 46 46 255;
+ color_class: "bg_main_alternative";
}
}
part { name: "separator";
@@ -245,7 +245,7 @@ group { name: "elm/toolbar/base/tabs_horizontal";
align: 0.5 1.0;
min: 0 1;
max: -1 1;
- color: 23 23 25 255;
+ color_class: "bg_scroller";
}
}
part { name: "clipper_arrow_left";
@@ -254,13 +254,13 @@ group { name: "elm/toolbar/base/tabs_horizontal";
min: 18 0;
max: 18 -1;
align: 0.0 0.5;
- color: 0 0 0 0;
+ visible: 0;
}
description { state: "visible" 0.0;
min: 18 0;
max: 18 -1;
align: 0.0 0.5;
- color: 255 255 255 255;
+ visible: 1;
}
}
part { name: "arrow_left";
@@ -318,13 +318,13 @@ group { name: "elm/toolbar/base/tabs_horizontal";
min: 18 0;
max: 18 -1;
align: 1.0 0.5;
- color: 0 0 0 0;
+ visible: 0;
}
description { state: "visible" 0.0;
min: 18 0;
max: 18 -1;
align: 1.0 0.5;
- color: 255 255 255 255;
+ visible: 1;
}
}
part { name: "arrow_right";
@@ -757,7 +757,7 @@ group { name: "elm/toolbar/base/editor_tabs_horizontal";
description { state: "default" 0.0;
min: 0 27;
max: -1 27;
- color: 46 46 46 255;
+ color_class: "bg_main_alternative";
}
}
part { name: "separator";
@@ -766,7 +766,7 @@ group { name: "elm/toolbar/base/editor_tabs_horizontal";
align: 0.5 1.0;
min: 0 1;
max: -1 1;
- color: 23 23 25 255;
+ color_class: "bg_scroller";
}
}
part { name: "clipper";
--
