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
This commit is contained in:
Mike Blumenkrantz 2014-03-24 11:00:28 -04:00
parent c263d9c4d6
commit 1d958d1a29
1 changed files with 67 additions and 101 deletions

View File

@ -84,16 +84,15 @@ group { name: "e/comp/screen/overlay/default";
} }
} }
programs { programs {
program { name: "screensaver_post";
action: SIGNAL_EMIT "e,state,screensaver,active" "e";
}
program { program {
name: "screensaver_on"; name: "screensaver_on";
signal: "e,state,screensaver,on"; source: "e"; signal: "e,state,screensaver,on"; source: "e";
action: STATE_SET "visible" 0.0; action: STATE_SET "visible" 0.0;
transition: ACCELERATE 3.0 CURRENT; transition: ACCELERATE 3.0 CURRENT;
target: "blanker"; target: "blanker";
after: "screensaver_post"; sequence {
action: SIGNAL_EMIT "e,state,screensaver,active" "e";
}
} }
program { program {
name: "screensaver_on2"; name: "screensaver_on2";
@ -122,10 +121,9 @@ group { name: "e/comp/screen/overlay/default";
action: STATE_SET "visible" 0.0; action: STATE_SET "visible" 0.0;
transition: ACCELERATE 0.5 CURRENT; transition: ACCELERATE 0.5 CURRENT;
target: "suspender"; target: "suspender";
after: "suspend_done"; sequence {
} action: SIGNAL_EMIT "e,state,sys,suspend,done" "e";
program { name: "suspend_done"; }
action: SIGNAL_EMIT "e,state,sys,suspend,done" "e";
} }
program { program {
name: "hibernate"; name: "hibernate";
@ -133,10 +131,9 @@ group { name: "e/comp/screen/overlay/default";
action: STATE_SET "visible" 0.0; action: STATE_SET "visible" 0.0;
transition: ACCELERATE 0.5 CURRENT; transition: ACCELERATE 0.5 CURRENT;
target: "suspender"; target: "suspender";
after: "hibernate_done"; sequence {
} action: SIGNAL_EMIT "e,state,sys,hibernate,done" "e";
program { name: "hibernate_done"; }
action: SIGNAL_EMIT "e,state,sys,hibernate,done" "e";
} }
program { program {
name: "resume"; name: "resume";
@ -151,10 +148,9 @@ group { name: "e/comp/screen/overlay/default";
action: STATE_SET "visible" 0.0; action: STATE_SET "visible" 0.0;
transition: ACCELERATE 0.5 CURRENT; transition: ACCELERATE 0.5 CURRENT;
target: "suspender"; target: "suspender";
after: "reboot_done"; sequence {
} action: SIGNAL_EMIT "e,state,sys,reboot,done" "e";
program { name: "reboot_done"; }
action: SIGNAL_EMIT "e,state,sys,reboot,done" "e";
} }
program { program {
name: "halt"; name: "halt";
@ -162,10 +158,9 @@ group { name: "e/comp/screen/overlay/default";
action: STATE_SET "visible" 0.0; action: STATE_SET "visible" 0.0;
transition: ACCELERATE 0.5 CURRENT; transition: ACCELERATE 0.5 CURRENT;
target: "suspender"; target: "suspender";
after: "halt_done"; sequence {
} action: SIGNAL_EMIT "e,state,sys,halt,done" "e";
program { name: "halt_done"; }
action: SIGNAL_EMIT "e,state,sys,halt,done" "e";
} }
program { program {
name: "logout"; name: "logout";
@ -173,7 +168,9 @@ group { name: "e/comp/screen/overlay/default";
action: STATE_SET "visible" 0.0; action: STATE_SET "visible" 0.0;
transition: ACCELERATE 0.5 CURRENT; transition: ACCELERATE 0.5 CURRENT;
target: "suspender"; target: "suspender";
after: "logout_done"; sequence {
action: SIGNAL_EMIT "e,state,sys,logout,done" "e";
}
} }
program { name: "logout_done"; program { name: "logout_done";
action: SIGNAL_EMIT "e,state,sys,logout,done" "e"; action: SIGNAL_EMIT "e,state,sys,logout,done" "e";
@ -349,12 +346,10 @@ group { name: "e/comp/frame/default";
signal: "e,state,visible"; source: "e"; signal: "e,state,visible"; source: "e";
action: STATE_SET "visible" 0.0; action: STATE_SET "visible" 0.0;
transition: DECELERATE 0.15; transition: DECELERATE 0.15;
target: "clipper"; targets: "clipper" "shower";
target: "shower"; sequence {
after: "show2"; action: SIGNAL_EMIT "e,action,show,done" "e";
} }
program { name: "show2";
action: SIGNAL_EMIT "e,action,show,done" "e";
} }
program { program {
signal: "e,state,visible"; source: "e"; signal: "e,state,visible"; source: "e";
@ -371,26 +366,22 @@ group { name: "e/comp/frame/default";
signal: "e,state,hidden"; source: "e"; signal: "e,state,hidden"; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
transition: DECELERATE 0.30; transition: DECELERATE 0.30;
target: "clipper"; targets: "clipper" "shower";
target: "shower"; sequence {
after: "hide2"; action: SIGNAL_EMIT "e,action,hide,done" "e";
} }
program { name: "hide2";
action: SIGNAL_EMIT "e,action,hide,done" "e";
} }
program { program {
name: "focus_on"; name: "focus_on";
signal: "e,state,focused"; source: "e"; signal: "e,state,focused"; source: "e";
action: STATE_SET "focused" 0.0; action: STATE_SET "focused" 0.0;
transition: SINUSOIDAL 0.1; transition: SINUSOIDAL 0.1;
target: "glow"; targets: "glow" "focus-clipper";
target: "focus-clipper"; sequence {
after: "focus2"; action: STATE_SET "default" 0.0;
} transition: SINUSOIDAL 0.4;
program { name: "focus2"; target: "glow";
action: STATE_SET "default" 0.0; }
transition: SINUSOIDAL 0.4;
target: "glow";
} }
program { program {
name: "focus_off"; name: "focus_off";
@ -398,26 +389,23 @@ group { name: "e/comp/frame/default";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
transition: SINUSOIDAL 0.1; transition: SINUSOIDAL 0.1;
target: "focus-clipper"; target: "focus-clipper";
after: "focus_off2"; sequence {
} action: STATE_SET "default" 0.0;
program { transition: SINUSOIDAL 0.4;
name: "focus_off2"; target: "glow";
action: STATE_SET "default" 0.0; }
transition: SINUSOIDAL 0.4;
target: "glow";
} }
program { name: "urgent1"; program { name: "urgent1";
signal: "e,state,urgent"; source: "e"; signal: "e,state,urgent"; source: "e";
action: STATE_SET "focused" 0.0; action: STATE_SET "focused" 0.0;
transition: SINUSOIDAL 0.3; transition: SINUSOIDAL 0.3;
target: "glow"; target: "glow";
after: "urgent2"; sequence {
} action: STATE_SET "default" 0.0;
program { name: "urgent2"; transition: SINUSOIDAL 0.3;
action: STATE_SET "default" 0.0; target: "glow";
transition: SINUSOIDAL 0.3; after: "urgent1";
target: "glow"; }
after: "urgent1";
} }
program { program {
signal: "e,state,not_urgent"; source: "e"; signal: "e,state,not_urgent"; source: "e";
@ -546,14 +534,12 @@ group { name: "e/comp/frame/default/fast";
signal: "e,state,focus,on"; source: "e"; signal: "e,state,focus,on"; source: "e";
action: STATE_SET "focused" 0.0; action: STATE_SET "focused" 0.0;
transition: SINUSOIDAL 0.1; transition: SINUSOIDAL 0.1;
target: "glow"; targets: "glow" "focus-clipper";
target: "focus-clipper"; sequence {
after: "focus2"; action: STATE_SET "default" 0.0;
} transition: SINUSOIDAL 0.1;
program { name: "focus2"; target: "glow";
action: STATE_SET "default" 0.0; }
transition: SINUSOIDAL 0.1;
target: "glow";
} }
program { program {
name: "focus_off"; name: "focus_off";
@ -772,70 +758,50 @@ group { name: "e/comp/frame/fullscreen";
signal: "e,state,visible"; source: "e"; signal: "e,state,visible"; source: "e";
action: STATE_SET "visible" 0.0; action: STATE_SET "visible" 0.0;
transition: DECELERATE 0.25; transition: DECELERATE 0.25;
target: "scr_shadow"; targets: "scr_shadow" "scr_shade";
target: "scr_shade";
} }
program { program {
name: "visible_on2"; name: "visible_on2";
signal: "e,state,visible"; source: "e"; signal: "e,state,visible"; source: "e";
action: STATE_SET "visible1" 0.0; action: STATE_SET "visible1" 0.0;
transition: DECELERATE 0.05; transition: DECELERATE 0.05;
target: "clipper"; targets: "clipper" "shower" "fader";
target: "shower"; sequence {
target: "fader"; action: STATE_SET "visible2" 0.0;
after: "show2"; transition: DECELERATE 0.20;
} targets: "clipper" "shower" "fader";
program { name: "show2"; action: SIGNAL_EMIT "e,action,show,done" "e";
action: STATE_SET "visible2" 0.0; }
transition: DECELERATE 0.20;
target: "clipper";
target: "shower";
target: "fader";
after: "show3";
}
program { name: "show3";
action: SIGNAL_EMIT "e,action,show,done" "e";
} }
program { program {
signal: "e,state,visible"; source: "e"; signal: "e,state,visible"; source: "e";
action: ACTION_STOP; action: ACTION_STOP;
target: "visible_off"; targets: "visible_off" "visible_off2";
target: "visible_off2";
} }
program { program {
signal: "e,state,hidden"; source: "e"; signal: "e,state,hidden"; source: "e";
action: ACTION_STOP; action: ACTION_STOP;
target: "visible_on"; targets: "visible_on" "visible_on2";
target: "visible_on2";
} }
program { program {
name: "visible_off"; name: "visible_off";
signal: "e,state,hidden"; source: "e"; signal: "e,state,hidden"; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
transition: DECELERATE 0.25; transition: DECELERATE 0.25;
target: "scr_shadow"; targets: "scr_shadow" "scr_shade";
target: "scr_shade";
} }
program { program {
name: "visible_off2"; name: "visible_off2";
signal: "e,state,hidden"; source: "e"; signal: "e,state,hidden"; source: "e";
action: STATE_SET "visible1" 0.0; action: STATE_SET "visible1" 0.0;
transition: DECELERATE 0.2; transition: DECELERATE 0.2;
target: "clipper"; targets: "clipper" "shower" "fader";
target: "shower"; sequence {
target: "fader"; action: STATE_SET "default" 0.0;
after: "hide2"; transition: DECELERATE 0.05;
} targets: "clipper" "shower" "fader";
program { name: "hide2"; action: SIGNAL_EMIT "e,action,hide,done" "e";
action: STATE_SET "default" 0.0; }
transition: DECELERATE 0.05;
target: "clipper";
target: "shower";
target: "fader";
after: "hide3";
}
program { name: "hide3";
action: SIGNAL_EMIT "e,action,hide,done" "e";
} }
} }
} }