summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-02-16 01:57:48 +0000
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-02-16 01:57:48 +0000
commitd4a301d81a38c3c5238074ba7b3f14a285738d26 (patch)
tree8f2fb689e3b12579b2d83d67f8c5b403d82b72c9
parentfd974d7b2f607025afd416857c4e1bfdf707e255 (diff)
TH - streamline some formatting/naming to be more minimal
-rw-r--r--data/elementary/themes/edc/comp.edc88
-rw-r--r--data/elementary/themes/edc/desklock.edc28
2 files changed, 38 insertions, 78 deletions
diff --git a/data/elementary/themes/edc/comp.edc b/data/elementary/themes/edc/comp.edc
index dda8dcf379..5ab902f818 100644
--- a/data/elementary/themes/edc/comp.edc
+++ b/data/elementary/themes/edc/comp.edc
@@ -86,9 +86,7 @@ group { name: "e/comp/screen/overlay/default";
86 } 86 }
87 } 87 }
88 programs { 88 programs {
89 program { 89 program { signal: "e,state,screensaver,on"; source: "e";
90 name: "screensaver_on";
91 signal: "e,state,screensaver,on"; source: "e";
92 action: STATE_SET "visible" 0.0; 90 action: STATE_SET "visible" 0.0;
93 transition: ACCELERATE 3.0 USE_DURATION_FACTOR 1 CURRENT; 91 transition: ACCELERATE 3.0 USE_DURATION_FACTOR 1 CURRENT;
94 target: "blanker"; 92 target: "blanker";
@@ -96,30 +94,22 @@ group { name: "e/comp/screen/overlay/default";
96 action: SIGNAL_EMIT "e,state,screensaver,active" "e"; 94 action: SIGNAL_EMIT "e,state,screensaver,active" "e";
97 } 95 }
98 } 96 }
99 program { 97 program { signal: "e,state,screensaver,on"; source: "e";
100 name: "screensaver_on2";
101 signal: "e,state,screensaver,on"; source: "e";
102 action: STATE_SET "visible" 0.0; 98 action: STATE_SET "visible" 0.0;
103 transition: DECELERATE 3.0 USE_DURATION_FACTOR 1 CURRENT; 99 transition: DECELERATE 3.0 USE_DURATION_FACTOR 1 CURRENT;
104 target: "shadow"; 100 target: "shadow";
105 } 101 }
106 program { 102 program { signal: "e,state,screensaver,off"; source: "e";
107 name: "screensaver_off";
108 signal: "e,state,screensaver,off"; source: "e";
109 action: STATE_SET "default" 0.0; 103 action: STATE_SET "default" 0.0;
110 transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT; 104 transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
111 target: "blanker"; 105 target: "blanker";
112 } 106 }
113 program { 107 program { signal: "e,state,screensaver,off"; source: "e";
114 name: "screensaver_off2";
115 signal: "e,state,screensaver,off"; source: "e";
116 action: STATE_SET "default" 0.0; 108 action: STATE_SET "default" 0.0;
117 transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT; 109 transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
118 target: "shadow"; 110 target: "shadow";
119 } 111 }
120 program { 112 program { signal: "e,state,sys,suspend"; source: "e";
121 name: "suspend";
122 signal: "e,state,sys,suspend"; source: "e";
123 action: STATE_SET "visible" 0.0; 113 action: STATE_SET "visible" 0.0;
124 transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT; 114 transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
125 target: "suspender"; 115 target: "suspender";
@@ -127,9 +117,7 @@ group { name: "e/comp/screen/overlay/default";
127 action: SIGNAL_EMIT "e,state,sys,suspend,done" "e"; 117 action: SIGNAL_EMIT "e,state,sys,suspend,done" "e";
128 } 118 }
129 } 119 }
130 program { 120 program { signal: "e,state,sys,hibernate"; source: "e";
131 name: "hibernate";
132 signal: "e,state,sys,hibernate"; source: "e";
133 action: STATE_SET "visible" 0.0; 121 action: STATE_SET "visible" 0.0;
134 transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT; 122 transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
135 target: "suspender"; 123 target: "suspender";
@@ -137,16 +125,12 @@ group { name: "e/comp/screen/overlay/default";
137 action: SIGNAL_EMIT "e,state,sys,hibernate,done" "e"; 125 action: SIGNAL_EMIT "e,state,sys,hibernate,done" "e";
138 } 126 }
139 } 127 }
140 program { 128 program { signal: "e,state,sys,resume"; source: "e";
141 name: "resume";
142 signal: "e,state,sys,resume"; source: "e";
143 action: STATE_SET "default" 0.0; 129 action: STATE_SET "default" 0.0;
144 transition: DECELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT; 130 transition: DECELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
145 target: "suspender"; 131 target: "suspender";
146 } 132 }
147 program { 133 program { signal: "e,state,sys,reboot"; source: "e";
148 name: "reboot";
149 signal: "e,state,sys,reboot"; source: "e";
150 action: STATE_SET "visible" 0.0; 134 action: STATE_SET "visible" 0.0;
151 transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT; 135 transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
152 target: "suspender"; 136 target: "suspender";
@@ -154,9 +138,7 @@ group { name: "e/comp/screen/overlay/default";
154 action: SIGNAL_EMIT "e,state,sys,reboot,done" "e"; 138 action: SIGNAL_EMIT "e,state,sys,reboot,done" "e";
155 } 139 }
156 } 140 }
157 program { 141 program { signal: "e,state,sys,halt"; source: "e";
158 name: "halt";
159 signal: "e,state,sys,halt"; source: "e";
160 action: STATE_SET "visible" 0.0; 142 action: STATE_SET "visible" 0.0;
161 transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT; 143 transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
162 target: "suspender"; 144 target: "suspender";
@@ -164,9 +146,7 @@ group { name: "e/comp/screen/overlay/default";
164 action: SIGNAL_EMIT "e,state,sys,halt,done" "e"; 146 action: SIGNAL_EMIT "e,state,sys,halt,done" "e";
165 } 147 }
166 } 148 }
167 program { 149 program { signal: "e,state,sys,logout"; source: "e";
168 name: "logout";
169 signal: "e,state,sys,logout"; source: "e";
170 action: STATE_SET "visible" 0.0; 150 action: STATE_SET "visible" 0.0;
171 transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT; 151 transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
172 target: "suspender"; 152 target: "suspender";
@@ -272,18 +252,15 @@ group { name: "e/comp/frame/default";
272 } 252 }
273 } 253 }
274 programs { 254 programs {
275 program { 255 program { signal: "e,state,shadow,on"; source: "e";
276 signal: "e,state,shadow,on"; source: "e";
277 action: STATE_SET "default" 0.0; 256 action: STATE_SET "default" 0.0;
278 target: "shadow"; 257 target: "shadow";
279 } 258 }
280 program { 259 program { signal: "e,state,shadow,off"; source: "e";
281 signal: "e,state,shadow,off"; source: "e";
282 action: STATE_SET "hidden" 0.0; 260 action: STATE_SET "hidden" 0.0;
283 target: "shadow"; 261 target: "shadow";
284 } 262 }
285 program { 263 program { name: "visible_on";
286 name: "visible_on";
287 signal: "e,state,visible"; source: "e"; 264 signal: "e,state,visible"; source: "e";
288 action: STATE_SET "visible" 0.0; 265 action: STATE_SET "visible" 0.0;
289 transition: DECELERATE 0.15 USE_DURATION_FACTOR 1; 266 transition: DECELERATE 0.15 USE_DURATION_FACTOR 1;
@@ -292,18 +269,15 @@ group { name: "e/comp/frame/default";
292 action: SIGNAL_EMIT "e,action,show,done" "e"; 269 action: SIGNAL_EMIT "e,action,show,done" "e";
293 } 270 }
294 } 271 }
295 program { 272 program { signal: "e,state,visible"; source: "e";
296 signal: "e,state,visible"; source: "e";
297 action: ACTION_STOP; 273 action: ACTION_STOP;
298 target: "visible_off"; 274 target: "visible_off";
299 } 275 }
300 program { 276 program { signal: "e,state,hidden"; source: "e";
301 signal: "e,state,hidden"; source: "e";
302 action: ACTION_STOP; 277 action: ACTION_STOP;
303 target: "visible_on"; 278 target: "visible_on";
304 } 279 }
305 program { 280 program { name: "visible_off";
306 name: "visible_off";
307 signal: "e,state,hidden"; source: "e"; 281 signal: "e,state,hidden"; source: "e";
308 action: STATE_SET "default" 0.0; 282 action: STATE_SET "default" 0.0;
309 transition: DECELERATE 0.30 USE_DURATION_FACTOR 1; 283 transition: DECELERATE 0.30 USE_DURATION_FACTOR 1;
@@ -393,14 +367,12 @@ group { name: "e/comp/frame/rotate";
393 } 367 }
394 } 368 }
395 programs { 369 programs {
396 program { name: "focus3"; 370 program { signal: "e,state,focused"; source: "e";
397 signal: "e,state,focused"; source: "e";
398 action: STATE_SET "default" 0.0; 371 action: STATE_SET "default" 0.0;
399 target: "e.swallow.content"; 372 target: "e.swallow.content";
400 transition: LINEAR 0.3 USE_DURATION_FACTOR 1; 373 transition: LINEAR 0.3 USE_DURATION_FACTOR 1;
401 } 374 }
402 program { name: "focus_off3"; 375 program { signal: "e,state,unfocused"; source: "e";
403 signal: "e,state,unfocused"; source: "e";
404 action: STATE_SET "focus-out" 0.0; 376 action: STATE_SET "focus-out" 0.0;
405 target: "e.swallow.content"; 377 target: "e.swallow.content";
406 transition: LINEAR 0.3 USE_DURATION_FACTOR 1; 378 transition: LINEAR 0.3 USE_DURATION_FACTOR 1;
@@ -455,12 +427,10 @@ group { name: "e/comp/frame/none";
455 } 427 }
456 } 428 }
457 programs { 429 programs {
458 program { 430 program { signal: "e,state,visible"; source: "e";
459 signal: "e,state,visible"; source: "e";
460 action: SIGNAL_EMIT "e,action,show,done" "e"; 431 action: SIGNAL_EMIT "e,action,show,done" "e";
461 } 432 }
462 program { 433 program { signal: "e,state,hidden"; source: "e";
463 signal: "e,state,hidden"; source: "e";
464 action: SIGNAL_EMIT "e,action,hide,done" "e"; 434 action: SIGNAL_EMIT "e,action,hide,done" "e";
465 } 435 }
466 } 436 }
@@ -620,15 +590,13 @@ group { name: "e/comp/frame/fullscreen";
620 } 590 }
621 } 591 }
622 programs { 592 programs {
623 program { 593 program { name: "visible_on";
624 name: "visible_on";
625 signal: "e,state,visible"; source: "e"; 594 signal: "e,state,visible"; source: "e";
626 action: STATE_SET "visible" 0.0; 595 action: STATE_SET "visible" 0.0;
627 transition: DECELERATE 0.25 USE_DURATION_FACTOR 1; 596 transition: DECELERATE 0.25 USE_DURATION_FACTOR 1;
628 targets: "scr_shadow" "scr_shade"; 597 targets: "scr_shadow" "scr_shade";
629 } 598 }
630 program { 599 program { name: "visible_on2";
631 name: "visible_on2";
632 signal: "e,state,visible"; source: "e"; 600 signal: "e,state,visible"; source: "e";
633 action: STATE_SET "visible1" 0.0; 601 action: STATE_SET "visible1" 0.0;
634 transition: DECELERATE 0.05 USE_DURATION_FACTOR 1; 602 transition: DECELERATE 0.05 USE_DURATION_FACTOR 1;
@@ -640,25 +608,21 @@ group { name: "e/comp/frame/fullscreen";
640 action: SIGNAL_EMIT "e,action,show,done" "e"; 608 action: SIGNAL_EMIT "e,action,show,done" "e";
641 } 609 }
642 } 610 }
643 program { 611 program { signal: "e,state,visible"; source: "e";
644 signal: "e,state,visible"; source: "e";
645 action: ACTION_STOP; 612 action: ACTION_STOP;
646 targets: "visible_off" "visible_off2"; 613 targets: "visible_off" "visible_off2";
647 } 614 }
648 program { 615 program { signal: "e,state,hidden"; source: "e";
649 signal: "e,state,hidden"; source: "e";
650 action: ACTION_STOP; 616 action: ACTION_STOP;
651 targets: "visible_on" "visible_on2"; 617 targets: "visible_on" "visible_on2";
652 } 618 }
653 program { 619 program { name: "visible_off";
654 name: "visible_off";
655 signal: "e,state,hidden"; source: "e"; 620 signal: "e,state,hidden"; source: "e";
656 action: STATE_SET "default" 0.0; 621 action: STATE_SET "default" 0.0;
657 transition: DECELERATE 0.25 USE_DURATION_FACTOR 1; 622 transition: DECELERATE 0.25 USE_DURATION_FACTOR 1;
658 targets: "scr_shadow" "scr_shade"; 623 targets: "scr_shadow" "scr_shade";
659 } 624 }
660 program { 625 program { name: "visible_off2";
661 name: "visible_off2";
662 signal: "e,state,hidden"; source: "e"; 626 signal: "e,state,hidden"; source: "e";
663 action: STATE_SET "visible1" 0.0; 627 action: STATE_SET "visible1" 0.0;
664 transition: DECELERATE 0.2 USE_DURATION_FACTOR 1; 628 transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
diff --git a/data/elementary/themes/edc/desklock.edc b/data/elementary/themes/edc/desklock.edc
index 7bd51fc376..de63eeb5fd 100644
--- a/data/elementary/themes/edc/desklock.edc
+++ b/data/elementary/themes/edc/desklock.edc
@@ -195,26 +195,24 @@ group { name: "e/desklock/login_box";
195 target: "cursor"; 195 target: "cursor";
196 after: "cursor_show_timer"; 196 after: "cursor_show_timer";
197 } 197 }
198 program { name: "cursor_show_timer";
199 in: 0.4 0.0;
200 after: "cursor_hide";
201 }
198 program { name: "cursor_hide"; 202 program { name: "cursor_hide";
199 action: STATE_SET "default" 0.0; 203 action: STATE_SET "default" 0.0;
200 target: "cursor"; 204 target: "cursor";
201 after: "cursor_hide_timer"; 205 after: "cursor_hide_timer";
202 } 206 }
203 program { name: "cursor_show_timer";
204 in: 0.4 0.0;
205 after: "cursor_hide";
206 }
207 program { name: "cursor_hide_timer"; 207 program { name: "cursor_hide_timer";
208 in: 0.4 0.0; 208 in: 0.4 0.0;
209 after: "cursor_show"; 209 after: "cursor_show";
210 } 210 }
211 program { 211 program { signal: "e,state,selected"; source: "e";
212 signal: "e,state,selected"; source: "e";
213 action: STATE_SET "active" 0.0; 212 action: STATE_SET "active" 0.0;
214 target: "selection"; 213 target: "selection";
215 } 214 }
216 program { 215 program { signal: "e,state,unselected"; source: "e";
217 signal: "e,state,unselected"; source: "e";
218 action: STATE_SET "default" 0.0; 216 action: STATE_SET "default" 0.0;
219 target: "selection"; 217 target: "selection";
220 } 218 }
@@ -316,27 +314,25 @@ group { name: "e/desklock/pin_box";
316 target: "cursor"; 314 target: "cursor";
317 after: "cursor_show_timer"; 315 after: "cursor_show_timer";
318 } 316 }
317 program { name: "cursor_show_timer";
318 in: 0.5 0.0;
319 after: "cursor_hide";
320 }
319 program { name: "cursor_hide"; 321 program { name: "cursor_hide";
320 action: STATE_SET "default" 0.0; 322 action: STATE_SET "default" 0.0;
321 target: "cursor"; 323 target: "cursor";
322 transition: SINUSOIDAL 0.2 USE_DURATION_FACTOR 1; 324 transition: SINUSOIDAL 0.2 USE_DURATION_FACTOR 1;
323 after: "cursor_hide_timer"; 325 after: "cursor_hide_timer";
324 } 326 }
325 program { name: "cursor_show_timer";
326 in: 0.5 0.0;
327 after: "cursor_hide";
328 }
329 program { name: "cursor_hide_timer"; 327 program { name: "cursor_hide_timer";
330 in: 0.2 0.0; 328 in: 0.2 0.0;
331 after: "cursor_show"; 329 after: "cursor_show";
332 } 330 }
333 program { 331 program { signal: "e,state,selected"; source: "e";
334 signal: "e,state,selected"; source: "e";
335 action: STATE_SET "active" 0.0; 332 action: STATE_SET "active" 0.0;
336 target: "selection"; 333 target: "selection";
337 } 334 }
338 program { 335 program { signal: "e,state,unselected"; source: "e";
339 signal: "e,state,unselected"; source: "e";
340 action: STATE_SET "default" 0.0; 336 action: STATE_SET "default" 0.0;
341 target: "selection"; 337 target: "selection";
342 } 338 }