summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-11-25 12:49:45 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-11-25 12:49:45 +0900
commit5e5c2a8e360329675d22bb2733087118679e30e4 (patch)
tree14f0760146377f4d42b84f82a63264de8ba2c475
parent98a47b6071fd5ef47bcb64ed211b082e12859fcc (diff)
-rw-r--r--data/elementary/themes/default.edc2
-rw-r--r--data/elementary/themes/edc/elm/button.edc5
-rw-r--r--data/elementary/themes/edc/elm/check.edc1119
-rw-r--r--data/elementary/themes/edc/elm/radio.edc399
-rw-r--r--data/elementary/themes/edc/elm/toolbar.edc16
-rw-r--r--data/elementary/themes/macros.edc4
6 files changed, 686 insertions, 859 deletions
diff --git a/data/elementary/themes/default.edc b/data/elementary/themes/default.edc
index 4a0101146c..034e8deee5 100644
--- a/data/elementary/themes/default.edc
+++ b/data/elementary/themes/default.edc
@@ -22,7 +22,6 @@ collections {
22#include "edc/elm/label.edc" 22#include "edc/elm/label.edc"
23#include "edc/elm/separator.edc" 23#include "edc/elm/separator.edc"
24#include "edc/elm/check.edc" 24#include "edc/elm/check.edc"
25#include "edc/elm/slider.edc"
26#include "edc/elm/radio.edc" 25#include "edc/elm/radio.edc"
27#include "edc/elm/bubble.edc" 26#include "edc/elm/bubble.edc"
28#include "edc/elm/panes.edc" 27#include "edc/elm/panes.edc"
@@ -75,6 +74,7 @@ collections {
75#include "edc/elm/code.edc" 74#include "edc/elm/code.edc"
76#include "edc/elm/ews.edc" 75#include "edc/elm/ews.edc"
77#include "edc/elm/textpath.edc" 76#include "edc/elm/textpath.edc"
77#include "edc/elm/slider.edc"
78 78
79 79
80// desktop in general 80// desktop in general
diff --git a/data/elementary/themes/edc/elm/button.edc b/data/elementary/themes/edc/elm/button.edc
index 9e315c1da1..697ab0e9a6 100644
--- a/data/elementary/themes/edc/elm/button.edc
+++ b/data/elementary/themes/edc/elm/button.edc
@@ -1,7 +1,9 @@
1group { name: "elm/button/base/default"; 1group { name: "elm/button/base/default";
2 alias: "elm/button/base/naviframe/back_btn/default"; 2 alias: "elm/button/base/naviframe/back_btn/default";
3 alias: "elm/button/base/naviframe/back_btn/pager"; 3 alias: "elm/button/base/naviframe/back_btn/pager";
4 BUTTONMODE_SCRIPT 4 script {
5 BUTTONMODE_SCRIPT
6 }
5 parts { 7 parts {
6 rect { "base"; 8 rect { "base";
7 scale: 1; 9 scale: 1;
@@ -156,6 +158,7 @@ group { name: "elm/button/base/default";
156 } 158 }
157 } 159 }
158 rect { "event"; 160 rect { "event";
161 ignore_flags: ON_HOLD;
159 desc { "default"; 162 desc { "default";
160 color: 0 0 0 0; 163 color: 0 0 0 0;
161 } 164 }
diff --git a/data/elementary/themes/edc/elm/check.edc b/data/elementary/themes/edc/elm/check.edc
index 1a1cfd436c..47371959d3 100644
--- a/data/elementary/themes/edc/elm/check.edc
+++ b/data/elementary/themes/edc/elm/check.edc
@@ -1,204 +1,76 @@
1group { name: "elm/check/base/default"; 1group { name: "elm/check/base/default";
2 images.image: "inset_shadow_tiny.png" COMP; 2 images.image: "check.png" COMP;
3 images.image: "bevel_in.png" COMP;
4 images.image: "sym_check_alum.png" COMP;
5#define ICON 1
6#define LABEL 2
7#define MASK 3
8#define DISABLE 4
9 script { 3 script {
10 public btmode; 4 BUTTONMODE_SCRIPT
11 public eval_mode(m) {
12 new m1 = m & MASK;
13 new d = m & DISABLE;
14 if (m1 == (ICON | LABEL)) {
15 if (!d) {
16 set_state(PART:"elm.swallow.content", "visible", 0.0);
17 set_state(PART:"sizer.content", "visible", 0.0);
18 set_state(PART:"elm.text", "visible", 0.0);
19 set_state(PART:"shadow", "default", 0.0);
20 set_state(PART:"base", "default", 0.0);
21 set_state(PART:"clip", "default", 0.0);
22 set_state(PART:"event", "default", 0.0);
23 } else {
24 set_state(PART:"elm.swallow.content", "visible", 0.0);
25 set_state(PART:"sizer.content", "visible", 0.0);
26 set_state(PART:"elm.text", "disabled_visible", 0.0);
27 set_state(PART:"shadow", "disabled", 0.0);
28 set_state(PART:"base", "disabled", 0.0);
29 set_state(PART:"clip", "disabled", 0.0);
30 set_state(PART:"event", "disabled", 0.0);
31 }
32 } else if (m1 == (ICON)) {
33 if (!d) {
34 set_state(PART:"elm.swallow.content", "visible", 0.0);
35 set_state(PART:"sizer.content", "icononly", 0.0);
36 set_state(PART:"elm.text", "default", 0.0);
37 set_state(PART:"shadow", "default", 0.0);
38 set_state(PART:"base", "default", 0.0);
39 set_state(PART:"clip", "default", 0.0);
40 set_state(PART:"event", "default", 0.0);
41 } else {
42 set_state(PART:"elm.swallow.content", "visible", 0.0);
43 set_state(PART:"sizer.content", "icononly", 0.0);
44 set_state(PART:"elm.text", "disabled", 0.0);
45 set_state(PART:"shadow", "disabled", 0.0);
46 set_state(PART:"base", "disabled", 0.0);
47 set_state(PART:"clip", "disabled", 0.0);
48 set_state(PART:"event", "disabled", 0.0);
49 }
50 } else if (m1 == (LABEL)) {
51 if (!d) {
52 set_state(PART:"elm.swallow.content", "default", 0.0);
53 set_state(PART:"sizer.content", "default", 0.0);
54 set_state(PART:"elm.text", "visible", 0.0);
55 set_state(PART:"shadow", "default", 0.0);
56 set_state(PART:"base", "default", 0.0);
57 set_state(PART:"clip", "default", 0.0);
58 set_state(PART:"event", "default", 0.0);
59 } else {
60 set_state(PART:"elm.swallow.content", "default", 0.0);
61 set_state(PART:"sizer.content", "default", 0.0);
62 set_state(PART:"elm.text", "disabled_visible", 0.0);
63 set_state(PART:"shadow", "disabled", 0.0);
64 set_state(PART:"base", "disabled", 0.0);
65 set_state(PART:"clip", "disabled", 0.0);
66 set_state(PART:"event", "disabled", 0.0);
67 }
68 } else {
69 if (!d) {
70 set_state(PART:"elm.swallow.content", "default", 0.0);
71 set_state(PART:"sizer.content", "default", 0.0);
72 set_state(PART:"elm.text", "default", 0.0);
73 set_state(PART:"shadow", "default", 0.0);
74 set_state(PART:"base", "default", 0.0);
75 set_state(PART:"clip", "default", 0.0);
76 set_state(PART:"event", "default", 0.0);
77 } else {
78 set_state(PART:"elm.swallow.content", "default", 0.0);
79 set_state(PART:"sizer.content", "default", 0.0);
80 set_state(PART:"elm.text", "default", 0.0);
81 set_state(PART:"shadow", "disabled", 0.0);
82 set_state(PART:"base", "disabled", 0.0);
83 set_state(PART:"clip", "disabled", 0.0);
84 set_state(PART:"event", "disabled", 0.0);
85 }
86 }
87 }
88 } 5 }
89 parts { 6 parts {
90 part { name: "base"; type: RECT; 7 swallow { "elm.swallow.background"; nomouse;
91 description { state: "default" 0.0; 8 desc { "default";
92 rel1.offset: 1 1; 9 visible: 0;
93 rel1.to: "inset";
94 rel2.offset: -2 -2;
95 rel2.to: "inset";
96 color: 24 24 24 255;
97 } 10 }
98 description { state: "disabled" 0.0; 11 desc { "visible"; inherit;
99 inherit: "default" 0.0; 12 visible: 1;
100 color: 64 64 64 255;
101 } 13 }
102 } 14 }
103 part { name: "shadow"; mouse_events: 0; 15 rect { "icon_clip";
104 description { state: "default" 0.0; 16 desc { "default";
105 image.normal: "inset_shadow_tiny.png"; 17 color_class: "button_icon";
106 image.border: 4 4 4 4;
107 rel1.to: "base";
108 rel2.to: "base";
109 } 18 }
110 description { state: "disabled" 0.0; 19 desc { "pressed"; inherit;
111 inherit: "default" 0.0; 20 color_class: "button_icon_pressed";
112 visible: 0; 21 }
22 desc { "disabled"; inherit;
23 color_class: "button_icon_disabled";
113 } 24 }
114 } 25 }
115 part { name: "inset"; mouse_events: 0; 26 swallow { "elm.swallow.content"; nomouse;
27 clip_to: "icon_clip";
116 scale: 1; 28 scale: 1;
117 description { state: "default" 0.0; 29 desc { "default";
118 fixed: 1 0; 30 fixed: 1 0;
119 rel1.offset: 2 2;
120 rel2.relative: 0.0 1.0;
121 rel2.offset: 2 -3;
122 align: 0.0 0.5; 31 align: 0.0 0.5;
123 min: 13 13; 32 rel1.to_x: "base";
124 max: 13 13; 33 rel2.to_x: "base";
125 image.normal: "bevel_in.png"; 34 rel1.offset: 4 4;
126 image.border: 1 1 1 1; 35 rel1.relative: 1.0 0.0;
127 image.middle: 0; 36 rel2.relative: 0.0 1.0;
128 fill.smooth: 0; 37 rel2.offset: 4 -5;
129 }
130 }
131 part { name: "indicator"; mouse_events: 0;
132 scale: 1;
133 clip_to: "clip";
134 description { state: "default" 0.0;
135 fixed: 1 1;
136 rel1.to: "base";
137 rel2.to: "base";
138 image.normal: "sym_check_alum.png";
139 min: 11 11;
140 max: 11 11;
141 visible: 0; 38 visible: 0;
39 offscale;
142 } 40 }
143 description { state: "selected" 0.0; 41 desc { "visible"; inherit;
144 inherit: "default" 0.0; 42 fixed: 1 0;
43 aspect: 1.0 1.0;
145 visible: 1; 44 visible: 1;
146 } 45 }
147 } 46 desc { "icononly"; inherit;
148 part { name: "clip"; type: RECT; 47 fixed: 0 0;
149 description { state: "default" 0.0; 48 align: 0.5 0.5;
150 }
151 description { state: "disabled" 0.0;
152 inherit: "default" 0.0;
153 color: 255 255 255 64;
154 }
155 }
156 part { name: "elm.swallow.content"; type: SWALLOW;
157 scale: 1;
158 clip_to: "clip";
159 description { state: "default" 0.0;
160 fixed: 1 0;
161 visible: 0;
162 align: 0.0 0.5;
163 max: 0 0;
164 rel1.to_x: "inset";
165 rel1.relative: 1.0 0.0;
166 rel1.offset: 1 1;
167 rel2.to_x: "inset";
168 rel2.offset: 1 -2;
169 rel2.relative: 1.0 1.0; 49 rel2.relative: 1.0 1.0;
170 } 50 rel2.offset: -5 -5;
171 description { state: "visible" 0.0; 51 rel2.to_x: "";
172 inherit: "default" 0.0;
173 visible: 1; 52 visible: 1;
174 aspect: 1.0 1.0;
175 min: 16 16;
176 } 53 }
177 } 54 }
178 part { name: "sizer.content"; type: TEXT; mouse_events: 0; 55 text { "sizer.content"; nomouse;
179 scale: 1; 56 scale: 1;
180 description { state: "default" 0.0; 57 desc { "default";
181 fixed: 1 1;
182 visible: 0; 58 visible: 0;
183 text { font: FN; size: 10; 59 text { font: FN; size: 10;
184 min: 0 0; 60 min: 0 0;
185 text_class: "check_text"; 61 text_class: "button_text";
186 } 62 }
187 } 63 }
188 description { state: "visible" 0.0; 64 desc { "visible"; inherit;
189 inherit: "default" 0.0; 65 rel.to: "elm.swallow.content";
190 rel1.to: "elm.swallow.content";
191 rel2.to: "elm.swallow.content";
192 text { 66 text {
193 min: 1 1; 67 min: 1 1;
194 ellipsis: -1; 68 ellipsis: -1;
195 text: "M"; 69 text: "M";
196 } 70 }
197 } 71 }
198 description { state: "icononly" 0.0; 72 desc { "icononly"; inherit;
199 inherit: "default" 0.0; 73 rel.to: "elm.swallow.content";
200 rel1.to: "elm.swallow.content";
201 rel2.to: "elm.swallow.content";
202 text { 74 text {
203 min: 1 1; 75 min: 1 1;
204 ellipsis: -1; 76 ellipsis: -1;
@@ -206,49 +78,123 @@ group { name: "elm/check/base/default";
206 } 78 }
207 } 79 }
208 } 80 }
209 part { name: "elm.text"; type: TEXT; mouse_events: 0; 81 part { name: "base"; type: RECT;
210 effect: SHADOW BOTTOM;
211 scale: 1; 82 scale: 1;
83 description { state: "default";
84 fixed: 1 0;
85 color: 0 0 0 64;
86 align: 0.0 0.5;
87 min: 13 13;
88 max: 13 13;
89 rel1.offset: 4 4;
90 rel2.relative: 0.0 1.0;
91 rel2.offset: 4 -5;
92 aspect: 1.0 1.0; aspect_preference: VERTICAL;
93 offscale;
94 }
95 desc { "pressed"; inherit;
96 color: 0 0 0 128;
97 }
98 desc { "disabled"; inherit;
99 color: 0 0 0 16;
100 }
101 }
102 part { name: "ck_check";
103 clip_to: "ck_selected";
212 description { state: "default" 0.0; 104 description { state: "default" 0.0;
213 rel1.offset: 2 2; 105 fixed: 0 0;
214 rel1.to_x: "elm.swallow.content"; 106 rel.to: "base";
107 image.normal: "check.png";
108 min: 13 13;
109 max: 13 13;
110 visible: 0;
111 color: 160 160 160 255;
112 }
113 description { state: "pressed" 0.0;
114 inherit: "default" 0.0;
115 color: 255 255 255 255;
116 visible: 1;
117 }
118 description { state: "selected" 0.0;
119 inherit: "default" 0.0;
120 visible: 1;
121 }
122 }
123 part { name: "ck_selected"; type: RECT;
124 description { state: "default" 0.0;
125 rel.to: "base";
126 }
127 description { state: "disabled" 0.0;
128 inherit: "default" 0.0;
129 color: 153 153 153 255;
130 }
131 }
132 text { "elm.text"; nomouse;
133 scale: 1;
134 desc { "default";
135 fixed: 1 1;
136 color: 160 160 160 255;
137 rel1.offset: 0 4;
215 rel1.relative: 1.0 0.0; 138 rel1.relative: 1.0 0.0;
216 rel2.offset: -3 -3; 139 rel1.to_x: "elm.swallow.content";
217 color: FN_COL_DEFAULT; 140 rel2.offset: -5 -5;
218 color_class: "check_text";
219 text { font: FN; size: 10; 141 text { font: FN; size: 10;
220 min: 0 0; 142 align: 0.5 0.5;
221 align: 0.0 0.5; 143 min: 0 0;
222 text_class: "check";
223 } 144 }
145 visible: 0;
146 offscale;
224 } 147 }
225 description { state: "disabled" 0.0; 148 desc { "visible"; inherit;
226 inherit: "default" 0.0; 149 fixed: 0 0;
227 color_class: "check_text_disabled"; 150 rel1.offset: 4 4;
228 color3: 255 255 255 255; 151 text.min: 1 1;
152 text.ellipsis: -1;
153 visible: 1;
229 } 154 }
230 description { state: "visible" 0.0; 155 desc { "pressed_visible"; inherit;
231 inherit: "default" 0.0; 156 fixed: 0 0;
157 color: 255 255 255 255;
158 rel1.offset: 4 4;
159 text.min: 1 1;
160 text.ellipsis: -1;
232 visible: 1; 161 visible: 1;
162 }
163 desc { "textonly"; inherit;
164 fixed: 0 0;
233 text.min: 1 1; 165 text.min: 1 1;
234 text.ellipsis: -1; 166 text.ellipsis: -1;
167 visible: 1;
235 } 168 }
236 description { state: "disabled_visible" 0.0; 169 desc { "pressed_textonly"; inherit;
237 inherit: "default" 0.0; 170 fixed: 0 0;
238 color_class: "check_text_disabled"; 171 color: 255 255 255 255;
239 color3: 255 255 255 255; 172 text.min: 1 1;
173 text.ellipsis: -1;
240 visible: 1; 174 visible: 1;
175 }
176 desc { "disabled_visible"; inherit;
177 fixed: 0 0;
178 color: 96 96 96 255;
179 rel1.offset: 4 4;
241 text.min: 1 1; 180 text.min: 1 1;
242 text.ellipsis: -1; 181 text.ellipsis: -1;
182 visible: 1;
183 }
184 desc { "disabled_textonly"; inherit;
185 fixed: 0 0;
186 color: 96 96 96 255;
187 text.min: 1 1;
188 text.ellipsis: -1;
189 visible: 1;
243 } 190 }
244 } 191 }
245 part { name: "event"; type: RECT; 192 rect { "event";
246 ignore_flags: ON_HOLD; 193 ignore_flags: ON_HOLD;
247 description { state: "default" 0.0; 194 desc { "default";
248 color: 0 0 0 0; 195 color: 0 0 0 0;
249 } 196 }
250 description { state: "disabled" 0.0; 197 desc { "disabled"; inherit;
251 inherit: "default" 0.0;
252 visible: 0; 198 visible: 0;
253 } 199 }
254 } 200 }
@@ -261,250 +207,231 @@ group { name: "elm/check/base/default";
261 program { 207 program {
262 signal: "elm,state,check,on"; source: "elm"; 208 signal: "elm,state,check,on"; source: "elm";
263 action: STATE_SET "selected" 0.0; 209 action: STATE_SET "selected" 0.0;
264 target: "indicator"; 210 target: "ck_check";
265 } 211 }
266 program { 212 program {
267 signal: "elm,state,check,off"; source: "elm"; 213 signal: "elm,state,check,off"; source: "elm";
268 action: STATE_SET "default" 0.0; 214 action: STATE_SET "default" 0.0;
269 target: "indicator"; 215 target: "ck_check";
270 } 216 }
271 program { 217 program {
272 signal: "elm,state,text,visible"; source: "elm"; 218 signal: "mouse,down,1"; source: "event";
273 script { 219 action: SIGNAL_EMIT "elm,action,press" "elm";
274 new m = get_int(btmode); 220 after: "button_click_anim";
275 m |= LABEL; set_int(btmode, m);
276 eval_mode(m);
277 }
278 } 221 }
279 program { 222 program {
280 signal: "elm,state,text,hidden"; source: "elm"; 223 signal: "mouse,down,1"; source: "event";
281 script { 224 action: STATE_SET "pressed" 0.0;
282 new m = get_int(btmode); 225 target: "ck_check";
283 m &= ~LABEL; set_int(btmode, m); 226 }
284 eval_mode(m); 227 program { name: "button_click_anim";
285 } 228 script { flag_set(PRESSED); }
229 }
230 program { name: "button_unclick";
231 signal: "mouse,up,1"; source: "event";
232 action: SIGNAL_EMIT "elm,action,unpress" "elm";
233 after: "button_unclick_anim";
286 } 234 }
287 program { 235 program {
288 signal: "elm,state,icon,visible"; source: "elm"; 236 signal: "mouse,up,1"; source: "event";
289 script { 237 action: STATE_SET "default" 0.0;
290 new m = get_int(btmode); 238 target: "ck_check";
291 m |= ICON; set_int(btmode, m); 239 }
292 eval_mode(m); 240 program { name: "button_unclick_anim";
293 } 241 script { flag_unset(PRESSED); }
242 }
243 program { name: "buttonactivate";
244 signal: "elm,anim,activate"; source: "elm";
245 action: STATE_SET "pressed" 0.0;
246 target: "ck_check";
247 after: "button_unpressed_anim";
248 }
249 program { name: "button_unpressed_anim";
250 in: 0.5 0.0;
251 action: STATE_SET "default" 0.0;
252 target: "ck_check";
294 } 253 }
295 program { 254 program {
255 signal: "mouse,clicked,1"; source: "event";
256 action: SIGNAL_EMIT "elm,action,click" "elm";
257 }
258 program { name: "button_text_visible";
259 signal: "elm,state,text,visible"; source: "elm";
260 script { flag_set(LABEL); }
261 }
262 program { name: "button_text_hidden";
263 signal: "elm,state,text,hidden"; source: "elm";
264 script { flag_unset(LABEL); }
265 }
266 program { name: "button_icon_visible";
267 signal: "elm,state,icon,visible"; source: "elm";
268 script { flag_set(ICON); }
269 }
270 program { name: "button_icon_hidden";
296 signal: "elm,state,icon,hidden"; source: "elm"; 271 signal: "elm,state,icon,hidden"; source: "elm";
297 script { 272 script { flag_unset(ICON); }
298 new m = get_int(btmode); 273 }
299 m &= ~ICON; set_int(btmode, m); 274 program { name: "button_background_visible";
300 eval_mode(m); 275 signal: "elm,state,background,visible"; source: "elm";
301 } 276 script { flag_set(BACKGROUND); }
277 }
278 program { name: "button_background_hidden";
279 signal: "elm,state,background,hidden"; source: "elm";
280 script { flag_unset(BACKGROUND); }
281 }
282 program { name: "button_state_disabled";
283 signal: "elm,state,disabled"; source: "elm";
284 script { flag_set(DISABLE); }
285 }
286 program { name: "button_state_enabled";
287 signal: "elm,state,enabled"; source: "elm";
288 script { flag_unset(DISABLE); }
302 } 289 }
303 program { 290 program {
304 signal: "elm,state,disabled"; source: "elm"; 291 signal: "elm,state,disabled"; source: "elm";
305 script { 292 action: STATE_SET "disabled" 0.0;
306 new m = get_int(btmode); 293 target: "ck_selected";
307 m |= DISABLE; set_int(btmode, m);
308 eval_mode(m);
309 }
310 } 294 }
311 program { 295 program {
312 signal: "elm,state,enabled"; source: "elm"; 296 signal: "elm,state,enabled"; source: "elm";
313 script { 297 action: STATE_SET "default" 0.0;
314 new m = get_int(btmode); 298 target: "ck_selected";
315 m &= ~DISABLE; set_int(btmode, m);
316 eval_mode(m);
317 }
318 } 299 }
319 } 300 }
320#undef ICON
321#undef LABEL
322#undef MASK
323#undef DISABLE
324} 301}
325 302
326group { name: "elm/check/base/toggle"; 303group { name: "elm/check/base/toggle";
327 images.image: "inset_shadow_tiny.png" COMP; 304 images.image: "check.png" COMP;
328 images.image: "bevel_in.png" COMP;
329 images.image: "bevel_out.png" COMP;
330 images.image: "vgrad_med_lighter.png" COMP;
331 images.image: "shadow_square_tiny.png" COMP;
332 images.image: "glow_small.png" COMP;
333
334#define ICON 1
335#define LABEL 2
336#define MASK 3
337#define DISABLE 4
338 script { 305 script {
339 public is_rtl;
340 public is_drag; 306 public is_drag;
341 public was_drag; 307 public was_drag;
342 308 public is_rtl;
343 public btmode; 309
344 public eval_mode(m) { 310 BUTTONMODE_SCRIPT
345 new m1 = m & MASK; 311 }
346 new d = m & DISABLE; 312 parts {
347 if (m1 == (ICON | LABEL)) { 313 swallow { "elm.swallow.background"; nomouse;
348 if (!d) { 314 desc { "default";
349 set_state(PART:"elm.swallow.content", "visible", 0.0); 315 visible: 0;
350 set_state(PART:"sizer.content", "visible", 0.0); 316 }
351 set_state(PART:"elm.text", "visible", 0.0); 317 desc { "visible"; inherit;
352 set_state(PART:"shadow", "default", 0.0); 318 visible: 1;
353 set_state(PART:"clip", "default", 0.0); 319 }
354 set_state(PART:"event", "default", 0.0); 320 }
355 set_state(PART:"event2", "default", 0.0); 321 rect { "icon_clip";
356 set_state(PART:"elm.ontext", "default", 0.0); 322 desc { "default";
357 set_state(PART:"elm.offtext", "default", 0.0); 323 color_class: "button_icon";
358 set_state(PART:"onrect", "default", 0.0); 324 }
359 set_state(PART:"offrect", "default", 0.0); 325 desc { "pressed"; inherit;
360 } else { 326 color_class: "button_icon_pressed";
361 set_state(PART:"elm.swallow.content", "visible", 0.0); 327 }
362 set_state(PART:"sizer.content", "visible", 0.0); 328 desc { "disabled"; inherit;
363 set_state(PART:"elm.text", "disabled_visible", 0.0); 329 color_class: "button_icon_disabled";
364 set_state(PART:"shadow", "disabled", 0.0); 330 }
365 set_state(PART:"clip", "disabled", 0.0); 331 }
366 set_state(PART:"event", "disabled", 0.0); 332 swallow { "elm.swallow.content"; nomouse;
367 set_state(PART:"event2", "disabled", 0.0); 333 clip_to: "icon_clip";
368 set_state(PART:"elm.ontext", "disabled", 0.0); 334 scale: 1;
369 set_state(PART:"elm.offtext", "disabled", 0.0); 335 desc { "default";
370 set_state(PART:"onrect", "disabled", 0.0); 336 fixed: 1 0;
371 set_state(PART:"offrect", "disabled", 0.0); 337 align: 0.0 0.5;
372 } 338 rel1.offset: 4 4;
373 } else if (m1 == (ICON)) { 339 rel2.relative: 0.0 1.0;
374 if (!d) { 340 rel2.offset: 4 -5;
375 set_state(PART:"elm.swallow.content", "visible", 0.0); 341 visible: 0;
376 set_state(PART:"sizer.content", "icononly", 0.0); 342 offscale;
377 set_state(PART:"elm.text", "default", 0.0); 343 }
378 set_state(PART:"shadow", "default", 0.0); 344 desc { "visible"; inherit;
379 set_state(PART:"clip", "default", 0.0); 345 fixed: 1 0;
380 set_state(PART:"event", "default", 0.0); 346 aspect: 1.0 1.0;
381 set_state(PART:"event2", "default", 0.0); 347 visible: 1;
382 set_state(PART:"elm.ontext", "default", 0.0); 348 }
383 set_state(PART:"elm.offtext", "default", 0.0); 349 desc { "icononly"; inherit;
384 set_state(PART:"onrect", "default", 0.0); 350 fixed: 0 0;
385 set_state(PART:"offrect", "default", 0.0); 351 align: 0.5 0.5;
386 } else { 352 rel2.relative: 1.0 1.0;
387 set_state(PART:"elm.swallow.content", "visible", 0.0); 353 rel2.offset: -5 -5;
388 set_state(PART:"sizer.content", "icononly", 0.0); 354 rel2.to_x: "tog";
389 set_state(PART:"elm.text", "disabled", 0.0); 355 rel2.relative: 0.0 1.0;
390 set_state(PART:"shadow", "disabled", 0.0); 356 visible: 1;
391 set_state(PART:"clip", "disabled", 0.0); 357 }
392 set_state(PART:"event", "disabled", 0.0); 358 }
393 set_state(PART:"event2", "disabled", 0.0); 359 text { "sizer.content"; nomouse;
394 set_state(PART:"elm.ontext", "disabled", 0.0); 360 scale: 1;
395 set_state(PART:"elm.offtext", "disabled", 0.0); 361 desc { "default";
396 set_state(PART:"onrect", "disabled", 0.0); 362 visible: 0;
397 set_state(PART:"offrect", "disabled", 0.0); 363 text { font: FN; size: 10;
364 min: 0 0;
365 text_class: "button_text";
398 } 366 }
399 } else if (m1 == (LABEL)) { 367 }
400 if (!d) { 368 desc { "visible"; inherit;
401 set_state(PART:"elm.swallow.content", "default", 0.0); 369 rel.to: "elm.swallow.content";
402 set_state(PART:"sizer.content", "default", 0.0); 370 text {
403 set_state(PART:"elm.text", "visible", 0.0); 371 min: 1 1;
404 set_state(PART:"shadow", "default", 0.0); 372 ellipsis: -1;
405 set_state(PART:"clip", "default", 0.0); 373 text: "M";
406 set_state(PART:"event", "default", 0.0);
407 set_state(PART:"event2", "default", 0.0);
408 set_state(PART:"elm.ontext", "default", 0.0);
409 set_state(PART:"elm.offtext", "default", 0.0);
410 set_state(PART:"onrect", "default", 0.0);
411 set_state(PART:"offrect", "default", 0.0);
412 } else {
413 set_state(PART:"elm.swallow.content", "default", 0.0);
414 set_state(PART:"sizer.content", "default", 0.0);
415 set_state(PART:"elm.text", "disabled_visible", 0.0);
416 set_state(PART:"shadow", "disabled", 0.0);
417 set_state(PART:"clip", "disabled", 0.0);
418 set_state(PART:"event", "disabled", 0.0);
419 set_state(PART:"event2", "disabled", 0.0);
420 set_state(PART:"elm.ontext", "disabled", 0.0);
421 set_state(PART:"elm.offtext", "disabled", 0.0);
422 set_state(PART:"onrect", "disabled", 0.0);
423 set_state(PART:"offrect", "disabled", 0.0);
424 } 374 }
425 } else { 375 }
426 if (!d) { 376 desc { "icononly"; inherit;
427 set_state(PART:"elm.swallow.content", "default", 0.0); 377 rel.to: "elm.swallow.content";
428 set_state(PART:"sizer.content", "default", 0.0); 378 text {
429 set_state(PART:"elm.text", "default", 0.0); 379 min: 1 1;
430 set_state(PART:"shadow", "default", 0.0); 380 ellipsis: -1;
431 set_state(PART:"clip", "default", 0.0); 381 text: "M";
432 set_state(PART:"event", "default", 0.0);
433 set_state(PART:"event2", "default", 0.0);
434 set_state(PART:"elm.ontext", "default", 0.0);
435 set_state(PART:"elm.offtext", "default", 0.0);
436 set_state(PART:"onrect", "default", 0.0);
437 set_state(PART:"offrect", "default", 0.0);
438 } else {
439 set_state(PART:"elm.swallow.content", "default", 0.0);
440 set_state(PART:"sizer.content", "default", 0.0);
441 set_state(PART:"elm.text", "default", 0.0);
442 set_state(PART:"shadow", "disabled", 0.0);
443 set_state(PART:"clip", "disabled", 0.0);
444 set_state(PART:"event", "disabled", 0.0);
445 set_state(PART:"event2", "disabled", 0.0);
446 set_state(PART:"elm.ontext", "disabled", 0.0);
447 set_state(PART:"elm.offtext", "disabled", 0.0);
448 set_state(PART:"onrect", "disabled", 0.0);
449 set_state(PART:"offrect", "disabled", 0.0);
450 } 382 }
451 } 383 }
452 } 384 }
453 } 385 spacer { name: "tog"; scale: 1;
454 parts {
455 part { name: "tog"; type: SPACER;
456 scale: 1;
457 description { state: "default" 0.0; 386 description { state: "default" 0.0;
458 fixed: 1 0; 387 fixed: 1 1;
459 rel1.relative: 1.0 0.0; 388 rel1.relative: 1.0 0.0;
460 rel1.offset: 2 2; 389 rel1.offset: -5 4;
461 rel2.offset: -3 -3; 390 rel2.offset: -5 -5;
462 align: 1.0 0.5; 391 align: 1.0 0.5;
463 min: 88 15; 392 min: 88 15;
464 max: 88 15; 393 max: 88 15;
394 offscale;
465 } 395 }
466 } 396 }
467 part { name: "onrect"; type: RECT; mouse_events: 0; 397 rect { name: "base";
468 scale: 1; 398 description { state: "default";
469 clip_to: "tog_clip"; 399 fixed: 1 1;
400 color: 0 0 0 64;
401 rel.to: "tog";
402 }
403 desc { "pressed"; inherit;
404 color: 0 0 0 128;
405 }
406 desc { "disabled"; inherit;
407 color: 0 0 0 16;
408 }
409 }
410 spacer { name: "onrect";
470 description { state: "default" 0.0; 411 description { state: "default" 0.0;
471 rel1.to: "button"; 412 rel.to: "button";
472 rel1.relative: -5.0 0.0; 413 rel1.relative: -5.0 0.0;
473 rel2.to: "button";
474 rel2.relative: 0.5 1.0; 414 rel2.relative: 0.5 1.0;
475 color: 24 24 24 255;
476 }
477 description { state: "disabled" 0.0;
478 inherit: "default" 0.0;
479 color: 64 64 64 255;
480 } 415 }
481 } 416 }
482 part { name: "offrect"; type: RECT; mouse_events: 0; 417 spacer { name: "offrect";
483 scale: 1;
484 clip_to: "tog_clip";
485 description { state: "default" 0.0; 418 description { state: "default" 0.0;
486 rel1.to: "button"; 419 rel.to: "button";
487 rel1.relative: 0.5 0.0; 420 rel1.relative: 0.5 0.0;
488 rel2.to: "button";
489 rel2.relative: 6.0 1.0; 421 rel2.relative: 6.0 1.0;
490 color: 24 24 24 255;
491 }
492 description { state: "disabled" 0.0;
493 inherit: "default" 0.0;
494 color: 64 64 64 255;
495 } 422 }
496 } 423 }
497 part { name: "elm.offtext"; type: TEXT; mouse_events: 0; 424 text { name: "elm.offtext"; nomouse; scale: 1;
498 effect: SHADOW BOTTOM;
499 scale: 1;
500 clip_to: "tog_clip"; 425 clip_to: "tog_clip";
501 description { state: "default" 0.0; 426 description { state: "default" 0.0;
502 fixed: 1 1; 427 fixed: 1 1;
503 rel1.to: "button"; 428 rel1.to: "button";
504 rel1.relative: 1.0 0.0; 429 rel1.relative: 1.0 0.0;
430 rel1.offset: 4 0;
505 rel2.to: "offrect"; 431 rel2.to: "offrect";
506 color: FN_COL_DEFAULT; 432 rel2.offset: -5 -1;
507 color_class: "check_off_text"; 433 offscale;
434 color: 160 160 160 255;
508 text { font: FN; size: 10; 435 text { font: FN; size: 10;
509 min: 0 1; 436 min: 0 1;
510 align: 0.5 0.5; 437 align: 0.5 0.5;
@@ -514,24 +441,24 @@ group { name: "elm/check/base/toggle";
514 } 441 }
515 description { state: "disabled" 0.0; 442 description { state: "disabled" 0.0;
516 inherit: "default" 0.0; 443 inherit: "default" 0.0;
517 color_class: "check_off_text_disabled"; 444 color: 96 96 96 255;
518 color3: 255 255 255 255; 445 }
446 description { state: "clicked" 0.0;
447 inherit: "default" 0.0;
448 color: 255 255 255 255;
519 } 449 }
520 } 450 }
521 part { name: "elm.ontext"; type: TEXT; mouse_events: 0; 451 text { name: "elm.ontext"; nomouse; scale: 1;
522 effect: GLOW;
523 scale: 1;
524 clip_to: "tog_clip"; 452 clip_to: "tog_clip";
525 description { state: "default" 0.0; 453 description { state: "default" 0.0;
526 fixed: 1 1; 454 fixed: 1 1;
527 rel1.to: "onrect"; 455 rel1.to: "onrect";
528 rel1.offset: 2 -1; 456 rel1.offset: 4 0;
529 rel2.to: "button"; 457 rel2.to: "button";
530 rel2.relative: 0.0 1.0; 458 rel2.relative: 0.0 1.0;
531 rel2.offset: -1 -2; 459 rel2.offset: -5 -1;
532 color_class: "check_on_text"; 460 offscale;
533 color2: 255 255 255 255; 461 color: 51 153 255 255;
534 color3: 255 255 255 255;
535 text { font: FN; size: 10; 462 text { font: FN; size: 10;
536 min: 0 1; 463 min: 0 1;
537 align: 0.5 0.5; 464 align: 0.5 0.5;
@@ -541,44 +468,19 @@ group { name: "elm/check/base/toggle";
541 } 468 }
542 description { state: "disabled" 0.0; 469 description { state: "disabled" 0.0;
543 inherit: "default" 0.0; 470 inherit: "default" 0.0;
544 color_class: "check_on_text_disabled"; 471 color: 96 96 96 255;
545 color3: 255 255 255 255;
546 } 472 }
547 } 473 description { state: "clicked" 0.0;
548 part { name: "shadow"; mouse_events: 0;
549 description { state: "default" 0.0;
550 image.normal: "inset_shadow_tiny.png";
551 image.border: 4 4 4 4;
552 rel1.to: "tog";
553 rel2.to: "tog";
554 }
555 description { state: "disabled" 0.0;
556 inherit: "default" 0.0; 474 inherit: "default" 0.0;
557 visible: 0; 475 color: 255 255 255 255;
558 }
559 }
560 part { name: "inset"; mouse_events: 0;
561 scale: 1;
562 description { state: "default" 0.0;
563 fixed: 1 1;
564 rel1.to: "tog";
565 rel1.offset: -1 -1;
566 rel2.to: "tog";
567 rel2.offset: 0 0;
568 image.normal: "bevel_in.png";
569 image.border: 1 1 1 1;
570 image.middle: 0;
571 fill.smooth: 0;
572 } 476 }
573 } 477 }
574 part { name: "tog_clip"; type: RECT; 478 part { name: "tog_clip"; type: RECT;
575 description { state: "default" 0.0; 479 description { state: "default" 0.0;
576 rel1.to: "tog"; 480 rel.to: "tog";
577 rel2.to: "tog";
578 } 481 }
579 } 482 }
580 part { name: "button"; type: RECT; 483 part { name: "button"; type: RECT; scale: 1;
581 scale: 1;
582 clip_to: "tog_clip"; 484 clip_to: "tog_clip";
583 dragable { 485 dragable {
584 x: 1 1 0; 486 x: 1 1 0;
@@ -587,222 +489,131 @@ group { name: "elm/check/base/toggle";
587 } 489 }
588 description { state: "default" 0.0; 490 description { state: "default" 0.0;
589 fixed: 1 1; 491 fixed: 1 1;
590 rel1.to: "tog"; 492 rel.to: "tog";
591 rel2.to: "tog";
592 min: 15 15; 493 min: 15 15;
593 max: 15 99999; 494 max: 15 99999;
594 color: 0 0 0 0; 495 color: 0 0 0 0;
595 } 496 }
596 } 497 }
597 part { name: "shadow_but"; mouse_events: 0; 498 rect { name: "base_but"; nomouse;
598 description { state: "default" 0.0; 499 description { state: "default" 0.0;
599 rel1.offset: -3 -2; 500 rel.to: "button";
600 rel1.to: "base_but"; 501 color: 51 153 255 255;
601 rel2.offset: 2 4;
602 rel2.to: "base_but";
603 image.normal: "shadow_square_tiny.png";
604 image.border: 6 6 6 6;
605 fill.smooth: 0;
606 } 502 }
607 description { state: "clicked" 0.0; 503 description { state: "clicked" 0.0;
608 inherit: "default" 0.0; 504 inherit: "default" 0.0;
609 rel1.offset: -2 -2; 505 color: 255 255 255 255;
610 rel2.offset: 1 1;
611 color: 255 255 255 128;
612 }
613 }
614 part { name: "glow_but"; mouse_events: 0;
615 description { state: "default" 0.0;
616 rel1.offset: -3 -3;
617 rel1.to: "base_but";
618 rel2.offset: 2 2;
619 rel2.to: "base_but";
620 image.normal: "glow_small.png";
621 image.border: 7 7 7 7;
622 fill.smooth: 0;
623 visible: 0;
624 } 506 }
625 description { state: "clicked" 0.0; 507 description { state: "disabled" 0.0;
626 inherit: "default" 0.0; 508 inherit: "default" 0.0;
627 visible: 1; 509 color: 64 64 64 255;
628 }
629 }
630 part { name: "base_but"; mouse_events: 0;
631 description { state: "default" 0.0;
632 rel1.to: "button";
633 rel2.to: "button";
634 image.normal: "vgrad_med_lighter.png";
635 fill.smooth: 0;
636 TILED_HORIZ(120)
637 }
638 }
639 part { name: "bevel_but"; mouse_events: 0;
640 description { state: "default" 0.0;
641 rel1.to: "base_but";
642 rel2.to: "base_but";
643 image.normal: "bevel_out.png";
644 image.border: 1 1 1 1;
645 image.middle: 0;
646 fill.smooth: 0;
647 } 510 }
648 } 511 }
649 part { name: "button_events"; type: RECT; 512 rect { name: "button_events";
650 dragable.events: "button"; 513 dragable.events: "button";
651 description { state: "default" 0.0; 514 description { state: "default" 0.0;
652 color: 0 0 0 0; 515 color: 0 0 0 0;
653 } 516 }
654 } 517 }
655 part { name: "clip"; type: RECT; 518 text { "elm.text"; nomouse;
656 description { state: "default" 0.0;
657 }
658 description { state: "disabled" 0.0;
659 inherit: "default" 0.0;
660 color: 255 255 255 64;
661 }
662 }
663 part { name: "elm.swallow.content"; type: SWALLOW;
664 scale: 1;
665 clip_to: "clip";
666 description { state: "default" 0.0;
667 fixed: 1 0;
668 visible: 0;
669 align: 0.0 0.5;
670 max: 0 0;
671 rel1.offset: 1 1;
672 rel2.offset: 1 -2;
673 rel2.relative: 0.0 1.0;
674 }
675 description { state: "visible" 0.0;
676 inherit: "default" 0.0;
677 fixed: 0 0;
678 visible: 1;
679 min: 16 16;
680 }
681 }
682 part { name: "sizer.content"; type: TEXT; mouse_events: 0;
683 scale: 1; 519 scale: 1;
684 description { state: "default" 0.0; 520 desc { "default";
685 fixed: 1 1; 521 fixed: 1 1;
686 visible: 0; 522 color: 160 160 160 255;
687 text { font: FN; size: 10; 523 rel1.offset: 0 4;
688 min: 0 0;
689 text_class: "check_text";
690 }
691 }
692 description { state: "visible" 0.0;
693 inherit: "default" 0.0;
694 rel1.to: "elm.swallow.content";
695 rel2.to: "elm.swallow.content";
696 text {
697 min: 1 1;
698 ellipsis: -1;
699 text: "M";
700 }
701 }
702 description { state: "icononly" 0.0;
703 inherit: "default" 0.0;
704 rel1.to: "elm.swallow.content";
705 rel2.to: "elm.swallow.content";
706 text {
707 min: 1 1;
708 ellipsis: -1;
709 text: "M";
710 }
711 }
712 }
713 part { name: "elm.text"; type: TEXT; mouse_events: 0;
714 effect: SHADOW BOTTOM;
715 scale: 1;
716 description { state: "default" 0.0;
717 rel1.to_x: "elm.swallow.content";
718 rel1.relative: 1.0 0.0; 524 rel1.relative: 1.0 0.0;
719 rel1.offset: 2 2; 525 rel1.to_x: "elm.swallow.content";
720 rel2.to_x: "tog"; 526 rel2.offset: -5 -5;
721 rel2.relative: 0.0 1.0; 527 rel2.relative: 0.0 1.0;
722 rel2.offset: -5 -3; 528 rel2.to_x: "tog";
723 color: FN_COL_DEFAULT;
724 color_class: "check_text";
725 text { font: FN; size: 10; 529 text { font: FN; size: 10;
726 min: 0 0; 530 align: 0.5 0.5;
727 align: 0.0 0.5; 531 min: 0 0;
728 text_class: "check";
729 } 532 }
533 visible: 0;
534 offscale;
730 } 535 }
731 description { state: "disabled" 0.0; 536 desc { "visible"; inherit;
732 inherit: "default" 0.0; 537 fixed: 0 0;
733 color_class: "check_text_disabled"; 538 rel1.offset: 4 4;
734 color3: 255 255 255 255; 539 text.min: 1 1;
540 text.ellipsis: -1;
541 visible: 1;
735 } 542 }
736 description { state: "visible" 0.0; 543 desc { "pressed_visible"; inherit;
737 inherit: "default" 0.0; 544 fixed: 0 0;
545 color: 255 255 255 255;
546 rel1.offset: 4 4;
547 text.min: 1 1;
548 text.ellipsis: -1;
549 visible: 1;
550 }
551 desc { "textonly"; inherit;
552 fixed: 0 0;
553 text.min: 1 1;
554 text.ellipsis: -1;
738 visible: 1; 555 visible: 1;
556 }
557 desc { "pressed_textonly"; inherit;
558 fixed: 0 0;
559 color: 255 255 255 255;
739 text.min: 1 1; 560 text.min: 1 1;
740 text.ellipsis: -1; 561 text.ellipsis: -1;
562 visible: 1;
741 } 563 }
742 description { state: "disabled_visible" 0.0; 564 desc { "disabled_visible"; inherit;
743 inherit: "default" 0.0; 565 fixed: 0 0;
744 color_class: "check_text_disabled"; 566 color: 96 96 96 255;
745 color3: 255 255 255 255; 567 rel1.offset: 4 4;
568 text.min: 1 1;
569 text.ellipsis: -1;
746 visible: 1; 570 visible: 1;
571 }
572 desc { "disabled_textonly"; inherit;
573 fixed: 0 0;
574 color: 96 96 96 255;
747 text.min: 1 1; 575 text.min: 1 1;
748 text.ellipsis: -1; 576 text.ellipsis: -1;
577 visible: 1;
749 } 578 }
750 } 579 }
751 part { name: "event"; type: RECT; 580 rect { "event2";
752 ignore_flags: ON_HOLD; 581 desc { "default";
753 description { state: "default" 0.0;
754 color: 0 0 0 0; 582 color: 0 0 0 0;
755 rel1.to_x: "elm.swallow.content";
756 rel2.to_x: "elm.text";
757 }
758 description { state: "disabled" 0.0;
759 inherit: "default" 0.0;
760 visible: 0; 583 visible: 0;
761 } 584 }
585 desc { "disabled"; inherit;
586 visible: 1;
587 }
762 } 588 }
763 part { name: "event2"; type: RECT; 589 rect { "event"; repeat;
764 ignore_flags: ON_HOLD; 590 ignore_flags: ON_HOLD;
765 description { state: "default" 0.0; 591 desc { "default";
766 color: 0 0 0 0; 592 color: 0 0 0 0;
767 visible: 0;
768 } 593 }
769 description { state: "disabled" 0.0; 594 desc { "disabled"; inherit;
770 inherit: "default" 0.0; 595 visible: 0;
771 visible: 1;
772 } 596 }
773 } 597 }
774 } 598 }
775 programs { 599 programs {
776 program { 600 program { signal: "elm,state,check,on"; source: "elm";
777 signal: "mouse,clicked,1"; source: "event";
778 action: SIGNAL_EMIT "elm,action,check,toggle" "elm";
779 }
780 program {
781 signal: "elm,state,check,on"; source: "elm";
782 script { 601 script {
783 new Float:drag; 602 new Float:drag;
784 if (get_int(is_rtl) == 0) { 603 if (get_int(is_rtl) == 0) { drag = 100.0; }
785 drag = 100.0; 604 else { drag = 0.0; }
786 } else {
787 drag = 0.0;
788 }
789 set_drag(PART:"button", drag, 0.0); 605 set_drag(PART:"button", drag, 0.0);
790 } 606 }
791 } 607 }
792 program { 608 program { signal: "elm,state,check,off"; source: "elm";
793 signal: "elm,state,check,off"; source: "elm";
794 script { 609 script {
795 new Float:drag; 610 new Float:drag;
796 if (get_int(is_rtl) == 0) { 611 if (get_int(is_rtl) == 0) { drag = 0.0; }
797 drag = 0.0; 612 else { drag = 100.0; }
798 } else {
799 drag = 100.0;
800 }
801 set_drag(PART:"button", drag, 0.0); 613 set_drag(PART:"button", drag, 0.0);
802 } 614 }
803 } 615 }
804 program { 616 program { signal: "mouse,clicked,1"; source: "button";
805 signal: "mouse,clicked,1"; source: "button";
806 script { 617 script {
807 new Float:dx, Float:dy; 618 new Float:dx, Float:dy;
808 get_drag(PART:"button", dx, dy); 619 get_drag(PART:"button", dx, dy);
@@ -821,21 +632,18 @@ group { name: "elm/check/base/toggle";
821 } 632 }
822 } 633 }
823 } 634 }
824 program { 635 program { signal: "drag"; source: "button";
825 signal: "drag"; source: "button";
826 script { 636 script {
827 set_int(is_drag, 1); 637 set_int(is_drag, 1);
828 } 638 }
829 } 639 }
830 program { 640 program { signal: "mouse,down,1"; source: "button";
831 signal: "mouse,down,1"; source: "button";
832 script { 641 script {
833 set_int(was_drag, 0); 642 set_int(was_drag, 0);
834 set_int(is_drag, 0); 643 set_int(is_drag, 0);
835 } 644 }
836 } 645 }
837 program { name: "drag_end"; 646 program { signal: "mouse,up,1"; source: "button";
838 signal: "mouse,up,1"; source: "button";
839 script { 647 script {
840 new Float:dx, Float:dy; 648 new Float:dx, Float:dy;
841 get_drag(PART:"button", dx, dy); 649 get_drag(PART:"button", dx, dy);
@@ -856,81 +664,116 @@ group { name: "elm/check/base/toggle";
856 } 664 }
857 } 665 }
858 } 666 }
859 program { 667 program { signal: "mouse,down,1"; source: "button";
860 signal: "mouse,down,1"; source: "button";
861 action: STATE_SET "clicked" 0.0; 668 action: STATE_SET "clicked" 0.0;
862 target: "shadow_but"; 669 target: "base_but";
863 target: "glow_but"; 670 target: "elm.ontext";
671 target: "elm.offtext";
864 } 672 }
865 program { 673 program { signal: "mouse,up,1"; source: "button";
866 signal: "mouse,up,1"; source: "button";
867 action: STATE_SET "default" 0.0; 674 action: STATE_SET "default" 0.0;
868 target: "shadow_but"; 675 target: "base_but";
869 target: "glow_but"; 676 target: "elm.ontext";
677 target: "elm.offtext";
870 } 678 }
871 program { 679 program {
872 signal: "elm,state,text,visible"; source: "elm"; 680 signal: "mouse,clicked,1"; source: "event";
873 script { 681 action: SIGNAL_EMIT "elm,action,check,toggle" "elm";
874 new m = get_int(btmode);
875 m |= LABEL; set_int(btmode, m);
876 eval_mode(m);
877 }
878 } 682 }
879 program { 683 program {
880 signal: "elm,state,text,hidden"; source: "elm"; 684 signal: "mouse,down,1"; source: "event";
881 script { 685 action: SIGNAL_EMIT "elm,action,press" "elm";
882 new m = get_int(btmode); 686 after: "button_click_anim";
883 m &= ~LABEL; set_int(btmode, m); 687 }
884 eval_mode(m); 688 program { name: "button_click_anim";
885 } 689 script { flag_set(PRESSED); }
690 }
691 program { name: "button_unclick";
692 signal: "mouse,up,1"; source: "event";
693 action: SIGNAL_EMIT "elm,action,unpress" "elm";
694 after: "button_unclick_anim";
695 }
696 program { name: "button_unclick_anim";
697 script { flag_unset(PRESSED); }
886 } 698 }
887 program { 699 program {
888 signal: "elm,state,icon,visible"; source: "elm"; 700 signal: "elm,anim,activate"; source: "elm";
889 script { 701 script {
890 new m = get_int(btmode); 702 new Float:drag;
891 m |= ICON; set_int(btmode, m); 703 if (get_int(is_rtl) == 0) { drag = 100.0; }
892 eval_mode(m); 704 else { drag = 0.0; }
705 set_drag(PART:"button", drag, 0.0);
893 } 706 }
707 after: "button_unpressed_anim";
894 } 708 }
895 program { 709 program { name: "button_unpressed_anim";
896 signal: "elm,state,icon,hidden"; source: "elm"; 710 in: 0.5 0.0;
897 script { 711 script {
898 new m = get_int(btmode); 712 new Float:drag;
899 m &= ~ICON; set_int(btmode, m); 713 if (get_int(is_rtl) == 0) { drag = 0.0; }
900 eval_mode(m); 714 else { drag = 100.0; }
715 set_drag(PART:"button", drag, 0.0);
901 } 716 }
902 } 717 }
903 program { 718 program {
719 signal: "mouse,clicked,1"; source: "event";
720 action: SIGNAL_EMIT "elm,action,click" "elm";
721 }
722 program { name: "button_text_visible";
723 signal: "elm,state,text,visible"; source: "elm";
724 script { flag_set(LABEL); }
725 }
726 program { name: "button_text_hidden";
727 signal: "elm,state,text,hidden"; source: "elm";
728 script { flag_unset(LABEL); }
729 }
730 program { name: "button_icon_visible";
731 signal: "elm,state,icon,visible"; source: "elm";
732 script { flag_set(ICON); }
733 }
734 program { name: "button_icon_hidden";
735 signal: "elm,state,icon,hidden"; source: "elm";
736 script { flag_unset(ICON); }
737 }
738 program { name: "button_background_visible";
739 signal: "elm,state,background,visible"; source: "elm";
740 script { flag_set(BACKGROUND); }
741 }
742 program { name: "button_background_hidden";
743 signal: "elm,state,background,hidden"; source: "elm";
744 script { flag_unset(BACKGROUND); }
745 }
746 program { name: "button_state_disabled";
904 signal: "elm,state,disabled"; source: "elm"; 747 signal: "elm,state,disabled"; source: "elm";
905 script { 748 script { flag_set(DISABLE); }
906 new m = get_int(btmode);
907 m |= DISABLE; set_int(btmode, m);
908 eval_mode(m);
909 }
910 } 749 }
911 program { 750 program { name: "button_state_enabled";
912 signal: "elm,state,enabled"; source: "elm"; 751 signal: "elm,state,enabled"; source: "elm";
913 script { 752 script { flag_unset(DISABLE); }
914 new m = get_int(btmode);
915 m &= ~DISABLE; set_int(btmode, m);
916 eval_mode(m);
917 }
918 } 753 }
919 program { 754 program { signal: "elm,state,disabled"; source: "elm";
920 signal: "edje,state,rtl"; source: "edje"; 755 action: STATE_SET "disabled" 0.0;
921 script { 756 target: "base_but";
922 set_int(is_rtl, 1); 757 target: "event2";
923 } 758 target: "elm.offtext";
759 target: "elm.ontext";
924 } 760 }
925 program { 761 program { signal: "elm,state,enabled"; source: "elm";
926 signal: "edje,state,ltr"; source: "edje"; 762 action: STATE_SET "default" 0.0;
763 target: "base_but";
764 target: "event2";
765 target: "elm.offtext";
766 target: "elm.ontext";
767 }
768 program { signal: "edje,state,rtl"; source: "edje";
769 script {
770 set_int(is_rtl, 1);
771 }
772 }
773 program { signal: "edje,state,ltr"; source: "edje";
927 script { 774 script {
928 set_int(is_rtl, 0); 775 set_int(is_rtl, 0);
929 } 776 }
930 } 777 }
931 } 778 }
932#undef ICON
933#undef LABEL
934#undef MASK
935#undef DISABLE
936} 779}
diff --git a/data/elementary/themes/edc/elm/radio.edc b/data/elementary/themes/edc/elm/radio.edc
index e820f32896..bf387f4872 100644
--- a/data/elementary/themes/edc/elm/radio.edc
+++ b/data/elementary/themes/edc/elm/radio.edc
@@ -1,171 +1,76 @@
1group { name: "elm/radio/base/default"; 1group { name: "elm/radio/base/default";
2 images.image: "inset_shadow_circle_tiny.png" COMP; 2 images.image: "radio.png" COMP;
3 images.image: "inset_circle_tiny.png" COMP;
4 images.image: "sym_radio_alum.png" COMP;
5#define ICON 1
6#define LABEL 2
7#define MASK 3
8#define DISABLE 4
9 script { 3 script {
10 public btmode; 4 BUTTONMODE_SCRIPT
11 public eval_mode(m) {
12 new m1 = m & MASK;
13 new d = m & DISABLE;
14 if (m1 == (ICON | LABEL)) {
15 if (!d) {
16 set_state(PART:"elm.swallow.content", "visible", 0.0);
17 set_state(PART:"sizer.content", "visible", 0.0);
18 set_state(PART:"elm.text", "visible", 0.0);
19 set_state(PART:"inset", "default", 0.0);
20 set_state(PART:"clip", "default", 0.0);
21 set_state(PART:"event", "default", 0.0);
22 } else {
23 set_state(PART:"elm.swallow.content", "visible", 0.0);
24 set_state(PART:"sizer.content", "visible", 0.0);
25 set_state(PART:"elm.text", "disabled_visible", 0.0);
26 set_state(PART:"inset", "disabled", 0.0);
27 set_state(PART:"clip", "disabled", 0.0);
28 set_state(PART:"event", "disabled", 0.0);
29 }
30 } else if (m1 == (ICON)) {
31 if (!d) {
32 set_state(PART:"elm.swallow.content", "visible", 0.0);
33 set_state(PART:"sizer.content", "icononly", 0.0);
34 set_state(PART:"elm.text", "default", 0.0);
35 set_state(PART:"inset", "default", 0.0);
36 set_state(PART:"clip", "default", 0.0);
37 set_state(PART:"event", "default", 0.0);
38 } else {
39 set_state(PART:"elm.swallow.content", "visible", 0.0);
40 set_state(PART:"sizer.content", "icononly", 0.0);
41 set_state(PART:"elm.text", "disabled", 0.0);
42 set_state(PART:"inset", "disabled", 0.0);
43 set_state(PART:"clip", "disabled", 0.0);
44 set_state(PART:"event", "disabled", 0.0);
45 }
46 } else if (m1 == (LABEL)) {
47 if (!d) {
48 set_state(PART:"elm.swallow.content", "default", 0.0);
49 set_state(PART:"sizer.content", "default", 0.0);
50 set_state(PART:"elm.text", "visible", 0.0);
51 set_state(PART:"inset", "default", 0.0);
52 set_state(PART:"clip", "default", 0.0);
53 set_state(PART:"event", "default", 0.0);
54 } else {
55 set_state(PART:"elm.swallow.content", "default", 0.0);
56 set_state(PART:"sizer.content", "default", 0.0);
57 set_state(PART:"elm.text", "disabled_visible", 0.0);
58 set_state(PART:"inset", "disabled", 0.0);
59 set_state(PART:"clip", "disabled", 0.0);
60 set_state(PART:"event", "disabled", 0.0);
61 }
62 } else {
63 if (!d) {
64 set_state(PART:"elm.swallow.content", "default", 0.0);
65 set_state(PART:"sizer.content", "default", 0.0);
66 set_state(PART:"elm.text", "default", 0.0);
67 set_state(PART:"inset", "default", 0.0);
68 set_state(PART:"clip", "default", 0.0);
69 set_state(PART:"event", "default", 0.0);
70 } else {
71 set_state(PART:"elm.swallow.content", "default", 0.0);
72 set_state(PART:"sizer.content", "default", 0.0);
73 set_state(PART:"elm.text", "default", 0.0);
74 set_state(PART:"inset", "disabled", 0.0);
75 set_state(PART:"clip", "disabled", 0.0);
76 set_state(PART:"event", "disabled", 0.0);
77 }
78 }
79 }
80 } 5 }
81 parts { 6 parts {
82 part { name: "inset"; mouse_events: 0; 7 swallow { "elm.swallow.background"; nomouse;
83 scale: 1; 8 desc { "default";
84 description { state: "default" 0.0;
85 rel1.offset: 2 2;
86 rel2.relative: 0.0 1.0;
87 rel2.offset: 2 -3;
88 image.normal: "inset_shadow_circle_tiny.png";
89 align: 0.0 0.5;
90 min: 13 13;
91 max: 13 13;
92 fixed: 1 0;
93 }
94 description { state: "disabled" 0.0;
95 inherit: "default" 0.0;
96 image.normal: "inset_circle_tiny.png";
97 }
98 }
99 part { name: "indicator"; mouse_events: 0;
100 scale: 1;
101 clip_to: "clip";
102 description { state: "default" 0.0;
103 rel1.to: "inset";
104 rel2.to: "inset";
105 image.normal: "sym_radio_alum.png";
106 min: 11 11;
107 max: 11 11;
108 visible: 0; 9 visible: 0;
109 } 10 }
110 description { state: "selected" 0.0; 11 desc { "visible"; inherit;
111 inherit: "default" 0.0;
112 visible: 1; 12 visible: 1;
113 } 13 }
114 } 14 }
115 part { name: "clip"; type: RECT; 15 rect { "icon_clip";
116 description { state: "default" 0.0; 16 desc { "default";
17 color_class: "button_icon";
117 } 18 }
118 description { state: "disabled" 0.0; 19 desc { "pressed"; inherit;
119 inherit: "default" 0.0; 20 color_class: "button_icon_pressed";
120 color: 255 255 255 64; 21 }
22 desc { "disabled"; inherit;
23 color_class: "button_icon_disabled";
121 } 24 }
122 } 25 }
123 part { name: "elm.swallow.content"; type: SWALLOW; 26 swallow { "elm.swallow.content"; nomouse;
27 clip_to: "icon_clip";
124 scale: 1; 28 scale: 1;
125 clip_to: "clip"; 29 desc { "default";
126 description { state: "default" 0.0;
127 fixed: 1 0; 30 fixed: 1 0;
128 visible: 0;
129 align: 0.0 0.5; 31 align: 0.0 0.5;
130 max: 0 0; 32 rel1.to_x: "base";
131 rel1.to_x: "inset"; 33 rel2.to_x: "base";
34 rel1.offset: 4 4;
132 rel1.relative: 1.0 0.0; 35 rel1.relative: 1.0 0.0;
133 rel1.offset: 1 1; 36 rel2.relative: 0.0 1.0;
134 rel2.to_x: "inset"; 37 rel2.offset: 4 -5;
135 rel2.offset: 1 -2; 38 visible: 0;
136 rel2.relative: 1.0 1.0; 39 offscale;
137 } 40 }
138 description { state: "visible" 0.0; 41 desc { "visible"; inherit;
139 inherit: "default" 0.0; 42 fixed: 1 0;
140 visible: 1;
141 aspect: 1.0 1.0; 43 aspect: 1.0 1.0;
142 min: 16 16; 44 visible: 1;
45 }
46 desc { "icononly"; inherit;
47 fixed: 0 0;
48 align: 0.5 0.5;
49 rel2.relative: 1.0 1.0;
50 rel2.offset: -5 -5;
51 rel2.to_x: "";
52 visible: 1;
143 } 53 }
144 } 54 }
145 part { name: "sizer.content"; type: TEXT; mouse_events: 0; 55 text { "sizer.content"; nomouse;
146 scale: 1; 56 scale: 1;
147 description { state: "default" 0.0; 57 desc { "default";
148 fixed: 1 1;
149 visible: 0; 58 visible: 0;
150 text { font: FN; size: 10; 59 text { font: FN; size: 10;
151 min: 0 0; 60 min: 0 0;
152 text_class: "radio_text"; 61 text_class: "button_text";
153 } 62 }
154 } 63 }
155 description { state: "visible" 0.0; 64 desc { "visible"; inherit;
156 inherit: "default" 0.0; 65 rel.to: "elm.swallow.content";
157 rel1.to: "elm.swallow.content";
158 rel2.to: "elm.swallow.content";
159 text { 66 text {
160 min: 1 1; 67 min: 1 1;
161 ellipsis: -1; 68 ellipsis: -1;
162 text: "M"; 69 text: "M";
163 } 70 }
164 } 71 }
165 description { state: "icononly" 0.0; 72 desc { "icononly"; inherit;
166 inherit: "default" 0.0; 73 rel.to: "elm.swallow.content";
167 rel1.to: "elm.swallow.content";
168 rel2.to: "elm.swallow.content";
169 text { 74 text {
170 min: 1 1; 75 min: 1 1;
171 ellipsis: -1; 76 ellipsis: -1;
@@ -173,48 +78,111 @@ group { name: "elm/radio/base/default";
173 } 78 }
174 } 79 }
175 } 80 }
176 part { name: "elm.text"; type: TEXT; mouse_events: 0; 81 part { name: "base"; type: RECT;
177 effect: SHADOW BOTTOM; 82 description { state: "default";
178 scale: 1; 83 fixed: 1 0;
84 align: 0.0 0.5;
85 min: 13 13;
86 max: 13 13;
87 rel1.offset: 4 4;
88 rel2.relative: 0.0 1.0;
89 rel2.offset: 4 -5;
90 aspect: 1.0 1.0; aspect_preference: VERTICAL;
91 offscale;
92 visible: 0;
93 }
94 desc { "pressed"; inherit;
95 }
96 desc { "disabled"; inherit;
97 }
98 }
99 part { name: "ck_check";
179 description { state: "default" 0.0; 100 description { state: "default" 0.0;
180 rel1.offset: 2 2; 101 fixed: 0 0;
181 rel1.to_x: "elm.swallow.content"; 102 rel.to: "base";
103 image.normal: "radio.png";
104 min: 13 13;
105 max: 13 13;
106 color: 0 0 0 64;
107 }
108 description { state: "pressed" 0.0;
109 inherit: "default" 0.0;
110 color: 255 255 255 255;
111 }
112 description { state: "selected" 0.0;
113 inherit: "default" 0.0;
114 color: 160 160 160 255;
115 }
116 desc { "disabled"; inherit;
117 color: 0 0 0 16;
118 }
119 }
120 text { "elm.text"; nomouse;
121 scale: 1;
122 desc { "default";
123 fixed: 1 1;
124 color: 160 160 160 255;
125 rel1.offset: 0 4;
182 rel1.relative: 1.0 0.0; 126 rel1.relative: 1.0 0.0;
183 rel2.offset: -3 -3; 127 rel1.to_x: "elm.swallow.content";
184 color: FN_COL_DEFAULT; 128 rel2.offset: -5 -5;
185 color_class: "radio_text";
186 text { font: FN; size: 10; 129 text { font: FN; size: 10;
187 min: 0 0; 130 align: 0.5 0.5;
188 align: 0.0 0.5; 131 min: 0 0;
189 text_class: "radio";
190 } 132 }
133 visible: 0;
134 offscale;
191 } 135 }
192 description { state: "disabled" 0.0; 136 desc { "visible"; inherit;
193 inherit: "default" 0.0; 137 fixed: 0 0;
194 color_class: "radio_text_disabled"; 138 rel1.offset: 4 4;
195 color3: 255 255 255 255; 139 text.min: 1 1;
140 text.ellipsis: -1;
141 visible: 1;
196 } 142 }
197 description { state: "visible" 0.0; 143 desc { "pressed_visible"; inherit;
198 inherit: "default" 0.0; 144 fixed: 0 0;
145 color: 255 255 255 255;
146 rel1.offset: 4 4;
147 text.min: 1 1;
148 text.ellipsis: -1;
199 visible: 1; 149 visible: 1;
150 }
151 desc { "textonly"; inherit;
152 fixed: 0 0;
200 text.min: 1 1; 153 text.min: 1 1;
201 text.ellipsis: -1; 154 text.ellipsis: -1;
155 visible: 1;
202 } 156 }
203 description { state: "disabled_visible" 0.0; 157 desc { "pressed_textonly"; inherit;
204 inherit: "default" 0.0; 158 fixed: 0 0;
205 color_class: "radio_text_disabled"; 159 color: 255 255 255 255;
206 color3: 255 255 255 255; 160 text.min: 1 1;
161 text.ellipsis: -1;
162 visible: 1;
163 }
164 desc { "disabled_visible"; inherit;
165 fixed: 0 0;
166 color: 96 96 96 255;
167 rel1.offset: 4 4;
168 text.min: 1 1;
169 text.ellipsis: -1;
207 visible: 1; 170 visible: 1;
171 }
172 desc { "disabled_textonly"; inherit;
173 fixed: 0 0;
174 color: 96 96 96 255;
208 text.min: 1 1; 175 text.min: 1 1;
209 text.ellipsis: -1; 176 text.ellipsis: -1;
177 visible: 1;
210 } 178 }
211 } 179 }
212 part { name: "event"; type: RECT; 180 rect { "event";
213 description { state: "default" 0.0; 181 ignore_flags: ON_HOLD;
182 desc { "default";
214 color: 0 0 0 0; 183 color: 0 0 0 0;
215 } 184 }
216 description { state: "disabled" 0.0; 185 desc { "disabled"; inherit;
217 inherit: "default" 0.0;
218 visible: 0; 186 visible: 0;
219 } 187 }
220 } 188 }
@@ -227,64 +195,95 @@ group { name: "elm/radio/base/default";
227 program { 195 program {
228 signal: "elm,state,radio,on"; source: "elm"; 196 signal: "elm,state,radio,on"; source: "elm";
229 action: STATE_SET "selected" 0.0; 197 action: STATE_SET "selected" 0.0;
230 target: "indicator"; 198 target: "ck_check";
231 } 199 }
232 program { 200 program {
233 signal: "elm,state,radio,off"; source: "elm"; 201 signal: "elm,state,radio,off"; source: "elm";
234 action: STATE_SET "default" 0.0; 202 action: STATE_SET "default" 0.0;
235 target: "indicator"; 203 target: "ck_check";
236 } 204 }
237 program { 205 program {
238 signal: "elm,state,text,visible"; source: "elm"; 206 signal: "mouse,down,1"; source: "event";
239 script { 207 action: SIGNAL_EMIT "elm,action,press" "elm";
240 new m = get_int(btmode); 208 after: "button_click_anim";
241 m |= LABEL; set_int(btmode, m);
242 eval_mode(m);
243 }
244 } 209 }
245 program { 210 program {
246 signal: "elm,state,text,hidden"; source: "elm"; 211 signal: "mouse,down,1"; source: "event";
247 script { 212 action: STATE_SET "pressed" 0.0;
248 new m = get_int(btmode); 213 target: "ck_check";
249 m &= ~LABEL; set_int(btmode, m); 214 }
250 eval_mode(m); 215 program { name: "button_click_anim";
251 } 216 script { flag_set(PRESSED); }
217 }
218 program { name: "button_unclick";
219 signal: "mouse,up,1"; source: "event";
220 action: SIGNAL_EMIT "elm,action,unpress" "elm";
221 after: "button_unclick_anim";
252 } 222 }
253 program { 223 program {
254 signal: "elm,state,icon,visible"; source: "elm"; 224 signal: "mouse,up,1"; source: "event";
255 script { 225 action: STATE_SET "default" 0.0;
256 new m = get_int(btmode); 226 target: "ck_check";
257 m |= ICON; set_int(btmode, m); 227 }
258 eval_mode(m); 228 program { name: "button_unclick_anim";
259 } 229 script { flag_unset(PRESSED); }
230 }
231 program { name: "buttonactivate";
232 signal: "elm,anim,activate"; source: "elm";
233 action: STATE_SET "pressed" 0.0;
234 target: "ck_check";
235 after: "button_unpressed_anim";
236 }
237 program { name: "button_unpressed_anim";
238 in: 0.5 0.0;
239 action: STATE_SET "default" 0.0;
240 target: "ck_check";
260 } 241 }
261 program { 242 program {
243 signal: "mouse,clicked,1"; source: "event";
244 action: SIGNAL_EMIT "elm,action,click" "elm";
245 }
246 program { name: "button_text_visible";
247 signal: "elm,state,text,visible"; source: "elm";
248 script { flag_set(LABEL); }
249 }
250 program { name: "button_text_hidden";
251 signal: "elm,state,text,hidden"; source: "elm";
252 script { flag_unset(LABEL); }
253 }
254 program { name: "button_icon_visible";
255 signal: "elm,state,icon,visible"; source: "elm";
256 script { flag_set(ICON); }
257 }
258 program { name: "button_icon_hidden";
262 signal: "elm,state,icon,hidden"; source: "elm"; 259 signal: "elm,state,icon,hidden"; source: "elm";
263 script { 260 script { flag_unset(ICON); }
264 new m = get_int(btmode); 261 }
265 m &= ~ICON; set_int(btmode, m); 262 program { name: "button_background_visible";
266 eval_mode(m); 263 signal: "elm,state,background,visible"; source: "elm";
267 } 264 script { flag_set(BACKGROUND); }
265 }
266 program { name: "button_background_hidden";
267 signal: "elm,state,background,hidden"; source: "elm";
268 script { flag_unset(BACKGROUND); }
269 }
270 program { name: "button_state_disabled";
271 signal: "elm,state,disabled"; source: "elm";
272 script { flag_set(DISABLE); }
273 }
274 program { name: "button_state_enabled";
275 signal: "elm,state,enabled"; source: "elm";
276 script { flag_unset(DISABLE); }
268 } 277 }
269 program { 278 program {
270 signal: "elm,state,disabled"; source: "elm"; 279 signal: "elm,state,disabled"; source: "elm";
271 script { 280 action: STATE_SET "disabled" 0.0;
272 new m = get_int(btmode); 281 target: "ck_check";
273 m |= DISABLE; set_int(btmode, m);
274 eval_mode(m);
275 }
276 } 282 }
277 program { 283 program {
278 signal: "elm,state,enabled"; source: "elm"; 284 signal: "elm,state,enabled"; source: "elm";
279 script { 285 action: STATE_SET "default" 0.0;
280 new m = get_int(btmode); 286 target: "ck_check";
281 m &= ~DISABLE; set_int(btmode, m);
282 eval_mode(m);
283 }
284 } 287 }
285 } 288 }
286#undef ICON
287#undef LABEL
288#undef MASK
289#undef DISABLE
290} 289}
diff --git a/data/elementary/themes/edc/elm/toolbar.edc b/data/elementary/themes/edc/elm/toolbar.edc
index 1a577f00ac..e31f108011 100644
--- a/data/elementary/themes/edc/elm/toolbar.edc
+++ b/data/elementary/themes/edc/elm/toolbar.edc
@@ -332,10 +332,6 @@ group { name: "elm/toolbar/item/default";
332 images.image: "shadow_angled_in_sides.png" COMP; 332 images.image: "shadow_angled_in_sides.png" COMP;
333 images.image: "horizontal_separated_bar_small_glow.png" COMP; 333 images.image: "horizontal_separated_bar_small_glow.png" COMP;
334 images.image: "bevel_dark_in.png" COMP; 334 images.image: "bevel_dark_in.png" COMP;
335#define ICON 1
336#define LABEL 2
337#define MASK 3
338#define DISABLE 4
339 script { 335 script {
340 public btmode; 336 public btmode;
341 public eval_mode(m) { 337 public eval_mode(m) {
@@ -932,10 +928,6 @@ group { name: "elm/toolbar/item/default";
932 target: "text_clip2"; 928 target: "text_clip2";
933 } 929 }
934 } 930 }
935#undef ICON
936#undef LABEL
937#undef MASK
938#undef DISABLE
939} 931}
940 932
941// === item: style assumed to exist 933// === item: style assumed to exist
@@ -947,10 +939,6 @@ group { name: "elm/toolbar/item/item_horizontal";
947 images.image: "shadow_angled_in_sides.png" COMP; 939 images.image: "shadow_angled_in_sides.png" COMP;
948 images.image: "horizontal_separated_bar_small_glow.png" COMP; 940 images.image: "horizontal_separated_bar_small_glow.png" COMP;
949 images.image: "bevel_dark_in.png" COMP; 941 images.image: "bevel_dark_in.png" COMP;
950#define ICON 1
951#define LABEL 2
952#define MASK 3
953#define DISABLE 4
954 script { 942 script {
955 public btmode; 943 public btmode;
956 public eval_mode(m) { 944 public eval_mode(m) {
@@ -1559,10 +1547,6 @@ group { name: "elm/toolbar/item/item_horizontal";
1559 target: "text_clip2"; 1547 target: "text_clip2";
1560 } 1548 }
1561 } 1549 }
1562#undef ICON
1563#undef LABEL
1564#undef MASK
1565#undef DISABLE
1566} 1550}
1567 1551
1568// === separator 1552// === separator
diff --git a/data/elementary/themes/macros.edc b/data/elementary/themes/macros.edc
index 667d4bb624..a7bf5f8769 100644
--- a/data/elementary/themes/macros.edc
+++ b/data/elementary/themes/macros.edc
@@ -156,7 +156,6 @@
156#define PRESSED 8 156#define PRESSED 8
157#define BACKGROUND 16 157#define BACKGROUND 16
158#define BUTTONMODE_SCRIPT \ 158#define BUTTONMODE_SCRIPT \
159 script { \
160 public btmode; \ 159 public btmode; \
161 public eval_mode(m) { \ 160 public eval_mode(m) { \
162 new m1 = m & MASK; \ 161 new m1 = m & MASK; \
@@ -250,5 +249,4 @@
250 flag_unset(flag) { \ 249 flag_unset(flag) { \
251 new m = get_int(btmode) & ~flag; \ 250 new m = get_int(btmode) & ~flag; \
252 set_int(btmode, m); eval_mode(m); \ 251 set_int(btmode, m); eval_mode(m); \
253 } \ 252 }
254 }