summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README5
-rw-r--r--data/elementary/themes/colorclasses.edc978
-rw-r--r--data/elementary/themes/default.edc1
-rw-r--r--data/elementary/themes/edc/border.edc27
-rw-r--r--data/elementary/themes/edc/connman.edc2
-rw-r--r--data/elementary/themes/edc/efl/border.edc82
-rw-r--r--data/elementary/themes/edc/efl/button.edc49
-rw-r--r--data/elementary/themes/edc/efl/calendar.edc45
-rw-r--r--data/elementary/themes/edc/efl/check.edc79
-rw-r--r--data/elementary/themes/edc/efl/datepicker.edc6
-rw-r--r--data/elementary/themes/edc/efl/focus.edc28
-rw-r--r--data/elementary/themes/edc/efl/frame.edc22
-rw-r--r--data/elementary/themes/edc/efl/grid.edc17
-rw-r--r--data/elementary/themes/edc/efl/group_item.edc6
-rw-r--r--data/elementary/themes/edc/efl/image_zoomable.edc2
-rw-r--r--data/elementary/themes/edc/efl/list.edc26
-rw-r--r--data/elementary/themes/edc/efl/navigation_bar.edc6
-rw-r--r--data/elementary/themes/edc/efl/panel.edc24
-rw-r--r--data/elementary/themes/edc/efl/panes.edc156
-rw-r--r--data/elementary/themes/edc/efl/pointer.edc5
-rw-r--r--data/elementary/themes/edc/efl/popup.edc32
-rw-r--r--data/elementary/themes/edc/efl/progress.edc99
-rw-r--r--data/elementary/themes/edc/efl/radio.edc69
-rw-r--r--data/elementary/themes/edc/efl/scroller.edc90
-rw-r--r--data/elementary/themes/edc/efl/separator.edc3
-rw-r--r--data/elementary/themes/edc/efl/slider.edc104
-rw-r--r--data/elementary/themes/edc/efl/spin.edc8
-rw-r--r--data/elementary/themes/edc/efl/spin_button.edc24
-rw-r--r--data/elementary/themes/edc/efl/spotlight.edc4
-rw-r--r--data/elementary/themes/edc/efl/tab_bar.edc42
-rw-r--r--data/elementary/themes/edc/efl/tab_pager.edc3
-rw-r--r--data/elementary/themes/edc/efl/tags.edc83
-rw-r--r--data/elementary/themes/edc/efl/text.edc189
-rw-r--r--data/elementary/themes/edc/efl/textpath.edc5
-rw-r--r--data/elementary/themes/edc/efl/timepicker.edc22
-rw-r--r--data/elementary/themes/edc/efl/tooltip.edc54
-rw-r--r--data/elementary/themes/edc/efl/uiclock.edc10
-rw-r--r--data/elementary/themes/edc/efl/video.edc4
-rw-r--r--data/elementary/themes/edc/elm/bg.edc20
-rw-r--r--data/elementary/themes/edc/elm/button.edc2
-rw-r--r--data/elementary/themes/edc/elm/calendar.edc33
-rw-r--r--data/elementary/themes/edc/elm/clock.edc18
-rw-r--r--data/elementary/themes/edc/elm/code.edc38
-rw-r--r--data/elementary/themes/edc/elm/colorclass.edc119
-rw-r--r--data/elementary/themes/edc/elm/colorsel.edc77
-rw-r--r--data/elementary/themes/edc/elm/ctxpopup.edc17
-rw-r--r--data/elementary/themes/edc/elm/dayselector.edc36
-rw-r--r--data/elementary/themes/edc/elm/diskselector.edc64
-rw-r--r--data/elementary/themes/edc/elm/entry.edc5
-rw-r--r--data/elementary/themes/edc/elm/fileselector.edc37
-rw-r--r--data/elementary/themes/edc/elm/flipselector.edc71
-rw-r--r--data/elementary/themes/edc/elm/focus.edc28
-rw-r--r--data/elementary/themes/edc/elm/frame.edc19
-rw-r--r--data/elementary/themes/edc/elm/gengrid.edc59
-rw-r--r--data/elementary/themes/edc/elm/genlist.edc2
-rw-r--r--data/elementary/themes/edc/elm/hover.edc52
-rw-r--r--data/elementary/themes/edc/elm/index.edc57
-rw-r--r--data/elementary/themes/edc/elm/inwin.edc20
-rw-r--r--data/elementary/themes/edc/elm/label.edc24
-rw-r--r--data/elementary/themes/edc/elm/layout.edc71
-rw-r--r--data/elementary/themes/edc/elm/map.edc11
-rw-r--r--data/elementary/themes/edc/elm/menu.edc61
-rw-r--r--data/elementary/themes/edc/elm/multibuttonentry.edc36
-rw-r--r--data/elementary/themes/edc/elm/naviframe.edc12
-rw-r--r--data/elementary/themes/edc/elm/notify.edc11
-rw-r--r--data/elementary/themes/edc/elm/panel.edc67
-rw-r--r--data/elementary/themes/edc/elm/panes.edc247
-rw-r--r--data/elementary/themes/edc/elm/photo.edc6
-rw-r--r--data/elementary/themes/edc/elm/player.edc18
-rw-r--r--data/elementary/themes/edc/elm/popup.edc33
-rw-r--r--data/elementary/themes/edc/elm/progress.edc117
-rw-r--r--data/elementary/themes/edc/elm/radio.edc53
-rw-r--r--data/elementary/themes/edc/elm/scroller.edc55
-rw-r--r--data/elementary/themes/edc/elm/textpath.edc2
-rw-r--r--data/elementary/themes/edc/elm/toolbar.edc2
-rw-r--r--data/elementary/themes/edc/evrything.edc2
-rw-r--r--data/elementary/themes/edc/gadman.edc2
-rw-r--r--data/elementary/themes/edc/procstats.edc115
-rw-r--r--data/elementary/themes/edc/randr.edc6
-rw-r--r--data/elementary/themes/edc/scrollframe.edc2
-rw-r--r--data/elementary/themes/edc/textblock.edc6
-rw-r--r--data/elementary/themes/edc/winlist.edc41
-rw-r--r--data/elementary/themes/fonts.edc132
-rw-r--r--data/elementary/themes/macros.edc19
-rw-r--r--src/bin/elementary/meson.build1
-rw-r--r--src/bin/elementary/test.c4
-rw-r--r--src/bin/elementary/test_fileselector_button.c1
-rw-r--r--src/bin/elementary/test_label.c17
-rw-r--r--src/bin/elementary/test_map.c1228
-rw-r--r--src/bin/exactness/player.c1
-rw-r--r--src/generic/evas/pdf/main.cpp4
-rw-r--r--src/generic/evas/rsvg/main.c50
-rw-r--r--src/generic/evas/rsvg/meson.build5
-rw-r--r--src/lib/ecore/ecore_anim.c1
-rw-r--r--src/lib/ecore_x/Ecore_X.h1
-rw-r--r--src/lib/ecore_x/ecore_x_randr.c35
-rw-r--r--src/lib/edje/edje_calc.c2
-rw-r--r--src/lib/edje/edje_embryo.c2
-rw-r--r--src/lib/edje/edje_lua2.c2
-rw-r--r--src/lib/edje/edje_private.h1
-rw-r--r--src/lib/edje/edje_util.c80
-rw-r--r--src/lib/eina/eina_debug_chunk.c22
-rw-r--r--src/lib/eina/eina_evlog.c22
-rw-r--r--src/lib/eina/eina_safepointer.c36
-rw-r--r--src/lib/elementary/efl_ui_focus_manager_calc.c2
-rw-r--r--src/lib/elementary/efl_ui_focus_manager_root_focus.c1
-rw-r--r--src/lib/elementary/efl_ui_widget.c16
-rw-r--r--src/lib/elementary/elm_code_syntax.c15
-rw-r--r--src/lib/elementary/elm_code_widget.c66
-rw-r--r--src/lib/elementary/elm_config.c276
-rw-r--r--src/lib/elementary/elm_map.c5529
-rw-r--r--src/lib/elementary/elm_map_common.h440
-rw-r--r--src/lib/elementary/elm_map_eo.legacy.h470
-rw-r--r--src/lib/elementary/elm_map_legacy.h130
-rw-r--r--src/lib/emotion/emotion_smart.c7
-rw-r--r--src/lib/eo/eo.c49
-rw-r--r--src/lib/eo/eo_add_fallback.c38
-rw-r--r--src/lib/eo/eo_ptr_indirection.x59
-rw-r--r--src/lib/evas/canvas/efl_canvas_proxy.c20
-rw-r--r--src/lib/evas/canvas/evas_map.c10
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c16
-rw-r--r--src/lib/evas/canvas/evas_textblock_legacy.h7
-rw-r--r--src/lib/evas/common/evas_image_main.c12
-rw-r--r--src/lib/evas/include/evas_private.h1
-rw-r--r--src/lib/evil/evil_main.c16
-rw-r--r--src/lib/evil/meson.build3
-rw-r--r--src/modules/emotion/gstreamer1/emotion_gstreamer.c18
-rw-r--r--src/modules/emotion/gstreamer1/emotion_gstreamer.h1
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_common.h2
-rw-r--r--src/modules/evas/engines/gl_x11/evas_engine.c10
-rw-r--r--src/modules/evas/engines/gl_x11/evas_x_main.c1
-rw-r--r--src/modules/evas/engines/software_generic/evas_native_common.h1
-rw-r--r--src/tests/eina/eina_test_simple_xml_parser.c2
-rw-r--r--src/tests/evas/evas_suite.c1
-rw-r--r--src/tests/evas/evas_suite.h1
-rw-r--r--src/tests/evas/evas_test_map.c128
-rw-r--r--src/tests/evas/meson.build1
137 files changed, 3564 insertions, 9636 deletions
diff --git a/README b/README
index fa42e90e35..148ab322a3 100644
--- a/README
+++ b/README
@@ -31,8 +31,9 @@ PLATFORMS
31 31
32EFL is primarily developerd on Linux (GNU/Linux) and should work on 32EFL is primarily developerd on Linux (GNU/Linux) and should work on
33most distributions as long as dependencies are provided. It has been 33most distributions as long as dependencies are provided. It has been
34compiled and run also on Windows (using MINGW32 - please see 34compiled and run also on Windows (using MSYS2 + mingw-w64 - please see
35http://www.winbuilds.org ), Mac OS X, FreeBSD and NetBSD. 35https://phab.enlightenment.org/w/windows/), Mac OS X, FreeBSD and
36NetBSD.
36 37
37COMPONENTS 38COMPONENTS
38---------- 39----------
diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc
index c2af19b86b..a7f1986928 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -1,9 +1,86 @@
1color_tree {
2 ":bg" {
3 "/bg";
4 "/bg/selected/border";
5 }
6 ":bg-alt" {
7 "/bg-alt";
8 }
9 ":fg" {
10 "/fg";
11 "/fg/normal/text-overlay";
12 "/fg/normal/button-media";
13 "/fg/normal/menu/item"; // XXX: dont need this as fallback to /fg will do
14 "/fg/normal/actionslider";
15 "/fg/normal/bubble/info";
16 "/fg/normal/spinner/arrow";
17 "/fg/normal/spinner/text";
18 "/fg/normal/notification/text";
19 "/fg/selected/winlist/item/text/iconified";
20 "/fg/pressed/gadgets/tasks/text/iconified";
21 "/fg/normal/gadgets/battery/level/discharge";
22 "/fg/disabled/gadgets/connman/eth/cable";
23 "/fg/normal/gadgets/connman/eth/cable";
24 "/fg/disabled/gadgets/connman/eth/connector";
25 "/fg/normal/gadgets/connman/eth/connector";
26 "/fg/selected/gadgets/connman/eth/connector";
27 "/fg/disabled/gadgets/connman/wifi/connected";
28 "/fg/normal/gadgets/connman/wifi/connected";
29 "/fg/normal/gadgets/connman/wifi/signal";
30 "/fg/normal/gadgets/connman/bt/base";
31 "/fg/normal/gadgets/connman/bt/signal";
32 "/fg/normal/gadgets/connman/cell/base";
33 "/fg/normal/gadgets/connman/cell/signal";
34 "/fg/normal/gadgets/connman/security";
35 "/fg/normal/gadgets/bluez/off";
36 "/fg/normal/gadgets/clock/digital/separator";
37 "/fg/normal/gadgets/clock/analog/hands/hours";
38 "/fg/normal/index/item/text";
39 "/fg-alt";
40 }
41 ":selected" {
42 "/bg/selected";
43 "/fg/normal/panes/flush";
44 }
45}
46
1color_classes { 47color_classes {
2/////////////////////////////////////////////////////////////////////////////// 48///////////////////////////////////////////////////////////////////////////////
3 color_class { name: "/bg"; 49// a core palette that the cc's below map to. this basically makes
50// for example ":selected" like a variable name that is that color and
51// then a list of explicit cc's that map TO that variable color.
52//
53// the idea is that a simple GUI for a palette only shows these variables
54// for you to modify for your colors. the "extended" gui allows you to
55// specifically override specific cc's like "/fg/normal/panes/flush" for
56// example to make a custom color appear for that specific element or anything
57// sharing that specific cc.
58///////////////////////////////////////////////////////////////////////////////
59 color_class { name: ":selected";
60 color: 51 153 255 255; }
61 color_class { name: ":bg";
4 color: 64 64 64 255; } 62 color: 64 64 64 255; }
5 color_class { name: "/bg-alt"; 63 color_class { name: ":bg-alt";
6 color: 56 56 56 255; } 64 color: 56 56 56 255; }
65 color_class { name: ":fg";
66 color: 160 160 160 255; }
67///////////////////////////////////////////////////////////////////////////////
68
69
70///////////////////////////////////////////////////////////////////////////////
71// specific element color classes. they fall abck like a directory search to
72// parent dirs so like if something is "/fg/normal" first that is looked for
73// then if that fails "/fg" is looked for etc.
74//
75// this below is inteneded to allow overriding in detail of specific uses
76// and elements, but the abovbe coarser ":something" palette is intended
77// for a simpler smaller set of colors used in a theme to allow very simple
78// setting of these.
79///////////////////////////////////////////////////////////////////////////////
80// color_class { name: "/bg";
81// color: 64 64 64 255; }
82// color_class { name: "/bg-alt";
83// color: 56 56 56 255; }
7 color_class { name: "/bg-dark"; 84 color_class { name: "/bg-dark";
8 color: 32 32 32 255; } 85 color: 32 32 32 255; }
9 color_class { name: "/bg-dark-alt"; 86 color_class { name: "/bg-dark-alt";
@@ -12,11 +89,11 @@ color_classes {
12 color: 192 192 192 255; } 89 color: 192 192 192 255; }
13 color_class { name: "/bg-light-alt"; 90 color_class { name: "/bg-light-alt";
14 color: 184 184 184 255; } 91 color: 184 184 184 255; }
15 color_class { name: "/bg/selected"; 92// color_class { name: "/bg/selected";
16 color: 51 153 255 255; } 93// color: 51 153 255 255; }
17/////////////////////////////////////////////////////////////////////////////// 94///////////////////////////////////////////////////////////////////////////////
18 color_class { name: "/fg"; 95// color_class { name: "/fg";
19 color: 160 160 160 255; } 96// color: 160 160 160 255; }
20 color_class { name: "/fg/disabled"; 97 color_class { name: "/fg/disabled";
21 color: 80 80 80 255; } 98 color: 80 80 80 255; }
22 color_class { name: "/fg/pressed"; 99 color_class { name: "/fg/pressed";
@@ -34,6 +111,9 @@ color_classes {
34 color_class { name: "/fg-alt/selected-pressed"; 111 color_class { name: "/fg-alt/selected-pressed";
35 color: 255 255 255 255; } 112 color: 255 255 255 255; }
36/////////////////////////////////////////////////////////////////////////////// 113///////////////////////////////////////////////////////////////////////////////
114 color_class { name: "/fg/normal/navigation/title";
115 color: 255 255 255 255; }
116///////////////////////////////////////////////////////////////////////////////
37 color_class { name: "/shadow"; 117 color_class { name: "/shadow";
38 color: 0 0 0 128; } 118 color: 0 0 0 128; }
39 color_class { name: "/shadow/selected"; 119 color_class { name: "/shadow/selected";
@@ -49,6 +129,53 @@ color_classes {
49 color: 0 0 0 200; } 129 color: 0 0 0 200; }
50 color_class { name: "/dim/disabled"; 130 color_class { name: "/dim/disabled";
51 color: 0 0 0 80; } 131 color: 0 0 0 80; }
132 color_class { name: "/dim-alt";
133 color: 0 0 0 160; }
134 color_class { name: "/dim-alt/pressed";
135 color: 0 0 0 200; }
136 color_class { name: "/dim-alt/disabled";
137 color: 0 0 0 80; }
138 color_class { name: "/dim/normal/hover";
139 color: 0 0 0 64; }
140///////////////////////////////////////////////////////////////////////////////
141 color_class { name: "/bg/normal/colorclass/color";
142 color: 48 48 48 255; }
143///////////////////////////////////////////////////////////////////////////////
144 color_class { name: "/bg/normal/popup";
145 color: 48 48 48 255; }
146 color_class { name: "/fg/normal/popup/text/title";
147 color: 255 255 255 255; }
148///////////////////////////////////////////////////////////////////////////////
149 color_class { name: "/bg/normal/photo/outline";
150 color: 255 255 255 255; }
151 color_class { name: "/fg/normal/photo/base";
152 color: 48 48 48 255; }
153///////////////////////////////////////////////////////////////////////////////
154 color_class { name: "/fg/normal/multibuttonentry/text/guide";
155 color: 80 80 80 255; }
156 color_class { name: "/bg/normal/multibuttonentry/button";
157 color: 0 0 0 64; }
158 color_class { name: "/bg/pressed/multibuttonentry/button";
159 color: 0 0 0 200; }
160// color_class { name: "/bg/selected/multibuttonentry/button/bar";
161// color: 51 153 255 255; }
162///////////////////////////////////////////////////////////////////////////////
163 color_class { name: "/bg/normal/naviframe/top";
164 color: 32 32 32 255; }
165 color_class { name: "/fg/normal/naviframe/text/title";
166 color: 255 255 255 255; }
167 color_class { name: "/fg/normal/naviframe/top/overlap";
168 color: 255 255 255 200; }
169///////////////////////////////////////////////////////////////////////////////
170 color_class { name: "/bg/normal/colorselector";
171 color: 32 32 32 255; }
172 color_class { name: "/bg/normal/colorselector/pattern";
173 color: 48 48 48 255; }
174 color_class { name: "/bg/normal/colorselector/cursor";
175 color: 255 255 255 255; }
176///////////////////////////////////////////////////////////////////////////////
177 color_class { name: "/fg/normal/layout/content-back/title";
178 color: 255 255 255 255; }
52/////////////////////////////////////////////////////////////////////////////// 179///////////////////////////////////////////////////////////////////////////////
53 color_class { name: "/fg/normal/menu/title"; 180 color_class { name: "/fg/normal/menu/title";
54 color: 255 255 255 255; } 181 color: 255 255 255 255; }
@@ -66,12 +193,49 @@ color_classes {
66 color_class { name: "/fg/normal/pointer/manipulator"; 193 color_class { name: "/fg/normal/pointer/manipulator";
67 color: 51 153 255 192; } 194 color: 51 153 255 192; }
68/////////////////////////////////////////////////////////////////////////////// 195///////////////////////////////////////////////////////////////////////////////
196 color_class { name: "/fg/normal/ctxpopup/arrow";
197 color: 255 255 255 255; }
198///////////////////////////////////////////////////////////////////////////////
199 color_class { name: "/bg/normal/scroller/base";
200 color: 0 0 0 0; }
69 color_class { name: "/fg/normal/scroller/bar"; 201 color_class { name: "/fg/normal/scroller/bar";
70 color: 51 153 255 255; } 202 color: 51 153 255 255; }
71/////////////////////////////////////////////////////////////////////////////// 203///////////////////////////////////////////////////////////////////////////////
72 color_class { name: "/fg/normal/color/cursor"; 204 color_class { name: "/fg/normal/color/cursor";
73 color: 255 255 255 192; } 205 color: 255 255 255 192; }
74/////////////////////////////////////////////////////////////////////////////// 206///////////////////////////////////////////////////////////////////////////////
207 color_class { name: "/fg/normal/index/base/text";
208 color: 51 153 255 255; }
209///////////////////////////////////////////////////////////////////////////////
210// color_class { name: "/fg/normal/panes/flush";
211// color: 51 163 255 255; }
212 color_class { name: "/fg/normal/panes/fold/arrow";
213 color: 255 255 255 255; }
214 color_class { name: "/fg/pressed/panes/fold/arrow";
215 color: 220 220 220 255; }
216///////////////////////////////////////////////////////////////////////////////
217 color_class { name: "/bg/normal/calendar/day/normal";
218 color: 0 0 0 0; }
219 color_class { name: "/bg/normal/calendar/day/today";
220 color: 0 0 0 64; }
221 color_class { name: "/bg/selected/calendar/day";
222 color: 51 153 255 128; }
223 color_class { name: "/fg/normal/calendar/day/checked";
224 color: 51 153 255 255; }
225 color_class { name: "/fg/normal/calendar/day/holiday";
226 color: 51 153 255 255; }
227 color_class { name: "/fg/normal/calendar/day/today";
228 color: 255 255 255 255; }
229 color_class { name: "/fg/normal/calendar/day/disabled";
230 color: 40 40 40 255; }
231 color_class { name: "/fg/normal/calendar/day/weekend1";
232 color: 51 153 255 255; }
233 color_class { name: "/fg/normal/calendar/day/weekend2";
234 color: 51 153 255 255; }
235///////////////////////////////////////////////////////////////////////////////
236 color_class { name: "/fg/normal/panel/arrow";
237 color: 255 255 255 255; }
238///////////////////////////////////////////////////////////////////////////////
75 color_class { name: "/bg/normal/access"; 239 color_class { name: "/bg/normal/access";
76 color: 255 153 51 64; } 240 color: 255 153 51 64; }
77/////////////////////////////////////////////////////////////////////////////// 241///////////////////////////////////////////////////////////////////////////////
@@ -85,6 +249,9 @@ color_classes {
85 color_class { name: "/bg/pressed/segmentcontrol/item"; 249 color_class { name: "/bg/pressed/segmentcontrol/item";
86 color: 32 32 32 255; } 250 color: 32 32 32 255; }
87/////////////////////////////////////////////////////////////////////////////// 251///////////////////////////////////////////////////////////////////////////////
252 color_class { name: "/fg/normal/dayselector/weekend";
253 color: 96 96 96 255; }
254///////////////////////////////////////////////////////////////////////////////
88 color_class { name: "/fg/normal/init/logo"; 255 color_class { name: "/fg/normal/init/logo";
89 color: 255 255 255 255; } 256 color: 255 255 255 255; }
90 color_class { name: "/fg/normal/init/text/version"; 257 color_class { name: "/fg/normal/init/text/version";
@@ -133,16 +300,16 @@ color_classes {
133 color_class { name: "/fg/pressed/fileman/overlay/progress/close"; 300 color_class { name: "/fg/pressed/fileman/overlay/progress/close";
134 color: 200 200 200 255; } 301 color: 200 200 200 255; }
135/////////////////////////////////////////////////////////////////////////////// 302///////////////////////////////////////////////////////////////////////////////
136 color_class { name: "/bg/normal/titlebar"; 303// color_class { name: "/bg/normal/titlebar";
137 color: 64 64 64 255; } 304// color: 64 64 64 255; }
138 color_class { name: "/bg/selected/titlebar"; 305 color_class { name: "/bg/selected/titlebar";
139 color: 32 32 32 255; } 306 color: 32 32 32 255; }
140 color_class { name: "/bg/normal/border"; 307// color_class { name: "/bg/normal/border";
141 color: 64 64 64 255; } 308// color: 64 64 64 255; }
142 color_class { name: "/bg/selected/border"; 309// color_class { name: "/bg/selected/border";
143 color: 64 64 64 255; } 310// color: 64 64 64 255; }
144 color_class { name: "/bg/normal/win-blocker"; 311 color_class { name: "/bg/normal/win-blocker";
145 color: 64 64 64 255; } 312 color: 64 64 64 192; }
146 color_class { name: "/bg/selected/win-blocker"; 313 color_class { name: "/bg/selected/win-blocker";
147 color: 64 64 64 255; } 314 color: 64 64 64 255; }
148 color_class { name: "/bg/normal/border/outline"; 315 color_class { name: "/bg/normal/border/outline";
@@ -169,6 +336,23 @@ color_classes {
169 color_class { name: "/fg/normal/slider/indicator"; 336 color_class { name: "/fg/normal/slider/indicator";
170 color: 255 255 255 255; } 337 color: 255 255 255 255; }
171/////////////////////////////////////////////////////////////////////////////// 338///////////////////////////////////////////////////////////////////////////////
339 color_class { name: "/bg/normal/progress/base";
340 color: 48 48 48 255; }
341 color_class { name: "/fg/normal/progress/bar";
342 color: 51 153 255 255; }
343 color_class { name: "/fg/normal/progress/bar1";
344 color: 80 80 80 255; }
345 color_class { name: "/fg/normal/progress/pulse";
346 color: 51 153 255 255; }
347 color_class { name: "/fg/normal/progress/text/status";
348 color: 255 255 255 255; }
349///////////////////////////////////////////////////////////////////////////////
350 color_class { name: "/bg/selected/focus/hilight";
351 color: 255 255 255 255; }
352///////////////////////////////////////////////////////////////////////////////
353 color_class { name: "/bg/normal/diskselector";
354 color: 48 48 48 255; }
355///////////////////////////////////////////////////////////////////////////////
172 color_class { name: "/bg/normal/entry"; 356 color_class { name: "/bg/normal/entry";
173 color: 48 48 48 255; } 357 color: 48 48 48 255; }
174 color_class { name: "/bg/normal/entry/focus"; 358 color_class { name: "/bg/normal/entry/focus";
@@ -187,6 +371,8 @@ color_classes {
187 color: 112 112 112 255; } 371 color: 112 112 112 255; }
188 color_class { name: "/fg/disabled/entry/text/guide"; 372 color_class { name: "/fg/disabled/entry/text/guide";
189 color: 80 80 80 255; } 373 color: 80 80 80 255; }
374 color_class { name: "/fg/normal/entry/handler/start";
375 color: 51 153 255 255; }
190 color_class { name: "/fg/normal/entry/handler/end"; 376 color_class { name: "/fg/normal/entry/handler/end";
191 color: 51 153 255 255; } 377 color: 51 153 255 255; }
192 color_class { name: "/fg/normal/entry/cursor"; 378 color_class { name: "/fg/normal/entry/cursor";
@@ -194,20 +380,198 @@ color_classes {
194/////////////////////////////////////////////////////////////////////////////// 380///////////////////////////////////////////////////////////////////////////////
195 color_class { name: "/fg/normal/text-heading"; 381 color_class { name: "/fg/normal/text-heading";
196 color: 255 255 255 255; } 382 color: 255 255 255 255; }
383 color_class { name: "/fg/disabled/text-heading";
384 color: 128 128 128 255; }
197 color_class { name: "/fg/normal/text-heading-sub"; 385 color_class { name: "/fg/normal/text-heading-sub";
198 color: 255 255 255 255; } 386 color: 255 255 255 255; }
387 color_class { name: "/fg/disabled/text-heading-sub";
388 color: 128 128 128 255; }
199 color_class { name: "/fg/normal/text-hilight"; 389 color_class { name: "/fg/normal/text-hilight";
200 color: 255 255 255 255; } 390 color: 255 255 255 255; }
391 color_class { name: "/fg/disabled/text-hilight";
392 color: 128 128 128 255; }
201 color_class { name: "/fg/normal/text-overlay"; 393 color_class { name: "/fg/normal/text-overlay";
202 color: 160 160 160 255; } 394 color: 220 220 220 255; }
395 color_class { name: "/fg/disabled/text-overlay";
396 color: 128 128 128 255; }
203 color_class { name: "/fg/normal/text-subtle"; 397 color_class { name: "/fg/normal/text-subtle";
204 color: 0 0 0 64; } 398 color: 0 0 0 64; }
205 color_class { name: "/fg/normal/text/hilight"; 399 color_class { name: "/fg/disabled/text-subtle";
400 color: 0 0 0 48; }
401 color_class { name: "/fg/normal/text-urgent";
402 color: 255 51 51 255; }
403 color_class { name: "/fg/normal/text-standout";
206 color: 51 153 255 255; } 404 color: 51 153 255 255; }
207 color_class { name: "/fg/disabled/text/hilight"; 405 color_class { name: "/fg/disabled/text-standout";
208 color: 25 76 128 255; } 406 color: 25 76 128 255; }
209 color_class { name: "/fg/disabled/text-urgent"; 407 color_class { name: "/fg/normal/text-link";
408 color: 51 153 255 255; }
409 color_class { name: "/fg/disabled/text-link";
410 color: 96 112 128 255; }
411 color_class { name: "/fg/normal/text-preedit";
412 color: 51 153 255 255; }
413 color_class { name: "/fg/disabled/text-preedit";
414 color: 96 112 128 255; }
415 color_class { name: "/fg/normal/text-preedit-sel";
416 color: 0 0 0 255; }
417 color_class { name: "/fg/disabled/text-preedit-sel";
418 color: 32 32 32 255; }
419 color_class { name: "/bg/normal/text-preedit-sel";
420 color: 220 220 220 255; }
421 color_class { name: "/bg/disabled/text-preedit-sel";
422 color: 80 80 80 255; }
423 color_class { name: "/fg/normal/text-name";
424 color: 96 96 96 255; }
425 color_class { name: "/fg/disabled/text-name";
426 color: 80 80 80 255; }
427 color_class { name: "/fg/normal/text-val";
428 color: 220 220 220 255; }
429 color_class { name: "/fg/disabled/text-val";
430 color: 80 80 80 255; }
431 color_class { name: "/fg/normal/text-info";
432 color: 51 153 255 255; }
433 color_class { name: "/fg/disabled/text-info";
434 color: 96 112 128 255; }
435 color_class { name: "/fg/normal/text-success";
436 color: 51 255 51 255; }
437 color_class { name: "/fg/disabled/text-success";
438 color: 51 153 51 255; }
439 color_class { name: "/fg/normal/text-warning";
440 color: 255 153 51 255; }
441 color_class { name: "/fg/disabled/text-warning";
442 color: 153 51 34 255; }
443 color_class { name: "/fg/normal/text-failure";
210 color: 255 51 51 255; } 444 color: 255 51 51 255; }
445 color_class { name: "/fg/disabled/text-failure";
446 color: 153 34 34 255; }
447 color_class { name: "/fg/normal/text-error";
448 color: 255 51 51 255; }
449 color_class { name: "/fg/disabled/text-error";
450 color: 153 34 34 255; }
451 color_class { name: "/fg/normal/text-fatal";
452 color: 255 51 51 255; }
453 color_class { name: "/fg/disabled/text-fatal";
454 color: 153 34 34 255; }
455 color_class { name: "/fg/normal/text-code";
456 color: 255 255 255 255; }
457 color_class { name: "/fg/disabled/text-code";
458 color: 128 128 128 255; }
459 color_class { name: "/fg/normal/text-comment";
460 color: 51 153 153 255; }
461 color_class { name: "/fg/disabled/text-comment";
462 color: 51 96 96 255; }
463 color_class { name: "/fg/normal/text-string";
464 color: 51 255 153 255; }
465 color_class { name: "/fg/disabled/text-string";
466 color: 96 128 112 255; }
467 color_class { name: "/fg/normal/text-number";
468 color: 220 220 48 255; }
469 color_class { name: "/fg/disabled/text-number";
470 color: 96 96 32 255; }
471 color_class { name: "/fg/normal/text-brace";
472 color: 128 128 128 255; }
473 color_class { name: "/fg/disabled/text-brace";
474 color: 80 80 80 255; }
475 color_class { name: "/fg/normal/text-type";
476 color: 51 153 255 255; }
477 color_class { name: "/fg/disabled/text-type";
478 color: 96 112 128 255; }
479 color_class { name: "/fg/normal/text-class";
480 color: 119 170 221 255; }
481 color_class { name: "/fg/disabled/text-class";
482 color: 59 85 110 255; }
483 color_class { name: "/fg/normal/text-function";
484 color: 153 51 255 255; }
485 color_class { name: "/fg/disabled/text-function";
486 color: 76 25 127 255; }
487 color_class { name: "/fg/normal/text-param";
488 color: 220 220 220 255; }
489 color_class { name: "/fg/disabled/text-param";
490 color: 96 96 96 255; }
491 color_class { name: "/fg/normal/text-keyword";
492 color: 255 153 153 255; }
493 color_class { name: "/fg/disabled/text-keyword";
494 color: 128 80 80 255; }
495 color_class { name: "/fg/normal/text-preprocessor";
496 color: 153 51 255 255; }
497 color_class { name: "/fg/disabled/text-preprocessor";
498 color: 128 37 128 255; }
499 color_class { name: "/fg/normal/text-line-added";
500 color: 153 255 51 255; }
501 color_class { name: "/fg/disabled/text-line-added";
502 color: 76 128 25 255; }
503 color_class { name: "/fg/normal/text-line-removed";
504 color: 255 51 51 255; }
505 color_class { name: "/fg/disabled/text-line-removed";
506 color: 128 25 25 255; }
507 color_class { name: "/fg/normal/text-line-changed";
508 color: 255 153 51 255; }
509 color_class { name: "/fg/disabled/text-line-changed";
510 color: 128 76 25 255; }
511 color_class { name: "/fg/normal/text-status";
512 color: 48 48 49 255; }
513 color_class { name: "/fg/disabled/text-status";
514 color: 56 56 56 255; }
515 color_class { name: "/fg/normal/text-match";
516 color: 187 187 51 255; }
517 color_class { name: "/fg/disabled/text-match";
518 color: 96 96 25 255; }
519 color_class { name: "/fg/normal/text-current";
520 color: 32 32 32 255; }
521 color_class { name: "/fg/disabled/text-current";
522 color: 48 48 48 255; }
523 color_class { name: "/fg/normal/text-ignored";
524 color: 36 36 36 255; }
525 color_class { name: "/fg/disabled/text-ignored";
526 color: 44 44 44 255; }
527 color_class { name: "/fg/normal/text-note";
528 color: 160 80 17 255; }
529 color_class { name: "/fg/disabled/text-note";
530 color: 80 40 8 255; }
531 color_class { name: "/fg/normal/text-todo";
532 color: 40 80 160 255; }
533 color_class { name: "/fg/disabled/text-todo";
534 color: 20 40 80 255; }
535 color_class { name: "/fg/normal/text-gutter";
536 color: 128 128 128 255; }
537 color_class { name: "/fg/disabled/text-gutter";
538 color: 80 80 80 255; }
539 color_class { name: "/bg/normal/text-gutter";
540 color: 64 64 64 255; }
541 color_class { name: "/bg/disabled/text-gutter";
542 color: 64 64 64 255; }
543 color_class { name: "/bg/normal/text-scope";
544 color: 54 54 54 255; }
545 color_class { name: "/bg/disabled/text-scope";
546 color: 58 58 58 255; }
547 color_class { name: "/bg/normal/text-whitespace";
548 color: 96 96 96 255; }
549 color_class { name: "/bg/disabled/text-whitespace";
550 color: 80 80 80 255; }
551 color_class { name: "/bg/normal/text-selection";
552 color: 51 153 255 128; }
553 color_class { name: "/bg/disabled/text-selection";
554 color: 25 76 128 128; }
555///////////////////////////////////////////////////////////////////////////////
556 color_class { name: "/bg/normal/flipselector/down";
557 color: 96 96 96 255; }
558 color_class { name: "/bg/disabled/flipselector/down";
559 color: 72 72 72 255; }
560 color_class { name: "/bg/normal/flipselector/up";
561 color: 80 80 80 255; }
562 color_class { name: "/bg/disabled/flipselector/up";
563 color: 64 64 64 255; }
564 color_class { name: "/fg/normal/flipselector/down";
565 color: 192 192 192 255; }
566 color_class { name: "/fg/disabled/flipselector/down";
567 color: 112 112 112 255; }
568 color_class { name: "/fg/normal/flipselector/up";
569 color: 160 160 160 255; }
570 color_class { name: "/fg/disabled/flipselector/up";
571 color: 96 96 96 255; }
572///////////////////////////////////////////////////////////////////////////////
573 color_class { name: "/fg/nmormal/fileselector/pathsep";
574 color: 51 153 255 255; }
211/////////////////////////////////////////////////////////////////////////////// 575///////////////////////////////////////////////////////////////////////////////
212 color_class { name: "/bg/normal/button"; 576 color_class { name: "/bg/normal/button";
213 color: 96 96 96 255; } 577 color: 96 96 96 255; }
@@ -224,7 +588,7 @@ color_classes {
224 color_class { name: "/fg/pressed/button"; 588 color_class { name: "/fg/pressed/button";
225 color: 255 255 255 255; } 589 color: 255 255 255 255; }
226 color_class { name: "/fg/disabled/button"; 590 color_class { name: "/fg/disabled/button";
227 color: 97 96 96 255; } 591 color: 96 96 96 255; }
228 color_class { name: "/fg/selected/button/bar"; 592 color_class { name: "/fg/selected/button/bar";
229 color: 51 153 255 255; } 593 color: 51 153 255 255; }
230 color_class { name: "/fg/normal/button-anchor"; 594 color_class { name: "/fg/normal/button-anchor";
@@ -233,8 +597,8 @@ color_classes {
233 color: 255 255 255 255; } 597 color: 255 255 255 255; }
234 color_class { name: "/fg/disabled/button-anchor"; 598 color_class { name: "/fg/disabled/button-anchor";
235 color: 96 96 96 255; } 599 color: 96 96 96 255; }
236 color_class { name: "/fg/normal/button-media"; 600// color_class { name: "/fg/normal/button-media";
237 color: 160 160 160 255; } 601// color: 160 160 160 255; }
238 color_class { name: "/fg/pressed/button-media"; 602 color_class { name: "/fg/pressed/button-media";
239 color: 255 255 255 255; } 603 color: 255 255 255 255; }
240 color_class { name: "/bg/normal/button-media"; 604 color_class { name: "/bg/normal/button-media";
@@ -246,8 +610,8 @@ color_classes {
246 color: 32 32 32 0; } 610 color: 32 32 32 0; }
247 color_class { name: "/bg/selected/menu/item"; 611 color_class { name: "/bg/selected/menu/item";
248 color: 32 32 32 255; } 612 color: 32 32 32 255; }
249 color_class { name: "/fg/normal/menu/item"; 613// color_class { name: "/fg/normal/menu/item";
250 color: 160 160 160 255; } 614// color: 160 160 160 255; }
251 color_class { name: "/fg/selected/menu/item"; 615 color_class { name: "/fg/selected/menu/item";
252 color: 255 255 255 255; } 616 color: 255 255 255 255; }
253/////////////////////////////////////////////////////////////////////////////// 617///////////////////////////////////////////////////////////////////////////////
@@ -265,17 +629,22 @@ color_classes {
265 color_class { name: "/fg/normal/list/typebuf/text"; 629 color_class { name: "/fg/normal/list/typebuf/text";
266 color: 255 255 255 255; } 630 color: 255 255 255 255; }
267/////////////////////////////////////////////////////////////////////////////// 631///////////////////////////////////////////////////////////////////////////////
632 color_class { name: "/bg/normal/grid/item/thumb";
633 color: 255 255 255 255; }
634///////////////////////////////////////////////////////////////////////////////
268 color_class { name: "/bg/normal/frame/title"; 635 color_class { name: "/bg/normal/frame/title";
269 color: 80 80 80 255; } 636 color: 80 80 80 255; }
270 color_class { name: "/fg/normal/frame/title"; 637 color_class { name: "/fg/normal/frame/title";
271 color: 255 255 255 255; } 638 color: 255 255 255 255; }
639 color_class { name: "/fg/normal/frame/separator";
640 color: 80 80 80 255; }
272/////////////////////////////////////////////////////////////////////////////// 641///////////////////////////////////////////////////////////////////////////////
273 color_class { name: "/bg/normal/actionslider/base"; 642 color_class { name: "/bg/normal/actionslider/base";
274 color: 0 0 0 64; } 643 color: 0 0 0 64; }
275 color_class { name: "/bg/disabled/actionslider/base"; 644 color_class { name: "/bg/disabled/actionslider/base";
276 color: 0 0 0 32; } 645 color: 0 0 0 32; }
277 color_class { name: "/fg/normal/actionslider"; 646// color_class { name: "/fg/normal/actionslider";
278 color: 160 160 160 255; } 647// color: 160 160 160 255; }
279 color_class { name: "/fg/disabled/actionslider"; 648 color_class { name: "/fg/disabled/actionslider";
280 color: 96 96 96 255; } 649 color: 96 96 96 255; }
281 color_class { name: "/bg/normal/actionslider/button"; 650 color_class { name: "/bg/normal/actionslider/button";
@@ -295,8 +664,8 @@ color_classes {
295/////////////////////////////////////////////////////////////////////////////// 664///////////////////////////////////////////////////////////////////////////////
296 color_class { name: "/fg/normal/bubble/text"; 665 color_class { name: "/fg/normal/bubble/text";
297 color: 255 255 255 255; } 666 color: 255 255 255 255; }
298 color_class { name: "/fg/normal/bubble/info"; 667// color_class { name: "/fg/normal/bubble/info";
299 color: 160 160 160 255; } 668// color: 160 160 160 255; }
300 color_class { name: "/bg/normal/bubble"; 669 color_class { name: "/bg/normal/bubble";
301 color: 48 48 48 255; } 670 color: 48 48 48 255; }
302/////////////////////////////////////////////////////////////////////////////// 671///////////////////////////////////////////////////////////////////////////////
@@ -315,6 +684,8 @@ color_classes {
315 color_class { name: "/fg/normal/desklock/fprint/fail"; 684 color_class { name: "/fg/normal/desklock/fprint/fail";
316 color: 255 153 51 255; } 685 color: 255 153 51 255; }
317/////////////////////////////////////////////////////////////////////////////// 686///////////////////////////////////////////////////////////////////////////////
687 color_class { name: "/bg/normal/hoversel/menu";
688 color: 96 96 96 255; }
318 color_class { name: "/bg/normal/hoversel/button"; 689 color_class { name: "/bg/normal/hoversel/button";
319 color: 96 96 96 255; } 690 color: 96 96 96 255; }
320 color_class { name: "/bg/pressed/hoversel/button"; 691 color_class { name: "/bg/pressed/hoversel/button";
@@ -365,14 +736,14 @@ color_classes {
365 color_class { name: "/fg/disabled/combobox/selector"; 736 color_class { name: "/fg/disabled/combobox/selector";
366 color: 96 96 96 255; } 737 color: 96 96 96 255; }
367/////////////////////////////////////////////////////////////////////////////// 738///////////////////////////////////////////////////////////////////////////////
368 color_class { name: "/fg/normal/spinner/arrow"; 739// color_class { name: "/fg/normal/spinner/arrow";
369 color: 160 160 160 255; } 740// color: 160 160 160 255; }
370 color_class { name: "/fg/pressed/spinner/arrow"; 741 color_class { name: "/fg/pressed/spinner/arrow";
371 color: 255 255 255 255; } 742 color: 255 255 255 255; }
372 color_class { name: "/fg/disabled/spinner/arrow"; 743 color_class { name: "/fg/disabled/spinner/arrow";
373 color: 96 96 96 255; } 744 color: 96 96 96 255; }
374 color_class { name: "/fg/normal/spinner/text"; 745// color_class { name: "/fg/normal/spinner/text";
375 color: 160 160 160 255; } 746// color: 160 160 160 255; }
376 color_class { name: "/fg/disabled/spinner/text"; 747 color_class { name: "/fg/disabled/spinner/text";
377 color: 96 96 96 255; } 748 color: 96 96 96 255; }
378/////////////////////////////////////////////////////////////////////////////// 749///////////////////////////////////////////////////////////////////////////////
@@ -394,8 +765,6 @@ color_classes {
394/////////////////////////////////////////////////////////////////////////////// 765///////////////////////////////////////////////////////////////////////////////
395 color_class { name: "/bg/normal/radio/base"; 766 color_class { name: "/bg/normal/radio/base";
396 color: 48 48 48 255; } 767 color: 48 48 48 255; }
397 color_class { name: "/bg/pressed/radio/base";
398 color: 32 32 32 255; }
399 color_class { name: "/bg/disabled/radio/base"; 768 color_class { name: "/bg/disabled/radio/base";
400 color: 56 56 56 255; } 769 color: 56 56 56 255; }
401 color_class { name: "/fg/selected/radio/radio"; 770 color_class { name: "/fg/selected/radio/radio";
@@ -432,8 +801,8 @@ color_classes {
432 color: 255 255 255 255; } 801 color: 255 255 255 255; }
433 color_class { name: "/fg/normal/notification/text/title"; 802 color_class { name: "/fg/normal/notification/text/title";
434 color: 255 255 255 255; } 803 color: 255 255 255 255; }
435 color_class { name: "/fg/normal/notification/text"; 804// color_class { name: "/fg/normal/notification/text";
436 color: 160 160 160 255; } 805// color: 160 160 160 255; }
437 color_class { name: "/fg/normal/notification/text/subject"; 806 color_class { name: "/fg/normal/notification/text/subject";
438 color: 51 153 255 255; } 807 color: 51 153 255 255; }
439 color_class { name: "/fg/normal/notification/text/bold"; 808 color_class { name: "/fg/normal/notification/text/bold";
@@ -449,7 +818,7 @@ color_classes {
449/////////////////////////////////////////////////////////////////////////////// 818///////////////////////////////////////////////////////////////////////////////
450 color_class { name: "/bg/selected/toolbar/base"; 819 color_class { name: "/bg/selected/toolbar/base";
451 color: 32 32 32 255; } 820 color: 32 32 32 255; }
452 color_class { name: "/fg/selected/toolbar/separator"; 821 color_class { name: "/fg/normal/toolbar/separator";
453 color: 80 80 80 255; } 822 color: 80 80 80 255; }
454/////////////////////////////////////////////////////////////////////////////// 823///////////////////////////////////////////////////////////////////////////////
455 color_class { name: "/fg/normal/winlist/text/title"; 824 color_class { name: "/fg/normal/winlist/text/title";
@@ -458,8 +827,8 @@ color_classes {
458 color: 32 32 32 255; } 827 color: 32 32 32 255; }
459 color_class { name: "/fg/normal/winlist/item/text/iconified"; 828 color_class { name: "/fg/normal/winlist/item/text/iconified";
460 color: 96 96 96 255; } 829 color: 96 96 96 255; }
461 color_class { name: "/fg/selected/winlist/item/text/iconified"; 830// color_class { name: "/fg/selected/winlist/item/text/iconified";
462 color: 160 160 160 255; } 831// color: 160 160 160 255; }
463/////////////////////////////////////////////////////////////////////////////// 832///////////////////////////////////////////////////////////////////////////////
464 color_class { name: "/fg/normal/wizard/text/title"; 833 color_class { name: "/fg/normal/wizard/text/title";
465 color: 255 255 255 255; } 834 color: 255 255 255 255; }
@@ -469,6 +838,17 @@ color_classes {
469 color_class { name: "/fg/normal/toolip/text/hilight"; 838 color_class { name: "/fg/normal/toolip/text/hilight";
470 color: 51 153 255 255; } 839 color: 51 153 255 255; }
471/////////////////////////////////////////////////////////////////////////////// 840///////////////////////////////////////////////////////////////////////////////
841 color_class { name: "/bg/normal/gadgets/procstats/base";
842 color: 32 32 32 255; }
843 color_class { name: "/fg/normal/gadgets/procstats/cpu/one";
844 color: 255 153 51 255; }
845 color_class { name: "/fg/normal/gadgets/procstats/cpu/all";
846 color: 255 51 153 255; }
847 color_class { name: "/fg/normal/gadgets/procstats/mem/limit";
848 color: 51 153 255 255; }
849 color_class { name: "/fg/normal/gadgets/procstats/mem/all";
850 color: 153 255 51 255; }
851///////////////////////////////////////////////////////////////////////////////
472 color_class { name: "/fg/normal/gadgets/temperature/low"; 852 color_class { name: "/fg/normal/gadgets/temperature/low";
473 color: 51 153 255 255; } 853 color: 51 153 255 255; }
474 color_class { name: "/fg/normal/gadgets/temperature/medium"; 854 color_class { name: "/fg/normal/gadgets/temperature/medium";
@@ -494,11 +874,11 @@ color_classes {
494 color: 255 255 255 255; } 874 color: 255 255 255 255; }
495 color_class { name: "/fg/normal/gadgets/tasks/text/iconified"; 875 color_class { name: "/fg/normal/gadgets/tasks/text/iconified";
496 color: 128 128 128 255; } 876 color: 128 128 128 255; }
497 color_class { name: "/fg/pressed/gadgets/tasks/text/iconified"; 877// color_class { name: "/fg/pressed/gadgets/tasks/text/iconified";
498 color: 160 160 160 255; } 878// color: 160 160 160 255; }
499/////////////////////////////////////////////////////////////////////////////// 879///////////////////////////////////////////////////////////////////////////////
500 color_class { name: "/bg/normal/gadgets/control/base"; 880 color_class { name: "/bg/normal/gadgets/control/base";
501 color: 51 153 255 255; } 881 color: 51 153 255 25; }
502 color_class { name: "/bg/normal/gadgets/control/outline"; 882 color_class { name: "/bg/normal/gadgets/control/outline";
503 color: 51 153 255 255; } 883 color: 51 153 255 255; }
504 color_class { name: "/bg/selected/gadgets/control/outline"; 884 color_class { name: "/bg/selected/gadgets/control/outline";
@@ -514,6 +894,8 @@ color_classes {
514 color: 51 153 255 255; } 894 color: 51 153 255 255; }
515 color_class { name: "/fg/normal/gadgets/ibar/drop/arrow"; 895 color_class { name: "/fg/normal/gadgets/ibar/drop/arrow";
516 color: 51 153 255 255; } 896 color: 51 153 255 255; }
897 color_class { name: "/fg/normal/gadgets/ibar/separator";
898 color: 80 80 80 255; }
517/////////////////////////////////////////////////////////////////////////////// 899///////////////////////////////////////////////////////////////////////////////
518 color_class { name: "/fg/normal/gadgets/backlight/light/off"; 900 color_class { name: "/fg/normal/gadgets/backlight/light/off";
519 color: 255 255 255 0; } 901 color: 255 255 255 0; }
@@ -528,8 +910,8 @@ color_classes {
528 color: 255 255 255 0; } 910 color: 255 255 255 0; }
529 color_class { name: "/fg/selected/gadgets/battery/text/info"; 911 color_class { name: "/fg/selected/gadgets/battery/text/info";
530 color: 255 255 255 255; } 912 color: 255 255 255 255; }
531 color_class { name: "/fg/normal/gadgets/battery/level/discharge"; 913// color_class { name: "/fg/normal/gadgets/battery/level/discharge";
532 color: 160 160 160 255; } 914// color: 160 160 160 255; }
533 color_class { name: "/fg/normal/gadgets/battery/level/charge"; 915 color_class { name: "/fg/normal/gadgets/battery/level/charge";
534 color: 51 153 255 255; } 916 color: 51 153 255 255; }
535 color_class { name: "/fg/normal/gadgets/battery/text/reading"; 917 color_class { name: "/fg/normal/gadgets/battery/text/reading";
@@ -537,54 +919,54 @@ color_classes {
537 color_class { name: "/fg/normal/gadgets/battery/text/time"; 919 color_class { name: "/fg/normal/gadgets/battery/text/time";
538 color: 255 255 255 255; } 920 color: 255 255 255 255; }
539/////////////////////////////////////////////////////////////////////////////// 921///////////////////////////////////////////////////////////////////////////////
540 color_class { name: "/fg/disabled/gadgets/connman/eth/cable"; 922// color_class { name: "/fg/disabled/gadgets/connman/eth/cable";
541 color: 160 160 160 128; } 923// color: 160 160 160 128; }
542 color_class { name: "/fg/normal/gadgets/connman/eth/cable"; 924// color_class { name: "/fg/normal/gadgets/connman/eth/cable";
543 color: 160 160 160 255; } 925// color: 160 160 160 255; }
544 color_class { name: "/fg/selected/gadgets/connman/eth/cable"; 926 color_class { name: "/fg/selected/gadgets/connman/eth/cable";
545 color: 51 153 255 255; } 927 color: 51 153 255 255; }
546 color_class { name: "/fg/disabled/gadgets/connman/eth/connector"; 928// color_class { name: "/fg/disabled/gadgets/connman/eth/connector";
547 color: 160 160 160 128; } 929// color: 160 160 160 128; }
548 color_class { name: "/fg/normal/gadgets/connman/eth/connector"; 930// color_class { name: "/fg/normal/gadgets/connman/eth/connector";
549 color: 160 160 160 255; } 931// color: 160 160 160 255; }
550 color_class { name: "/fg/selected/gadgets/connman/eth/connector"; 932// color_class { name: "/fg/selected/gadgets/connman/eth/connector";
551 color: 160 160 160 255; } 933// color: 160 160 160 255; }
552 color_class { name: "/fg/disabled/gadgets/connman/wifi/connected"; 934// color_class { name: "/fg/disabled/gadgets/connman/wifi/connected";
553 color: 160 160 160 255; } 935// color: 160 160 160 255; }
554 color_class { name: "/fg/normal/gadgets/connman/wifi/connected"; 936// color_class { name: "/fg/normal/gadgets/connman/wifi/connected";
555 color: 160 160 160 255; } 937// color: 160 160 160 255; }
556 color_class { name: "/fg/selected/gadgets/connman/wifi/connected"; 938 color_class { name: "/fg/selected/gadgets/connman/wifi/connected";
557 color: 51 153 255 255; } 939 color: 51 153 255 255; }
558 color_class { name: "/fg/normal/gadgets/connman/wifi/signal"; 940// color_class { name: "/fg/normal/gadgets/connman/wifi/signal";
559 color: 160 160 160 255; } 941// color: 160 160 160 255; }
560 color_class { name: "/fg/normal/gadgets/connman/bt/base"; 942// color_class { name: "/fg/normal/gadgets/connman/bt/base";
561 color: 160 160 160 255; } 943// color: 160 160 160 255; }
562 color_class { name: "/fg/normal/gadgets/connman/bt/signal"; 944// color_class { name: "/fg/normal/gadgets/connman/bt/signal";
563 color: 160 160 160 255; } 945// color: 160 160 160 255; }
564 color_class { name: "/fg/normal/gadgets/connman/cell/base"; 946// color_class { name: "/fg/normal/gadgets/connman/cell/base";
565 color: 160 160 160 255; } 947// color: 160 160 160 255; }
566 color_class { name: "/fg/normal/gadgets/connman/cell/signal"; 948// color_class { name: "/fg/normal/gadgets/connman/cell/signal";
567 color: 160 160 160 255; } 949// color: 160 160 160 255; }
568 color_class { name: "/fg/normal/gadgets/connman/security"; 950// color_class { name: "/fg/normal/gadgets/connman/security";
569 color: 160 160 160 255; } 951// color: 160 160 160 255; }
570/////////////////////////////////////////////////////////////////////////////// 952///////////////////////////////////////////////////////////////////////////////
571 color_class { name: "/fg/normal/gadgets/bluez/off"; 953// color_class { name: "/fg/normal/gadgets/bluez/off";
572 color: 160 160 160 128; } 954// color: 160 160 160 128; }
573 color_class { name: "/fg/normal/gadgets/bluez/visible"; 955 color_class { name: "/fg/normal/gadgets/bluez/visible";
574 color: 51 153 255 255; } 956 color: 51 153 255 255; }
575 color_class { name: "/fg/normal/gadgets/bluez/scan"; 957 color_class { name: "/fg/normal/gadgets/bluez/scan";
576 color: 255 153 51 255; } 958 color: 255 153 51 255; }
577/////////////////////////////////////////////////////////////////////////////// 959///////////////////////////////////////////////////////////////////////////////
578 color_class { name: "/fg/normal/gadgets/clock/digital/separator"; 960// color_class { name: "/fg/normal/gadgets/clock/digital/separator";
579 color: 160 160 160 255; } 961// color: 160 160 160 255; }
580 color_class { name: "/bg/normal/gadgets/clock/analog/base"; 962 color_class { name: "/bg/normal/gadgets/clock/analog/base";
581 color: 32 32 32 255; } 963 color: 32 32 32 255; }
582 color_class { name: "/fg/normal/gadgets/clock/analog/hands/secs"; 964 color_class { name: "/fg/normal/gadgets/clock/analog/hands/secs";
583 color: 255 64 32 255; } 965 color: 255 64 32 255; }
584 color_class { name: "/fg/normal/gadgets/clock/analog/hands/mins"; 966 color_class { name: "/fg/normal/gadgets/clock/analog/hands/mins";
585 color: 255 255 255 255; } 967 color: 255 255 255 255; }
586 color_class { name: "/fg/normal/gadgets/clock/analog/hands/hours"; 968// color_class { name: "/fg/normal/gadgets/clock/analog/hands/hours";
587 color: 160 160 160 255; } 969// color: 160 160 160 255; }
588 color_class { name: "/fg/normal/gadgets/clock/cal/day/name/weekend"; 970 color_class { name: "/fg/normal/gadgets/clock/cal/day/name/weekend";
589 color: 51 153 255 255; } 971 color: 51 153 255 255; }
590 color_class { name: "/fg/normal/gadgets/clock/cal/day/date/weekend"; 972 color_class { name: "/fg/normal/gadgets/clock/cal/day/date/weekend";
@@ -655,452 +1037,4 @@ color_classes {
655 color: 255 255 255 255; } 1037 color: 255 255 255 255; }
656 color_class { name: "/fg/normal/gadgets/packagekit/pkg/security"; 1038 color_class { name: "/fg/normal/gadgets/packagekit/pkg/security";
657 color: 255 153 51 255; } 1039 color: 255 153 51 255; }
658
659
660
661
662
663
664
665#define WIN_DEFAULT_BASIC 255 255 255 255
666
667// comp
668 color_class { name: "comp_focus-out_color";
669 color: 255 255 255 255;
670 description: "Objects which do not have focus";
671 }
672 color_class { name: "comp_focus_color";
673 color: 255 255 255 255;
674 description: "Objects which have focus";
675 }
676
677// wm
678 color_class { name: "border_title";
679 color: FN_COL_DISABLE;
680 desc: "Title of an inactive window frame";
681 }
682 color_class { name: "border_title_active";
683 color: FN_COL_DEFAULT_SOFT_SHADOW;
684 desc: "Title of an active window frame";
685 }
686 color_class { name: "border_frame";
687 color: WIN_DEFAULT_BASIC;
688 desc: "Base of an inactive window frame";
689 }
690 color_class { name: "border_frame_active";
691 color: WIN_DEFAULT_BASIC;
692 desc: "Base of an active window frame";
693 }
694 color_class { name: "border_bottom";
695 color: WIN_DEFAULT_BASIC;
696 desc: "Bottom edge of a window frame";
697 }
698 color_class { name: "move_text";
699 color: FN_COL_DEFAULT;
700 desc: "Info text while moving a window";
701 }
702 color_class { name: "resize_text";
703 color: FN_COL_DEFAULT;
704 desc: "Info text while resizing a window";
705 }
706 color_class { name: "menu_base";
707 color: WIN_DEFAULT_BASIC;
708 desc: "Base color of a menu";
709 }
710 color_class { name: "menu_title";
711 color: FN_COL_DISABLE;
712 desc: "Title text of a menu";
713 }
714 color_class { name: "menu_item";
715 color: FN_COL_DEFAULT;
716 desc: "Text of an inactive menu item";
717 }
718 color_class { name: "menu_item_active";
719 color: FN_COL_HIGHLIGHT;
720 desc: "Text of an active menu item";
721 }
722 color_class { name: "menu_item_disabled";
723 color: FN_COL_DISABLE;
724 desc: "Text of a disabled menu item";
725 }
726 color_class { name: "winlist_item";
727 color: FN_COL_DEFAULT;
728 desc: "Text of an inactive winlist item";
729 }
730 color_class { name: "winlist_item_active";
731 color: FN_COL_HIGHLIGHT;
732 desc: "Text of an active winlist item";
733 }
734 color_class { name: "winlist_label";
735 color: FN_COL_DEFAULT;
736 desc: "Text of the current winlist item";
737 }
738 color_class { name: "winlist_title";
739 color: FN_COL_DISABLE;
740 desc: "Text of the winlist's title";
741 }
742 color_class { name: "dialog_base";
743 color: WIN_DEFAULT_BASIC;
744 desc: "Base color of a dialog window";
745 }
746 color_class { name: "shelf_base";
747 color: WIN_DEFAULT_BASIC;
748 desc: "Base color of a shelf";
749 }
750 color_class { name: "fileman_base";
751 color: WIN_DEFAULT_BASIC;
752 desc: "Base color of filemanager backgrounds";
753 }
754
755// widgets
756 color_class { name: "button_bg";
757 color: 255 255 255 255;
758 desc: "Background of a button";
759 }
760 color_class { name: "button_bg_pressed";
761 color: 255 255 255 255;
762 desc: "Background of a pressed button";
763 }
764 color_class { name: "button_bg_disabled";
765 color: 255 255 255 255;
766 desc: "Background of a disabled button";
767 }
768 color_class { name: "button_icon";
769 color: 255 255 255 255;
770 desc: "Icon of a button";
771 }
772 color_class { name: "button_icon_pressed";
773 color: 255 255 255 255;
774 desc: "Icon of a pressed button";
775 }
776 color_class { name: "button_icon_disabled";
777 color: 255 255 255 64;
778 desc: "Icon of a disabled button";
779 }
780 color_class { name: "button_text";
781 color: FN_COL_DEFAULT;
782 desc: "Text of a button";
783 }
784 color_class { name: "button_text_pressed";
785 color: FN_COL_DEFAULT;
786 desc: "Text of a pressed button";
787 }
788 color_class { name: "button_text_disabled";
789 color: FN_COL_DISABLE;
790 desc: "Text of a disabled button";
791 }
792 color_class { name: "button_text_anchor";
793 color: FN_COL_HIGHLIGHT;
794 desc: "Text of an anchor link";
795 }
796 color_class { name: "button_text_anchor_clicked";
797 color: FN_COL_HIGHLIGHT_CLICKED;
798 desc: "Text of an anchor link when clicked";
799 }
800 color_class { name: "button_text_anchor_disabled";
801 color: FN_COL_HIGHLIGHT_DISABLE;
802 desc: "Text of a disabled anchor link";
803 }
804 color_class { name: "calendar_year_text";
805 color: FN_COL_DEFAULT;
806 desc: "Year Text in Title Area";
807 }
808 color_class { name: "calendar_month_text";
809 color: FN_COL_DEFAULT;
810 desc: "Month Text in Title Area";
811 }
812 color_class { name: "calendar_weekday_text";
813 color: FN_COL_DISABLE;
814 desc: "Weekday Text";
815 }
816 color_class { name: "calendar_day_text";
817 color: 255 255 255 255;
818 color3: 0 0 0 128;
819 desc: "Day Text";
820 }
821 color_class { name: "calendar_day_text_holiday";
822 color: 128 128 128 255;
823 color3: 0 0 0 128;
824 desc: "Holiday Text";
825 }
826 color_class { name: "calendar_day_text_today";
827 color: 51 153 255 255;
828 color2: 51 153 255 24;
829 desc: "Today Text";
830 }
831 color_class { name: "calendar_day_text_disabled";
832 color: 21 21 21 255;
833 color3: 255 255 255 192;
834 desc: "Disabled Day Text";
835 }
836 color_class { name: "calendar_day_text_weekend1";
837 color: 128 128 128 255;
838 color3: 0 0 0 128;
839 desc: "Weekend Day1 Text";
840 }
841 color_class { name: "calendar_day_text_weekend2";
842 color: 128 128 128 255;
843 color3: 0 0 0 128;
844 desc: "Weekend Day2 Text";
845 }
846 color_class { name: "check_text";
847 color: FN_COL_DEFAULT;
848 desc: "Text of a checkbox's label";
849 }
850 color_class { name: "check_text_disabled";
851 color: FN_COL_DISABLE;
852 desc: "Text of a disabled checkbox's label";
853 }
854 color_class { name: "check_off_text";
855 color: FN_COL_DEFAULT;
856 desc: "Text of a checkbox's label when unchecked";
857 }
858 color_class { name: "check_off_text_disabled";
859 color: FN_COL_DISABLE;
860 desc: "Text of a disabled checkbox's label when unchecked";
861 }
862 color_class { name: "check_on_text";
863 color: FN_COL_HIGHLIGHT;
864 desc: "Text of a checkbox's label when checked";
865 }
866 color_class { name: "check_on_text_disabled";
867 color: FN_COL_DISABLE;
868 desc: "Text of a disabled checkbox's label when checked";
869 }
870 color_class { name: "datetime_bg";
871 color: 0 0 0 0;
872 desc: "Background of a datetime widget";
873 }
874 color_class { name: "datepicker_bg";
875 color: 0 0 0 0;
876 desc: "Background of a datepicker widget";
877 }
878 color_class { name: "timepicker_bg";
879 color: 0 0 0 0;
880 desc: "Background of a timepicker widget";
881 }
882 color_class { name: "datetime_separator_text";
883 color: FN_COL_DEFAULT;
884 desc: "Text in a datetime separator area";
885 }
886 color_class { name: "datetime_separator_text_disabled";
887 color: FN_COL_DISABLE;
888 desc: "Text in a disabled datetime separator area";
889 }
890 color_class { name: "entry_text";
891 color: FN_COL_DEFAULT;
892 desc: "Text in an entry box";
893 }
894 color_class { name: "entry_text_disabled";
895 color: FN_COL_DISABLE;
896 desc: "Text in a disabled entry box";
897 }
898 color_class { name: "entry_guide_text";
899 color: 0 0 0 255;
900 color3: 255 255 255 25;
901 desc: "Guide Text in a entry box";
902 }
903 color_class { name: "entry_scrollframe_base";
904 color: DARK_GREY_BG_COLOR;
905 desc: "Base of a entry's scroller widget";
906 }
907 color_class { name: "index_bg";
908 color: 0 0 0 0;
909 desc: "Background of a index widget";
910 }
911 color_class { name: "index_highlight_text";
912 color: FN_COL_HIGHLIGHT;
913 desc: "Text of a hlghlight item text";
914 }
915 color_class { name: "index_item_bg";
916 color: 0 0 0 0;
917 desc: "Background of a index item object";
918 }
919 color_class { name: "index_item_text";
920 color: FN_COL_DEFAULT;
921 desc: "Text of a index item";
922 }
923 color_class { name: "index_item_text_selected";
924 color: FN_COL_HIGHLIGHT;
925 desc: "Text of a selected index item";
926 }
927 color_class { name: "label_text";
928 color: FN_COL_DEFAULT;
929 desc: "Text of a generic label";
930 }
931 color_class { name: "label_text_disabled";
932 color: FN_COL_DISABLE;
933 desc: "Text of a disabled generic label";
934 }
935 color_class { name: "frame_base";
936 color: WIN_DEFAULT_BASIC;
937 desc: "Base of a frame widget";
938 }
939 color_class { name: "scroller_bg";
940 color: WIN_DEFAULT_BASIC;
941 desc: "Background of a scroller widget";
942 }
943 color_class { name: "scroller_bar";
944 color: 255 255 255 255;
945 desc: "Bar of a scroller widget";
946 }
947 color_class { name: "spinner_bg";
948 color: 0 0 0 0;
949 desc: "Background of a spinner widget";
950 }
951 color_class { name: "radio_text";
952 color: FN_COL_DEFAULT;
953 desc: "Text of a radio widget's label";
954 }
955 color_class { name: "radio_text_disabled";
956 color: FN_COL_DISABLE;
957 desc: "Text of a disabled radio widget's label";
958 }
959 color_class { name: "slider_text";
960 color: FN_COL_DEFAULT;
961 desc: "Text of a slider widget's label";
962 }
963 color_class { name: "slider_text_disabled";
964 color: FN_COL_DISABLE;
965 desc: "Text of a disabled slider widget's label";
966 }
967 color_class { name: "ilist_item_selected";
968 color: FN_COL_HIGHLIGHT;
969 desc: "Text of a selected ilist item";
970 }
971 color_class { name: "ilist_item";
972 color: FN_COL_DEFAULT;
973 desc: "Text of an even-numbered, unselected ilist item";
974 }
975 color_class { name: "ilist_item_base";
976 color: WIN_DEFAULT_BASIC;
977 desc: "Base of an even-numbered ilist item";
978 }
979 color_class { name: "ilist_item_odd";
980 color: FN_COL_DEFAULT;
981 desc: "Text of an odd-numbered, unselected ilist item";
982 }
983 color_class { name: "ilist_item_odd_base";
984 color: WIN_DEFAULT_BASIC;
985 desc: "Base of an odd-numbered ilist item";
986 }
987 color_class { name: "ilist_item_header";
988 color: FN_COL_DEFAULT;
989 desc: "Text of an even-numbered ilist header";
990 }
991 color_class { name: "ilist_item_header_base";
992 color: WIN_DEFAULT_BASIC;
993 desc: "Base of an even-numbered ilist header";
994 }
995 color_class { name: "ilist_item_header_odd";
996 color: FN_COL_DEFAULT;
997 desc: "Text of an odd-numbered ilist header";
998 }
999 color_class { name: "ilist_item_header_odd_base";
1000 color: WIN_DEFAULT_BASIC;
1001 desc: "Base of an odd-numbered ilist header";
1002 }
1003
1004 color_class { name: "hoversel_text";
1005 color: FN_COL_DEFAULT;
1006 desc: "Text of a hoverselector item";
1007 }
1008 color_class { name: "hoversel_text_disabled";
1009 color: FN_COL_DISABLE;
1010 desc: "Text of a disabled hoverselector item";
1011 }
1012 color_class { name: "hoversel_item_active";
1013 color: FN_COL_HIGHLIGHT;
1014 desc: "Text of an active hoverselector item";
1015 }
1016 color_class { name: "popup_bg";
1017 color: 0 0 0 0;
1018 desc: "Color of popup background";
1019 }
1020 color_class { name: "popup_title_bg";
1021 color: 0 0 0 0;
1022 desc: "Color of popup title background";
1023 }
1024 color_class { name: "popup_title_text";
1025 color: 255 255 255 255;
1026 desc: "Text color of popup title text";
1027 }
1028 color_class { name: "popup_text";
1029 color: 255 255 255 255;
1030 desc: "Text color of popup text";
1031 }
1032 color_class { name: "ctxpopup_bg";
1033 color: 255 255 255 255;
1034 desc: "Color of ctxpopup background";
1035 }
1036 color_class { name: "multibuttonentry_bg";
1037 color: 0 0 0 0;
1038 desc: "Background of a multibuttonentry widget";
1039 }
1040 color_class { name: "multibuttonentry_item_bg";
1041 color: 0 0 0 0;
1042 desc: "Background of a multibuttonentry item object";
1043 }
1044 color_class { name: "multibuttonentry_item_bg_selected";
1045 color: 0 0 0 0;
1046 desc: "Background of a selected multibuttonentry item object";
1047 }
1048 color_class { name: "multibuttonentry_item_text";
1049 color: FN_COL_DEFAULT;
1050 desc: "Text of a multibuttonentry item";
1051 }
1052 color_class { name: "multibuttonentry_item_text_pressed";
1053 color: FN_COL_HIGHLIGHT;
1054 desc: "Text of a pressed multibuttonentry item";
1055 }
1056 color_class { name: "multibuttonentry_item_text_disabled";
1057 color: FN_COL_DISABLE;
1058 desc: "Text of a disabled multibuttonentry item";
1059 }
1060 color_class { name: "tags_bg";
1061 color: 0 0 0 0;
1062 desc: "Background of a tags widget";
1063 }
1064 color_class { name: "tags_item_bg";
1065 color: 0 0 0 0;
1066 desc: "Background of a tags item object";
1067 }
1068 color_class { name: "tags_item_bg_selected";
1069 color: 0 0 0 0;
1070 desc: "Background of a selected tags item object";
1071 }
1072 color_class { name: "tags_item_text";
1073 color: FN_COL_DEFAULT;
1074 desc: "Text of a tags item";
1075 }
1076 color_class { name: "tags_item_text_pressed";
1077 color: FN_COL_HIGHLIGHT;
1078 desc: "Text of a pressed tags item";
1079 }
1080 color_class { name: "tags_item_text_disabled";
1081 color: FN_COL_DISABLE;
1082 desc: "Text of a disabled tags item";
1083 }
1084 color_class { "elm/win/background";
1085 color: 64 64 64 255;
1086 desc: "Background color of a standard window";
1087 }
1088 color_class { "elm/win/blocker";
1089 color: 32 32 32 128;
1090 desc: "Overlay color for windows with modal children (blocked)";
1091 }
1092
1093// modules
1094 color_class { name: "module_label";
1095 color: FN_COL_DEFAULT;
1096 desc: "Default text of a gadget";
1097 }
1098 color_class { name: "module_label_invisible";
1099 color: FN_COL_TRANSPARENT;
1100 desc: "Transparent text of a gadget";
1101 }
1102 color_class { name: "module_label_plain";
1103 color: FN_COL_DEFAULT_BASIC;
1104 desc: "Plain text of a gadget";
1105 }
1106} 1040}
diff --git a/data/elementary/themes/default.edc b/data/elementary/themes/default.edc
index 350ab2967e..f4e1eb445f 100644
--- a/data/elementary/themes/default.edc
+++ b/data/elementary/themes/default.edc
@@ -149,6 +149,7 @@ collections {
149#include "edc/bluez5.edc" 149#include "edc/bluez5.edc"
150#include "edc/packagekit.edc" 150#include "edc/packagekit.edc"
151#include "edc/tiling.edc" 151#include "edc/tiling.edc"
152#include "edc/procstats.edc"
152 153
153// icons 154// icons
154#include "edc/icons.edc" 155#include "edc/icons.edc"
diff --git a/data/elementary/themes/edc/border.edc b/data/elementary/themes/edc/border.edc
index a6413b463c..9c773fbf84 100644
--- a/data/elementary/themes/edc/border.edc
+++ b/data/elementary/themes/edc/border.edc
@@ -570,20 +570,6 @@ group { name: "e/widgets/border/default/border";
570 visible: 0; 570 visible: 0;
571 } 571 }
572 } 572 }
573 part { name: "e.swallow.volume";
574 type: SWALLOW;
575 source: "e/widgets/border/volume";
576 description { state: "default" 0.0;
577 fixed: 1 0;
578 rel1.to: "e.event.icon";
579 rel1.relative: 1.0 0.0;
580 rel2.to: "e.event.icon";
581 rel2.relative: 1.0 1.0;
582 rel2.offset: 0 -1;
583 align: 0.0 0.5;
584 aspect: 1.0 1.0; aspect_preference: VERTICAL;
585 }
586 }
587 part { name: "procstats"; type: RECT; 573 part { name: "procstats"; type: RECT;
588 mouse_events: 0; 574 mouse_events: 0;
589 description { state: "default" 0.0; 575 description { state: "default" 0.0;
@@ -617,6 +603,19 @@ group { name: "e/widgets/border/default/border";
617 visible: 1; 603 visible: 1;
618 } 604 }
619 } 605 }
606 part { name: "e.swallow.volume"; type: SWALLOW;
607 source: "e/widgets/border/volume";
608 description { state: "default" 0.0;
609 fixed: 1 0;
610 rel1.to: "e.event.icon";
611 rel1.relative: 1.0 0.0;
612 rel2.to: "e.event.icon";
613 rel2.relative: 1.0 1.0;
614 rel2.offset: 0 -1;
615 align: 0.0 0.5;
616 aspect: 1.0 1.0; aspect_preference: VERTICAL;
617 }
618 }
620 } 619 }
621 programs { 620 programs {
622 program { signal: "e,version,22"; source: "e"; 621 program { signal: "e,version,22"; source: "e";
diff --git a/data/elementary/themes/edc/connman.edc b/data/elementary/themes/edc/connman.edc
index 56dbdb7171..d8604c001d 100644
--- a/data/elementary/themes/edc/connman.edc
+++ b/data/elementary/themes/edc/connman.edc
@@ -66,7 +66,7 @@ group { name: "e/modules/connman/main";
66 } 66 }
67 description { state: "online" 0.0; 67 description { state: "online" 0.0;
68 inherit: "default" 0.0; 68 inherit: "default" 0.0;
69 color_class: "/fg/selected/gadgets/connman/eth/connector"; 69 color_class: "/fg/normal/gadgets/connman/eth/connector";
70 } 70 }
71 } 71 }
72/////////////////////// 72///////////////////////
diff --git a/data/elementary/themes/edc/efl/border.edc b/data/elementary/themes/edc/efl/border.edc
index 377e7ea658..3d3c79f7b6 100644
--- a/data/elementary/themes/edc/efl/border.edc
+++ b/data/elementary/themes/edc/efl/border.edc
@@ -76,10 +76,15 @@ group { "efl/border"; data.item: "version" "123";
76 part { name: "shadow_clip"; type: RECT; mouse_events: 0; 76 part { name: "shadow_clip"; type: RECT; mouse_events: 0;
77 description { state: "default"; 77 description { state: "default";
78 rel.to: "_sh1"; 78 rel.to: "_sh1";
79 color_class: "/shadow/normal/border";
79 } 80 }
80 description { state: "hidden"; 81 description { state: "hidden";
81 visible: 0; 82 visible: 0;
82 } 83 }
84 description { state: "focused";
85 inherit: "default";
86 color_class: "/shadow/selected/border";
87 }
83 } 88 }
84 part { name: "shadow_base"; type: SPACER; 89 part { name: "shadow_base"; type: SPACER;
85 scale: 1; 90 scale: 1;
@@ -104,7 +109,7 @@ group { "efl/border"; data.item: "version" "123";
104 required; // @since 1.19 109 required; // @since 1.19
105 clip: "bg_clip"; 110 clip: "bg_clip";
106 desc { "default"; 111 desc { "default";
107 color: 64 64 64 255; 112 color_class: "/bg/normal/background";
108 rel.to: "efl.spacer.content"; 113 rel.to: "efl.spacer.content";
109 visible: 0; 114 visible: 0;
110 } 115 }
@@ -136,7 +141,7 @@ group { "efl/border"; data.item: "version" "123";
136 /* main menu */ 141 /* main menu */
137 rect { "menu_bg"; 142 rect { "menu_bg";
138 desc { "default"; 143 desc { "default";
139 color: 64 64 64 255; 144 color_class: "/bg/normal/menu/bar";
140 align: 0.5 0.0; 145 align: 0.5 0.0;
141 rel.to: "efl.menu"; 146 rel.to: "efl.menu";
142 fixed: 1 1; 147 fixed: 1 1;
@@ -197,12 +202,13 @@ group { "efl/border"; data.item: "version" "123";
197 rel1.relative: 0.0 1.0; 202 rel1.relative: 0.0 1.0;
198 rel2.to: "bottom_clip"; 203 rel2.to: "bottom_clip";
199 rel2.relative: 1.0 0.0; 204 rel2.relative: 1.0 0.0;
200 color: 0 0 0 0; 205 color_class: "/dim/normal/win/modal";
206 color: 255 255 255 0; // no cc
201 hid; 207 hid;
202 } 208 }
203 desc { "visible"; 209 desc { "visible";
204 inherit: "default"; 210 inherit: "default";
205 color: 32 32 32 255; 211 color: 255 255 255 255; // no cc
206 vis; 212 vis;
207 } 213 }
208 } 214 }
@@ -237,11 +243,11 @@ group { "efl/border"; data.item: "version" "123";
237 clip: "top_clip"; 243 clip: "top_clip";
238 description { state: "default" 0.0; 244 description { state: "default" 0.0;
239 rel.to: "top_clip"; 245 rel.to: "top_clip";
240 color: 64 64 64 255; 246 color_class: "/bg/normal/titlebar";
241 } 247 }
242 description { state: "focused" 0.0; 248 description { state: "focused" 0.0;
243 inherit: "default" 0.0; 249 inherit: "default" 0.0;
244 color: 32 32 32 255; 250 color_class: "/bg/selected/titlebar";
245 } 251 }
246 } 252 }
247 part { name: "efl.text.title"; type: TEXT; mouse_events: 0; 253 part { name: "efl.text.title"; type: TEXT; mouse_events: 0;
@@ -257,7 +263,7 @@ group { "efl/border"; data.item: "version" "123";
257 rel2.to_x: "event.minimize"; 263 rel2.to_x: "event.minimize";
258 rel2.to_y: "shadow_base"; 264 rel2.to_y: "shadow_base";
259 align: 0.5 0.0; 265 align: 0.5 0.0;
260 color: 160 160 160 255; 266 color_class: "/fg/noemal/titlebar";
261 min: 0 16; 267 min: 0 16;
262 text { font: FNBD; size: 10; 268 text { font: FNBD; size: 10;
263 text_class: "title_bar"; 269 text_class: "title_bar";
@@ -269,7 +275,7 @@ group { "efl/border"; data.item: "version" "123";
269 } 275 }
270 description { state: "focused" 0.0; 276 description { state: "focused" 0.0;
271 inherit: "default" 0.0; 277 inherit: "default" 0.0;
272 color: 255 255 255 255; 278 color_class: "/fg/selected/titlebar";
273 } 279 }
274 } 280 }
275 spacer { "icon"; 281 spacer { "icon";
@@ -324,11 +330,11 @@ group { "efl/border"; data.item: "version" "123";
324 rel.to: "event.close"; 330 rel.to: "event.close";
325 min: 15 15; max: 15 15; 331 min: 15 15; max: 15 15;
326 fixed: 1 1; 332 fixed: 1 1;
327 color: 160 160 160 255; 333 color_class: "/fg/noemal/titlebar/close";
328 } 334 }
329 desc { "selected"; 335 desc { "selected";
330 inherit: "default"; 336 inherit: "default";
331 color: 255 255 255 255; 337 color_class: "/fg/pressed/titlebar/close";
332 } 338 }
333 } 339 }
334 image { "max1"; nomouse; 340 image { "max1"; nomouse;
@@ -339,11 +345,11 @@ group { "efl/border"; data.item: "version" "123";
339 rel.to: "event.maximize"; 345 rel.to: "event.maximize";
340 min: 15 15; max: 15 15; 346 min: 15 15; max: 15 15;
341 fixed: 1 1; 347 fixed: 1 1;
342 color: 160 160 160 255; 348 color_class: "/fg/noemal/titlebar/maximize";
343 } 349 }
344 desc { "selected"; 350 desc { "selected";
345 inherit: "default"; 351 inherit: "default";
346 color: 255 255 255 255; 352 color_class: "/fg/pressed/titlebar/maximize";
347 } 353 }
348 } 354 }
349 image { "min1"; nomouse; 355 image { "min1"; nomouse;
@@ -354,11 +360,11 @@ group { "efl/border"; data.item: "version" "123";
354 rel.to: "event.minimize"; 360 rel.to: "event.minimize";
355 min: 15 15; max: 15 15; 361 min: 15 15; max: 15 15;
356 fixed: 1 1; 362 fixed: 1 1;
357 color: 160 160 160 255; 363 color_class: "/fg/normal/titlebar/minimize";
358 } 364 }
359 desc { "selected"; 365 desc { "selected";
360 inherit: "default"; 366 inherit: "default";
361 color: 255 255 255 255; 367 color_class: "/fg/pressed/titlebar/minimize";
362 } 368 }
363 } 369 }
364 image { "close2"; nomouse; 370 image { "close2"; nomouse;
@@ -369,11 +375,11 @@ group { "efl/border"; data.item: "version" "123";
369 rel.to: "event.close"; 375 rel.to: "event.close";
370 min: 15 15; max: 15 15; 376 min: 15 15; max: 15 15;
371 fixed: 1 1; 377 fixed: 1 1;
372 color: 255 255 255 255; 378 color_class: "/fg/selected/titlebar/close";
373 } 379 }
374 desc { "selected"; 380 desc { "selected";
375 inherit: "default"; 381 inherit: "default";
376 color: 220 220 220 255; 382 color_class: "/fg/selected-pressed/titlebar/close";
377 } 383 }
378 } 384 }
379 image { "max2"; nomouse; 385 image { "max2"; nomouse;
@@ -384,11 +390,11 @@ group { "efl/border"; data.item: "version" "123";
384 rel.to: "event.maximize"; 390 rel.to: "event.maximize";
385 min: 15 15; max: 15 15; 391 min: 15 15; max: 15 15;
386 fixed: 1 1; 392 fixed: 1 1;
387 color: 255 255 255 255; 393 color_class: "/fg/selected/titlebar/maximize";
388 } 394 }
389 desc { "selected"; 395 desc { "selected";
390 inherit: "default"; 396 inherit: "default";
391 color: 220 220 220 255; 397 color_class: "/fg/selected-pressed/titlebar/maximize";
392 } 398 }
393 } 399 }
394 image { "min2"; nomouse; 400 image { "min2"; nomouse;
@@ -399,11 +405,11 @@ group { "efl/border"; data.item: "version" "123";
399 rel.to: "event.minimize"; 405 rel.to: "event.minimize";
400 min: 15 15; max: 15 15; 406 min: 15 15; max: 15 15;
401 fixed: 1 1; 407 fixed: 1 1;
402 color: 255 255 255 255; 408 color_class: "/fg/selected/titlebar/minimize";
403 } 409 }
404 desc { "selected"; 410 desc { "selected";
405 inherit: "default"; 411 inherit: "default";
406 color: 220 220 220 255; 412 color_class: "/fg/selected-pressed/titlebar/minimize";
407 } 413 }
408 } 414 }
409 rect { "event.icon"; 415 rect { "event.icon";
@@ -414,7 +420,7 @@ group { "efl/border"; data.item: "version" "123";
414 rel2.to: "top_clip"; 420 rel2.to: "top_clip";
415 align: 0.0 0.5; 421 align: 0.0 0.5;
416 aspect: 1.0 1.0; aspect_preference: VERTICAL; 422 aspect: 1.0 1.0; aspect_preference: VERTICAL;
417 color: 0 0 0 0; 423 color: 0 0 0 0; // no cc
418 } 424 }
419 } 425 }
420 rect { "event.titlebar"; 426 rect { "event.titlebar";
@@ -426,7 +432,7 @@ group { "efl/border"; data.item: "version" "123";
426 rel2.offset: 0 -1; 432 rel2.offset: 0 -1;
427 rel2.to_x: "event.minimize"; 433 rel2.to_x: "event.minimize";
428 rel2.to_y: "top_clip"; 434 rel2.to_y: "top_clip";
429 color: 0 0 0 0; 435 color: 0 0 0 0; // no cc
430 } 436 }
431 } 437 }
432 rect { "event.close"; 438 rect { "event.close";
@@ -436,7 +442,7 @@ group { "efl/border"; data.item: "version" "123";
436 rel2.relative: 1.0 1.0; 442 rel2.relative: 1.0 1.0;
437 align: 1.0 0.5; 443 align: 1.0 0.5;
438 aspect: 1.0 1.0; aspect_preference: VERTICAL; 444 aspect: 1.0 1.0; aspect_preference: VERTICAL;
439 color: 0 0 0 0; 445 color: 0 0 0 0; // no cc
440 } 446 }
441 } 447 }
442 rect { "event.maximize"; 448 rect { "event.maximize";
@@ -450,7 +456,7 @@ group { "efl/border"; data.item: "version" "123";
450 rel2.to_y: "top_clip"; 456 rel2.to_y: "top_clip";
451 align: 1.0 0.5; 457 align: 1.0 0.5;
452 aspect: 1.0 1.0; aspect_preference: VERTICAL; 458 aspect: 1.0 1.0; aspect_preference: VERTICAL;
453 color: 0 0 0 0; 459 color: 0 0 0 0; // no cc
454 } 460 }
455 } 461 }
456 rect { "event.minimize"; 462 rect { "event.minimize";
@@ -464,7 +470,7 @@ group { "efl/border"; data.item: "version" "123";
464 rel2.to_x: "event.maximize"; 470 rel2.to_x: "event.maximize";
465 align: 1.0 0.5; 471 align: 1.0 0.5;
466 aspect: 1.0 1.0; aspect_preference: VERTICAL; 472 aspect: 1.0 1.0; aspect_preference: VERTICAL;
467 color: 0 0 0 0; 473 color: 0 0 0 0; // no cc
468 } 474 }
469 } 475 }
470 rect { "top_resize_clip"; 476 rect { "top_resize_clip";
@@ -486,7 +492,7 @@ group { "efl/border"; data.item: "version" "123";
486 rel2.offset: 31 3; 492 rel2.offset: 31 3;
487 min: 40 6; 493 min: 40 6;
488 align: 1.0 1.0; 494 align: 1.0 1.0;
489 color: 0 0 0 0; 495 color: 0 0 0 0; // no cc
490 fixed: 1 1; 496 fixed: 1 1;
491 } 497 }
492 desc { "hidden"; inherit: "default"; hid; } 498 desc { "hidden"; inherit: "default"; hid; }
@@ -501,7 +507,7 @@ group { "efl/border"; data.item: "version" "123";
501 rel2.relative: 0.0 1.0; 507 rel2.relative: 0.0 1.0;
502 min: 0 6; 508 min: 0 6;
503 align: 0.5 1.0; 509 align: 0.5 1.0;
504 color: 0 0 0 0; 510 color: 0 0 0 0; // no cc
505 fixed: 1 1; 511 fixed: 1 1;
506 } 512 }
507 desc { "hidden"; inherit: "default"; hid; } 513 desc { "hidden"; inherit: "default"; hid; }
@@ -517,7 +523,7 @@ group { "efl/border"; data.item: "version" "123";
517 rel2.offset: -1 3; 523 rel2.offset: -1 3;
518 min: 40 6; 524 min: 40 6;
519 align: 0.0 1.0; 525 align: 0.0 1.0;
520 color: 0 0 0 0; 526 color: 0 0 0 0; // no cc
521 fixed: 1 1; 527 fixed: 1 1;
522 } 528 }
523 desc { "hidden"; inherit: "default"; hid; } 529 desc { "hidden"; inherit: "default"; hid; }
@@ -551,9 +557,13 @@ group { "efl/border"; data.item: "version" "123";
551 part { name: "bottom"; type: RECT; mouse_events: 0; 557 part { name: "bottom"; type: RECT; mouse_events: 0;
552 clip: "bottom_clip"; 558 clip: "bottom_clip";
553 description { state: "default" 0.0; 559 description { state: "default" 0.0;
554 color: 64 64 64 255; 560 color_class: "/bg/normal/border";
555 rel.to: "bottom_clip"; 561 rel.to: "bottom_clip";
556 } 562 }
563 description { state: "focused" 0.0;
564 inherit: "default";
565 color_class: "/bg/selected/border";
566 }
557 } 567 }
558 568
559 rect { "efl.event.resize.bl"; 569 rect { "efl.event.resize.bl";
@@ -565,7 +575,7 @@ group { "efl/border"; data.item: "version" "123";
565 rel2.offset: 31 -1; 575 rel2.offset: 31 -1;
566 min: 40 10; 576 min: 40 10;
567 align: 0.0 0.5; 577 align: 0.0 0.5;
568 color: 0 0 0 0; 578 color: 0 0 0 0; // no cc
569 fixed: 1 1; 579 fixed: 1 1;
570 offscale; 580 offscale;
571 } 581 }
@@ -581,7 +591,7 @@ group { "efl/border"; data.item: "version" "123";
581 rel2.relative: 0.0 1.0; 591 rel2.relative: 0.0 1.0;
582 min: 0 10; 592 min: 0 10;
583 align: 0.5 0.5; 593 align: 0.5 0.5;
584 color: 0 0 0 0; 594 color: 0 0 0 0; // no cc
585 fixed: 1 1; 595 fixed: 1 1;
586 offscale; 596 offscale;
587 } 597 }
@@ -596,7 +606,7 @@ group { "efl/border"; data.item: "version" "123";
596 rel1.offset: -32 0; 606 rel1.offset: -32 0;
597 min: 40 10; 607 min: 40 10;
598 align: 0.0 0.5; 608 align: 0.0 0.5;
599 color: 0 0 0 0; 609 color: 0 0 0 0; // no cc
600 fixed: 1 1; 610 fixed: 1 1;
601 offscale; 611 offscale;
602 } 612 }
@@ -605,12 +615,12 @@ group { "efl/border"; data.item: "version" "123";
605 rect { "indicator_bg"; 615 rect { "indicator_bg";
606 clip: "bg_clip"; 616 clip: "bg_clip";
607 desc { "default"; 617 desc { "default";
608 color: 148 23 45 255; 618 color: 148 23 45 255; // no cc never see this...
609 rel.to: "efl.indicator"; 619 rel.to: "efl.indicator";
610 } 620 }
611 desc { "bg_transparent"; 621 desc { "bg_transparent";
612 inherit: "default"; 622 inherit: "default";
613 color: 0 0 0 0; 623 color: 0 0 0 0; // no cc never see this...
614 } 624 }
615 } 625 }
616 swallow { "efl.indicator"; 626 swallow { "efl.indicator";
@@ -706,16 +716,20 @@ group { "efl/border"; data.item: "version" "123";
706 program { signal: "efl,action,focus"; source: "efl"; 716 program { signal: "efl,action,focus"; source: "efl";
707 action: STATE_SET "focused"; 717 action: STATE_SET "focused";
708 target: "top"; 718 target: "top";
719 target: "bottom";
709 target: "efl.text.title"; 720 target: "efl.text.title";
710 target: "clip1"; 721 target: "clip1";
711 target: "clip2"; 722 target: "clip2";
723 target: "shadow_clip";
712 } 724 }
713 program { signal: "efl,action,unfocus"; source: "efl"; 725 program { signal: "efl,action,unfocus"; source: "efl";
714 action: STATE_SET "default"; 726 action: STATE_SET "default";
715 target: "top"; 727 target: "top";
728 target: "bottom";
716 target: "efl.text.title"; 729 target: "efl.text.title";
717 target: "clip1"; 730 target: "clip1";
718 target: "clip2"; 731 target: "clip2";
732 target: "shadow_clip";
719 } 733 }
720 program { signal: "efl,state,urgent"; source: "efl"; 734 program { signal: "efl,state,urgent"; source: "efl";
721 action: STATE_SET "bounce1"; 735 action: STATE_SET "bounce1";
diff --git a/data/elementary/themes/edc/efl/button.edc b/data/elementary/themes/edc/efl/button.edc
index b72b51f109..e85415db9f 100644
--- a/data/elementary/themes/edc/efl/button.edc
+++ b/data/elementary/themes/edc/efl/button.edc
@@ -45,34 +45,37 @@ group { name: "efl/button";
45 description { state: "default" 0.0; 45 description { state: "default" 0.0;
46 rel.to: "base"; 46 rel.to: "base";
47 WIN_SHADOW_SMALL; 47 WIN_SHADOW_SMALL;
48 color_class: "/shadow/normal/button";
48 } 49 }
49 description { state: "pressed" 0.0; inherit; 50 description { state: "pressed" 0.0; inherit;
50 image.border_scale_by: 0.1; 51 image.border_scale_by: 0.1;
51 rel1.offset: -2 -1; 52 rel1.offset: -2 -1;
52 rel2.offset: 0 1; 53 rel2.offset: 0 1;
54 color_class: "/shadow/pressed/button";
53 } 55 }
54 description { state: "disabled" 0.0; inherit; 56 description { state: "disabled" 0.0; inherit;
55 image.border_scale_by: 0.1; 57 image.border_scale_by: 0.1;
56 rel1.offset: -2 -1; 58 rel1.offset: -2 -1;
57 rel2.offset: 0 1; 59 rel2.offset: 0 1;
60 color_class: "/shadow/disabled/button";
58 } 61 }
59 } 62 }
60 rect { "base"; 63 rect { "base";
61 scale: 1; 64 scale: 1;
62 desc { "default"; 65 desc { "default";
63 color: 96 96 96 255; 66 color_class: "/bg/normal/button";
64 rel1.offset: 2 2; 67 rel1.offset: 2 2;
65 rel2.offset: -3 -3; 68 rel2.offset: -3 -3;
66 offscale; 69 offscale;
67 } 70 }
68 desc { "pressed"; inherit; 71 desc { "pressed"; inherit;
69 color: 128 128 128 255; 72 color_class: "/bg/pressed/button";
70 rel1.offset: 3 3; 73 rel1.offset: 3 3;
71 rel2.offset: -4 -4; 74 rel2.offset: -4 -4;
72 offscale; 75 offscale;
73 } 76 }
74 desc { "disabled"; inherit; 77 desc { "disabled"; inherit;
75 color: 72 72 72 255; 78 color_class: "/bg/disabled/button";
76 } 79 }
77 desc { "hidden"; inherit; 80 desc { "hidden"; inherit;
78 visible: 0; 81 visible: 0;
@@ -89,13 +92,13 @@ group { name: "efl/button";
89 } 92 }
90 rect { "icon_clip"; 93 rect { "icon_clip";
91 desc { "default"; 94 desc { "default";
92 color: 255 255 255 255; 95 color: 255 255 255 255; // no cc
93 } 96 }
94 desc { "pressed"; inherit; 97 desc { "pressed"; inherit;
95 color: 255 255 255 255; 98 color: 255 255 255 255; // no cc
96 } 99 }
97 desc { "disabled"; inherit; 100 desc { "disabled"; inherit;
98 color: 255 255 255 64; 101 color: 255 255 255 64; // no cc
99 } 102 }
100 } 103 }
101 swallow { "efl.content"; nomouse; required; 104 swallow { "efl.content"; nomouse; required;
@@ -128,7 +131,7 @@ group { name: "efl/button";
128 text { "efl.text"; nomouse; required; 131 text { "efl.text"; nomouse; required;
129 scale: 1; 132 scale: 1;
130 desc { "default"; 133 desc { "default";
131 color: 192 192 192 255; 134 color_class: "/fg/normal/button";
132 rel1.offset: 0 6; 135 rel1.offset: 0 6;
133 rel1.relative: 1.0 0.0; 136 rel1.relative: 1.0 0.0;
134 rel1.to_x: "efl.content"; 137 rel1.to_x: "efl.content";
@@ -148,7 +151,7 @@ group { name: "efl/button";
148 visible: 1; 151 visible: 1;
149 } 152 }
150 desc { "pressed_visible"; inherit; 153 desc { "pressed_visible"; inherit;
151 color: 255 255 255 255; 154 color_class: "/fg/pressed/button";
152 rel1.offset: 6 6; 155 rel1.offset: 6 6;
153 text.min: 1 1; 156 text.min: 1 1;
154 text.ellipsis: -1; 157 text.ellipsis: -1;
@@ -160,20 +163,20 @@ group { name: "efl/button";
160 visible: 1; 163 visible: 1;
161 } 164 }
162 desc { "pressed_textonly"; inherit; 165 desc { "pressed_textonly"; inherit;
163 color: 255 255 255 255; 166 color_class: "/fg/pressed/button";
164 text.min: 1 1; 167 text.min: 1 1;
165 text.ellipsis: -1; 168 text.ellipsis: -1;
166 visible: 1; 169 visible: 1;
167 } 170 }
168 desc { "disabled_visible"; inherit; 171 desc { "disabled_visible"; inherit;
169 color: 96 96 96 255; 172 color_class: "/fg/disabled/button";
170 rel1.offset: 6 6; 173 rel1.offset: 6 6;
171 text.min: 1 1; 174 text.min: 1 1;
172 text.ellipsis: -1; 175 text.ellipsis: -1;
173 visible: 1; 176 visible: 1;
174 } 177 }
175 desc { "disabled_textonly"; inherit; 178 desc { "disabled_textonly"; inherit;
176 color: 96 96 96 255; 179 color_class: "/fg/disabled/button";
177 text.min: 1 1; 180 text.min: 1 1;
178 text.ellipsis: -1; 181 text.ellipsis: -1;
179 visible: 1; 182 visible: 1;
@@ -182,7 +185,7 @@ group { name: "efl/button";
182 rect { "event"; 185 rect { "event";
183 ignore_flags: ON_HOLD; 186 ignore_flags: ON_HOLD;
184 desc { "default"; 187 desc { "default";
185 color: 0 0 0 0; 188 color: 0 0 0 0; // no cc
186 } 189 }
187 desc { "disabled"; inherit; 190 desc { "disabled"; inherit;
188 visible: 0; 191 visible: 0;
@@ -321,7 +324,7 @@ group { name: "efl/button:anchor";
321 parts { 324 parts {
322 rect { "base"; 325 rect { "base";
323 desc { "default"; 326 desc { "default";
324 color: 0 0 0 0; 327 color: 0 0 0 0; // no cc
325 } 328 }
326 desc { "pressed"; inherit; 329 desc { "pressed"; inherit;
327 inherit: "default"; 330 inherit: "default";
@@ -338,7 +341,7 @@ group { name: "efl/button:anchor";
338 } 341 }
339 desc { "disabled"; 342 desc { "disabled";
340 inherit: "default"; 343 inherit: "default";
341 color: 255 255 255 64; 344 color: 255 255 255 64; // no cc
342 } 345 }
343 } 346 }
344 swallow { "efl.background"; nomouse; required; 347 swallow { "efl.background"; nomouse; required;
@@ -389,7 +392,7 @@ group { name: "efl/button:anchor";
389 rel1.to_y: "base"; 392 rel1.to_y: "base";
390 rel2.offset: -5 -5; 393 rel2.offset: -5 -5;
391 rel2.to: "base"; 394 rel2.to: "base";
392 color: 51 153 255 255; 395 color_class: "/fg/normal/button-anchor";
393 text { font: FN; size: 10; 396 text { font: FN; size: 10;
394 align: 0.5 0.5; 397 align: 0.5 0.5;
395 min: 0 0; 398 min: 0 0;
@@ -406,7 +409,7 @@ group { name: "efl/button:anchor";
406 } 409 }
407 desc { "pressed_visible"; 410 desc { "pressed_visible";
408 inherit: "default"; 411 inherit: "default";
409 color: 255 255 255 255; 412 color_class: "/fg/pressed/button-anchor";
410 rel1.offset: 4 4; 413 rel1.offset: 4 4;
411 text.min: 1 1; 414 text.min: 1 1;
412 text.ellipsis: -1; 415 text.ellipsis: -1;
@@ -421,7 +424,7 @@ group { name: "efl/button:anchor";
421 } 424 }
422 desc { "pressed_textonly"; 425 desc { "pressed_textonly";
423 inherit: "default"; 426 inherit: "default";
424 color: 255 255 255 255; 427 color_class: "/fg/pressed/button-anchor";
425 text.min: 1 1; 428 text.min: 1 1;
426 text.ellipsis: -1; 429 text.ellipsis: -1;
427 visible: 1; 430 visible: 1;
@@ -429,7 +432,7 @@ group { name: "efl/button:anchor";
429 desc { "disabled_visible"; 432 desc { "disabled_visible";
430 inherit: "default"; 433 inherit: "default";
431 rel1.offset: 0 0; 434 rel1.offset: 0 0;
432 color: 96 96 96 255; 435 color_class: "/fg/disabled/button-anchor";
433 text.min: 1 1; 436 text.min: 1 1;
434 text.ellipsis: -1; 437 text.ellipsis: -1;
435 visible: 1; 438 visible: 1;
@@ -437,7 +440,7 @@ group { name: "efl/button:anchor";
437 desc { "disabled_textonly"; 440 desc { "disabled_textonly";
438 inherit: "default"; 441 inherit: "default";
439 rel1.offset: 0 4; 442 rel1.offset: 0 4;
440 color: 96 96 96 255; 443 color_class: "/fg/disabled/button-anchor";
441 text.min: 1 1; 444 text.min: 1 1;
442 text.ellipsis: -1; 445 text.ellipsis: -1;
443 visible: 1; 446 visible: 1;
@@ -445,23 +448,23 @@ group { name: "efl/button:anchor";
445 } 448 }
446 rect { "bar"; nomouse; 449 rect { "bar"; nomouse;
447 desc { "default"; 450 desc { "default";
448 color: 51 153 255 255; 451 color_class: "/fg/normal/button-anchor";
449 rel1.relative: 0.0 1.0; 452 rel1.relative: 0.0 1.0;
450 rel1.offset: 2 -3; 453 rel1.offset: 2 -3;
451 rel2.offset: -3 -3; 454 rel2.offset: -3 -3;
452 } 455 }
453 desc { "pressed"; 456 desc { "pressed";
454 inherit: "default"; 457 inherit: "default";
455 color: 255 255 255 255; 458 color_class: "/fg/pressed/button-anchor";
456 } 459 }
457 desc { "disabled"; 460 desc { "disabled";
458 inherit: "default"; 461 inherit: "default";
459 color: 96 96 96 255; 462 color_class: "/fg/disabled/button-anchor";
460 } 463 }
461 } 464 }
462 rect { "event"; 465 rect { "event";
463 desc { "default"; 466 desc { "default";
464 color: 0 0 0 0; 467 color: 0 0 0 0; // no cc
465 } 468 }
466 desc { "disabled"; 469 desc { "disabled";
467 inherit: "default"; 470 inherit: "default";
diff --git a/data/elementary/themes/edc/efl/calendar.edc b/data/elementary/themes/edc/efl/calendar.edc
index 79f81c218d..11e84ff060 100644
--- a/data/elementary/themes/edc/efl/calendar.edc
+++ b/data/elementary/themes/edc/efl/calendar.edc
@@ -1,21 +1,21 @@
1#define CIT_STYLES\ 1#define CIT_STYLES\
2 style { name: "efl_ui_calendar_date_style";\ 2 style { name: "efl_ui_calendar_date_style";\
3 base: "font="FN" font_size=10 color=#a0a0a0 align=center text_class=calendar_day_text";\ 3 base: "font="FN" font_size=10 color=cc:/fg/normal/calendar/day align=center text_class=calendar_day_text";\
4 }\ 4 }\
5 style { name: "efl_ui_calendar_date_holiday_style";\ 5 style { name: "efl_ui_calendar_date_holiday_style";\
6 base: "font="FN" font_size=10 color=#3399ff align=center text_class=calendar_day_text_holiday";\ 6 base: "font="FN" font_size=10 color=cc:/fg/normal/calendar/day/holiday align=center text_class=calendar_day_text_holiday";\
7 }\ 7 }\
8 style { name: "efl_ui_calendar_date_today_style";\ 8 style { name: "efl_ui_calendar_date_today_style";\
9 base: "font="FN" font_size=10 color=#ffffff align=center text_class=calendar_day_text_today";\ 9 base: "font="FN" font_size=10 color=cc:/fg/normal/calendar/day/today align=center text_class=calendar_day_text_today";\
10 }\ 10 }\
11 style { name: "efl_ui_calendar_date_disabled_style";\ 11 style { name: "efl_ui_calendar_date_disabled_style";\
12 base: "font="FN" font_size=10 color=#282828 align=center text_class=calendar_day_text_disabled";\ 12 base: "font="FN" font_size=10 color=cc:/fg/normal/calendar/day/disabled align=center text_class=calendar_day_text_disabled";\
13 }\ 13 }\
14 style { name: "efl_ui_calendar_date_weekend1_style";\ 14 style { name: "efl_ui_calendar_date_weekend1_style";\
15 base: "font="FN" font_size=10 color=#3399ff align=center text_class=calendar_day_text_weekend1";\ 15 base: "font="FN" font_size=10 color=cc:/fg/normal/calendar/day/weekend1 align=center text_class=calendar_day_text_weekend1";\
16 }\ 16 }\
17 style { name: "efl_ui_calendar_date_weekend2_style";\ 17 style { name: "efl_ui_calendar_date_weekend2_style";\
18 base: "font="FN" font_size=10 color=#3399ff align=center text_class=calendar_day_text_weekend2";\ 18 base: "font="FN" font_size=10 color=cc:/fg/normal/calendar/day/weekend2 align=center text_class=calendar_day_text_weekend2";\
19 }\ 19 }\
20 20
21#define CAL_SPIN(_sufix, _text, _relative)\ 21#define CAL_SPIN(_sufix, _text, _relative)\
@@ -34,7 +34,7 @@
34 max: 25 25;\ 34 max: 25 25;\
35 }\ 35 }\
36 }\ 36 }\
37 part { name: "right_bt"#_sufix; type: RECT;\ 37 part { name: "right_bt"#_sufix; type: SPACER;\
38 scale: 1;\ 38 scale: 1;\
39 description { state: "default" 0.0;\ 39 description { state: "default" 0.0;\
40 fixed: 1 1;\ 40 fixed: 1 1;\
@@ -47,7 +47,6 @@
47 align: 1.0 0.5;\ 47 align: 1.0 0.5;\
48 min: 25 25;\ 48 min: 25 25;\
49 max: 25 25;\ 49 max: 25 25;\
50 color: 0 0 0 0;\
51 }\ 50 }\
52 }\ 51 }\
53 part { name: "efl.calendar.button"#_sufix".left"; type: SWALLOW;\ 52 part { name: "efl.calendar.button"#_sufix".left"; type: SWALLOW;\
@@ -93,7 +92,7 @@
93 min: 0 1;\ 92 min: 0 1;\
94 text_class: "calendar_"#_text; \ 93 text_class: "calendar_"#_text; \
95 }\ 94 }\
96 color: 160 160 160 255; \ 95 color_class: "/fg/normal/calendar/text/title"; \
97 }\ 96 }\
98 } 97 }
99 98
@@ -118,7 +117,7 @@
118 ellipsis: -1; \ 117 ellipsis: -1; \
119 text_class: "calendar_weekday_text"; \ 118 text_class: "calendar_weekday_text"; \
120 } \ 119 } \
121 color: 160 160 160 255; \ 120 color_class: "/fg/normal/calendar/text/day"; \
122 } \ 121 } \
123 } \ 122 } \
124 part { name: "ch_"#_pos"_clipper"; type: RECT; \ 123 part { name: "ch_"#_pos"_clipper"; type: RECT; \
@@ -138,17 +137,17 @@
138 part { name: "cit_"#_pos"_event"; type: RECT; repeat_events: 1; \ 137 part { name: "cit_"#_pos"_event"; type: RECT; repeat_events: 1; \
139 description { state: "default" 0.0; \ 138 description { state: "default" 0.0; \
140 rel.to: "cit_"#_pos"_rect"; \ 139 rel.to: "cit_"#_pos"_rect"; \
141 color: 0 0 0 0; \ 140 color_class: "/bg/normal/calendar/day/normal"; \
142 } \ 141 } \
143 description { state: "today" 0.0; \ 142 description { state: "today" 0.0; \
144 inherit: "default" 0.0; \ 143 inherit: "default" 0.0; \
145 color: 0 0 0 64; \ 144 color_class: "/bg/normal/calendar/day/today"; \
146 } \ 145 } \
147 } \ 146 } \
148 part { name: "cit_"#_pos"_selected"; type: RECT; mouse_events: 0; \ 147 part { name: "cit_"#_pos"_selected"; type: RECT; mouse_events: 0; \
149 description { state: "default" 0.0; \ 148 description { state: "default" 0.0; \
150 rel.to: "cit_"#_pos"_rect"; \ 149 rel.to: "cit_"#_pos"_rect"; \
151 color: 51 153 255 128; \ 150 color_class: "/bg/selected/calendar/day"; \
152 visible: 0; \ 151 visible: 0; \
153 } \ 152 } \
154 description { state: "selected" 0.0; \ 153 description { state: "selected" 0.0; \
@@ -159,7 +158,7 @@
159 part { name: "cit_"#_pos"_focus"; type: RECT; mouse_events: 0; \ 158 part { name: "cit_"#_pos"_focus"; type: RECT; mouse_events: 0; \
160 description { state: "default" 0.0; \ 159 description { state: "default" 0.0; \
161 rel.to: "cit_"#_pos"_rect"; \ 160 rel.to: "cit_"#_pos"_rect"; \
162 color: 255 153 51 128; \ 161 color_class: "/bg/selected/calendar/day/focused"; \
163 visible: 0; \ 162 visible: 0; \
164 } \ 163 } \
165 description { state: "selected" 0.0; \ 164 description { state: "selected" 0.0; \
@@ -209,7 +208,7 @@
209 max: 15 15; \ 208 max: 15 15; \
210 align: 0.0 1.0;\ 209 align: 0.0 1.0;\
211 image.normal: "i-check"; \ 210 image.normal: "i-check"; \
212 color: 53 153 255 255; \ 211 color_class: "/fg/normal/calendar/day/checked"; \
213 visible: 0; \ 212 visible: 0; \
214 } \ 213 } \
215 description { state: "visible" 0.0; \ 214 description { state: "visible" 0.0; \
@@ -220,7 +219,7 @@
220 part { name: "efl.cit_"#_pos".access"; type: RECT; repeat_events: 1; \ 219 part { name: "efl.cit_"#_pos".access"; type: RECT; repeat_events: 1; \
221 description { state: "default" 0.0; \ 220 description { state: "default" 0.0; \
222 rel.to: "cit_"#_pos"_event"; \ 221 rel.to: "cit_"#_pos"_event"; \
223 color: 0 0 0 0; \ 222 color: 0 0 0 0; /* no cc */ \
224 } \ 223 } \
225 } \ 224 } \
226 programs { \ 225 programs { \
@@ -452,7 +451,7 @@ group { name: "efl/calendar";
452 rel1.relative: 0.0 1.0; 451 rel1.relative: 0.0 1.0;
453 rel1.offset: 8 -1; 452 rel1.offset: 8 -1;
454 rel2.offset: -9 -1; 453 rel2.offset: -9 -1;
455 color: 80 80 80 255; 454 color_class: "/fg/normal/separator";
456 offscale; 455 offscale;
457 } 456 }
458 } 457 }
@@ -512,28 +511,28 @@ group { name: "efl/calendar/inc_button";
512 part { name: "arrow.image"; 511 part { name: "arrow.image";
513 scale: 1; 512 scale: 1;
514 description { state: "default" 0.0; 513 description { state: "default" 0.0;
515 min: 15 15; max: 15 15; 514 FIXED_SIZE(15, 15)
516 color: 160 160 160 255; 515 color_class: "/fg/normal/spinner/arrow";
517 image.normal: "i-arrow-r"; 516 image.normal: "i-arrow-r";
518 } 517 }
519 description { state: "pressed" 0.0; 518 description { state: "pressed" 0.0;
520 inherit: "default" 0.0; 519 inherit: "default" 0.0;
521 color: 255 255 255 255; 520 color_class: "/fg/pressed/spinner/arrow";
522 } 521 }
523 description { state: "disabled" 0.0; 522 description { state: "disabled" 0.0;
524 inherit: "default" 0.0; 523 inherit: "default" 0.0;
525 color: 96 96 96 255; 524 color_class: "/fg/disabled/spinner/arrow";
526 } 525 }
527 } 526 }
528 part { name: "over"; type: RECT; 527 part { name: "over"; type: RECT;
529 repeat_events: 1; 528 repeat_events: 1;
530 description { state: "default" 0.0; 529 description { state: "default" 0.0;
531 color: 0 0 0 0; 530 color: 0 0 0 0; // no cc
532 } 531 }
533 } 532 }
534 part { name: "disabler"; type: RECT; 533 part { name: "disabler"; type: RECT;
535 description { state: "default" 0.0; 534 description { state: "default" 0.0;
536 color: 0 0 0 0; 535 color: 0 0 0 0; // no cc
537 visible: 0; 536 visible: 0;
538 } 537 }
539 description { state: "disabled" 0.0; 538 description { state: "disabled" 0.0;
diff --git a/data/elementary/themes/edc/efl/check.edc b/data/elementary/themes/edc/efl/check.edc
index 1077024873..2b703078ad 100644
--- a/data/elementary/themes/edc/efl/check.edc
+++ b/data/elementary/themes/edc/efl/check.edc
@@ -47,13 +47,13 @@ group { name: "efl/check";
47 } 47 }
48 rect { "icon_clip"; 48 rect { "icon_clip";
49 desc { "default"; 49 desc { "default";
50 color: 255 255 255 255; 50 color: 255 255 255 255; // no cc
51 } 51 }
52 desc { "pressed"; inherit; 52 desc { "pressed"; inherit;
53 color: 255 255 255 255; 53 color: 255 255 255 255; // no cc
54 } 54 }
55 desc { "disabled"; inherit; 55 desc { "disabled"; inherit;
56 color: 255 255 255 64; 56 color: 255 255 255 64; // no cc
57 } 57 }
58 } 58 }
59 swallow { "efl.background"; nomouse; 59 swallow { "efl.background"; nomouse;
@@ -103,7 +103,7 @@ group { name: "efl/check";
103 scale: 1; 103 scale: 1;
104 description { state: "default"; 104 description { state: "default";
105 fixed: 1 0; 105 fixed: 1 0;
106 color: 0 0 0 64; 106 color_class: "/bg/normal/check/base";
107 align: 0.0 0.5; 107 align: 0.0 0.5;
108 min: 13 13; 108 min: 13 13;
109 max: 13 13; 109 max: 13 13;
@@ -114,10 +114,10 @@ group { name: "efl/check";
114 offscale; 114 offscale;
115 } 115 }
116 desc { "pressed"; inherit; 116 desc { "pressed"; inherit;
117 color: 0 0 0 128; 117 color_class: "/bg/pressed/check/base";
118 } 118 }
119 desc { "disabled"; inherit; 119 desc { "disabled"; inherit;
120 color: 0 0 0 16; 120 color_class: "/bg/disabled/check/base";
121 } 121 }
122 } 122 }
123 part { name: "ck_check"; 123 part { name: "ck_check";
@@ -130,16 +130,17 @@ group { name: "efl/check";
130 min: 15 15; 130 min: 15 15;
131 max: 15 15; 131 max: 15 15;
132 visible: 0; 132 visible: 0;
133 color: 160 160 160 255; 133 color_class: "/fg/normal/check/check";
134 fixed: 1 1; 134 fixed: 1 1;
135 } 135 }
136 description { state: "pressed" 0.0; 136 description { state: "pressed" 0.0;
137 inherit: "default" 0.0; 137 inherit: "default" 0.0;
138 color: 255 255 255 255; 138 color_class: "/fg/pressed/check/check";
139 visible: 1; 139 visible: 1;
140 } 140 }
141 description { state: "selected" 0.0; 141 description { state: "selected" 0.0;
142 inherit: "default" 0.0; 142 inherit: "default" 0.0;
143 color_class: "/fg/selected/check/check";
143 visible: 1; 144 visible: 1;
144 } 145 }
145 } 146 }
@@ -149,14 +150,14 @@ group { name: "efl/check";
149 } 150 }
150 description { state: "disabled" 0.0; 151 description { state: "disabled" 0.0;
151 inherit: "default" 0.0; 152 inherit: "default" 0.0;
152 color: 153 153 153 255; 153 color: 255 255 255 153; // no cc
153 } 154 }
154 } 155 }
155 text { "efl.text"; nomouse; 156 text { "efl.text"; nomouse;
156 scale: 1; 157 scale: 1;
157 desc { "default"; 158 desc { "default";
158 fixed: 0 1; 159 fixed: 0 1;
159 color: 160 160 160 255; 160 color_class: "/fg/normal/check/text";
160 rel1.offset: 0 4; 161 rel1.offset: 0 4;
161 rel1.relative: 1.0 0.0; 162 rel1.relative: 1.0 0.0;
162 rel1.to_x: "efl.content"; 163 rel1.to_x: "efl.content";
@@ -178,7 +179,7 @@ group { name: "efl/check";
178 } 179 }
179 desc { "pressed_visible"; inherit; 180 desc { "pressed_visible"; inherit;
180 fixed: 0 0; 181 fixed: 0 0;
181 color: 255 255 255 255; 182 color_class: "/fg/pressed/check/text";
182 rel1.offset: 4 4; 183 rel1.offset: 4 4;
183 text.min: 1 1; 184 text.min: 1 1;
184 text.ellipsis: -1; 185 text.ellipsis: -1;
@@ -192,14 +193,14 @@ group { name: "efl/check";
192 } 193 }
193 desc { "pressed_textonly"; inherit; 194 desc { "pressed_textonly"; inherit;
194 fixed: 0 0; 195 fixed: 0 0;
195 color: 255 255 255 255; 196 color_class: "/fg/pressed/check/text";
196 text.min: 1 1; 197 text.min: 1 1;
197 text.ellipsis: -1; 198 text.ellipsis: -1;
198 visible: 1; 199 visible: 1;
199 } 200 }
200 desc { "disabled_visible"; inherit; 201 desc { "disabled_visible"; inherit;
201 fixed: 0 0; 202 fixed: 0 0;
202 color: 96 96 96 255; 203 color_class: "/fg/disabled/check/text";
203 rel1.offset: 4 4; 204 rel1.offset: 4 4;
204 text.min: 1 1; 205 text.min: 1 1;
205 text.ellipsis: -1; 206 text.ellipsis: -1;
@@ -207,7 +208,7 @@ group { name: "efl/check";
207 } 208 }
208 desc { "disabled_textonly"; inherit; 209 desc { "disabled_textonly"; inherit;
209 fixed: 0 0; 210 fixed: 0 0;
210 color: 96 96 96 255; 211 color_class: "/fg/disabled/check/text";
211 text.min: 1 1; 212 text.min: 1 1;
212 text.ellipsis: -1; 213 text.ellipsis: -1;
213 visible: 1; 214 visible: 1;
@@ -216,7 +217,7 @@ group { name: "efl/check";
216 rect { "event"; 217 rect { "event";
217 ignore_flags: ON_HOLD; 218 ignore_flags: ON_HOLD;
218 desc { "default"; 219 desc { "default";
219 color: 0 0 0 0; 220 color: 0 0 0 0; // no cc
220 } 221 }
221 desc { "disabled"; inherit; 222 desc { "disabled"; inherit;
222 visible: 0; 223 visible: 0;
@@ -323,13 +324,13 @@ group { name: "efl/check:toggle";
323 } 324 }
324 rect { "icon_clip"; 325 rect { "icon_clip";
325 desc { "default"; 326 desc { "default";
326 color: 255 255 255 255; 327 color: 255 255 255 255; // no cc
327 } 328 }
328 desc { "pressed"; inherit; 329 desc { "pressed"; inherit;
329 color: 255 255 255 255; 330 color: 255 255 255 255; // no cc
330 } 331 }
331 desc { "disabled"; inherit; 332 desc { "disabled"; inherit;
332 color: 255 255 255 64; 333 color: 255 255 255 64; // no cc
333 } 334 }
334 } 335 }
335 swallow { "efl.content"; nomouse; 336 swallow { "efl.content"; nomouse;
@@ -376,14 +377,14 @@ group { name: "efl/check:toggle";
376 rect { name: "base"; 377 rect { name: "base";
377 description { state: "default"; 378 description { state: "default";
378 fixed: 1 1; 379 fixed: 1 1;
379 color: 0 0 0 64; 380 color_class: "/bg/normal/toggle/base";
380 rel.to: "tog"; 381 rel.to: "tog";
381 } 382 }
382 desc { "pressed"; inherit; 383 desc { "pressed"; inherit;
383 color: 0 0 0 128; 384 color_class: "/bg/pressed/toggle/base";
384 } 385 }
385 desc { "disabled"; inherit; 386 desc { "disabled"; inherit;
386 color: 0 0 0 16; 387 color_class: "/bg/disabled/toggle/base";
387 } 388 }
388 } 389 }
389 spacer { name: "onrect"; 390 spacer { name: "onrect";
@@ -410,7 +411,7 @@ group { name: "efl/check:toggle";
410 rel2.to: "offrect"; 411 rel2.to: "offrect";
411 rel2.offset: -5 -1; 412 rel2.offset: -5 -1;
412 offscale; 413 offscale;
413 color: 160 160 160 255; 414 color_class: "/fg/normal/toggle/text/off";
414 text { font: FN; size: 10; 415 text { font: FN; size: 10;
415 min: 0 1; 416 min: 0 1;
416 align: 0.5 0.5; 417 align: 0.5 0.5;
@@ -420,11 +421,11 @@ group { name: "efl/check:toggle";
420 } 421 }
421 description { state: "disabled" 0.0; 422 description { state: "disabled" 0.0;
422 inherit: "default" 0.0; 423 inherit: "default" 0.0;
423 color: 96 96 96 255; 424 color_class: "/fg/disabled/toggle/text/off";
424 } 425 }
425 description { state: "clicked" 0.0; 426 description { state: "clicked" 0.0;
426 inherit: "default" 0.0; 427 inherit: "default" 0.0;
427 color: 255 255 255 255; 428 color_class: "/fg/pressed/toggle/text/off";
428 } 429 }
429 } 430 }
430 text { name: "efl.ontext"; nomouse; scale: 1; 431 text { name: "efl.ontext"; nomouse; scale: 1;
@@ -437,7 +438,7 @@ group { name: "efl/check:toggle";
437 rel2.relative: 0.0 1.0; 438 rel2.relative: 0.0 1.0;
438 rel2.offset: -5 -1; 439 rel2.offset: -5 -1;
439 offscale; 440 offscale;
440 color: 51 153 255 255; 441 color_class: "/fg/normal/toggle/text/on";
441 text { font: FN; size: 10; 442 text { font: FN; size: 10;
442 min: 0 1; 443 min: 0 1;
443 align: 0.5 0.5; 444 align: 0.5 0.5;
@@ -447,11 +448,11 @@ group { name: "efl/check:toggle";
447 } 448 }
448 description { state: "disabled" 0.0; 449 description { state: "disabled" 0.0;
449 inherit: "default" 0.0; 450 inherit: "default" 0.0;
450 color: 96 96 96 255; 451 color_class: "/fg/disabled/toggle/text/on";
451 } 452 }
452 description { state: "clicked" 0.0; 453 description { state: "clicked" 0.0;
453 inherit: "default" 0.0; 454 inherit: "default" 0.0;
454 color: 255 255 255 255; 455 color_class: "/fg/pressed/toggle/text/on";
455 } 456 }
456 } 457 }
457 part { name: "tog_clip"; type: RECT; 458 part { name: "tog_clip"; type: RECT;
@@ -471,34 +472,34 @@ group { name: "efl/check:toggle";
471 rel.to: "tog"; 472 rel.to: "tog";
472 min: 15 15; 473 min: 15 15;
473 max: 15 99999; 474 max: 15 99999;
474 color: 0 0 0 0; 475 color: 0 0 0 0; // no cc
475 } 476 }
476 } 477 }
477 rect { name: "base_but"; nomouse; 478 rect { name: "base_but"; nomouse;
478 description { state: "default" 0.0; 479 description { state: "default" 0.0;
479 rel.to: "button"; 480 rel.to: "button";
480 color: 51 153 255 255; 481 color_class: "/fg/normal/toggle/button";
481 } 482 }
482 description { state: "clicked" 0.0; 483 description { state: "clicked" 0.0;
483 inherit: "default" 0.0; 484 inherit: "default" 0.0;
484 color: 255 255 255 255; 485 color_class: "/fg/pressed/toggle/button";
485 } 486 }
486 description { state: "disabled" 0.0; 487 description { state: "disabled" 0.0;
487 inherit: "default" 0.0; 488 inherit: "default" 0.0;
488 color: 64 64 64 255; 489 color_class: "/fg/disabled/toggle/button";
489 } 490 }
490 } 491 }
491 rect { name: "button_events"; 492 rect { name: "button_events";
492 dragable.events: "button"; 493 dragable.events: "button";
493 description { state: "default" 0.0; 494 description { state: "default" 0.0;
494 color: 0 0 0 0; 495 color: 0 0 0 0; // no cc
495 } 496 }
496 } 497 }
497 text { "efl.text"; nomouse; 498 text { "efl.text"; nomouse;
498 scale: 1; 499 scale: 1;
499 desc { "default"; 500 desc { "default";
500 fixed: 0 1; 501 fixed: 0 1;
501 color: 160 160 160 255; 502 color_class: "/fg/normal/toggle/text";
502 rel1.offset: 0 4; 503 rel1.offset: 0 4;
503 rel1.relative: 1.0 0.0; 504 rel1.relative: 1.0 0.0;
504 rel1.to_x: "efl.content"; 505 rel1.to_x: "efl.content";
@@ -522,7 +523,7 @@ group { name: "efl/check:toggle";
522 } 523 }
523 desc { "pressed_visible"; inherit; 524 desc { "pressed_visible"; inherit;
524 fixed: 0 0; 525 fixed: 0 0;
525 color: 255 255 255 255; 526 color_class: "/fg/pressed/toggle/text";
526 rel1.offset: 4 4; 527 rel1.offset: 4 4;
527 text.min: 1 1; 528 text.min: 1 1;
528 text.ellipsis: -1; 529 text.ellipsis: -1;
@@ -536,14 +537,14 @@ group { name: "efl/check:toggle";
536 } 537 }
537 desc { "pressed_textonly"; inherit; 538 desc { "pressed_textonly"; inherit;
538 fixed: 0 0; 539 fixed: 0 0;
539 color: 255 255 255 255; 540 color_class: "/fg/pressed/toggle/text";
540 text.min: 1 1; 541 text.min: 1 1;
541 text.ellipsis: -1; 542 text.ellipsis: -1;
542 visible: 1; 543 visible: 1;
543 } 544 }
544 desc { "disabled_visible"; inherit; 545 desc { "disabled_visible"; inherit;
545 fixed: 0 0; 546 fixed: 0 0;
546 color: 96 96 96 255; 547 color_class: "/fg/disabled/toggle/text";
547 rel1.offset: 4 4; 548 rel1.offset: 4 4;
548 text.min: 1 1; 549 text.min: 1 1;
549 text.ellipsis: -1; 550 text.ellipsis: -1;
@@ -551,7 +552,7 @@ group { name: "efl/check:toggle";
551 } 552 }
552 desc { "disabled_textonly"; inherit; 553 desc { "disabled_textonly"; inherit;
553 fixed: 0 0; 554 fixed: 0 0;
554 color: 96 96 96 255; 555 color_class: "/fg/disabled/toggle/text";
555 text.min: 1 1; 556 text.min: 1 1;
556 text.ellipsis: -1; 557 text.ellipsis: -1;
557 visible: 1; 558 visible: 1;
@@ -559,7 +560,7 @@ group { name: "efl/check:toggle";
559 } 560 }
560 rect { "event2"; 561 rect { "event2";
561 desc { "default"; 562 desc { "default";
562 color: 0 0 0 0; 563 color: 0 0 0 0; // no cc
563 visible: 0; 564 visible: 0;
564 } 565 }
565 desc { "disabled"; inherit; 566 desc { "disabled"; inherit;
@@ -569,7 +570,7 @@ group { name: "efl/check:toggle";
569 rect { "event"; repeat; 570 rect { "event"; repeat;
570 ignore_flags: ON_HOLD; 571 ignore_flags: ON_HOLD;
571 desc { "default"; 572 desc { "default";
572 color: 0 0 0 0; 573 color: 0 0 0 0; // no cc
573 } 574 }
574 desc { "disabled"; inherit; 575 desc { "disabled"; inherit;
575 visible: 0; 576 visible: 0;
diff --git a/data/elementary/themes/edc/efl/datepicker.edc b/data/elementary/themes/edc/efl/datepicker.edc
index ce8986d6e0..730477c028 100644
--- a/data/elementary/themes/edc/efl/datepicker.edc
+++ b/data/elementary/themes/edc/efl/datepicker.edc
@@ -155,7 +155,7 @@ group { "efl/datepicker";
155 desc { "default"; 155 desc { "default";
156 fixed: 1 1; 156 fixed: 1 1;
157 rel.to: "bg"; 157 rel.to: "bg";
158 color: 0 0 0 0; 158 color: 0 0 0 0; // no cc
159 } 159 }
160 } 160 }
161 } 161 }
@@ -179,7 +179,7 @@ group { "efl/datepicker/spin_button";
179 repeat; 179 repeat;
180 desc { "default"; 180 desc { "default";
181 fixed: 1 1; 181 fixed: 1 1;
182 color: 0 0 0 0; 182 color: 0 0 0 0; // no cc
183 rel.to: "base"; 183 rel.to: "base";
184 hid; 184 hid;
185 } 185 }
@@ -243,7 +243,7 @@ group { "efl/datepicker/spin_button";
243 norepeat; 243 norepeat;
244 nomouse; 244 nomouse;
245 desc { "default"; 245 desc { "default";
246 color: 0 0 0 0; 246 color: 0 0 0 0; // no cc
247 hid; 247 hid;
248 } 248 }
249 desc { "disabled"; 249 desc { "disabled";
diff --git a/data/elementary/themes/edc/efl/focus.edc b/data/elementary/themes/edc/efl/focus.edc
index d135632570..8b326d4228 100644
--- a/data/elementary/themes/edc/efl/focus.edc
+++ b/data/elementary/themes/edc/efl/focus.edc
@@ -88,12 +88,12 @@ group { name: "efl/focus_highlight/top";
88 rel1.offset: -999 -999; 88 rel1.offset: -999 -999;
89 rel2.relative: 2.0 2.0; 89 rel2.relative: 2.0 2.0;
90 rel2.offset: 999 999; 90 rel2.offset: 999 999;
91 color: 255 255 255 0; 91 color: 255 255 255 0; // no cc
92 visible: 0; 92 visible: 0;
93 } 93 }
94 description { state: "visible" 0.0; 94 description { state: "visible" 0.0;
95 inherit: "default" 0.0; 95 inherit: "default" 0.0;
96 color: 255 255 255 255; 96 color: 255 255 255 255; // no cc
97 visible: 1; 97 visible: 1;
98 } 98 }
99 } 99 }
@@ -102,13 +102,13 @@ group { name: "efl/focus_highlight/top";
102 scale: 1; 102 scale: 1;
103 description { state: "default" 0.0; 103 description { state: "default" 0.0;
104 rel.to: "base"; 104 rel.to: "base";
105 color: 51 153 255 255; 105 color_class: "/bg/selected/focus";
106 rel2.relative: 1.0 0.0; 106 rel2.relative: 1.0 0.0;
107 min: 4 4; 107 min: 4 4;
108 } 108 }
109 description { state: "hi" 0.0; 109 description { state: "hi" 0.0;
110 inherit: "default" 0.0; 110 inherit: "default" 0.0;
111 color: 255 255 255 255; 111 color_class: "/bg/selected/focus/hilight";
112 } 112 }
113 } 113 }
114 part { name: "topl"; type: RECT; 114 part { name: "topl"; type: RECT;
@@ -116,7 +116,7 @@ group { name: "efl/focus_highlight/top";
116 scale: 1; 116 scale: 1;
117 description { state: "default" 0.0; 117 description { state: "default" 0.0;
118 rel.to: "top"; 118 rel.to: "top";
119 color: 51 153 255 255; 119 color_class: "/bg/selected/focus";
120 rel1.relative: 0.0 1.0; 120 rel1.relative: 0.0 1.0;
121 rel2.relative: 0.0 1.0; 121 rel2.relative: 0.0 1.0;
122 align: 0.0 0.0; 122 align: 0.0 0.0;
@@ -124,7 +124,7 @@ group { name: "efl/focus_highlight/top";
124 } 124 }
125 description { state: "hi" 0.0; 125 description { state: "hi" 0.0;
126 inherit: "default" 0.0; 126 inherit: "default" 0.0;
127 color: 255 255 255 255; 127 color_class: "/bg/selected/focus/hilight";
128 } 128 }
129 } 129 }
130 part { name: "topr"; type: RECT; 130 part { name: "topr"; type: RECT;
@@ -132,7 +132,7 @@ group { name: "efl/focus_highlight/top";
132 scale: 1; 132 scale: 1;
133 description { state: "default" 0.0; 133 description { state: "default" 0.0;
134 rel.to: "top"; 134 rel.to: "top";
135 color: 51 153 255 255; 135 color_class: "/bg/selected/focus";
136 rel1.relative: 1.0 1.0; 136 rel1.relative: 1.0 1.0;
137 rel2.relative: 1.0 1.0; 137 rel2.relative: 1.0 1.0;
138 align: 1.0 0.0; 138 align: 1.0 0.0;
@@ -140,7 +140,7 @@ group { name: "efl/focus_highlight/top";
140 } 140 }
141 description { state: "hi" 0.0; 141 description { state: "hi" 0.0;
142 inherit: "default" 0.0; 142 inherit: "default" 0.0;
143 color: 255 255 255 255; 143 color_class: "/bg/selected/focus/hilight";
144 } 144 }
145 } 145 }
146 part { name: "bot"; type: RECT; 146 part { name: "bot"; type: RECT;
@@ -148,13 +148,13 @@ group { name: "efl/focus_highlight/top";
148 scale: 1; 148 scale: 1;
149 description { state: "default" 0.0; 149 description { state: "default" 0.0;
150 rel.to: "base"; 150 rel.to: "base";
151 color: 51 153 255 255; 151 color_class: "/bg/selected/focus";
152 rel1.relative: 0.0 1.0; 152 rel1.relative: 0.0 1.0;
153 min: 4 4; 153 min: 4 4;
154 } 154 }
155 description { state: "hi" 0.0; 155 description { state: "hi" 0.0;
156 inherit: "default" 0.0; 156 inherit: "default" 0.0;
157 color: 255 255 255 255; 157 color_class: "/bg/selected/focus/hilight";
158 } 158 }
159 } 159 }
160 part { name: "botl"; type: RECT; 160 part { name: "botl"; type: RECT;
@@ -162,7 +162,7 @@ group { name: "efl/focus_highlight/top";
162 scale: 1; 162 scale: 1;
163 description { state: "default" 0.0; 163 description { state: "default" 0.0;
164 rel.to: "bot"; 164 rel.to: "bot";
165 color: 51 153 255 255; 165 color_class: "/bg/selected/focus";
166 rel1.relative: 0.0 0.0; 166 rel1.relative: 0.0 0.0;
167 rel2.relative: 0.0 0.0; 167 rel2.relative: 0.0 0.0;
168 align: 0.0 1.0; 168 align: 0.0 1.0;
@@ -170,7 +170,7 @@ group { name: "efl/focus_highlight/top";
170 } 170 }
171 description { state: "hi" 0.0; 171 description { state: "hi" 0.0;
172 inherit: "default" 0.0; 172 inherit: "default" 0.0;
173 color: 255 255 255 255; 173 color_class: "/bg/selected/focus/hilight";
174 } 174 }
175 } 175 }
176 part { name: "botr"; type: RECT; 176 part { name: "botr"; type: RECT;
@@ -178,7 +178,7 @@ group { name: "efl/focus_highlight/top";
178 scale: 1; 178 scale: 1;
179 description { state: "default" 0.0; 179 description { state: "default" 0.0;
180 rel.to: "bot"; 180 rel.to: "bot";
181 color: 51 153 255 255; 181 color_class: "/bg/selected/focus";
182 rel1.relative: 1.0 0.0; 182 rel1.relative: 1.0 0.0;
183 rel2.relative: 1.0 0.0; 183 rel2.relative: 1.0 0.0;
184 align: 1.0 1.0; 184 align: 1.0 1.0;
@@ -186,7 +186,7 @@ group { name: "efl/focus_highlight/top";
186 } 186 }
187 description { state: "hi" 0.0; 187 description { state: "hi" 0.0;
188 inherit: "default" 0.0; 188 inherit: "default" 0.0;
189 color: 255 255 255 255; 189 color_class: "/bg/selected/focus/hilight";
190 } 190 }
191 } 191 }
192 } 192 }
diff --git a/data/elementary/themes/edc/efl/frame.edc b/data/elementary/themes/edc/efl/frame.edc
index 7e967c48db..34a2177637 100644
--- a/data/elementary/themes/edc/efl/frame.edc
+++ b/data/elementary/themes/edc/efl/frame.edc
@@ -5,6 +5,7 @@ group { name: "efl/frame";
5 part { name: "shadow"; type: RECT; 5 part { name: "shadow"; type: RECT;
6 description { state: "default" 0.0; 6 description { state: "default" 0.0;
7 rel.to: "_sh1"; 7 rel.to: "_sh1";
8 color_class: "/shadow/normal/frame";
8 } 9 }
9 description { state: "hidden" 0.0; 10 description { state: "hidden" 0.0;
10 inherit; 11 inherit;
@@ -12,15 +13,20 @@ group { name: "efl/frame";
12 } 13 }
13 } 14 }
14 WIN_SHAD("base", "shadow", "win_shad_flat.png", 10, 10, 7, 14, 0.25); 15 WIN_SHAD("base", "shadow", "win_shad_flat.png", 10, 10, 7, 14, 0.25);
15 part { name: "base"; type: RECT; 16 part { name: "base"; type: SPACER;
16 scale: 1; 17 scale: 1;
17 description { state: "default" 0.0; 18 description { state: "default" 0.0;
18 rel1.offset: 6 6; 19 rel1.offset: 6 6;
19 rel2.offset: -7 -7; 20 rel2.offset: -7 -7;
20 color: 80 80 80 255;
21 offscale; 21 offscale;
22 } 22 }
23 } 23 }
24 part { name: "top_bg"; type: RECT;
25 description { state: "default" 0.0;
26 rel.to: "top";
27 color_class: "/bg/normal/frame/title";
28 }
29 }
24 part { name: "top"; type: SPACER; 30 part { name: "top"; type: SPACER;
25 scale: 1; 31 scale: 1;
26 description { state: "default" 0.0; 32 description { state: "default" 0.0;
@@ -34,13 +40,12 @@ group { name: "efl/frame";
34 part { name: "efl.text"; type: TEXT; 40 part { name: "efl.text"; type: TEXT;
35 scale: 1; 41 scale: 1;
36 description { state: "default" 0.0; 42 description { state: "default" 0.0;
43 rel.to: "base";
37 rel1.offset: 4 4; 44 rel1.offset: 4 4;
38 rel1.to: "base";
39 rel2.relative: 1.0 0.0; 45 rel2.relative: 1.0 0.0;
40 rel2.offset: -5 4; 46 rel2.offset: -5 4;
41 rel2.to: "base";
42 align: 0.0 0.0; 47 align: 0.0 0.0;
43 color: 255 255 255 255; 48 color_class: "/fg/normal/frame/title";
44 text { font: FNBD; size: 10; 49 text { font: FNBD; size: 10;
45 align: 0.0 0.0; 50 align: 0.0 0.0;
46 min: 0 1; 51 min: 0 1;
@@ -56,13 +61,12 @@ group { name: "efl/frame";
56 rel1.to_y: "top"; 61 rel1.to_y: "top";
57 rel1.relative: 0.0 1.0; 62 rel1.relative: 0.0 1.0;
58 rel2.to: "base"; 63 rel2.to: "base";
59 color: 64 64 64 255; 64 color_class: "/bg/normal/frame";
60 } 65 }
61 } 66 }
62 part { name: "clip"; type: RECT; 67 part { name: "clip"; type: RECT;
63 description { state: "default" 0.0; 68 description { state: "default" 0.0;
64 rel1.to: "bg"; 69 rel.to: "bg";
65 rel2.to: "bg";
66 } 70 }
67 } 71 }
68 part { name: "efl.content"; type: SWALLOW; 72 part { name: "efl.content"; type: SWALLOW;
@@ -84,7 +88,7 @@ group { name: "efl/frame";
84 } 88 }
85 part { name: "event"; type: RECT; ignore_flags: ON_HOLD; 89 part { name: "event"; type: RECT; ignore_flags: ON_HOLD;
86 description { state: "default" 0.0; 90 description { state: "default" 0.0;
87 color: 0 0 0 0; 91 color: 0 0 0 0; // no cc
88 rel1.to_y: "efl.text"; 92 rel1.to_y: "efl.text";
89 rel2.to_y: "efl.text"; 93 rel2.to_y: "efl.text";
90 } 94 }
diff --git a/data/elementary/themes/edc/efl/grid.edc b/data/elementary/themes/edc/efl/grid.edc
index 5879f543ef..6e36d6e102 100644
--- a/data/elementary/themes/edc/efl/grid.edc
+++ b/data/elementary/themes/edc/efl/grid.edc
@@ -51,12 +51,12 @@ group { "efl/grid_item";
51#define BASEP() \ 51#define BASEP() \
52 part { name: "base"; type: RECT; mouse_events: 0; \ 52 part { name: "base"; type: RECT; mouse_events: 0; \
53 description { state: "default" 0.0; \ 53 description { state: "default" 0.0; \
54 color: 64 64 64 255; \ 54 color_class: "/bg/normal/grid/item"; \
55 } \ 55 } \
56 } \ 56 } \
57 part { name: "sel_base"; type: RECT; mouse_events: 0; \ 57 part { name: "sel_base"; type: RECT; mouse_events: 0; \
58 description { state: "default" 0.0; \ 58 description { state: "default" 0.0; \
59 color: 51 153 255 255; \ 59 color_class: "/bg/selected/grid/item"; \
60 visible: 0; \ 60 visible: 0; \
61 } \ 61 } \
62 description { state: "selected" 0.0; \ 62 description { state: "selected" 0.0; \
@@ -84,7 +84,7 @@ group { "efl/grid_item";
84 part { name: "event"; type: RECT; \ 84 part { name: "event"; type: RECT; \
85 repeat_events: 1; \ 85 repeat_events: 1; \
86 description { state: "default" 0.0; \ 86 description { state: "default" 0.0; \
87 color: 0 0 0 0; \ 87 color: 0 0 0 0; /* no cc */ \
88 } \ 88 } \
89 description { state: "disabled" 0.0; \ 89 description { state: "disabled" 0.0; \
90 inherit: "default" 0.0; \ 90 inherit: "default" 0.0; \
@@ -93,7 +93,7 @@ group { "efl/grid_item";
93 } \ 93 } \
94 part { name: "event_block"; type: RECT; \ 94 part { name: "event_block"; type: RECT; \
95 description { state: "default" 0.0; \ 95 description { state: "default" 0.0; \
96 color: 0 0 0 0; \ 96 color: 0 0 0 0; /* no cc */ \
97 visible: 0; \ 97 visible: 0; \
98 } \ 98 } \
99 description { state: "disabled" 0.0; \ 99 description { state: "disabled" 0.0; \
@@ -120,7 +120,7 @@ group { "efl/grid_item";
120 rel1.relative: 0.0 1.0; 120 rel1.relative: 0.0 1.0;
121 rel1.offset: 4 -5; 121 rel1.offset: 4 -5;
122 rel2.offset: -5 -5; 122 rel2.offset: -5 -5;
123 color: 160 160 160 255; 123 color_class: "/fg/normal/grid/item";
124 align: 0.5 1.0; 124 align: 0.5 1.0;
125 offscale; 125 offscale;
126 text { font: FN; size: 10; 126 text { font: FN; size: 10;
@@ -131,11 +131,11 @@ group { "efl/grid_item";
131 } 131 }
132 description { state: "selected" 0.0; 132 description { state: "selected" 0.0;
133 inherit: "default" 0.0; 133 inherit: "default" 0.0;
134 color: 255 255 255 255; 134 color_class: "/fg/selected/grid/item";
135 } 135 }
136 description { state: "disabled" 0.0; 136 description { state: "disabled" 0.0;
137 inherit: "default" 0.0; 137 inherit: "default" 0.0;
138 color: 80 80 80 255; 138 color_class: "/fg/disabled/grid/item";
139 } 139 }
140 } 140 }
141 program { signal: "efl,state,selected"; source: "efl"; 141 program { signal: "efl,state,selected"; source: "efl";
@@ -164,11 +164,12 @@ group { "efl/grid_item";
164 rel2.to_y: "efl.text"; 164 rel2.to_y: "efl.text";
165 rel2.relative: 1.0 0.0; 165 rel2.relative: 1.0 0.0;
166 rel2.offset: -5 -5; 166 rel2.offset: -5 -5;
167 color: 255 255 255 255; // no cc
167 offscale; 168 offscale;
168 } 169 }
169 description { state: "disabled" 0.0; 170 description { state: "disabled" 0.0;
170 inherit: "default" 0.0; 171 inherit: "default" 0.0;
171 color: 255 255 255 64; 172 color: 255 255 255 64; // no cc
172 } 173 }
173 } 174 }
174 part { name: "efl.icon"; type: SWALLOW; 175 part { name: "efl.icon"; type: SWALLOW;
diff --git a/data/elementary/themes/edc/efl/group_item.edc b/data/elementary/themes/edc/efl/group_item.edc
index f19a720a83..bd2a0b68c7 100644
--- a/data/elementary/themes/edc/efl/group_item.edc
+++ b/data/elementary/themes/edc/efl/group_item.edc
@@ -14,7 +14,7 @@ group { "efl/group_item";
14 parts { 14 parts {
15 rect { "base"; 15 rect { "base";
16 desc { "default"; 16 desc { "default";
17 color: 32 32 32 255; 17 color_class: "/bg/normal/list/group";
18 } 18 }
19 } 19 }
20 text { "efl.text"; 20 text { "efl.text";
@@ -29,7 +29,7 @@ group { "efl/group_item";
29 rel2.relative: 0.0 1.0; 29 rel2.relative: 0.0 1.0;
30 rel2.to_x: "efl.extra"; 30 rel2.to_x: "efl.extra";
31 align: 0.0 0.5; 31 align: 0.0 0.5;
32 color: 255 255 255 255; 32 color_class: "/fg/normal/list/group";
33 text { font: FNBD; size: 10; 33 text { font: FNBD; size: 10;
34 min: 1 1; 34 min: 1 1;
35 ellipsis: -1; 35 ellipsis: -1;
@@ -40,7 +40,7 @@ group { "efl/group_item";
40 } 40 }
41 desc { "disabled"; 41 desc { "disabled";
42 inherit: "default"; 42 inherit: "default";
43 color: 80 80 80 255; 43 color_class: "/fg/disabled/list/group";
44 link.base: "efl,state,disabled"; 44 link.base: "efl,state,disabled";
45 } 45 }
46 } 46 }
diff --git a/data/elementary/themes/edc/efl/image_zoomable.edc b/data/elementary/themes/edc/efl/image_zoomable.edc
index 64d759a723..65cec3065e 100644
--- a/data/elementary/themes/edc/efl/image_zoomable.edc
+++ b/data/elementary/themes/edc/efl/image_zoomable.edc
@@ -25,7 +25,7 @@ group { name: "efl/image_zoomable";
25 part { name: "base"; type: RECT; 25 part { name: "base"; type: RECT;
26 scale: 1; 26 scale: 1;
27 description { state: "default" 0.0; 27 description { state: "default" 0.0;
28 color: 0 0 0 0; 28 color: 0 0 0 0; // no cc
29 rel1.offset: 4 4; 29 rel1.offset: 4 4;
30 rel2.offset: -5 -5; 30 rel2.offset: -5 -5;
31 align: 1.0 1.0; 31 align: 1.0 1.0;
diff --git a/data/elementary/themes/edc/efl/list.edc b/data/elementary/themes/edc/efl/list.edc
index 6bc0521fde..b123ea8a99 100644
--- a/data/elementary/themes/edc/efl/list.edc
+++ b/data/elementary/themes/edc/efl/list.edc
@@ -63,15 +63,15 @@ group { "efl/list_item";
63 parts { 63 parts {
64 rect { "base"; nomouse; 64 rect { "base"; nomouse;
65 desc { "default"; 65 desc { "default";
66 color: 64 64 64 255; 66 color_class: "/bg/normal/list/item";
67 } 67 }
68 desc { "odd"; 68 desc { "odd";
69 color: 56 56 56 255; 69 color_class: "/bg-alt/normal/list/item";
70 } 70 }
71 } 71 }
72 rect { "sel_base"; nomouse; 72 rect { "sel_base"; nomouse;
73 desc { "default"; 73 desc { "default";
74 color: 51 153 255 255; 74 color_class: "/bg/selected/list/item";
75 hid; 75 hid;
76 } 76 }
77 desc { "selected"; 77 desc { "selected";
@@ -95,7 +95,7 @@ group { "efl/list_item";
95 rel2.offset: -5 -5; 95 rel2.offset: -5 -5;
96 rel2.relative: 0.0 1.0; 96 rel2.relative: 0.0 1.0;
97 rel2.to_x: "efl.extra"; 97 rel2.to_x: "efl.extra";
98 color: 160 160 160 255; 98 color_class: "/fg/normal/list/item";
99 text { font: FN; size: 10; 99 text { font: FN; size: 10;
100 min: 1 1; 100 min: 1 1;
101 ellipsis: -1; 101 ellipsis: -1;
@@ -106,16 +106,16 @@ group { "efl/list_item";
106 } 106 }
107 desc { "selected"; 107 desc { "selected";
108 inherit: "default"; 108 inherit: "default";
109 color: 255 255 255 255; 109 color_class: "/fg/selected/list/item";
110 } 110 }
111 desc { "disabled"; 111 desc { "disabled";
112 inherit: "default"; 112 inherit: "default";
113 color: 80 80 80 255; 113 color_class: "/fg/disabled/list/item";
114 } 114 }
115 } 115 }
116 rect { "event"; 116 rect { "event";
117 desc { "default"; 117 desc { "default";
118 color: 0 0 0 0; 118 color: 0 0 0 0; // no cc
119 } 119 }
120 desc { "disabled"; 120 desc { "disabled";
121 inherit: "default"; 121 inherit: "default";
@@ -149,7 +149,7 @@ group { "efl/list_item";
149 } 149 }
150 rect { "event_block"; 150 rect { "event_block";
151 desc { "default"; 151 desc { "default";
152 color: 0 0 0 0; 152 color: 0 0 0 0; // no cc
153 hid; 153 hid;
154 } 154 }
155 desc { "disabled"; 155 desc { "disabled";
@@ -208,15 +208,15 @@ group { "efl/list_item:placeholder";
208 parts { 208 parts {
209 rect { "base"; nomouse; 209 rect { "base"; nomouse;
210 desc { "default"; 210 desc { "default";
211 color: 64 64 64 255; 211 color_class: "/bg/normal/list/item";
212 } 212 }
213 desc { "odd"; 213 desc { "odd";
214 color: 56 56 56 255; 214 color_class: "/bg-alt/normal/list/item";
215 } 215 }
216 } 216 }
217 rect { "sel_base"; nomouse; 217 rect { "sel_base"; nomouse;
218 desc { "default"; 218 desc { "default";
219 color: 51 153 255 255; 219 color_class: "/bg/selected/list/item";
220 hid; 220 hid;
221 } 221 }
222 desc { "selected"; 222 desc { "selected";
@@ -233,7 +233,7 @@ group { "efl/list_item:placeholder";
233 //##// 233 //##//
234 rect { "event"; 234 rect { "event";
235 desc { "default"; 235 desc { "default";
236 color: 0 0 0 0; 236 color: 0 0 0 0; // no cc
237 } 237 }
238 desc { "disabled"; 238 desc { "disabled";
239 inherit: "default"; 239 inherit: "default";
@@ -252,7 +252,7 @@ group { "efl/list_item:placeholder";
252 } 252 }
253 rect { "event_block"; 253 rect { "event_block";
254 desc { "default"; 254 desc { "default";
255 color: 0 0 0 0; 255 color: 0 0 0 0; // no cc
256 hid; 256 hid;
257 } 257 }
258 desc { "disabled"; 258 desc { "disabled";
diff --git a/data/elementary/themes/edc/efl/navigation_bar.edc b/data/elementary/themes/edc/efl/navigation_bar.edc
index 93ef542cb0..3e7db6ce60 100644
--- a/data/elementary/themes/edc/efl/navigation_bar.edc
+++ b/data/elementary/themes/edc/efl/navigation_bar.edc
@@ -3,11 +3,11 @@ group { "efl/navigation_bar";
3 data.item: "version" "123"; 3 data.item: "version" "123";
4 styles { 4 styles {
5 style { name: "navigation_bar_text"; 5 style { name: "navigation_bar_text";
6 base: "font="FNBD" font_size=10 text_class=label align=center color=#fff ellipsis=1.0 wrap=mixed"; 6 base: "font="FNBD" font_size=10 text_class=label align=center color=cc:/fg/normal/navigation/title ellipsis=1.0 wrap=mixed";
7 tag: "br" "\n"; 7 tag: "br" "\n";
8 tag: "hilight" "+ font="FNBD" text_class=label_light"; 8 tag: "hilight" "+ font="FNBD" text_class=label_light";
9 tag: "b" "+ font="FNBD" text_class=label_light"; 9 tag: "b" "+ font="FNBD" text_class=label_light";
10 tag: "whitecolor" "+ color=#fff"; 10 tag: "whitecolor" "+ color=#fff"; // no cc
11 tag: "tab" "\t"; 11 tag: "tab" "\t";
12 } 12 }
13 } 13 }
@@ -103,7 +103,7 @@ group { name: "efl/navigation_bar/back_button";
103 insert_before: "efl.content"; 103 insert_before: "efl.content";
104 desc { "default"; 104 desc { "default";
105 image.normal: "i-arrow-l"; 105 image.normal: "i-arrow-l";
106 color: 160 160 160 255; 106 color_class: "/fg/normal/navigation/back/arrow";
107 } 107 }
108 } 108 }
109 } 109 }
diff --git a/data/elementary/themes/edc/efl/panel.edc b/data/elementary/themes/edc/efl/panel.edc
index 4dfc85a5a8..3bce143a5e 100644
--- a/data/elementary/themes/edc/efl/panel.edc
+++ b/data/elementary/themes/edc/efl/panel.edc
@@ -42,13 +42,13 @@ group { name: "efl/scroller/panel/left";
42 repeat_events: 1; 42 repeat_events: 1;
43 description { state: "default" 0.0; 43 description { state: "default" 0.0;
44 rel.to: "efl.panel_area"; 44 rel.to: "efl.panel_area";
45 color: 0 0 0 0; 45 color: 0 0 0 0; // no cc
46 } 46 }
47 } 47 }
48 part { name: "bg"; type: RECT; 48 part { name: "bg"; type: RECT;
49 description { state: "default" 0.0; 49 description { state: "default" 0.0;
50 rel.to: "efl.panel_area"; 50 rel.to: "efl.panel_area";
51 color: 64 64 64 255; 51 color_class: "/bg/normal/panel";
52 visible: 0; 52 visible: 0;
53 } 53 }
54 description { state: "visible" 0.0; 54 description { state: "visible" 0.0;
@@ -124,14 +124,14 @@ group { name: "efl/scroller/panel/right";
124 description { state: "default" 0.0; 124 description { state: "default" 0.0;
125 rel1.to: "efl.panel_area"; 125 rel1.to: "efl.panel_area";
126 rel2.to: "efl.panel_area"; 126 rel2.to: "efl.panel_area";
127 color: 0 0 0 0; 127 color: 0 0 0 0; // no cc
128 } 128 }
129 } 129 }
130 part { name: "bg"; type: RECT; 130 part { name: "bg"; type: RECT;
131 description { state: "default" 0.0; 131 description { state: "default" 0.0;
132 rel1.to: "efl.panel_area"; 132 rel1.to: "efl.panel_area";
133 rel2.to: "efl.panel_area"; 133 rel2.to: "efl.panel_area";
134 color: 64 64 64 255; 134 color_class: "/bg/normal/panel";
135 visible: 0; 135 visible: 0;
136 } 136 }
137 description { state: "visible" 0.0; 137 description { state: "visible" 0.0;
@@ -208,14 +208,14 @@ group { name: "efl/scroller/panel/top";
208 description { state: "default" 0.0; 208 description { state: "default" 0.0;
209 rel1.to: "efl.panel_area"; 209 rel1.to: "efl.panel_area";
210 rel2.to: "efl.panel_area"; 210 rel2.to: "efl.panel_area";
211 color: 0 0 0 0; 211 color: 0 0 0 0; // no cc
212 } 212 }
213 } 213 }
214 part { name: "bg"; type: RECT; 214 part { name: "bg"; type: RECT;
215 description { state: "default" 0.0; 215 description { state: "default" 0.0;
216 rel1.to: "efl.panel_area"; 216 rel1.to: "efl.panel_area";
217 rel2.to: "efl.panel_area"; 217 rel2.to: "efl.panel_area";
218 color: 64 64 64 255; 218 color_class: "/bg/normal/panel";
219 visible: 0; 219 visible: 0;
220 } 220 }
221 description { state: "visible" 0.0; 221 description { state: "visible" 0.0;
@@ -285,13 +285,13 @@ group { name: "efl/scroller/panel/bottom";
285 part { name: "access.outline"; type: RECT; repeat_events: 1; 285 part { name: "access.outline"; type: RECT; repeat_events: 1;
286 description { state: "default" 0.0; 286 description { state: "default" 0.0;
287 rel.to: "efl.panel_area"; 287 rel.to: "efl.panel_area";
288 color: 0 0 0 0; 288 color: 0 0 0 0; // no cc
289 } 289 }
290 } 290 }
291 part { name: "bg"; type: RECT; 291 part { name: "bg"; type: RECT;
292 description { state: "default" 0.0; 292 description { state: "default" 0.0;
293 rel.to: "efl.panel_area"; 293 rel.to: "efl.panel_area";
294 color: 64 64 64 255; 294 color_class: "/bg/normal/panel";
295 visible: 0; 295 visible: 0;
296 } 296 }
297 description { state: "visible" 0.0; 297 description { state: "visible" 0.0;
@@ -346,7 +346,7 @@ group { name: "efl/panel/left";
346 scale: 1; 346 scale: 1;
347 description { state: "default" 0.0; 347 description { state: "default" 0.0;
348 rel.to: "base"; 348 rel.to: "base";
349 color: 51 153 255 255; 349 color_class: "/bg/selected/panel";
350 visible: 0; 350 visible: 0;
351 offscale; 351 offscale;
352 } 352 }
@@ -366,7 +366,7 @@ group { name: "efl/panel/left";
366 rel1.to_x: "all"; 366 rel1.to_x: "all";
367 rel2.to_x: "efl.swallow.event"; 367 rel2.to_x: "efl.swallow.event";
368 rel2.relative: 0.0 1.0; 368 rel2.relative: 0.0 1.0;
369 color: 64 64 64 255; 369 color_class: "/bg/normal/panel";
370 } 370 }
371 } 371 }
372 part { name: "efl.content"; type: SWALLOW; 372 part { name: "efl.content"; type: SWALLOW;
@@ -386,7 +386,7 @@ group { name: "efl/panel/left";
386 align: 1.0 0.5; 386 align: 1.0 0.5;
387 rel1.relative: 1.0 0.0; 387 rel1.relative: 1.0 0.0;
388 rel2.relative: 1.0 1.0; 388 rel2.relative: 1.0 1.0;
389 color: 0 0 0 0; 389 color: 0 0 0 0; // no cc
390 } 390 }
391 description { state: "hidden" 0.0; 391 description { state: "hidden" 0.0;
392 inherit: "default" 0.0; 392 inherit: "default" 0.0;
@@ -398,7 +398,7 @@ group { name: "efl/panel/left";
398 part { name: "btn"; type: RECT; 398 part { name: "btn"; type: RECT;
399 description { state: "default" 0.0; 399 description { state: "default" 0.0;
400 rel.to: "efl.swallow.event"; 400 rel.to: "efl.swallow.event";
401 color: 0 0 0 0; 401 color: 0 0 0 0; // no cc
402 } 402 }
403 description { state: "hidden" 0.0; 403 description { state: "hidden" 0.0;
404 rel.to: "efl.swallow.event"; 404 rel.to: "efl.swallow.event";
diff --git a/data/elementary/themes/edc/efl/panes.edc b/data/elementary/themes/edc/efl/panes.edc
index e9834af6f6..1706cf8172 100644
--- a/data/elementary/themes/edc/efl/panes.edc
+++ b/data/elementary/themes/edc/efl/panes.edc
@@ -98,7 +98,11 @@ group { name: "efl/panes/vertical";
98 image.normal: "pane_handle_v.png"; 98 image.normal: "pane_handle_v.png";
99 fill.smooth: 0; 99 fill.smooth: 0;
100 rel.to: "efl.bar"; 100 rel.to: "efl.bar";
101 color: 160 160 160 255; 101 color_class: "/fg/normal/panes/handle";
102 }
103 description { state: "pressed" 0.0;
104 inherit: "default" 0.0;
105 color_class: "/fg/pressed/panes/handle";
102 } 106 }
103 } 107 }
104 part { name: "efl.event"; type: SWALLOW; 108 part { name: "efl.event"; type: SWALLOW;
@@ -117,7 +121,7 @@ group { name: "efl/panes/vertical";
117 fixed: 1 1; 121 fixed: 1 1;
118 rel1.to_x: "efl.event"; 122 rel1.to_x: "efl.event";
119 rel2.to_x: "efl.event"; 123 rel2.to_x: "efl.event";
120 color: 0 0 0 0; 124 color: 0 0 0 0; // no cc
121 } 125 }
122 description { state: "disabled" 0.0; 126 description { state: "disabled" 0.0;
123 inherit: "default" 0.0; 127 inherit: "default" 0.0;
@@ -127,6 +131,16 @@ group { name: "efl/panes/vertical";
127 } 131 }
128 programs { 132 programs {
129 EFL_UI_CLICKABLE_PART_BIND("bar") 133 EFL_UI_CLICKABLE_PART_BIND("bar")
134 program { name: "bar_down";
135 signal: "mouse,down,1"; source: "bar";
136 action: STATE_SET "pressed" 0.0;
137 target: "dots";
138 }
139 program { name: "bar_up";
140 signal: "mouse,up,1"; source: "bar";
141 action: STATE_SET "default" 0.0;
142 target: "dots";
143 }
130 program { // for efl_panes_fixed_set() 144 program { // for efl_panes_fixed_set()
131 signal: "efl,panes,fixed"; source: "efl"; 145 signal: "efl,panes,fixed"; source: "efl";
132 action: STATE_SET "disabled" 0.0; 146 action: STATE_SET "disabled" 0.0;
@@ -225,7 +239,11 @@ group { name: "efl/panes/horizontal";
225 image.normal: "pane_handle_h.png"; 239 image.normal: "pane_handle_h.png";
226 fill.smooth: 0; 240 fill.smooth: 0;
227 rel.to: "efl.bar"; 241 rel.to: "efl.bar";
228 color: 160 160 160 255; 242 color_class: "/fg/normal/panes/handle";
243 }
244 description { state: "pressed" 0.0;
245 inherit: "default" 0.0;
246 color_class: "/fg/pressed/panes/handle";
229 } 247 }
230 } 248 }
231 part { name: "efl.event"; type: SWALLOW; 249 part { name: "efl.event"; type: SWALLOW;
@@ -244,7 +262,7 @@ group { name: "efl/panes/horizontal";
244 fixed: 1 1; 262 fixed: 1 1;
245 rel1.to_y: "efl.event"; 263 rel1.to_y: "efl.event";
246 rel2.to_y: "efl.event"; 264 rel2.to_y: "efl.event";
247 color: 0 0 0 0; 265 color: 0 0 0 0; // no cc
248 } 266 }
249 description { state: "disabled" 0.0; 267 description { state: "disabled" 0.0;
250 inherit: "default" 0.0; 268 inherit: "default" 0.0;
@@ -254,6 +272,16 @@ group { name: "efl/panes/horizontal";
254 } 272 }
255 programs { 273 programs {
256 EFL_UI_CLICKABLE_PART_BIND("bar") 274 EFL_UI_CLICKABLE_PART_BIND("bar")
275 program { name: "bar_down";
276 signal: "mouse,down,1"; source: "bar";
277 action: STATE_SET "pressed" 0.0;
278 target: "dots";
279 }
280 program { name: "bar_up";
281 signal: "mouse,up,1"; source: "bar";
282 action: STATE_SET "default" 0.0;
283 target: "dots";
284 }
257 program { // for efl_panes_fixed_set() 285 program { // for efl_panes_fixed_set()
258 signal: "efl,panes,fixed"; source: "efl"; 286 signal: "efl,panes,fixed"; source: "efl";
259 action: STATE_SET "disabled" 0.0; 287 action: STATE_SET "disabled" 0.0;
@@ -362,7 +390,7 @@ group { name: "efl/panes/vertical:flush";
362 rel1.relative: 0.0 0.25; 390 rel1.relative: 0.0 0.25;
363 rel2.to_x: "efl.event"; 391 rel2.to_x: "efl.event";
364 rel2.relative: 1.0 0.75; 392 rel2.relative: 1.0 0.75;
365 color: 0 0 0 0; 393 color: 0 0 0 0; // no cc
366 } 394 }
367 description { state: "disabled" 0.0; 395 description { state: "disabled" 0.0;
368 inherit: "default" 0.0; 396 inherit: "default" 0.0;
@@ -376,13 +404,14 @@ group { name: "efl/panes/vertical:flush";
376 image.normal: "shadow_circle_vert.png"; 404 image.normal: "shadow_circle_vert.png";
377 rel1.to_x: "efl.bar"; 405 rel1.to_x: "efl.bar";
378 rel2.to_x: "efl.bar"; 406 rel2.to_x: "efl.bar";
379 color: 255 255 255 0; 407 color_class: "/shadow/normal/panes/flush";
408 color: 255 255 255 0; // no cc
380 offscale; 409 offscale;
381 visible: 0; 410 visible: 0;
382 } 411 }
383 description { state: "active" 0.0; 412 description { state: "active" 0.0;
384 inherit: "default" 0.0; 413 inherit: "default" 0.0;
385 color: 255 255 255 128; 414 color: 255 255 255 255; // no cc
386 rel1.offset: -16 0; 415 rel1.offset: -16 0;
387 rel2.offset: 15 -1; 416 rel2.offset: 15 -1;
388 visible: 1; 417 visible: 1;
@@ -395,13 +424,14 @@ group { name: "efl/panes/vertical:flush";
395 image.normal: "shadow_circle_vert.png"; 424 image.normal: "shadow_circle_vert.png";
396 rel1.to_x: "efl.bar"; 425 rel1.to_x: "efl.bar";
397 rel2.to_x: "efl.bar"; 426 rel2.to_x: "efl.bar";
398 color: 255 255 255 0; 427 color_class: "/shadow/normal/panes/flush";
428 color: 255 255 255 0; // no cc
399 offscale; 429 offscale;
400 visible: 0; 430 visible: 0;
401 } 431 }
402 description { state: "active" 0.0; 432 description { state: "active" 0.0;
403 inherit: "default" 0.0; 433 inherit: "default" 0.0;
404 color: 255 255 255 128; 434 color: 255 255 255 255; // no cc
405 rel1.offset: -16 0; 435 rel1.offset: -16 0;
406 rel2.offset: 15 -1; 436 rel2.offset: 15 -1;
407 visible: 1; 437 visible: 1;
@@ -413,7 +443,7 @@ group { name: "efl/panes/vertical:flush";
413 description { state: "default" 0.0; 443 description { state: "default" 0.0;
414 rel1.to_x: "efl.bar"; 444 rel1.to_x: "efl.bar";
415 rel2.to_x: "efl.bar"; 445 rel2.to_x: "efl.bar";
416 color: 51 153 255 255; 446 color_class: "/fg/normal/panes/flush";
417 offscale; 447 offscale;
418 visible: 0; 448 visible: 0;
419 } 449 }
@@ -430,7 +460,7 @@ group { name: "efl/panes/vertical:flush";
430 description { state: "default" 0.0; 460 description { state: "default" 0.0;
431 rel1.to_x: "efl.bar"; 461 rel1.to_x: "efl.bar";
432 rel2.to_x: "efl.bar"; 462 rel2.to_x: "efl.bar";
433