summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2021-02-09 22:08:14 +0000
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2021-02-09 22:08:14 +0000
commit343887256dad9b84cd1a2c424f831138517e97c5 (patch)
treef0bb4819692260f1ac79ee1c7d9460e95692036b /data
parentea0429b0bddf40ae801d125d4557e2c137b11739 (diff)
TH - shelf/gadgets - add paddingh/spacing to be less crammed
Diffstat (limited to 'data')
-rw-r--r--data/elementary/themes/edc/ibar-ibox.edc96
-rw-r--r--data/elementary/themes/edc/pager.edc144
-rw-r--r--data/elementary/themes/edc/pager16.edc123
-rw-r--r--data/elementary/themes/edc/shelf.edc128
-rw-r--r--data/elementary/themes/edc/systray.edc44
-rw-r--r--data/elementary/themes/edc/tasks.edc94
-rw-r--r--data/elementary/themes/macros.edc1
7 files changed, 314 insertions, 316 deletions
diff --git a/data/elementary/themes/edc/ibar-ibox.edc b/data/elementary/themes/edc/ibar-ibox.edc
index 941223f62c..1475d16d3a 100644
--- a/data/elementary/themes/edc/ibar-ibox.edc
+++ b/data/elementary/themes/edc/ibar-ibox.edc
@@ -51,11 +51,12 @@ group { name: "e/modules/ibox/icon";
51 } 51 }
52 part { name: "e.swallow.content"; type: SWALLOW; 52 part { name: "e.swallow.content"; type: SWALLOW;
53 clip_to: "item_clip"; 53 clip_to: "item_clip";
54 scale: 1;
54 description { state: "default" 0.0; 55 description { state: "default" 0.0;
55 rel1.to: "content"; 56 rel.to: "content";
56 rel2.to: "content";
57 rel1.offset: 3 3; 57 rel1.offset: 3 3;
58 rel2.offset: -4 -4; 58 rel2.offset: -4 -4;
59 offscale;
59 } 60 }
60 description { state: "bounce1" 0.0; 61 description { state: "bounce1" 0.0;
61 inherit: "default" 0.0; 62 inherit: "default" 0.0;
@@ -91,42 +92,58 @@ group { name: "e/modules/ibox/icon";
91 } 92 }
92 } 93 }
93 part { name: "clip"; type: RECT; mouse_events: 0; 94 part { name: "clip"; type: RECT; mouse_events: 0;
95 scale: 1;
94 description { state: "default" 0.0; 96 description { state: "default" 0.0;
97 rel1.offset: (0 - SHELFPAD) (0 - SHELFPAD);
98 rel2.offset: (SHELFPAD - 1) (SHELFPAD - 1);
99 offscale;
95 } 100 }
96 } 101 }
97 part { name: "clip1"; type: RECT; mouse_events: 0; 102 part { name: "clip1"; type: RECT; mouse_events: 0;
98 clip_to: "clip"; 103 clip_to: "clip";
104 scale: 1;
99 description { state: "default" 0.0; 105 description { state: "default" 0.0;
106 rel1.offset: (0 - SHELFPAD) (0 - SHELFPAD);
107 rel2.offset: (SHELFPAD - 1) (SHELFPAD - 1);
108 offscale;
100 visible: 1; 109 visible: 1;
101 } 110 }
102 description { state: "left" 0.0; 111 description { state: "left" 0.0;
112 inherit: "default" 0.0;
103 visible: 0; 113 visible: 0;
104 } 114 }
105 description { state: "right" 0.0; 115 description { state: "right" 0.0;
116 inherit: "default" 0.0;
106 visible: 0; 117 visible: 0;
107 } 118 }
108 } 119 }
109 part { name: "clip2"; type: RECT; mouse_events: 0; 120 part { name: "clip2"; type: RECT; mouse_events: 0;
110 clip_to: "clip"; 121 clip_to: "clip";
111 description { state: "default" 0.0; 122 description { state: "default" 0.0;
123 rel.to: "clip1";
112 visible: 0; 124 visible: 0;
113 } 125 }
114 description { state: "left" 0.0; 126 description { state: "left" 0.0;
127 inherit: "default" 0.0;
115 visible: 1; 128 visible: 1;
116 } 129 }
117 description { state: "right" 0.0; 130 description { state: "right" 0.0;
131 inherit: "default" 0.0;
118 visible: 0; 132 visible: 0;
119 } 133 }
120 } 134 }
121 part { name: "clip3"; type: RECT; mouse_events: 0; 135 part { name: "clip3"; type: RECT; mouse_events: 0;
122 clip_to: "clip"; 136 clip_to: "clip";
123 description { state: "default" 0.0; 137 description { state: "default" 0.0;
138 rel.to: "clip1";
124 visible: 0; 139 visible: 0;
125 } 140 }
126 description { state: "left" 0.0; 141 description { state: "left" 0.0;
142 inherit: "default" 0.0;
127 visible: 0; 143 visible: 0;
128 } 144 }
129 description { state: "right" 0.0; 145 description { state: "right" 0.0;
146 inherit: "default" 0.0;
130 visible: 1; 147 visible: 1;
131 } 148 }
132 } 149 }
@@ -139,6 +156,9 @@ group { name: "e/modules/ibox/icon";
139 rel1.relative: 0.0 1.0; 156 rel1.relative: 0.0 1.0;
140 align: 0.5 1.0; 157 align: 0.5 1.0;
141 max: 99999 5; 158 max: 99999 5;
159 rel1.offset: 0 (SHELFPAD - 1);
160 rel2.offset: -1 (SHELFPAD - 1);
161 offscale;
142 } 162 }
143 description { state: "visible" 0.0; 163 description { state: "visible" 0.0;
144 inherit: "default" 0.0; 164 inherit: "default" 0.0;
@@ -155,6 +175,9 @@ group { name: "e/modules/ibox/icon";
155 rel2.relative: 0.0 1.0; 175 rel2.relative: 0.0 1.0;
156 align: 0.0 0.5; 176 align: 0.0 0.5;
157 max: 5 99999; 177 max: 5 99999;
178 rel1.offset: (0 - SHELFPAD) 0;
179 rel2.offset: (0 - SHELFPAD) -1;
180 offscale;
158 } 181 }
159 description { state: "visible" 0.0; 182 description { state: "visible" 0.0;
160 inherit: "default" 0.0; 183 inherit: "default" 0.0;
@@ -171,6 +194,9 @@ group { name: "e/modules/ibox/icon";
171 rel1.relative: 1.0 0.0; 194 rel1.relative: 1.0 0.0;
172 align: 1.0 0.5; 195 align: 1.0 0.5;
173 max: 5 99999; 196 max: 5 99999;
197 rel1.offset: (SHELFPAD - 1) 0;
198 rel2.offset: (SHELFPAD - 1) -1;
199 offscale;
174 } 200 }
175 description { state: "visible" 0.0; 201 description { state: "visible" 0.0;
176 inherit: "default" 0.0; 202 inherit: "default" 0.0;
@@ -185,22 +211,19 @@ group { name: "e/modules/ibox/icon";
185 } 211 }
186 } 212 }
187 programs { 213 programs {
188 program { 214 program { signal: "e,origin,center"; source: "e";
189 signal: "e,origin,center"; source: "e";
190 action: STATE_SET "default" 0.0; 215 action: STATE_SET "default" 0.0;
191 target: "clip1"; 216 target: "clip1";
192 target: "clip2"; 217 target: "clip2";
193 target: "clip3"; 218 target: "clip3";
194 } 219 }
195 program { 220 program { signal: "e,origin,left"; source: "e";
196 signal: "e,origin,left"; source: "e";
197 action: STATE_SET "left" 0.0; 221 action: STATE_SET "left" 0.0;
198 target: "clip1"; 222 target: "clip1";
199 target: "clip2"; 223 target: "clip2";
200 target: "clip3"; 224 target: "clip3";
201 } 225 }
202 program { 226 program { signal: "e,origin,right"; source: "e";
203 signal: "e,origin,right"; source: "e";
204 action: STATE_SET "right" 0.0; 227 action: STATE_SET "right" 0.0;
205 target: "clip1"; 228 target: "clip1";
206 target: "clip2"; 229 target: "clip2";
@@ -225,29 +248,25 @@ group { name: "e/modules/ibox/icon";
225// program { 248// program {
226// signal: "e,action,hide,label"; source: "e"; 249// signal: "e,action,hide,label"; source: "e";
227// } 250// }
228 program { 251 program { signal: "e,state,starting"; source: "e";
229 signal: "e,state,starting"; source: "e";
230 action: STATE_SET "starting" 0.0; 252 action: STATE_SET "starting" 0.0;
231 transition: DECELERATE 0.2; 253 transition: DECELERATE 0.2;
232 target: "content"; 254 target: "content";
233 } 255 }
234 program { 256 program { signal: "e,state,started"; source: "e";
235 signal: "e,state,started"; source: "e";
236 action: STATE_SET "default" 0.0; 257 action: STATE_SET "default" 0.0;
237 transition: ACCELERATE 0.2; 258 transition: ACCELERATE 0.2;
238 target: "content"; 259 target: "content";
239 } 260 }
240 ///////////////////////////////////////////////////////////// 261 /////////////////////////////////////////////////////////////
241 program { 262 program { signal: "e,state,on"; source: "e";
242 signal: "e,state,on"; source: "e";
243 action: STATE_SET "visible" 0.0; 263 action: STATE_SET "visible" 0.0;
244 target: "indicator1"; 264 target: "indicator1";
245 target: "indicator2"; 265 target: "indicator2";
246 target: "indicator3"; 266 target: "indicator3";
247 transition: ACCELERATE 0.2; 267 transition: ACCELERATE 0.2;
248 } 268 }
249 program { 269 program { signal: "e,state,off"; source: "e";
250 signal: "e,state,off"; source: "e";
251 action: STATE_SET "default" 0.0; 270 action: STATE_SET "default" 0.0;
252 target: "indicator1"; 271 target: "indicator1";
253 target: "indicator2"; 272 target: "indicator2";
@@ -255,8 +274,7 @@ group { name: "e/modules/ibox/icon";
255 transition: DECELERATE 0.2; 274 transition: DECELERATE 0.2;
256 } 275 }
257 ///////////////////////////////////////////////////////////// 276 /////////////////////////////////////////////////////////////
258 program { 277 program { signal: "e,state,urgent"; source: "e";
259 signal: "e,state,urgent"; source: "e";
260 action: STATE_SET "bounce1" 0.0; 278 action: STATE_SET "bounce1" 0.0;
261 target: "e.swallow.content"; 279 target: "e.swallow.content";
262 target: "e.swallow.preview"; 280 target: "e.swallow.preview";
@@ -276,8 +294,7 @@ group { name: "e/modules/ibox/icon";
276 target: "e.swallow.preview"; 294 target: "e.swallow.preview";
277 after: "urg1"; 295 after: "urg1";
278 } 296 }
279 program { 297 program { signal: "e,state,not_urgent"; source: "e";
280 signal: "e,state,not_urgent"; source: "e";
281 action: STATE_SET "default" 0.0; 298 action: STATE_SET "default" 0.0;
282 target: "e.swallow.content"; 299 target: "e.swallow.content";
283 target: "e.swallow.preview"; 300 target: "e.swallow.preview";
@@ -327,8 +344,7 @@ group { name: "e/modules/ibox/icon_overlay";
327 clip_to: "item_clip"; 344 clip_to: "item_clip";
328 description { state: "default" 0.0; 345 description { state: "default" 0.0;
329 visible: 0; 346 visible: 0;
330 rel1.to: "base"; 347 rel.to: "base";
331 rel2.to: "base";
332 color: 255 255 255 0; 348 color: 255 255 255 0;
333 } 349 }
334 description { state: "visible" 0.0; 350 description { state: "visible" 0.0;
@@ -362,8 +378,7 @@ group { name: "e/modules/ibox/icon_overlay";
362 BUSY("busy_area", "e,state,starting", "e", "e,state,started", "e") 378 BUSY("busy_area", "e,state,starting", "e", "e,state,started", "e")
363 part { name: "busy_area"; type: SPACER; 379 part { name: "busy_area"; type: SPACER;
364 description { state: "default" 0.0; 380 description { state: "default" 0.0;
365 rel1.to: "content"; 381 rel.to: "content";
366 rel2.to: "content";
367 rel1.relative: -0.5 -0.5; 382 rel1.relative: -0.5 -0.5;
368 rel2.relative: 1.5 1.5; 383 rel2.relative: 1.5 1.5;
369 } 384 }
@@ -406,9 +421,8 @@ group { name: "e/modules/ibox/icon_overlay";
406 part { name: "bg"; type: RECT; mouse_events: 0; 421 part { name: "bg"; type: RECT; mouse_events: 0;
407 description { state: "default" 0.0; 422 description { state: "default" 0.0;
408 rel1.offset: -5 -5; 423 rel1.offset: -5 -5;
409 rel1.to: "e.text.label"; 424 rel.to: "e.text.label";
410 rel2.offset: 4 4; 425 rel2.offset: 4 4;
411 rel2.to: "e.text.label";
412 fixed: 1 1; 426 fixed: 1 1;
413 color: 0 0 0 0; 427 color: 0 0 0 0;
414 visible: 0; 428 visible: 0;
@@ -451,21 +465,18 @@ group { name: "e/modules/ibox/icon_overlay";
451// program { 465// program {
452// signal: "e,action,start"; source: "e"; 466// signal: "e,action,start"; source: "e";
453// } 467// }
454 program { 468 program { signal: "e,state,starting"; source: "e";
455 signal: "e,state,starting"; source: "e";
456 action: STATE_SET "starting" 0.0; 469 action: STATE_SET "starting" 0.0;
457 transition: DECELERATE 0.2; 470 transition: DECELERATE 0.2;
458 target: "content"; 471 target: "content";
459 } 472 }
460 program { 473 program { signal: "e,state,started"; source: "e";
461 signal: "e,state,started"; source: "e";
462 action: STATE_SET "default" 0.0; 474 action: STATE_SET "default" 0.0;
463 transition: ACCELERATE 0.2; 475 transition: ACCELERATE 0.2;
464 target: "content"; 476 target: "content";
465 } 477 }
466 /////////////////////////////////////////////////////////// 478 ///////////////////////////////////////////////////////////
467 program { 479 program { signal: "load"; source: "";
468 signal: "load"; source: "";
469 script { 480 script {
470 set_int(urgent, 0); 481 set_int(urgent, 0);
471 } 482 }
@@ -497,15 +508,13 @@ group { name: "e/modules/ibox/icon_overlay";
497 } 508 }
498 after: "go_passive2"; 509 after: "go_passive2";
499 } 510 }
500 program { 511 program { signal: "e,action,show,label"; source: "e";
501 signal: "e,action,show,label"; source: "e";
502 action: STATE_SET "visible" 0.0; 512 action: STATE_SET "visible" 0.0;
503 transition: SINUSOIDAL 0.5; 513 transition: SINUSOIDAL 0.5;
504 target: "e.text.label"; 514 target: "e.text.label";
505 target: "bg"; 515 target: "bg";
506 } 516 }
507 program { 517 program { signal: "e,action,hide,label"; source: "e";
508 signal: "e,action,hide,label"; source: "e";
509 action: STATE_SET "default" 0.0; 518 action: STATE_SET "default" 0.0;
510 transition: SINUSOIDAL 1.0; 519 transition: SINUSOIDAL 1.0;
511 target: "e.text.label"; 520 target: "e.text.label";
@@ -543,8 +552,7 @@ group { name: "e/modules/ibox/icon_overlay";
543 action: STATE_SET "disabled" 0.0; 552 action: STATE_SET "disabled" 0.0;
544 target: "item_clip"; 553 target: "item_clip";
545 } 554 }
546 program { 555 program { signal: "e,state,not_urgent"; source: "e";
547 signal: "e,state,not_urgent"; source: "e";
548 script { 556 script {
549 set_int(urgent, 0); 557 set_int(urgent, 0);
550 } 558 }
@@ -554,8 +562,7 @@ group { name: "e/modules/ibox/icon_overlay";
554 action: STATE_SET "default" 0.0; 562 action: STATE_SET "default" 0.0;
555 target: "item_clip"; 563 target: "item_clip";
556 } 564 }
557 program { 565 program { signal: "e,action,exec"; source: "e";
558 signal: "e,action,exec"; source: "e";
559 after: "exec_start"; 566 after: "exec_start";
560 } 567 }
561 program { name: "exec_start"; 568 program { name: "exec_start";
@@ -846,8 +853,7 @@ group { name: "e/modules/ibar/menu/item";
846 } 853 }
847 part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0; 854 part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0;
848 description { state: "default"; 855 description { state: "default";
849 rel1.to: "icon"; 856 rel.to: "icon";
850 rel2.to: "icon";
851 } 857 }
852 } 858 }
853 part { name: "e.text.title"; type: TEXT; mouse_events: 0; 859 part { name: "e.text.title"; type: TEXT; mouse_events: 0;
@@ -879,14 +885,12 @@ group { name: "e/modules/ibar/menu/item";
879 } 885 }
880 } 886 }
881 programs { 887 programs {
882 program { 888 program { signal: "mouse,in"; source: "event";
883 signal: "mouse,in"; source: "event";
884 action: STATE_SET "focus" 0.0; 889 action: STATE_SET "focus" 0.0;
885 target: "e.text.title"; 890 target: "e.text.title";
886 transition: ACCELERATE 0.2; 891 transition: ACCELERATE 0.2;
887 } 892 }
888 program { 893 program { signal: "mouse,out"; source: "event";
889 signal: "mouse,out"; source: "event";
890 action: STATE_SET "default" 0.0; 894 action: STATE_SET "default" 0.0;
891 target: "e.text.title"; 895 target: "e.text.title";
892 transition: DECELERATE 0.2; 896 transition: DECELERATE 0.2;
diff --git a/data/elementary/themes/edc/pager.edc b/data/elementary/themes/edc/pager.edc
index 41c8d33be5..b4a46b57ca 100644
--- a/data/elementary/themes/edc/pager.edc
+++ b/data/elementary/themes/edc/pager.edc
@@ -18,9 +18,8 @@ group { name: "e/modules/pager/popup";
18 part { name: "e.text.label"; type: TEXT; mouse_events: 0; 18 part { name: "e.text.label"; type: TEXT; mouse_events: 0;
19 scale: 1; 19 scale: 1;
20 description { state: "default" 0.0; 20 description { state: "default" 0.0;
21 rel1.to: "base"; 21 rel.to: "base";
22 rel1.offset: 0 1; 22 rel1.offset: 0 1;
23 rel2.to: "base";
24 rel2.relative: 1.0 0.0; 23 rel2.relative: 1.0 0.0;
25 rel2.offset: -1 1; 24 rel2.offset: -1 1;
26 align: 0.5 0.0; 25 align: 0.5 0.0;
@@ -50,34 +49,30 @@ group { name: "e/modules/pager/desk";
50 ASPECT_FILL((7680/4320)) 49 ASPECT_FILL((7680/4320))
51 } 50 }
52 } 51 }
52 part { name: "clip"; type: RECT; mouse_events: 0;
53 description { state: "default" 0.0;
54 rel.to: "base";
55 }
56 }
53 part { name: "e.background"; type: SWALLOW; 57 part { name: "e.background"; type: SWALLOW;
54 clip_to: "clip"; 58 clip_to: "clip";
55 description { state: "default" 0.0; 59 description { state: "default" 0.0;
56 rel1.to: "base"; 60 rel.to: "base";
57 rel2.to: "base";
58 } 61 }
59 description { state: "hidden" 0.0; 62 description { state: "hidden" 0.0;
60 inherit: "default" 0.0; 63 inherit: "default" 0.0;
61 visible: 0; 64 visible: 0;
62 } 65 }
63 } 66 }
64 part { name: "clip"; type: RECT; mouse_events: 0;
65 description { state: "default" 0.0;
66 rel1.to: "base";
67 rel2.to: "base";
68 }
69 }
70 part { name: "e.swallow.content"; type: SWALLOW; 67 part { name: "e.swallow.content"; type: SWALLOW;
71 clip_to: "clip"; 68 clip_to: "clip";
72 description { state: "default" 0.0; 69 description { state: "default" 0.0;
73 rel1.to: "base"; 70 rel.to: "base";
74 rel2.to: "base";
75 } 71 }
76 } 72 }
77 part { name: "e.text.label"; type: TEXT; mouse_events: 0; 73 part { name: "e.text.label"; type: TEXT; mouse_events: 0;
78 desc { "default"; 74 desc { "default";
79 rel1.to: "e.swallow.content"; 75 rel.to: "e.swallow.content";
80 rel2.to: "e.swallow.content";
81 color3: 255 255 255 255; 76 color3: 255 255 255 255;
82 text { font: "Sans"; size: 10; 77 text { font: "Sans"; size: 10;
83 text_class: "module_small"; 78 text_class: "module_small";
@@ -96,9 +91,7 @@ group { name: "e/modules/pager/desk";
96 desc { "default"; 91 desc { "default";
97 color: 51 153 255 255; 92 color: 51 153 255 255;
98 visible: 0; 93 visible: 0;
99 rel1.to: "e.swallow.content"; 94 rel.to: "e.swallow.content";
100 rel2.to: "e.swallow.content";
101 rel2.offset: -1 0;
102 rel1.relative: 0.0 1.0; 95 rel1.relative: 0.0 1.0;
103 align: 0.5 1.0; 96 align: 0.5 1.0;
104 max: 99999 5; 97 max: 99999 5;
@@ -112,10 +105,9 @@ group { name: "e/modules/pager/desk";
112 part { name: "drop0"; mouse_events: 0; 105 part { name: "drop0"; mouse_events: 0;
113 description { state: "default" 0.0; 106 description { state: "default" 0.0;
114 image.normal: "mini_blue_glow_arrow_0.png"; 107 image.normal: "mini_blue_glow_arrow_0.png";
115 rel1.to: "base"; 108 rel.to: "base";
116 rel1.offset: -1 -1; 109 rel1.offset: -1 -1;
117 rel1.relative: 0.0 0.0; 110 rel1.relative: 0.0 0.0;
118 rel2.to: "base";
119 rel2.relative: 0.0 0.0; 111 rel2.relative: 0.0 0.0;
120 rel2.offset: -1 -1; 112 rel2.offset: -1 -1;
121 align: 0.0 0.0; 113 align: 0.0 0.0;
@@ -138,10 +130,9 @@ group { name: "e/modules/pager/desk";
138 part { name: "drop1"; mouse_events: 0; 130 part { name: "drop1"; mouse_events: 0;
139 description { state: "default" 0.0; 131 description { state: "default" 0.0;
140 image.normal: "mini_blue_glow_arrow_1.png"; 132 image.normal: "mini_blue_glow_arrow_1.png";
141 rel1.to: "base"; 133 rel.to: "base";
142 rel1.offset: 0 -1; 134 rel1.offset: 0 -1;
143 rel1.relative: 1.0 0.0; 135 rel1.relative: 1.0 0.0;
144 rel2.to: "base";
145 rel2.relative: 1.0 0.0; 136 rel2.relative: 1.0 0.0;
146 rel2.offset: 0 -1; 137 rel2.offset: 0 -1;
147 align: 1.0 0.0; 138 align: 1.0 0.0;
@@ -164,10 +155,9 @@ group { name: "e/modules/pager/desk";
164 part { name: "drop2"; mouse_events: 0; 155 part { name: "drop2"; mouse_events: 0;
165 description { state: "default" 0.0; 156 description { state: "default" 0.0;
166 image.normal: "mini_blue_glow_arrow_2.png"; 157 image.normal: "mini_blue_glow_arrow_2.png";
167 rel1.to: "base"; 158 rel.to: "base";
168 rel1.offset: 0 0; 159 rel1.offset: 0 0;
169 rel1.relative: 1.0 1.0; 160 rel1.relative: 1.0 1.0;
170 rel2.to: "base";
171 rel2.relative: 1.0 1.0; 161 rel2.relative: 1.0 1.0;
172 rel2.offset: 0 0; 162 rel2.offset: 0 0;
173 align: 1.0 1.0; 163 align: 1.0 1.0;
@@ -190,10 +180,9 @@ group { name: "e/modules/pager/desk";
190 part { name: "drop3"; mouse_events: 0; 180 part { name: "drop3"; mouse_events: 0;
191 description { state: "default" 0.0; 181 description { state: "default" 0.0;
192 image.normal: "mini_blue_glow_arrow_3.png"; 182 image.normal: "mini_blue_glow_arrow_3.png";
193 rel1.to: "base"; 183 rel.to: "base";
194 rel1.offset: -1 0; 184 rel1.offset: -1 0;
195 rel1.relative: 0.0 1.0; 185 rel1.relative: 0.0 1.0;
196 rel2.to: "base";
197 rel2.relative: 0.0 1.0; 186 rel2.relative: 0.0 1.0;
198 rel2.offset: -1 0; 187 rel2.offset: -1 0;
199 align: 0.0 1.0; 188 align: 0.0 1.0;
@@ -227,24 +216,20 @@ group { name: "e/modules/pager/desk";
227 transition: DECELERATE 0.2; 216 transition: DECELERATE 0.2;
228 target: "sel"; 217 target: "sel";
229 } 218 }
230 program { 219 program { signal: "e,state,unselected"; source: "e";
231 signal: "e,state,unselected"; source: "e";
232 action: ACTION_STOP; 220 action: ACTION_STOP;
233 target: "sel"; 221 target: "sel";
234 } 222 }
235 program { 223 program { signal: "e,state,unselected"; source: "e";
236 signal: "e,state,unselected"; source: "e";
237 action: STATE_SET "default" 0.0; 224 action: STATE_SET "default" 0.0;
238 transition: DECELERATE 0.2; 225 transition: DECELERATE 0.2;
239 target: "sel"; 226 target: "sel";
240 } 227 }
241 program { 228 program { signal: "e,preview,on"; source: "e";
242 signal: "e,preview,on"; source: "e";
243 action: STATE_SET "default" 0.0; 229 action: STATE_SET "default" 0.0;
244 target: "e.background"; 230 target: "e.background";
245 } 231 }
246 program { 232 program { signal: "e,preview,off"; source: "e";
247 signal: "e,preview,off"; source: "e";
248 action: STATE_SET "hidden" 0.0; 233 action: STATE_SET "hidden" 0.0;
249 target: "e.background"; 234 target: "e.background";
250 } 235 }
@@ -266,21 +251,18 @@ group { name: "e/modules/pager/desk";
266 target: "drop3"; 251 target: "drop3";
267 after: "drop1"; 252 after: "drop1";
268 } 253 }
269 program { 254 program { signal: "e,action,drag,out"; source: "e";
270 signal: "e,action,drag,out"; source: "e";
271 action: STATE_SET "default" 0.0; 255 action: STATE_SET "default" 0.0;
272 target: "drop0"; 256 target: "drop0";
273 target: "drop1"; 257 target: "drop1";
274 target: "drop2"; 258 target: "drop2";
275 target: "drop3"; 259 target: "drop3";
276 } 260 }
277 program { 261 program { signal: "e,name,show"; source: "e";
278 signal: "e,name,show"; source: "e";
279 action: STATE_SET "active" 0.0; 262 action: STATE_SET "active" 0.0;
280 target: "e.text.label"; 263 target: "e.text.label";
281 } 264 }
282 program { 265 program { signal: "e,name,hide"; source: "e";
283 signal: "e,name,hide"; source: "e";
284 action: STATE_SET "default" 0.0; 266 action: STATE_SET "default" 0.0;
285 target: "e.text.label"; 267 target: "e.text.label";
286 } 268 }
@@ -304,8 +286,7 @@ group { name: "e/gadget/pager/plain/desk";
304 part { name: "e.background"; type: SWALLOW; 286 part { name: "e.background"; type: SWALLOW;
305 clip_to: "clip"; 287 clip_to: "clip";
306 description { state: "default" 0.0; 288 description { state: "default" 0.0;
307 rel1.to: "base"; 289 rel.to: "base";
308 rel2.to: "base";
309 } 290 }
310 description { state: "hidden" 0.0; 291 description { state: "hidden" 0.0;
311 inherit: "default" 0.0; 292 inherit: "default" 0.0;
@@ -314,15 +295,13 @@ group { name: "e/gadget/pager/plain/desk";
314 } 295 }
315 part { name: "clip"; type: RECT; mouse_events: 0; 296 part { name: "clip"; type: RECT; mouse_events: 0;
316 description { state: "default" 0.0; 297 description { state: "default" 0.0;
317 rel1.to: "base"; 298 rel.to: "base";
318 rel2.to: "base";
319 } 299 }
320 } 300 }
321 part { name: "e.swallow.drop"; type: SWALLOW; 301 part { name: "e.swallow.drop"; type: SWALLOW;
322 clip_to: "clip"; 302 clip_to: "clip";
323 description { state: "default" 0.0; 303 description { state: "default" 0.0;
324 rel1.to: "base"; 304 rel.to: "base";
325 rel2.to: "base";
326 rel2.offset: -2 -1; 305 rel2.offset: -2 -1;
327 link.base: "e,state,visible" "e"; 306 link.base: "e,state,visible" "e";
328 } 307 }
@@ -333,14 +312,12 @@ group { name: "e/gadget/pager/plain/desk";
333 part { name: "e.swallow.content"; type: SWALLOW; 312 part { name: "e.swallow.content"; type: SWALLOW;
334 clip_to: "clip"; 313 clip_to: "clip";
335 description { state: "default" 0.0; 314 description { state: "default" 0.0;
336 rel1.to: "base"; 315 rel.to: "base";
337 rel2.to: "base";
338 } 316 }
339 } 317 }
340 part { name: "e.text.label"; type: TEXT; mouse_events: 0; 318 part { name: "e.text.label"; type: TEXT; mouse_events: 0;
341 desc { "default"; 319 desc { "default";
342 rel1.to: "e.swallow.content"; 320 rel.to: "e.swallow.content";
343 rel2.to: "e.swallow.content";
344 color3: 255 255 255 255; 321 color3: 255 255 255 255;
345 text { font: "Sans"; size: 10; 322 text { font: "Sans"; size: 10;
346 text_class: "module_small"; 323 text_class: "module_small";
@@ -359,8 +336,7 @@ group { name: "e/gadget/pager/plain/desk";
359 desc { "default"; 336 desc { "default";
360 color: 51 153 255 255; 337 color: 51 153 255 255;
361 visible: 0; 338 visible: 0;
362 rel1.to: "e.swallow.content"; 339 rel.to: "e.swallow.content";
363 rel2.to: "e.swallow.content";
364 align: 0.5 1.0; 340 align: 0.5 1.0;
365 max: 99999 5; 341 max: 99999 5;
366 } 342 }
@@ -560,26 +536,22 @@ group { name: "e/gadget/pager/plain/desk";
560 transition: DECELERATE 0.2; 536 transition: DECELERATE 0.2;
561 target: "sel"; 537 target: "sel";
562 } 538 }
563 program { 539 program { signal: "e,state,unselected"; source: "e";
564 signal: "e,state,unselected"; source: "e";
565 action: ACTION_STOP; 540 action: ACTION_STOP;
566 target: "sel_left"; 541 target: "sel_left";
567 target: "sel_top"; 542 target: "sel_top";
568 target: "sel_right"; 543 target: "sel_right";
569 target: "sel_bottom"; 544 target: "sel_bottom";
570 } 545 }
571 program { 546 program { signal: "e,state,unselected"; source: "e";
572 signal: "e,state,unselected"; source: "e";
573 action: STATE_SET "default" 0.0; 547 action: STATE_SET "default" 0.0;
574 target: "sel"; 548 target: "sel";
575 } 549 }
576 program { 550 program { signal: "e,preview,on"; source: "e";
577 signal: "e,preview,on"; source: "e";
578 action: STATE_SET "default" 0.0; 551 action: STATE_SET "default" 0.0;
579 target: "e.background"; 552 target: "e.background";
580 } 553 }
581 program { 554 program { signal: "e,preview,off"; source: "e";
582 signal: "e,preview,off"; source: "e";
583 action: STATE_SET "hidden" 0.0; 555 action: STATE_SET "hidden" 0.0;
584 target: "e.background"; 556 target: "e.background";
585 } 557 }
@@ -601,21 +573,18 @@ group { name: "e/gadget/pager/plain/desk";
601 target: "drop3"; 573 target: "drop3";
602 after: "drop1"; 574 after: "drop1";
603 } 575 }
604 program { 576 program { signal: "e,action,drag,out"; source: "e";
605 signal: "e,action,drag,out"; source: "e";
606 action: STATE_SET "default" 0.0; 577 action: STATE_SET "default" 0.0;
607 target: "drop0"; 578 target: "drop0";
608 target: "drop1"; 579 target: "drop1";
609 target: "drop2"; 580 target: "drop2";
610 target: "drop3"; 581 target: "drop3";
611 } 582 }
612 program { 583 program { signal: "e,name,show"; source: "e";
613 signal: "e,name,show"; source: "e";
614 action: STATE_SET "active" 0.0; 584 action: STATE_SET "active" 0.0;
615 target: "e.text.label"; 585 target: "e.text.label";
616 } 586 }
617 program { 587 program { signal: "e,name,hide"; source: "e";
618 signal: "e,name,hide"; source: "e";
619 action: STATE_SET "default" 0.0; 588 action: STATE_SET "default" 0.0;
620 target: "e.text.label"; 589 target: "e.text.label";
621 } 590 }
@@ -635,15 +604,13 @@ group { name: "e/gadget/pager/default/desk";
635 } 604 }
636 part { name: "clip"; type: RECT; mouse_events: 0; 605 part { name: "clip"; type: RECT; mouse_events: 0;
637 desc { "default"; 606 desc { "default";
638 rel1.to: "e.swallow.content"; 607 rel.to: "e.swallow.content";
639 rel2.to: "e.swallow.content";
640 } 608 }
641 } 609 }
642 part { name: "e.swallow.drop"; type: SWALLOW; 610 part { name: "e.swallow.drop"; type: SWALLOW;
643 clip_to: "clip"; 611 clip_to: "clip";
644 description { state: "default" 0.0; 612 description { state: "default" 0.0;
645 rel1.to: "base"; 613 rel.to: "base";
646 rel2.to: "base";
647 rel2.offset: -2 -1; 614 rel2.offset: -2 -1;
648 link.base: "e,state,visible" "e"; 615 link.base: "e,state,visible" "e";
649 } 616 }
@@ -663,8 +630,7 @@ group { name: "e/gadget/pager/default/desk";
663 part { name: "e.text.label"; type: TEXT; mouse_events: 0; 630 part { name: "e.text.label"; type: TEXT; mouse_events: 0;
664 scale: 1; 631 scale: 1;
665 desc { "default"; 632 desc { "default";
666 rel1.to: "e.swallow.content"; 633 rel.to: "e.swallow.content";
667 rel2.to: "e.swallow.content";
668 color3: 255 255 255 255; 634 color3: 255 255 255 255;
669 text { font: "Sans"; size: 10; 635 text { font: "Sans"; size: 10;
670 text_class: "module_small"; 636 text_class: "module_small";
@@ -683,8 +649,7 @@ group { name: "e/gadget/pager/default/desk";
683 desc { "default"; 649 desc { "default";
684 color: 51 153 255 255; 650 color: 51 153 255 255;
685 visible: 0; 651 visible: 0;
686 rel1.to: "e.swallow.content"; 652 rel.to: "e.swallow.content";
687 rel2.to: "e.swallow.content";
688 align: 0.5 1.0; 653 align: 0.5 1.0;
689 max: 99999 5; 654 max: 99999 5;
690 } 655 }
@@ -884,16 +849,14 @@ group { name: "e/gadget/pager/default/desk";
884 transition: DECELERATE 0.2; 849 transition: DECELERATE 0.2;
885 target: "sel"; 850 target: "sel";
886 } 851 }
887 program { 852 program { signal: "e,state,unselected"; source: "e";
888 signal: "e,state,unselected"; source: "e";
889 action: ACTION_STOP; 853 action: ACTION_STOP;
890 target: "sel_left"; 854 target: "sel_left";
891 target: "sel_top"; 855 target: "sel_top";
892 target: "sel_right"; 856 target: "sel_right";
893 target: "sel_bottom"; 857 target: "sel_bottom";
894 } 858 }
895 program { 859 program { signal: "e,state,unselected"; source: "e";
896 signal: "e,state,unselected"; source: "e";
897 action: STATE_SET "default" 0.0; 860 action: STATE_SET "default" 0.0;
898 target: "sel"; 861 target: "sel";
899 } 862 }
@@ -915,21 +878,18 @@ group { name: "e/gadget/pager/default/desk";
915 target: "drop3"; 878 target: "drop3";
916 after: "drop1"; 879 after: "drop1";
917 } 880 }
918 program { 881 program { signal: "e,action,drag,out"; source: "e";
919 signal: "e,action,drag,out"; source: "e";
920 action: STATE_SET "default" 0.0; 882 action: STATE_SET "default" 0.0;
921 target: "drop0"; 883 target: "drop0";
922 target: "drop1"; 884 target: "drop1";
923 target: "drop2"; 885 target: "drop2";
924 target: "drop3"; 886 target: "drop3";
925 } 887 }
926 program { 888 program { signal: "e,name,show"; source: "e";
927 signal: "e,name,show"; source: "e";
928 action: STATE_SET "active" 0.0; 889 action: STATE_SET "active" 0.0;
929 target: "e.text.label"; 890 target: "e.text.label";
930 } 891 }
931 program { 892 program { signal: "e,name,hide"; source: "e";
932 signal: "e,name,hide"; source: "e";
933 action: STATE_SET "default" 0.0; 893 action: STATE_SET "default" 0.0;
934 target: "e.text.label"; 894 target: "e.text.label";
935 } 895 }
@@ -972,9 +932,8 @@ group { name: "e/modules/pager/window";
972 } 932 }
973 part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0; 933 part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0;
974 description { state: "default" 0.0; 934 description { state: "default" 0.0;
975 rel1.to: "base"; 935 rel.to: "base";
976 rel1.offset: 2 2; 936 rel1.offset: 2 2;
977 rel2.to: "base";
978 rel2.offset: -3 -3; 937 rel2.offset: -3 -3;
979 align: 1.0 1.0; 938 align: 1.0 1.0;
980 max: 24 24; 939 max: 24 24;
@@ -987,8 +946,7 @@ group { name: "e/modules/pager/window";
987 } 946 }
988 part { name: "e.swallow.content"; type: SWALLOW; mouse_events: 0; 947 part { name: "e.swallow.content"; type: SWALLOW; mouse_events: 0;
989 description { state: "default" 0.0; 948 description { state: "default" 0.0;
990 rel1.to: "base"; 949 rel.to: "base";
991 rel2.to: "base";
992 visible: 0; 950 visible: 0;
993 } 951 }
994 description { state: "preview" 0.0; 952 description { state: "preview" 0.0;
@@ -1003,24 +961,20 @@ group { name: "e/modules/pager/window";
1003 } 961 }
1004 } 962 }
1005 programs { 963 programs {
1006 program { 964 program { signal: "e,state,focused"; source: "e";
1007 signal: "e,state,focused"; source: "e";
1008 action: STATE_SET "active" 0.0; 965 action: STATE_SET "active" 0.0;
1009 target: "win"; 966 target: "win";
1010 } 967 }
1011 program { 968 program { signal: "e,state,unfocused"; source: "e";
1012 signal: "e,state,unfocused"; source: "e";
1013 action: STATE_SET "default" 0.0; 969 action: STATE_SET "default" 0.0;
1014 target: "win"; 970 target: "win";
1015 } 971 }
1016 program { 972 program { signal: "e,preview,on"; source: "e";
1017 signal: "e,preview,on"; source: "e";
1018 action: STATE_SET "preview" 0.0; 973 action: STATE_SET "preview" 0.0;
1019 target: "e.swallow.content"; 974 target: "e.swallow.content";
1020 target: "e.swallow.icon"; 975 target: "e.swallow.icon";
1021 } 976 }
1022 program { 977 program { signal: "e,preview,off"; source: "e";
1023 signal: "e,preview,off"; source: "e";
1024 action: STATE_SET "default" 0.0; 978 action: STATE_SET "default" 0.0;
1025 target: "e.swallow.content"; 979 target: "e.swallow.content";
1026 target: "e.swallow.icon"; 980 target: "e.swallow.icon";
diff --git a/data/elementary/themes/edc/pager16.edc b/data/elementary/themes/edc/pager16.edc
index 0835f57729..c4c15e348d 100644
--- a/data/elementary/themes/edc/pager16.edc
+++ b/data/elementary/themes/edc/pager16.edc
@@ -17,9 +17,8 @@ group { name: "e/modules/pager16/popup";
17 part { name: "e.text.label"; type: TEXT; mouse_events: 0; 17 part { name: "e.text.label"; type: TEXT; mouse_events: 0;
18 scale: 1; 18 scale: 1;
19 description { state: "default" 0.0; 19 description { state: "default" 0.0;
20 rel1.to: "base"; 20 rel.to: "base";
21 rel1.offset: 0 1; 21 rel1.offset: 0 1;
22 rel2.to: "base";
23 rel2.relative: 1.0 0.0; 22 rel2.relative: 1.0 0.0;
24 rel2.offset: -1 1; 23 rel2.offset: -1 1;
25 align: 0.5 0.0; 24 align: 0.5 0.0;
@@ -35,6 +34,82 @@ group { name: "e/modules/pager16/popup";
35 } 34 }
36} 35}
37 36
37group { name: "e/modules/pager16/base";
38 parts {
39 part { name: "e.swallow.content"; type: SWALLOW;
40 scale: 1;
41 desc { "default";
42 rel1.offset: 0 (0 - SHELFPAD);
43 rel2.offset: -1 (SHELFPAD - 1);
44 offscale;
45 }
46 desc { "vertical";
47 inherit: "default" 0.0;
48 rel1.offset: (0 - SHELFPAD) 0;
49 rel2.offset: (SHELFPAD - 1) -1;
50 }
51 }
52 }
53 programs {
54 program { signal: "e,state,orient,horiz"; source: "e";
55 action: STATE_SET "default" 0.0;
56 target: "e.swallow.content";
57 }
58 program { signal: "e,state,orient,vert"; source: "e";
59 action: STATE_SET "vertical" 0.0;
60 target: "e.swallow.content";
61 }
62 program { signal: "e,state,orient,left"; source: "e";
63 action: STATE_SET "vertical" 0.0;
64 target: "e.swallow.content";
65 }
66 program { signal: "e,state,orient,right"; source: "e";
67 action: STATE_SET "vertical" 0.0;
68 target: "e.swallow.content";
69 }
70 program { signal: "e,state,orient,top"; source: "e";
71 action: STATE_SET "default" 0.0;
72 target: "e.swallow.content";
73 }
74 program { signal: "e,state,orient,bottom"; source: "e";
75 action: STATE_SET "default" 0.0;
76 target: "e.swallow.content";
77 }
78 program { signal: "e,state,orient,corner_tl"; source: "e";
79 action: STATE_SET "default" 0.0;
80 target: "e.swallow.content";
81 }
82 program { signal: "e,state,orient,corner_tr"; source: "e";
83 action: STATE_SET "default" 0.0;
84 target: "e.swallow.content";
85 }
86 program { signal: "e,state,orient,corner_bl"; source: "e";
87 action: STATE_SET "default" 0.0;
88 target: "e.swallow.content";
89 }
90 program { signal: "e,state,orient,corner_br"; source: "e";
91 action: STATE_SET "default" 0.0;
92 target: "e.swallow.content";
93 }
94 program { signal: "e,state,orient,corner_lt"; source: "e";
95 action: STATE_SET "vertical" 0.0;
96 target: "e.swallow.content";
97 }
98 program { signal: "e,state,orient,corner_rt"; source: "e";
99 action: STATE_SET "vertical" 0.0;
100 target: "e.swallow.content";
101 }
102 program { signal: "e,state,orient,corner_lb"; source: "e";
103 action: STATE_SET "vertical" 0.0;
104 target: "e.swallow.content";
105 }
106 program { signal: "e,state,orient,corner_rb"; source: "e";
107 action: STATE_SET "vertical" 0.0;
108 target: "e.swallow.content";
109 }
110 }
111}
112
38group { name: "e/modules/pager16/desk"; 113group { name: "e/modules/pager16/desk";
39 images.image: "mini_blue_glow_arrow_0.png" COMP; 114 images.image: "mini_blue_glow_arrow_0.png" COMP;
40 images.image: "mini_blue_glow_arrow_1.png" COMP; 115 images.image: "mini_blue_glow_arrow_1.png" COMP;
@@ -48,16 +123,13 @@ group { name: "e/modules/pager16/desk";
48 } 123 }
49 part { name: "clip"; type: RECT; mouse_events: 0; 124 part { name: "clip"; type: RECT; mouse_events: 0;
50 desc { "default"; 125 desc { "default";
51 rel1.to: "e.swallow.content"; 126 rel.to: "e.swallow.content";
52 rel2.to: "e.swallow.content";
53 } 127 }
54 } 128 }
55 part { name: "e.swallow.drop"; type: SWALLOW; 129 part { name: "e.swallow.drop"; type: SWALLOW;
56 clip_to: "clip"; 130 clip_to: "clip";
57 description { state: "default" 0.0; 131 description { state: "default" 0.0;
58 rel1.to: "base"; 132 rel.to: "base";
59 rel2.to: "base";
60 rel2.offset: -2 -1;
61 link.base: "e,state,visible" "e"; 133 link.base: "e,state,visible" "e";
62 } 134 }
63 desc { "hid"; inherit; hid; 135 desc { "hid"; inherit; hid;
@@ -67,6 +139,7 @@ group { name: "e/modules/pager16/desk";
67 part { name: "e.swallow.content"; type: SWALLOW; 139 part { name: "e.swallow.content"; type: SWALLOW;
68 clip_to: "clip"; 140 clip_to: "clip";
69 desc { "default"; 141 desc { "default";
142 rel.to: "base";
70 link.base: "e,state,visible" "e"; 143 link.base: "e,state,visible" "e";
71 } 144 }
72 desc { "hid"; inherit; hid; 145 desc { "hid"; inherit; hid;
@@ -76,8 +149,7 @@ group { name: "e/modules/pager16/desk";
76 part { name: "e.text.label"; type: TEXT; mouse_events: 0; 149 part { name: "e.text.label"; type: TEXT; mouse_events: 0;
77 scale: 1; 150 scale: 1;
78 desc { "default"; 151 desc { "default";
79 rel1.to: "e.swallow.content"; 152 rel.to: "e.swallow.content";
80 rel2.to: "e.swallow.content";
81 color3: 255 255 255 255; 153 color3: 255 255 255 255;
82 text { font: "Sans"; size: 10; 154 text { font: "Sans"; size: 10;
83 text_class: "module_small"; 155 text_class: "module_small";
@@ -96,12 +168,10 @@ group { name: "e/modules/pager16/desk";
96 desc { "default"; 168 desc { "default";
97 color: 51 153 255 255; 169 color: 51 153 255 255;
98 visible: 0; 170 visible: 0;
99 rel1.to: "e.swallow.content"; 171 rel.to: "e.swallow.content";
100 rel2.to: "e.swallow.content";
101 rel2.offset: -1 0;
102 rel1.relative: 0.0 1.0; 172 rel1.relative: 0.0 1.0;
103 align: 0.5 1.0; 173 align: 0.5 1.0;
104 max: 99999 6; 174 max: 99999 5;
105 } 175 }
106 desc { "active"; inherit; 176 desc { "active"; inherit;
107 inherit: "default" 0.0; 177 inherit: "default" 0.0;
@@ -112,10 +182,9 @@ group { name: "e/modules/pager16/desk";
112 part { name: "drop0"; mouse_events: 0; 182 part { name: "drop0"; mouse_events: 0;
113 description { state: "default" 0.0; 183 description { state: "default" 0.0;
114 image.normal: "mini_blue_glow_arrow_0.png"; 184 image.normal: "mini_blue_glow_arrow_0.png";
115 rel1.to: "e.swallow.content"; 185 rel.to: "e.swallow.content";
116 rel1.offset: -1 -1; 186 rel1.offset: -1 -1;
117 rel1.relative: 0.0 0.0; 187 rel1.relative: 0.0 0.0;
118 rel2.to: "e.swallow.content";
119 rel2.relative: 0.0 0.0; 188 rel2.relative: 0.0 0.0;
120 rel2.offset: -1 -1; 189 rel2.offset: -1 -1;
121 align: 0.0 0.0; 190 align: 0.0 0.0;
@@ -138,10 +207,9 @@ group { name: "e/modules/pager16/desk";
138 part { name: "drop1"; mouse_events: 0; 207 part { name: "drop1"; mouse_events: 0;
139 description { state: "default" 0.0; 208 description { state: "default" 0.0;
140 image.normal: "mini_blue_glow_arrow_1.png"; 209 image.normal: "mini_blue_glow_arrow_1.png";
141 rel1.to: "e.swallow.content"; 210 rel.to: "e.swallow.content";
142 rel1.offset: 0 -1; 211 rel1.offset: 0 -1;
143 rel1.relative: 1.0 0.0; 212 rel1.relative: 1.0 0.0;
144 rel2.to: "e.swallow.content";
145 rel2.relative: 1.0 0.0; 213 rel2.relative: 1.0 0.0;
146 rel2.offset: 0 -1; 214 rel2.offset: 0 -1;
147 align: 1.0 0.0; 215 align: 1.0 0.0;
@@ -164,10 +232,9 @@ group { name: "e/modules/pager16/desk";
164 part { name: "drop2"; mouse_events: 0; 232 part { name: "drop2"; mouse_events: 0;
165 description { state: "default" 0.0; 233 description { state: "default" 0.0;
166 image.normal: "mini_blue_glow_arrow_2.png"; 234 image.normal: "mini_blue_glow_arrow_2.png";
167 rel1.to: "e.swallow.content"; 235 rel.to: "e.swallow.content";
168 rel1.offset: 0 0; 236 rel1.offset: 0 0;
169 rel1.relative: 1.0 1.0; 237 rel1.relative: 1.0 1.0;
170 rel2.to: "e.swallow.content";
171 rel2.relative: 1.0 1.0; 238 rel2.relative: 1.0 1.0;
172 rel2.offset: 0 0; 239 rel2.offset: 0 0;
173 align: 1.0 1.0; 240 align: 1.0 1.0;
@@ -190,10 +257,9 @@ group { name: "e/modules/pager16/desk";
190 part { name: "drop3"; mouse_events: 0; 257 part { name: "drop3"; mouse_events: 0;
191 description { state: "default" 0.0; 258 description { state: "default" 0.0;
192 image.normal: "mini_blue_glow_arrow_3.png"; 259 image.normal: "mini_blue_glow_arrow_3.png";
193 rel1.to: "e.swallow.content"; 260 rel.to: "e.swallow.content";
194 rel1.offset: -1 0; 261 rel1.offset: -1 0;
195 rel1.relative: 0.0 1.0; 262 rel1.relative: 0.0 1.0;
196 rel2.to: "e.swallow.content";
197 rel2.relative: 0.0 1.0; 263 rel2.relative: 0.0 1.0;
198 rel2.offset: -1 0; 264 rel2.offset: -1 0;
199 align: 0.0 1.0; 265 align: 0.0 1.0;
@@ -227,13 +293,11 @@ group { name: "e/modules/pager16/desk";
227 transition: DECELERATE 0.2; 293 transition: DECELERATE 0.2;
228 target: "sel"; 294 target: "sel";
229 } 295 }
230 program { 296 program { signal: "e,state,unselected"; source: "e";
231 signal: "e,state,unselected"; source: "e";
232 action: ACTION_STOP; 297 action: ACTION_STOP;
233 target: "sel"; 298 target: "sel";
234 } 299 }
235 program { 300 program { signal: "e,state,unselected"; source: "e";
236 signal: "e,state,unselected"; source: "e";
237 action: STATE_SET "default" 0.0; 301 action: STATE_SET "default" 0.0;
238 transition: DECELERATE 0.2; 302 transition: DECELERATE 0.2;
239 target: "sel"; 303 target: "sel";
@@ -256,21 +320,18 @@ group { name: "e/modules/pager16/desk";
256 target: "drop3"; 320 target: "drop3";
257 after: "drop1"; 321 after: "drop1";
258 } 322 }
259 program { 323 program { signal: "e,action,drag,out"; source: "e";
260 signal: "e,action,drag,out"; source: "e";
261 action: STATE_SET "default" 0.0; 324 action: STATE_SET "default" 0.0;
262 target: "drop0"; 325 target: "drop0";
263 target: "drop1"; 326 target: "drop1";
264 target: "drop2"; 327 target: "drop2";
265 target: "drop3"; 328 target: "drop3";
266 } 329 }
267 program { 330 program { signal: "e,name,show"; source: "e";
268 signal: "e,name,show"; source: "e";
269 action: STATE_SET "active" 0.0; 331 action: STATE_SET "active" 0.0;
270 target: "e.text.label"; 332 target: "e.text.label";
271 } 333 }
272 program { 334 program { signal: "e,name,hide"; source: "e";
273 signal: "e,name,hide"; source: "e";
274 action: STATE_SET "default" 0.0; 335 action: STATE_SET "default" 0.0;
275 target: "e.text.label"; 336 target: "e.text.label";
276 } 337 }
diff --git a/data/elementary/themes/edc/shelf.edc b/data/elementary/themes/edc/shelf.edc
index a51ca7e97e..2dbefd5f6d 100644
--- a/data/elementary/themes/edc/shelf.edc
+++ b/data/elementary/themes/edc/shelf.edc
@@ -106,13 +106,13 @@ group { name: "e/shelf/default/inset"; nomouse;
106 spacer { "sizer"; 106 spacer { "sizer";
107 scale: 1; 107 scale: 1;
108 description { state: "default" 0.0; 108 description { state: "default" 0.0;
109 rel1.offset: 3 0; 109 rel1.offset: (3 + SHELFPAD) SHELFPAD;
110 rel2.offset: -4 -1; 110 rel2.offset: (-4 - SHELFPAD) (-1 - SHELFPAD);
111 offscale; 111 offscale;
112 } 112 }
113 description { state: "vert" 0.0; 113 description { state: "vert" 0.0;
114 rel1.offset: 0 3; 114 rel1.offset: SHELFPAD (3 + SHELFPAD);
115 rel2.offset: -1 -4; 115 rel2.offset: (-1 - SHELFPAD) (-4 - SHELFPAD);
116 offscale; 116 offscale;
117 } 117 }
118 } 118 }
@@ -217,8 +217,7 @@ group { name: "e/shelf/default/inset"; nomouse;
217 } 217 }
218 programs { 218 programs {
219#define ORIENT_SATE(_ORIENT, _STATE) \ 219#define ORIENT_SATE(_ORIENT, _STATE) \
220program { \ 220program { signal: "e,state,orientation,"_ORIENT; source: "e"; \
221signal: "e,state,orientation,"_ORIENT; source: "e"; \
222action: STATE_SET _STATE 0.0; \ 221action: STATE_SET _STATE 0.0; \
223target: "sizer"; \ 222target: "sizer"; \
224target: "clip"; \ 223target: "clip"; \
@@ -238,57 +237,49 @@ target: "sh_vert_clip"; \
238 ORIENT_SATE("right_top", "vert") 237 ORIENT_SATE("right_top", "vert")
239 ORIENT_SATE("right_bottom", "vert") 238 ORIENT_SATE("right_bottom", "vert")
240#undef ORIENT_SATE 239#undef ORIENT_SATE
241 program { 240 program { signal: "e,state,scroll,begin"; source: "e";
242 signal: "e,state,scroll,begin"; source: "e";
243 action: STATE_SET "default" 0.0; 241 action: STATE_SET "default" 0.0;
244 transition: SINUSOIDAL 0.5 CURRENT; 242 transition: SINUSOIDAL 0.5 CURRENT;
245 target: "sh_l"; 243 target: "sh_l";
246 target: "sh_t"; 244 target: "sh_t";
247 } 245 }
248 program { 246 program { signal: "e,state,scroll,begin"; source: "e";
249 signal: "e,state,scroll,begin"; source: "e";
250 action: STATE_SET "active" 0.0; 247 action: STATE_SET "active" 0.0;
251 transition: SINUSOIDAL 0.5 CURRENT; 248 transition: SINUSOIDAL 0.5 CURRENT;
252 target: "sh_r"; 249 target: "sh_r";
253 target: "sh_b"; 250 target: "sh_b";
254 } 251 }
255 program { 252 program { signal: "e,state,scroll,middle"; source: "e";
256 signal: "e,state,scroll,middle"; source: "e";
257 action: STATE_SET "active" 0.0; 253 action: STATE_SET "active" 0.0;
258 transition: SINUSOIDAL 0.5 CURRENT; 254 transition: SINUSOIDAL 0.5 CURRENT;
259 target: "sh_l"; 255 target: "sh_l";
260 target: "sh_t"; 256 target: "sh_t";
261 } 257 }
262 program { 258 program { signal: "e,state,scroll,middle"; source: "e";
263 signal: "e,state,scroll,middle"; source: "e";
264 action: STATE_SET "active" 0.0; 259 action: STATE_SET "active" 0.0;
265 transition: SINUSOIDAL 0.5 CURRENT; 260 transition: SINUSOIDAL 0.5 CURRENT;
266 target: "sh_r"; 261 target: "sh_r";
267 target: "sh_b"; 262 target: "sh_b";
268 } 263 }
269 program { 264 program { signal: "e,state,scroll,end"; source: "e";
270 signal: "e,state,scroll,end"; source: "e";
271 action: STATE_SET "active" 0.0; 265 action: STATE_SET "active" 0.0;
272 transition: SINUSOIDAL 0.5 CURRENT; 266 transition: SINUSOIDAL 0.5 CURRENT;
273 target: "sh_l"; 267 target: "sh_l";
274 target: "sh_t"; 268 target: "sh_t";
275 } 269 }
276 program { 270 program { signal: "e,state,scroll,end"; source: "e";
277 signal: "e,state,scroll,end"; source: "e";
278 action: STATE_SET "default" 0.0; 271 action: STATE_SET "default" 0.0;
279 transition: SINUSOIDAL 0.5 CURRENT; 272 transition: SINUSOIDAL 0.5 CURRENT;
280 target: "sh_r"; 273 target: "sh_r";
281 target: "sh_b"; 274 target: "sh_b";
282 } 275 }
283 program { 276 program { signal: "e,state,scroll,none"; source: "e";
284 signal: "e,state,scroll,none"; source: "e";
285 action: STATE_SET "default" 0.0; 277 action: STATE_SET "default" 0.0;
286 transition: SINUSOIDAL 0.5 CURRENT; 278 transition: SINUSOIDAL 0.5 CURRENT;
287 target: "sh_l"; 279 target: "sh_l";
288 target: "sh_t"; 280 target: "sh_t";
289 } 281 }
290 program { 282 program { signal: "e,state,scroll,none"; source: "e";
291 signal: "e,state,scroll,none"; source: "e";
292 action: STATE_SET "default" 0.0; 283 action: STATE_SET "default" 0.0;
293 transition: SINUSOIDAL 0.5 CURRENT; 284 transition: SINUSOIDAL 0.5 CURRENT;
294 target: "sh_r"; 285 target: "sh_r";
@@ -297,6 +288,49 @@ target: "sh_vert_clip"; \
297 } 288 }
298} 289}
299 290
291group { name: "e/shelf/default/plain"; nomouse;
292 alias: "e/shelf/alternate/plain";
293 alias: "e/shelf/invisible/plain";
294 alias: "e/shelf/translucent/plain";
295 parts {
296 rect { "mouse"; mouse;
297 desc { color: 0 0 0 0; }
298 }
299 part { name: "base"; type: RECT;
300 description { state: "default" 0.0;
301 color: 0 0 0 0;
302 }
303 }
304 part { name: "clip"; type: RECT;
305 description { state: "default" 0.0;
306 color: 255 255 255 255;
307 }
308 }
309 spacer { "sizer";
310 scale: 1;
311 desc {
312 rel1.offset: SHELFPAD SHELFPAD;
313 rel2.offset: (-1 - SHELFPAD) (-1 - SHELFPAD);
314 offscale;
315 }
316 }
317 part { name: "e.swallow.content"; type: SWALLOW; mouse;
318 clip_to: "clip";
319 desc {
320 rel.to: "sizer";
321 link.base: "e,state,visible" "e";
322 }
323 desc { "hidden"; hid;
324 rel.to: "sizer";
325 link.base: "e,state,hidden" "e";
326 }
327 }
328 rect { "events"; repeat; mouse;
329 desc { color: 0 0 0 0; }
330 }
331 }
332}
333
300group { name: "e/shelf/alternate/base"; nomouse; 334group { name: "e/shelf/alternate/base"; nomouse;
301 inherit: "e/shelf/default/base"; 335 inherit: "e/shelf/default/base";
302 parts { 336 parts {
@@ -326,11 +360,6 @@ group { name: "e/shelf/invisible/base"; nomouse;
326 visible: 0; 360 visible: 0;
327 } 361 }
328 } 362 }
329 part { name: "shine";
330 description { state: "default" 0.0;
331 visible: 0;
332 }
333 }
334 } 363 }
335} 364}
336 365
@@ -343,52 +372,11 @@ group { name: "e/shelf/translucent/base"; nomouse;
343 parts { 372 parts {
344 part { name: "bg"; 373 part { name: "bg";
345 description { state: "default" 0.0; 374 description { state: "default" 0.0;
346 color: 32 32 32 128; 375 color: 64 64 64 128;
347 } 376 }
348 description { state: "vert" 0.0; 377 description { state: "vert" 0.0;
349 color: 32 32 32 128; 378 color: 64 64 64 128;
350 }
351 }
352 }
353}
354
355group { name: "e/shelf/default/plain"; nomouse;
356 alias: "e/shelf/alternate/plain";
357 alias: "e/shelf/invisible/plain";
358 alias: "e/shelf/translucent/plain";
359 parts {
360 rect { "mouse"; mouse;
361 desc { color: 0 0 0 0; }
362 }
363 part { name: "base"; type: RECT;
364 description { state: "default" 0.0;
365 color: 0 0 0 0;
366 }
367 }
368 part { name: "clip"; type: RECT;
369 description { state: "default" 0.0;
370 color: 255 255 255 255;
371 }
372 }
373 spacer { "sizer";
374 desc {
375 rel1.offset: 0 0;
376 rel2.offset: -1 -1;
377 }
378 }
379 part { name: "e.swallow.content"; type: SWALLOW; mouse;
380 clip_to: "clip";
381 desc {
382 rel.to: "sizer";
383 link.base: "e,state,visible" "e";
384 } 379 }
385 desc { "hidden"; hid;
386 rel.to: "sizer";
387 link.base: "e,state,hidden" "e";
388 }
389 }
390 rect { "events"; repeat; mouse;
391 desc { color: 0 0 0 0; }
392 } 380 }
393 } 381 }
394} 382}
diff --git a/data/elementary/themes/edc/systray.edc b/data/elementary/themes/edc/systray.edc
index c994fd3904..19d20af3db 100644
--- a/data/elementary/themes/edc/systray.edc
+++ b/data/elementary/themes/edc/systray.edc
@@ -13,7 +13,7 @@ group { name: "e/modules/systray/main";
13 } 13 }
14 description { state: "disabled" 0.0; 14 description { state: "disabled" 0.0;
15 inherit: "default" 0.0; 15 inherit: "default" 0.0;
16 color: 255 0 0 128; 16 color: 255 255 255 128;
17 } 17 }
18 } 18 }
19 part { name: "e.box"; type: BOX; 19 part { name: "e.box"; type: BOX;
@@ -36,73 +36,59 @@ group { name: "e/modules/systray/main";
36 } 36 }
37 } 37 }
38 programs { 38 programs {
39 program { 39 program { signal: "e,action,orient,horiz"; source: "e";
40 signal: "e,action,orient,horiz"; source: "e";
41 action: STATE_SET "default" 0.0; 40 action: STATE_SET "default" 0.0;
42 target: "e.box"; 41 target: "e.box";
43 } 42 }
44 program { 43 program { signal: "e,action,orient,vert"; source: "e";
45 signal: "e,action,orient,vert"; source: "e";
46 action: STATE_SET "vertical" 0.0; 44 action: STATE_SET "vertical" 0.0;
47 target: "e.box"; 45 target: "e.box";
48 } 46 }
49 program { 47 program { signal: "e,action,orient,left"; source: "e";
50 signal: "e,action,orient,left"; source: "e";
51 action: STATE_SET "vertical" 0.0; 48 action: STATE_SET "vertical" 0.0;
52 target: "e.box"; 49 target: "e.box";
53 } 50 }
54 program { 51 program { signal: "e,action,orient,right"; source: "e";
55 signal: "e,action,orient,right"; source: "e";
56 action: STATE_SET "vertical" 0.0; 52 action: STATE_SET "vertical" 0.0;
57 target: "e.box"; 53 target: "e.box";
58 } 54 }
59 program { 55 program { signal: "e,action,orient,top"; source: "e";
60 signal: "e,action,orient,top"; source: "e";
61 action: STATE_SET "default" 0.0; 56 action: STATE_SET "default" 0.0;
62 target: "e.box"; 57 target: "e.box";
63 } 58 }
64 program { 59 program { signal: "e,action,orient,bottom"; source: "e";
65 signal: "e,action,orient,bottom"; source: "e";
66 action: STATE_SET "default" 0.0; 60 action: STATE_SET "default" 0.0;
67 target: "e.box"; 61 target: "e.box";
68 } 62 }
69 program { 63 program { signal: "e,action,orient,corner_tl"; source: "e";
70 signal: "e,action,orient,corner_tl"; source: "e";
71 action: STATE_SET "default" 0.0; 64 action: STATE_SET "default" 0.0;
72 target: "e.box"; 65 target: "e.box";
73 } 66 }
74 program { 67 program { signal: "e,action,orient,corner_tr"; source: "e";
75 signal: "e,action,orient,corner_tr"; source: "e";
76 action: STATE_SET "default" 0.0; 68 action: STATE_SET "default" 0.0;
77 target: "e.box"; 69 target: "e.box";
78 } 70 }
79 program { 71 program { signal: "e,action,orient,corner_bl"; source: "e";
80 signal: "e,action,orient,corner_bl"; source: "e";
81 action: STATE_SET "default" 0.0; 72 action: STATE_SET "default" 0.0;
82 target: "e.box"; 73 target: "e.box";
83 } 74 }
84 program { 75 program { signal: "e,action,orient,corner_br"; source: "e";
85 signal: "e,action,orient,corner_br"; source: "e";
86 action: STATE_SET "default" 0.0; 76 action: STATE_SET "default" 0.0;
87 target: "e.box"; 77 target: "e.box";
88 } 78 }
89 program { 79 program { signal: "e,action,orient,corner_lt"; source: "e";
90 signal: "e,action,orient,corner_lt"; source: "e";
91 action: STATE_SET "vertical" 0.0; 80 action: STATE_SET "vertical" 0.0;
92 target: "e.box"; 81 target: "e.box";
93 } 82 }
94 program { 83 program { signal: "e,action,orient,corner_rt"; source: "e";
95 signal: "e,action,orient,corner_rt"; source: "e";
96 action: STATE_SET "vertical" 0.0; 84 action: STATE_SET "vertical" 0.0;
97 target: "e.box"; 85 target: "e.box";
98 } 86 }
99 program { 87 program { signal: "e,action,orient,corner_lb"; source: "e";
100 signal: "e,action,orient,corner_lb"; source: "e";
101 action: STATE_SET "vertical" 0.0; 88 action: STATE_SET "vertical" 0.0;
102 target: "e.box"; 89 target: "e.box";
103 } 90 }
104 program { 91 program { signal: "e,action,orient,corner_rb"; source: "e";
105 signal: "e,action,orient,corner_rb"; source: "e";
106 action: STATE_SET "vertical" 0.0; 92 action: STATE_SET "vertical" 0.0;
107 target: "e.box"; 93 target: "e.box";
108 } 94 }
diff --git a/data/elementary/themes/edc/tasks.edc b/data/elementary/themes/edc/tasks.edc
index 777f2049b5..f977e62612 100644
--- a/data/elementary/themes/edc/tasks.edc
+++ b/data/elementary/themes/edc/tasks.edc
@@ -21,8 +21,12 @@ group { name:"e/modules/tasks/item";
21 parts { 21 parts {
22 part { name: "base"; type: RECT; mouse_events: 0; 22 part { name: "base"; type: RECT; mouse_events: 0;
23 clip_to: "clip"; 23 clip_to: "clip";
24 scale: 1;
24 description { state: "default" 0.0; 25 description { state: "default" 0.0;
25 color: 64 64 64 255; 26 color: 64 64 64 255;
27 rel1.offset: 0 (0 - SHELFPAD);
28 rel2.offset: -1 (SHELFPAD - 1);
29 offscale;
26 } 30 }
27 description { state: "iconic" 0.0; 31 description { state: "iconic" 0.0;
28 inherit: "default" 0.0; 32 inherit: "default" 0.0;
@@ -34,8 +38,12 @@ group { name:"e/modules/tasks/item";
34 } 38 }
35 part { name: "click"; type: RECT; mouse_events: 0; 39 part { name: "click"; type: RECT; mouse_events: 0;
36 clip_to: "clip"; 40 clip_to: "clip";
41 scale: 1;
37 description { state: "default" 0.0; 42 description { state: "default" 0.0;
38 color: 32 32 32 0; 43 color: 32 32 32 0;
44 rel1.offset: 0 (0 - SHELFPAD);
45 rel2.offset: -1 (SHELFPAD - 1);
46 offscale;
39 } 47 }
40 description { state: "clicked" 0.0; 48 description { state: "clicked" 0.0;
41 inherit: "default" 0.0; 49 inherit: "default" 0.0;
@@ -231,9 +239,9 @@ group { name:"e/modules/tasks/item";
231 description { state: "default" 0.0; 239 description { state: "default" 0.0;
232 color: 51 153 255 255; 240 color: 51 153 255 255;
233 align: 0.5 1.0; 241 align: 0.5 1.0;
234 rel1.offset: 0 -1; 242 rel1.offset: 0 (SHELFPAD - 1);
235 rel1.relative: 0.0 1.0; 243 rel1.relative: 0.0 1.0;
236 rel2.offset: -1 -1; 244 rel2.offset: -1 (SHELFPAD - 1);
237 fixed: 0 1; 245 fixed: 0 1;
238 visible: 0; 246 visible: 0;
239 min: 0 0; 247 min: 0 0;
@@ -259,9 +267,11 @@ group { name:"e/modules/tasks/item";
259 } 267 }
260 } 268 }
261 part { name: "clip"; type: RECT; 269 part { name: "clip"; type: RECT;
270 scale: 1;
262 description { state: "default" 0.0; 271 description { state: "default" 0.0;
263 rel1.offset: -20 -20; 272 rel1.offset: -80 -80;
264 rel2.offset: 19 19; 273 rel2.offset: 79 79;
274 offscale;
265 visible: 1; 275 visible: 1;
266 } 276 }
267 description { state: "selected" 0.0; 277 description { state: "selected" 0.0;
@@ -275,8 +285,8 @@ group { name:"e/modules/tasks/item";
275 } 285 }
276 part { name: "sel_clip"; type: RECT; 286 part { name: "sel_clip"; type: RECT;
277 description { state: "default" 0.0; 287 description { state: "default" 0.0;
278 rel1.offset: -20 -20; 288 rel1.offset: -80 -80;
279 rel2.offset: 19 19; 289 rel2.offset: 79 79;
280 visible: 0; 290 visible: 0;
281 } 291 }
282 description { state: "selected" 0.0; 292 description { state: "selected" 0.0;
@@ -290,97 +300,82 @@ group { name:"e/modules/tasks/item";
290 } 300 }
291 } 301 }
292 programs { 302 programs {
293 program { 303 program { signal: "mouse,down,1"; source: "event";
294 signal: "mouse,down,1"; source: "event";
295 action: STATE_SET "clicked" 0.0; 304 action: STATE_SET "clicked" 0.0;
296 target: "click"; 305 target: "click";
297 target: "e.text.label"; 306 target: "e.text.label";
298 target: "label_focused"; 307 target: "label_focused";
299 target: "label_iconic"; 308 target: "label_iconic";
300 } 309 }
301 program { 310 program { signal: "mouse,up,1"; source: "event";
302 signal: "mouse,up,1"; source: "event";
303 action: STATE_SET "default" 0.0; 311 action: STATE_SET "default" 0.0;
304 target: "click"; 312 target: "click";
305 target: "e.text.label"; 313 target: "e.text.label";
306 target: "label_focused"; 314 target: "label_focused";
307 target: "label_iconic"; 315 target: "label_iconic";
308 } 316 }
309 program { 317 program { signal: "mouse,up,clicked,1*"; source: "event";
310 signal: "mouse,up,clicked,1*"; source: "event";
311 action: SIGNAL_EMIT "e,action,click" ""; 318 action: SIGNAL_EMIT "e,action,click" "";
312 } 319 }
313 320
314 program { 321 program { signal: "e,state,focused"; source: "e";
315 signal: "e,state,focused"; source: "e";
316 action: STATE_SET "focused" 0.0; 322 action: STATE_SET "focused" 0.0;
317 transition: ACCELERATE 0.2; 323 transition: ACCELERATE 0.2;
318 target: "bar"; 324 target: "bar";
319 } 325 }
320 program { 326 program { signal: "e,state,unfocused"; source: "e";
321 signal: "e,state,unfocused"; source: "e";
322 action: STATE_SET "default" 0.0; 327 action: STATE_SET "default" 0.0;
323 transition: DECELERATE 0.2; 328 transition: DECELERATE 0.2;
324 target: "bar"; 329 target: "bar";
325 } 330 }
326 331
327 program { 332 program { signal: "state,default"; source: "int";
328 signal: "state,default"; source: "int";
329 action: STATE_SET "default" 0.0; 333 action: STATE_SET "default" 0.0;
330 target: "normal_clip"; 334 target: "normal_clip";
331 target: "focused_clip"; 335 target: "focused_clip";
332 target: "iconic_clip"; 336 target: "iconic_clip";
333 target: "base"; 337 target: "base";
334 } 338 }
335 program { 339 program { signal: "state,default"; source: "int";
336 signal: "state,default"; source: "int";
337 action: STATE_SET "default" 0.0; 340 action: STATE_SET "default" 0.0;
338 transition: SINUSOIDAL 0.2; 341 transition: SINUSOIDAL 0.2;
339 target: "icon2"; 342 target: "icon2";
340 } 343 }
341 program { 344 program { signal: "state,focused"; source: "int";
342 signal: "state,focused"; source: "int";
343 action: STATE_SET "focused" 0.0; 345 action: STATE_SET "focused" 0.0;
344 target: "normal_clip"; 346 target: "normal_clip";
345 target: "focused_clip"; 347 target: "focused_clip";
346 target: "iconic_clip"; 348 target: "iconic_clip";
347 target: "base"; 349 target: "base";
348 } 350 }
349 program { 351 program { signal: "state,focused"; source: "int";
350 signal: "state,focused"; source: "int";
351 action: STATE_SET "focused" 0.0; 352 action: STATE_SET "focused" 0.0;
352 transition: SINUSOIDAL 0.2; 353 transition: SINUSOIDAL 0.2;
353 target: "icon2"; 354 target: "icon2";
354 } 355 }
355 program { 356 program { signal: "state,iconic"; source: "int";
356 signal: "state,iconic"; source: "int";
357 action: STATE_SET "iconic" 0.0; 357 action: STATE_SET "iconic" 0.0;
358 target: "normal_clip"; 358 target: "normal_clip";
359 target: "focused_clip"; 359 target: "focused_clip";
360 target: "iconic_clip"; 360 target: "iconic_clip";
361 target: "base"; 361 target: "base";
362 } 362 }
363 program { 363 program { signal: "state,iconic"; source: "int";
364 signal: "state,iconic"; source: "int";
365 action: STATE_SET "iconic" 0.0; 364 action: STATE_SET "iconic" 0.0;
366 transition: SINUSOIDAL 0.2; 365 transition: SINUSOIDAL 0.2;
367 target: "icon2"; 366 target: "icon2";
368 } 367 }
369 368
370 program { 369 program { signal: "e,state,focused"; source: "e";
371 signal: "e,state,focused"; source: "e";
372 script { set_focused(1); } 370 script { set_focused(1); }
373 } 371 }
374 program { 372 program { signal: "e,state,unfocused"; source: "e";
375 signal: "e,state,unfocused"; source: "e";
376 script { set_focused(0); } 373 script { set_focused(0); }
377 } 374 }
378 program { 375 program { signal: "e,state,iconified"; source: "e";
379 signal: "e,state,iconified"; source: "e";
380 script { set_iconic(1); } 376 script { set_iconic(1); }
381 } 377 }
382 program { 378 program { signal: "e,state,uniconified"; source: "e";
383 signal: "e,state,uniconified"; source: "e";
384 script { set_iconic(0); } 379 script { set_iconic(0); }
385 } 380 }
386 381
@@ -398,8 +393,7 @@ group { name:"e/modules/tasks/item";
398 target: "urgent"; 393 target: "urgent";
399 after: "urg1"; 394 after: "urg1";
400 } 395 }
401 program { 396 program { signal: "e,state,not_urgent"; source: "e";
402 signal: "e,state,not_urgent"; source: "e";
403 action: ACTION_STOP; 397 action: ACTION_STOP;
404 target: "urg1"; 398 target: "urg1";
405 target: "urg2"; 399 target: "urg2";
@@ -410,15 +404,13 @@ group { name:"e/modules/tasks/item";
410 target: "urgent"; 404 target: "urgent";
411 } 405 }
412 406
413 program { 407 program { signal: "e,state,icon_only"; source: "e";
414 signal: "e,state,icon_only"; source: "e";
415 action: STATE_SET "icon_only" 0.0; 408 action: STATE_SET "icon_only" 0.0;
416 target: "icon"; 409 target: "icon";
417 target: "icon_clip"; 410 target: "icon_clip";
418 target: "label_clip"; 411 target: "label_clip";
419 } 412 }
420 program { 413 program { signal: "e,state,text_only"; source: "e";
421 signal: "e,state,text_only"; source: "e";
422 action: STATE_SET "text_only" 0.0; 414 action: STATE_SET "text_only" 0.0;
423 target: "icon"; 415 target: "icon";
424 target: "icon_clip"; 416 target: "icon_clip";
@@ -449,6 +441,19 @@ group { name:"e/modules/tasks/item_vert";
449 } 441 }
450 } 442 }
451 parts { 443 parts {
444 part { name: "base"; type: RECT; mouse_events: 0;
445 description { state: "default" 0.0;
446 rel1.offset: (0 - SHELFPAD) 0;
447 rel2.offset: (SHELFPAD - 1) -1;
448 }
449 description { state: "iconic" 0.0;
450 inherit: "default" 0.0;
451 }
452 description { state: "focused" 0.0;
453 inherit: "default" 0.0;
454 color: 40 40 40 255;
455 }
456 }
452 part { name: "e.text.label"; 457 part { name: "e.text.label";
453 description { state: "default" 0.0; 458 description { state: "default" 0.0;
454 rel.to: "icon"; 459 rel.to: "icon";
@@ -507,16 +512,15 @@ group { name:"e/modules/tasks/item_vert";
507 part { name: "bar"; type: RECT; 512 part { name: "bar"; type: RECT;
508 description { state: "default" 0.0; 513 description { state: "default" 0.0;
509 align: 1.0 0.5; 514 align: 1.0 0.5;
515 rel1.offset: 2 0;
510 rel1.relative: 1.0 0.0; 516 rel1.relative: 1.0 0.0;
511 rel2.offset: -1 -1; 517 rel2.offset: 2 -1;
512 fixed: 1 0; 518 fixed: 1 0;
513 } 519 }
514 description { state: "focused" 0.0; 520 description { state: "focused" 0.0;
515 inherit: "default" 0.0; 521 inherit: "default" 0.0;
516 align: 1.0 0.5; 522 align: 1.0 0.5;
517 rel1.relative: 1.0 0.0; 523 rel1.relative: 1.0 0.0;
518 rel1.offset: -1 0;
519 rel2.offset: -1 -1;
520 fixed: 1 0; 524 fixed: 1 0;
521 min: 5 0; 525 min: 5 0;
522 visible: 1; 526 visible: 1;
diff --git a/data/elementary/themes/macros.edc b/data/elementary/themes/macros.edc
index c5f938982f..8fe990d451 100644
--- a/data/elementary/themes/macros.edc
+++ b/data/elementary/themes/macros.edc
@@ -7,6 +7,7 @@
7#define FIXED_SIZE(_WIDTH, _HEIGHT) \ 7#define FIXED_SIZE(_WIDTH, _HEIGHT) \
8 min: _WIDTH _HEIGHT; max: _WIDTH _HEIGHT; fixed: 1 1; 8 min: _WIDTH _HEIGHT; max: _WIDTH _HEIGHT; fixed: 1 1;
9 9
10#define SHELFPAD 3
10#define ICMIN 15 11#define ICMIN 15
11 12
12#define SPACER_TEXT "NN"; 13#define SPACER_TEXT "NN";