summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2014-03-24 11:00:28 -0400
committerMike Blumenkrantz <zmike@samsung.com>2014-03-24 11:03:13 -0400
commite49a70ae2685188f9f84ed324733f3b42a37a7bb (patch)
treebde48def98d0ab534f6f4146ceb54951106b1e46
parent82dc94738bfddc23b95ac6c05af0879059ff2c49 (diff)
comp edc now uses edje 1.10 features to simplify programs
this is a nice example of how program.sequencing and program.targets can make life a little easier
-rw-r--r--data/themes/edc/comp.edc168
1 files changed, 67 insertions, 101 deletions
diff --git a/data/themes/edc/comp.edc b/data/themes/edc/comp.edc
index 0aa558551..f2e4b86d5 100644
--- a/data/themes/edc/comp.edc
+++ b/data/themes/edc/comp.edc
@@ -84,16 +84,15 @@ group { name: "e/comp/screen/overlay/default";
84 } 84 }
85 } 85 }
86 programs { 86 programs {
87 program { name: "screensaver_post";
88 action: SIGNAL_EMIT "e,state,screensaver,active" "e";
89 }
90 program { 87 program {
91 name: "screensaver_on"; 88 name: "screensaver_on";
92 signal: "e,state,screensaver,on"; source: "e"; 89 signal: "e,state,screensaver,on"; source: "e";
93 action: STATE_SET "visible" 0.0; 90 action: STATE_SET "visible" 0.0;
94 transition: ACCELERATE 3.0 CURRENT; 91 transition: ACCELERATE 3.0 CURRENT;
95 target: "blanker"; 92 target: "blanker";
96 after: "screensaver_post"; 93 sequence {
94 action: SIGNAL_EMIT "e,state,screensaver,active" "e";
95 }
97 } 96 }
98 program { 97 program {
99 name: "screensaver_on2"; 98 name: "screensaver_on2";
@@ -122,10 +121,9 @@ group { name: "e/comp/screen/overlay/default";
122 action: STATE_SET "visible" 0.0; 121 action: STATE_SET "visible" 0.0;
123 transition: ACCELERATE 0.5 CURRENT; 122 transition: ACCELERATE 0.5 CURRENT;
124 target: "suspender"; 123 target: "suspender";
125 after: "suspend_done"; 124 sequence {
126 } 125 action: SIGNAL_EMIT "e,state,sys,suspend,done" "e";
127 program { name: "suspend_done"; 126 }
128 action: SIGNAL_EMIT "e,state,sys,suspend,done" "e";
129 } 127 }
130 program { 128 program {
131 name: "hibernate"; 129 name: "hibernate";
@@ -133,10 +131,9 @@ group { name: "e/comp/screen/overlay/default";
133 action: STATE_SET "visible" 0.0; 131 action: STATE_SET "visible" 0.0;
134 transition: ACCELERATE 0.5 CURRENT; 132 transition: ACCELERATE 0.5 CURRENT;
135 target: "suspender"; 133 target: "suspender";
136 after: "hibernate_done"; 134 sequence {
137 } 135 action: SIGNAL_EMIT "e,state,sys,hibernate,done" "e";
138 program { name: "hibernate_done"; 136 }
139 action: SIGNAL_EMIT "e,state,sys,hibernate,done" "e";
140 } 137 }
141 program { 138 program {
142 name: "resume"; 139 name: "resume";
@@ -151,10 +148,9 @@ group { name: "e/comp/screen/overlay/default";
151 action: STATE_SET "visible" 0.0; 148 action: STATE_SET "visible" 0.0;
152 transition: ACCELERATE 0.5 CURRENT; 149 transition: ACCELERATE 0.5 CURRENT;
153 target: "suspender"; 150 target: "suspender";
154 after: "reboot_done"; 151 sequence {
155 } 152 action: SIGNAL_EMIT "e,state,sys,reboot,done" "e";
156 program { name: "reboot_done"; 153 }
157 action: SIGNAL_EMIT "e,state,sys,reboot,done" "e";
158 } 154 }
159 program { 155 program {
160 name: "halt"; 156 name: "halt";
@@ -162,10 +158,9 @@ group { name: "e/comp/screen/overlay/default";
162 action: STATE_SET "visible" 0.0; 158 action: STATE_SET "visible" 0.0;
163 transition: ACCELERATE 0.5 CURRENT; 159 transition: ACCELERATE 0.5 CURRENT;
164 target: "suspender"; 160 target: "suspender";
165 after: "halt_done"; 161 sequence {
166 } 162 action: SIGNAL_EMIT "e,state,sys,halt,done" "e";
167 program { name: "halt_done"; 163 }
168 action: SIGNAL_EMIT "e,state,sys,halt,done" "e";
169 } 164 }
170 program { 165 program {
171 name: "logout"; 166 name: "logout";
@@ -173,7 +168,9 @@ group { name: "e/comp/screen/overlay/default";
173 action: STATE_SET "visible" 0.0; 168 action: STATE_SET "visible" 0.0;
174 transition: ACCELERATE 0.5 CURRENT; 169 transition: ACCELERATE 0.5 CURRENT;
175 target: "suspender"; 170 target: "suspender";
176 after: "logout_done"; 171 sequence {
172 action: SIGNAL_EMIT "e,state,sys,logout,done" "e";
173 }
177 } 174 }
178 program { name: "logout_done"; 175 program { name: "logout_done";
179 action: SIGNAL_EMIT "e,state,sys,logout,done" "e"; 176 action: SIGNAL_EMIT "e,state,sys,logout,done" "e";
@@ -349,12 +346,10 @@ group { name: "e/comp/frame/default";
349 signal: "e,state,visible"; source: "e"; 346 signal: "e,state,visible"; source: "e";
350 action: STATE_SET "visible" 0.0; 347 action: STATE_SET "visible" 0.0;
351 transition: DECELERATE 0.15; 348 transition: DECELERATE 0.15;
352 target: "clipper"; 349 targets: "clipper" "shower";
353 target: "shower"; 350 sequence {
354 after: "show2"; 351 action: SIGNAL_EMIT "e,action,show,done" "e";
355 } 352 }
356 program { name: "show2";
357 action: SIGNAL_EMIT "e,action,show,done" "e";
358 } 353 }
359 program { 354 program {
360 signal: "e,state,visible"; source: "e"; 355 signal: "e,state,visible"; source: "e";
@@ -371,26 +366,22 @@ group { name: "e/comp/frame/default";
371 signal: "e,state,hidden"; source: "e"; 366 signal: "e,state,hidden"; source: "e";
372 action: STATE_SET "default" 0.0; 367 action: STATE_SET "default" 0.0;
373 transition: DECELERATE 0.30; 368 transition: DECELERATE 0.30;
374 target: "clipper"; 369 targets: "clipper" "shower";
375 target: "shower"; 370 sequence {
376 after: "hide2"; 371 action: SIGNAL_EMIT "e,action,hide,done" "e";
377 } 372 }
378 program { name: "hide2";
379 action: SIGNAL_EMIT "e,action,hide,done" "e";
380 } 373 }
381 program { 374 program {
382 name: "focus_on"; 375 name: "focus_on";
383 signal: "e,state,focused"; source: "e"; 376 signal: "e,state,focused"; source: "e";
384 action: STATE_SET "focused" 0.0; 377 action: STATE_SET "focused" 0.0;
385 transition: SINUSOIDAL 0.1; 378 transition: SINUSOIDAL 0.1;
386 target: "glow"; 379 targets: "glow" "focus-clipper";
387 target: "focus-clipper"; 380 sequence {
388 after: "focus2"; 381 action: STATE_SET "default" 0.0;
389 } 382 transition: SINUSOIDAL 0.4;
390 program { name: "focus2"; 383 target: "glow";
391 action: STATE_SET "default" 0.0; 384 }
392 transition: SINUSOIDAL 0.4;
393 target: "glow";
394 } 385 }
395 program { 386 program {
396 name: "focus_off"; 387 name: "focus_off";
@@ -398,26 +389,23 @@ group { name: "e/comp/frame/default";
398 action: STATE_SET "default" 0.0; 389 action: STATE_SET "default" 0.0;
399 transition: SINUSOIDAL 0.1; 390 transition: SINUSOIDAL 0.1;
400 target: "focus-clipper"; 391 target: "focus-clipper";
401 after: "focus_off2"; 392 sequence {
402 } 393 action: STATE_SET "default" 0.0;
403 program { 394 transition: SINUSOIDAL 0.4;
404 name: "focus_off2"; 395 target: "glow";
405 action: STATE_SET "default" 0.0; 396 }
406 transition: SINUSOIDAL 0.4;
407 target: "glow";
408 } 397 }
409 program { name: "urgent1"; 398 program { name: "urgent1";
410 signal: "e,state,urgent"; source: "e"; 399 signal: "e,state,urgent"; source: "e";
411 action: STATE_SET "focused" 0.0; 400 action: STATE_SET "focused" 0.0;
412 transition: SINUSOIDAL 0.3; 401 transition: SINUSOIDAL 0.3;
413 target: "glow"; 402 target: "glow";
414 after: "urgent2"; 403 sequence {
415 } 404 action: STATE_SET "default" 0.0;
416 program { name: "urgent2"; 405 transition: SINUSOIDAL 0.3;
417 action: STATE_SET "default" 0.0; 406 target: "glow";
418 transition: SINUSOIDAL 0.3; 407 after: "urgent1";
419 target: "glow"; 408 }
420 after: "urgent1";
421 } 409 }
422 program { 410 program {
423 signal: "e,state,not_urgent"; source: "e"; 411 signal: "e,state,not_urgent"; source: "e";
@@ -546,14 +534,12 @@ group { name: "e/comp/frame/default/fast";
546 signal: "e,state,focus,on"; source: "e"; 534 signal: "e,state,focus,on"; source: "e";
547 action: STATE_SET "focused" 0.0; 535 action: STATE_SET "focused" 0.0;
548 transition: SINUSOIDAL 0.1; 536 transition: SINUSOIDAL 0.1;
549 target: "glow"; 537 targets: "glow" "focus-clipper";
550 target: "focus-clipper"; 538 sequence {
551 after: "focus2"; 539 action: STATE_SET "default" 0.0;
552 } 540 transition: SINUSOIDAL 0.1;
553 program { name: "focus2"; 541 target: "glow";
554 action: STATE_SET "default" 0.0; 542 }
555 transition: SINUSOIDAL 0.1;
556 target: "glow";
557 } 543 }
558 program { 544 program {
559 name: "focus_off"; 545 name: "focus_off";
@@ -772,70 +758,50 @@ group { name: "e/comp/frame/fullscreen";
772 signal: "e,state,visible"; source: "e"; 758 signal: "e,state,visible"; source: "e";
773 action: STATE_SET "visible" 0.0; 759 action: STATE_SET "visible" 0.0;
774 transition: DECELERATE 0.25; 760 transition: DECELERATE 0.25;
775 target: "scr_shadow"; 761 targets: "scr_shadow" "scr_shade";
776 target: "scr_shade";
777 } 762 }
778 program { 763 program {
779 name: "visible_on2"; 764 name: "visible_on2";
780 signal: "e,state,visible"; source: "e"; 765 signal: "e,state,visible"; source: "e";
781 action: STATE_SET "visible1" 0.0; 766 action: STATE_SET "visible1" 0.0;
782 transition: DECELERATE 0.05; 767 transition: DECELERATE 0.05;
783 target: "clipper"; 768 targets: "clipper" "shower" "fader";
784 target: "shower"; 769 sequence {
785 target: "fader"; 770 action: STATE_SET "visible2" 0.0;
786 after: "show2"; 771 transition: DECELERATE 0.20;
787 } 772 targets: "clipper" "shower" "fader";
788 program { name: "show2"; 773 action: SIGNAL_EMIT "e,action,show,done" "e";
789 action: STATE_SET "visible2" 0.0; 774 }
790 transition: DECELERATE 0.20;
791 target: "clipper";
792 target: "shower";
793 target: "fader";
794 after: "show3";
795 }
796 program { name: "show3";
797 action: SIGNAL_EMIT "e,action,show,done" "e";
798 } 775 }
799 program { 776 program {
800 signal: "e,state,visible"; source: "e"; 777 signal: "e,state,visible"; source: "e";
801 action: ACTION_STOP; 778 action: ACTION_STOP;
802 target: "visible_off"; 779 targets: "visible_off" "visible_off2";
803 target: "visible_off2";
804 } 780 }
805 program { 781 program {
806 signal: "e,state,hidden"; source: "e"; 782 signal: "e,state,hidden"; source: "e";
807 action: ACTION_STOP; 783 action: ACTION_STOP;
808 target: "visible_on"; 784 targets: "visible_on" "visible_on2";
809 target: "visible_on2";
810 } 785 }
811 program { 786 program {
812 name: "visible_off"; 787 name: "visible_off";
813 signal: "e,state,hidden"; source: "e"; 788 signal: "e,state,hidden"; source: "e";
814 action: STATE_SET "default" 0.0; 789 action: STATE_SET "default" 0.0;
815 transition: DECELERATE 0.25; 790 transition: DECELERATE 0.25;
816 target: "scr_shadow"; 791 targets: "scr_shadow" "scr_shade";
817 target: "scr_shade";
818 } 792 }
819 program { 793 program {
820 name: "visible_off2"; 794 name: "visible_off2";
821 signal: "e,state,hidden"; source: "e"; 795 signal: "e,state,hidden"; source: "e";
822 action: STATE_SET "visible1" 0.0; 796 action: STATE_SET "visible1" 0.0;
823 transition: DECELERATE 0.2; 797 transition: DECELERATE 0.2;
824 target: "clipper"; 798 targets: "clipper" "shower" "fader";
825 target: "shower"; 799 sequence {
826 target: "fader"; 800 action: STATE_SET "default" 0.0;
827 after: "hide2"; 801 transition: DECELERATE 0.05;
828 } 802 targets: "clipper" "shower" "fader";
829 program { name: "hide2"; 803 action: SIGNAL_EMIT "e,action,hide,done" "e";
830 action: STATE_SET "default" 0.0; 804 }
831 transition: DECELERATE 0.05;
832 target: "clipper";
833 target: "shower";
834 target: "fader";
835 after: "hide3";
836 }
837 program { name: "hide3";
838 action: SIGNAL_EMIT "e,action,hide,done" "e";
839 } 805 }
840 } 806 }
841} 807}