summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/elementary/themes/default.edc22
-rw-r--r--data/elementary/themes/edc/batman.edc15
-rw-r--r--data/elementary/themes/edc/battery.edc30
-rw-r--r--data/elementary/themes/edc/border.edc8
-rw-r--r--data/elementary/themes/edc/comp.edc12
-rw-r--r--data/elementary/themes/edc/comp_compat.edc34
-rw-r--r--data/elementary/themes/edc/deskmirror.edc16
-rw-r--r--data/elementary/themes/edc/efl/button.edc2
-rw-r--r--data/elementary/themes/edc/efl/panel.edc373
-rw-r--r--data/elementary/themes/edc/efl/panes.edc423
-rw-r--r--data/elementary/themes/edc/efl/pointer.edc86
-rw-r--r--data/elementary/themes/edc/efl/popup.edc128
-rw-r--r--data/elementary/themes/edc/efl/progress.edc1495
-rw-r--r--data/elementary/themes/edc/efl/radio.edc381
-rw-r--r--data/elementary/themes/edc/efl/scroller.edc1164
-rw-r--r--data/elementary/themes/edc/elm/panel.edc7
-rw-r--r--data/elementary/themes/edc/elm/panes.edc44
-rw-r--r--data/elementary/themes/edc/gadman.edc110
-rw-r--r--data/elementary/themes/edc/ibar-ibox.edc28
-rw-r--r--data/elementary/themes/edc/init.edc10
-rw-r--r--data/elementary/themes/edc/mixer.edc4
-rw-r--r--data/elementary/themes/edc/music_control.edc2
-rw-r--r--data/elementary/themes/edc/pager.edc20
-rw-r--r--data/elementary/themes/edc/pager16.edc4
-rw-r--r--data/elementary/themes/edc/scrollframe.edc8
-rw-r--r--data/elementary/themes/edc/shelf.edc16
-rw-r--r--data/elementary/themes/edc/syscon.edc4
-rw-r--r--data/elementary/themes/edc/tasks.edc10
-rw-r--r--data/elementary/themes/edc/wizard.edc2
-rw-r--r--data/elementary/themes/snd/synth-worble-down.wavbin0 -> 68792 bytes
-rw-r--r--data/elementary/themes/snd/synth-worble-up.wavbin0 -> 68792 bytes
31 files changed, 2128 insertions, 2330 deletions
diff --git a/data/elementary/themes/default.edc b/data/elementary/themes/default.edc
index ecc4db9884..bb53a0e0b6 100644
--- a/data/elementary/themes/default.edc
+++ b/data/elementary/themes/default.edc
@@ -1,4 +1,4 @@
1efl_version: 1 22; 1efl_version: 1 25;
2 2
3#include "macros.edc" 3#include "macros.edc"
4 4
@@ -6,20 +6,22 @@ externals.external: "elm";
6 6
7// theme api version. from 1.10 on we will check version to avoid 7// theme api version. from 1.10 on we will check version to avoid
8// compat issues 8// compat issues
9data.item: "version" "119"; 9data.item: "version" "125";
10data.item: "efl_theme_base" "dark"; 10data.item: "efl_theme_base" "dark";
11 11
12collections { 12collections {
13 13
14sounds { 14sounds {
15 sample { name: "splash" LOSSY 256; source: "splash.wav"; } 15 sample { name: "splash" LOSSY 256; source: "splash.wav"; }
16 sample { name: "wood-tap1" LOSSY 64; source: "wood-tap.wav"; } 16 sample { name: "wood-tap1" LOSSY 64; source: "wood-tap.wav"; }
17 sample { name: "wood-tap2" LOSSY 64; source: "wood-tap2.wav"; } 17 sample { name: "wood-tap2" LOSSY 64; source: "wood-tap2.wav"; }
18 sample { name: "key-tap1" LOSSY 64; source: "kbd-tap.wav"; } 18 sample { name: "key-tap1" LOSSY 64; source: "kbd-tap.wav"; }
19 sample { name: "key-tap2" LOSSY 64; source: "kbd-tap2.wav"; } 19 sample { name: "key-tap2" LOSSY 64; source: "kbd-tap2.wav"; }
20 sample { name: "key-tap3" LOSSY 64; source: "kbd-tap3.wav"; } 20 sample { name: "key-tap3" LOSSY 64; source: "kbd-tap3.wav"; }
21 sample { name: "key-tap4" LOSSY 64; source: "kbd-tap4.wav"; } 21 sample { name: "key-tap4" LOSSY 64; source: "kbd-tap4.wav"; }
22 sample { name: "key-tap5" LOSSY 64; source: "kbd-tap5.wav"; } 22 sample { name: "key-tap5" LOSSY 64; source: "kbd-tap5.wav"; }
23 sample { name: "synth-worble-dn" LOSSY 128; source: "synth-worble-down.wav"; }
24 sample { name: "synth-worble-up" LOSSY 128; source: "synth-worble-up.wav"; }
23} 25}
24 26
25#include "ic.edc" 27#include "ic.edc"
diff --git a/data/elementary/themes/edc/batman.edc b/data/elementary/themes/edc/batman.edc
index 001beb3d54..e13c586e5e 100644
--- a/data/elementary/themes/edc/batman.edc
+++ b/data/elementary/themes/edc/batman.edc
@@ -69,13 +69,11 @@ group { name: "e/gadget/batman/main";
69 } 69 }
70 } 70 }
71 programs { 71 programs {
72 program { 72 program { signal: "e,state,charging"; source: "e";
73 signal: "e,state,charging"; source: "e";
74 action: STATE_SET "charging" 0.0; 73 action: STATE_SET "charging" 0.0;
75 target: "fill"; 74 target: "fill";
76 } 75 }
77 program { 76 program { signal: "e,state,discharging"; source: "e";
78 signal: "e,state,discharging"; source: "e";
79 action: STATE_SET "default" 0.0; 77 action: STATE_SET "default" 0.0;
80 target: "fill"; 78 target: "fill";
81 } 79 }
@@ -92,8 +90,7 @@ group { name: "e/gadget/batman/main";
92 target: "pulse_clip"; 90 target: "pulse_clip";
93 after: "pulse"; 91 after: "pulse";
94 } 92 }
95 program { 93 program { signal: "e,action,pulse,stop"; source: "e";
96 signal: "e,action,pulse,stop"; source: "e";
97 action: ACTION_STOP; 94 action: ACTION_STOP;
98 target: "pulse"; 95 target: "pulse";
99 target: "pulse2"; 96 target: "pulse2";
@@ -104,14 +101,12 @@ group { name: "e/gadget/batman/main";
104 action: STATE_SET "default" 0.0; 101 action: STATE_SET "default" 0.0;
105 target: "pulse_clip"; 102 target: "pulse_clip";
106 } 103 }
107 program { 104 program { signal: "mouse,in"; source: "over";
108 signal: "mouse,in"; source: "over";
109 action: STATE_SET "visible" 0.0; 105 action: STATE_SET "visible" 0.0;
110 transition: SINUSOIDAL 0.3; 106 transition: SINUSOIDAL 0.3;
111 target: "fill_clip_dim"; 107 target: "fill_clip_dim";
112 } 108 }
113 program { 109 program { signal: "mouse,out"; source: "over";
114 signal: "mouse,out"; source: "over";
115 action: STATE_SET "default" 0.0; 110 action: STATE_SET "default" 0.0;
116 transition: SINUSOIDAL 0.3; 111 transition: SINUSOIDAL 0.3;
117 target: "fill_clip_dim"; 112 target: "fill_clip_dim";
diff --git a/data/elementary/themes/edc/battery.edc b/data/elementary/themes/edc/battery.edc
index 8b1b34c2ce..8a3c4cd36d 100644
--- a/data/elementary/themes/edc/battery.edc
+++ b/data/elementary/themes/edc/battery.edc
@@ -3,6 +3,7 @@ group { name: "e/modules/battery/main";
3 min: 16 16; 3 min: 16 16;
4 max: 160 160; 4 max: 160 160;
5 script { 5 script {
6 public load_time;
6 public message(Msg_Type:type, id, ...) { 7 public message(Msg_Type:type, id, ...) {
7 if ((type == MSG_FLOAT) && (id == 1)) { 8 if ((type == MSG_FLOAT) && (id == 1)) {
8 new Float:val = getfarg(2); 9 new Float:val = getfarg(2);
@@ -12,6 +13,20 @@ group { name: "e/modules/battery/main";
12 set_state(PART:"fill_clip", "custom", 0.0); 13 set_state(PART:"fill_clip", "custom", 0.0);
13 } 14 }
14 } 15 }
16 public Float:year_sec() {
17 new year, month, day, yearday, weekday, hour, minute;
18 new Float:second;
19
20 date(year, month, day, yearday, weekday, hour, minute, second);
21 return seconds() + float(yearday * 24 * 3600);
22 }
23 public run_prog_later(prog) {
24 new Float:second, Float:start;
25
26 second = Float:year_sec();
27 start = get_float(load_time);
28 if ((second - start) > float(5)) run_program(prog);
29 }
15 } 30 }
16 parts { 31 parts {
17 part { name: "pulse_clip"; type: RECT; 32 part { name: "pulse_clip"; type: RECT;
@@ -112,6 +127,21 @@ group { name: "e/modules/battery/main";
112 } 127 }
113 } 128 }
114 programs { 129 programs {
130 program { signal: "load"; source: "";
131 script { set_float(load_time, year_sec()); }
132 }
133 program { signal: "e,state,ac,on"; source: "e";
134 script { run_prog_later(PROGRAM:"ac_on"); }
135 }
136 program { name: "ac_on";
137 action: PLAY_SAMPLE "synth-worble-up" 1.0 ALERT;
138 }
139 program { signal: "e,state,ac,off"; source: "e";
140 script { run_prog_later(PROGRAM:"ac_off"); }
141 }
142 program { name: "ac_off";
143 action: PLAY_SAMPLE "synth-worble-dn" 1.0 ALERT;
144 }
115 program { signal: "e,state,charging"; source: "e"; 145 program { signal: "e,state,charging"; source: "e";
116 action: STATE_SET "charging" 0.0; 146 action: STATE_SET "charging" 0.0;
117 target: "fill"; 147 target: "fill";
diff --git a/data/elementary/themes/edc/border.edc b/data/elementary/themes/edc/border.edc
index beba2a99fc..2aa1349a4d 100644
--- a/data/elementary/themes/edc/border.edc
+++ b/data/elementary/themes/edc/border.edc
@@ -98,7 +98,7 @@ group { name: "e/widgets/border/volume";
98 } 98 }
99 program { name: "show_volume2"; 99 program { name: "show_volume2";
100 action: STATE_SET "show" 0.0; 100 action: STATE_SET "show" 0.0;
101 transition: SINUSOIDAL 0.3; 101 transition: SINUSOIDAL 0.3 USE_DURATION_FACTOR 1;
102 target: "clip"; 102 target: "clip";
103 } 103 }
104 104
@@ -110,7 +110,7 @@ group { name: "e/widgets/border/volume";
110 } 110 }
111 program { name: "hide_volume1"; 111 program { name: "hide_volume1";
112 action: STATE_SET "default" 0.0; 112 action: STATE_SET "default" 0.0;
113 transition: SINUSOIDAL 0.5; 113 transition: SINUSOIDAL 0.5 USE_DURATION_FACTOR 1;
114 target: "clip"; 114 target: "clip";
115 after: "hide_volume2"; 115 after: "hide_volume2";
116 } 116 }
@@ -612,13 +612,13 @@ group { name: "e/widgets/border/default/border";
612 } 612 }
613 program { name: "urg1"; 613 program { name: "urg1";
614 action: STATE_SET "bounce2" 0.0; 614 action: STATE_SET "bounce2" 0.0;
615 transition: DECELERATE 0.4; 615 transition: DECELERATE 0.4 USE_DURATION_FACTOR 1;
616 target: "icon"; 616 target: "icon";
617 after: "urg2"; 617 after: "urg2";
618 } 618 }
619 program { name: "urg2"; 619 program { name: "urg2";
620 action: STATE_SET "bounce1" 0.0; 620 action: STATE_SET "bounce1" 0.0;
621 transition: ACCELERATE 0.3; 621 transition: ACCELERATE 0.3 USE_DURATION_FACTOR 1;
622 target: "icon"; 622 target: "icon";
623 after: "urg1"; 623 after: "urg1";
624 } 624 }
diff --git a/data/elementary/themes/edc/comp.edc b/data/elementary/themes/edc/comp.edc
index f7e3e0be99..ea1db457b3 100644
--- a/data/elementary/themes/edc/comp.edc
+++ b/data/elementary/themes/edc/comp.edc
@@ -311,11 +311,11 @@ group { name: "e/comp/frame/default";
311 name: "focus_on"; 311 name: "focus_on";
312 signal: "e,state,focused"; source: "e"; 312 signal: "e,state,focused"; source: "e";
313 action: STATE_SET "focused" 0.0; 313 action: STATE_SET "focused" 0.0;
314 transition: SINUSOIDAL 0.1; 314 transition: SINUSOIDAL 0.1 USE_DURATION_FACTOR 1;
315 targets: "glow" "focus-clipper"; 315 targets: "glow" "focus-clipper";
316 sequence { 316 sequence {
317 action: STATE_SET "default" 0.0; 317 action: STATE_SET "default" 0.0;
318 transition: SINUSOIDAL 0.4; 318 transition: SINUSOIDAL 0.4 USE_DURATION_FACTOR 1;
319 target: "glow"; 319 target: "glow";
320 } 320 }
321 } 321 }
@@ -323,7 +323,7 @@ group { name: "e/comp/frame/default";
323 name: "focus_off"; 323 name: "focus_off";
324 signal: "e,state,unfocused"; source: "e"; 324 signal: "e,state,unfocused"; source: "e";
325 action: STATE_SET "default" 0.0; 325 action: STATE_SET "default" 0.0;
326 transition: SINUSOIDAL 0.1; 326 transition: SINUSOIDAL 0.1 USE_DURATION_FACTOR 1;
327 target: "focus-clipper"; 327 target: "focus-clipper";
328 sequence { 328 sequence {
329 action: STATE_SET "default" 0.0; 329 action: STATE_SET "default" 0.0;
@@ -333,11 +333,11 @@ group { name: "e/comp/frame/default";
333 program { name: "urgent1"; 333 program { name: "urgent1";
334 signal: "e,state,urgent"; source: "e"; 334 signal: "e,state,urgent"; source: "e";
335 action: STATE_SET "focused" 0.0; 335 action: STATE_SET "focused" 0.0;
336 transition: SINUSOIDAL 0.3; 336 transition: SINUSOIDAL 0.3 USE_DURATION_FACTOR 1;
337 target: "glow"; 337 target: "glow";
338 sequence { 338 sequence {
339 action: STATE_SET "default" 0.0; 339 action: STATE_SET "default" 0.0;
340 transition: SINUSOIDAL 0.3; 340 transition: SINUSOIDAL 0.3 USE_DURATION_FACTOR 1;
341 target: "glow"; 341 target: "glow";
342 after: "urgent1"; 342 after: "urgent1";
343 } 343 }
@@ -345,7 +345,7 @@ group { name: "e/comp/frame/default";
345 program { 345 program {
346 signal: "e,state,not_urgent"; source: "e"; 346 signal: "e,state,not_urgent"; source: "e";
347 action: STATE_SET "default" 0.0; 347 action: STATE_SET "default" 0.0;
348 transition: SINUSOIDAL 0.6 CURRENT; 348 transition: SINUSOIDAL 0.6 CURRENT USE_DURATION_FACTOR 1;
349 target: "glow"; 349 target: "glow";
350 } 350 }
351 program { signal: "e,state,focus,disabled"; source: "e"; 351 program { signal: "e,state,focus,disabled"; source: "e";
diff --git a/data/elementary/themes/edc/comp_compat.edc b/data/elementary/themes/edc/comp_compat.edc
index ffc9990b37..ca6ce18715 100644
--- a/data/elementary/themes/edc/comp_compat.edc
+++ b/data/elementary/themes/edc/comp_compat.edc
@@ -84,7 +84,7 @@ group { name: "e/comp/border/default";
84 name: "visible_on"; 84 name: "visible_on";
85 signal: "e,state,visible,on"; source: "e"; 85 signal: "e,state,visible,on"; source: "e";
86 action: STATE_SET "visible" 0.0; 86 action: STATE_SET "visible" 0.0;
87 transition: DECELERATE 0.15; 87 transition: DECELERATE 0.15 USE_DURATION_FACTOR 1;
88 target: "clipper"; 88 target: "clipper";
89 target: "shower"; 89 target: "shower";
90 after: "show2"; 90 after: "show2";
@@ -96,7 +96,7 @@ group { name: "e/comp/border/default";
96 name: "visible_off"; 96 name: "visible_off";
97 signal: "e,state,visible,off"; source: "e"; 97 signal: "e,state,visible,off"; source: "e";
98 action: STATE_SET "default" 0.0; 98 action: STATE_SET "default" 0.0;
99 transition: DECELERATE 0.30; 99 transition: DECELERATE 0.30 USE_DURATION_FACTOR 1;
100 target: "clipper"; 100 target: "clipper";
101 target: "shower"; 101 target: "shower";
102 after: "hide2"; 102 after: "hide2";
@@ -109,47 +109,47 @@ group { name: "e/comp/border/default";
109 name: "focus_on"; 109 name: "focus_on";
110 signal: "e,state,focus,on"; source: "e"; 110 signal: "e,state,focus,on"; source: "e";
111 action: STATE_SET "focused" 0.0; 111 action: STATE_SET "focused" 0.0;
112 transition: SINUSOIDAL 0.1; 112 transition: SINUSOIDAL 0.1 USE_DURATION_FACTOR 1;
113 target: "glow"; 113 target: "glow";
114 target: "focus-clipper"; 114 target: "focus-clipper";
115 after: "focus2"; 115 after: "focus2";
116 } 116 }
117 program { name: "focus2"; 117 program { name: "focus2";
118 action: STATE_SET "default" 0.0; 118 action: STATE_SET "default" 0.0;
119 transition: SINUSOIDAL 0.4; 119 transition: SINUSOIDAL 0.4 USE_DURATION_FACTOR 1;
120 target: "glow"; 120 target: "glow";
121 } 121 }
122 program { 122 program {
123 name: "focus_off"; 123 name: "focus_off";
124 signal: "e,state,focus,off"; source: "e"; 124 signal: "e,state,focus,off"; source: "e";
125 action: STATE_SET "default" 0.0; 125 action: STATE_SET "default" 0.0;
126 transition: SINUSOIDAL 0.1; 126 transition: SINUSOIDAL 0.1 USE_DURATION_FACTOR 1;
127 target: "focus-clipper"; 127 target: "focus-clipper";
128 after: "focus_off2"; 128 after: "focus_off2";
129 } 129 }
130 program { 130 program {
131 name: "focus_off2"; 131 name: "focus_off2";
132 action: STATE_SET "default" 0.0; 132 action: STATE_SET "default" 0.0;
133 transition: SINUSOIDAL 0.4; 133 transition: SINUSOIDAL 0.4 USE_DURATION_FACTOR 1;
134 target: "glow"; 134 target: "glow";
135 } 135 }
136 program { name: "urgent1"; 136 program { name: "urgent1";
137 signal: "e,state,urgent,on"; source: "e"; 137 signal: "e,state,urgent,on"; source: "e";
138 action: STATE_SET "focused" 0.0; 138 action: STATE_SET "focused" 0.0;
139 transition: SINUSOIDAL 0.3; 139 transition: SINUSOIDAL 0.3 USE_DURATION_FACTOR 1;
140 target: "glow"; 140 target: "glow";
141 after: "urgent2"; 141 after: "urgent2";
142 } 142 }
143 program { name: "urgent2"; 143 program { name: "urgent2";
144 action: STATE_SET "default" 0.0; 144 action: STATE_SET "default" 0.0;
145 transition: SINUSOIDAL 0.3; 145 transition: SINUSOIDAL 0.3 USE_DURATION_FACTOR 1;
146 target: "glow"; 146 target: "glow";
147 after: "urgent1"; 147 after: "urgent1";
148 } 148 }
149 program { 149 program {
150 signal: "e,state,urgent,off"; source: "e"; 150 signal: "e,state,urgent,off"; source: "e";
151 action: STATE_SET "default" 0.0; 151 action: STATE_SET "default" 0.0;
152 transition: SINUSOIDAL 0.6 CURRENT; 152 transition: SINUSOIDAL 0.6 CURRENT USE_DURATION_FACTOR 1;
153 target: "glow"; 153 target: "glow";
154 } 154 }
155 */ 155 */
@@ -187,13 +187,13 @@ group { name: "e/comp/border/rotate";
187 signal: "e,state,focus,on"; source: "e"; 187 signal: "e,state,focus,on"; source: "e";
188 action: STATE_SET "default" 0.0; 188 action: STATE_SET "default" 0.0;
189 target: "e.swallow.content"; 189 target: "e.swallow.content";
190 transition: LINEAR 0.3; 190 transition: LINEAR 0.3 USE_DURATION_FACTOR 1;
191 } 191 }
192 program { name: "focus_off3"; 192 program { name: "focus_off3";
193 signal: "e,state,focus,off"; source: "e"; 193 signal: "e,state,focus,off"; source: "e";
194 action: STATE_SET "focus-out" 0.0; 194 action: STATE_SET "focus-out" 0.0;
195 target: "e.swallow.content"; 195 target: "e.swallow.content";
196 transition: LINEAR 0.3; 196 transition: LINEAR 0.3 USE_DURATION_FACTOR 1;
197 } 197 }
198 } 198 }
199} 199}
@@ -401,7 +401,7 @@ group { name: "e/comp/border/fullscreen";
401 name: "visible_on"; 401 name: "visible_on";
402 signal: "e,state,visible,on"; source: "e"; 402 signal: "e,state,visible,on"; source: "e";
403 action: STATE_SET "visible" 0.0; 403 action: STATE_SET "visible" 0.0;
404 transition: DECELERATE 0.25; 404 transition: DECELERATE 0.25 USE_DURATION_FACTOR 1;
405 target: "scr_shadow"; 405 target: "scr_shadow";
406 target: "scr_shade"; 406 target: "scr_shade";
407 } 407 }
@@ -409,7 +409,7 @@ group { name: "e/comp/border/fullscreen";
409 name: "visible_on2"; 409 name: "visible_on2";
410 signal: "e,state,visible,on"; source: "e"; 410 signal: "e,state,visible,on"; source: "e";
411 action: STATE_SET "visible1" 0.0; 411 action: STATE_SET "visible1" 0.0;
412 transition: DECELERATE 0.05; 412 transition: DECELERATE 0.05 USE_DURATION_FACTOR 1;
413 target: "clipper"; 413 target: "clipper";
414 target: "shower"; 414 target: "shower";
415 target: "fader"; 415 target: "fader";
@@ -417,7 +417,7 @@ group { name: "e/comp/border/fullscreen";
417 } 417 }
418 program { name: "show2"; 418 program { name: "show2";
419 action: STATE_SET "visible2" 0.0; 419 action: STATE_SET "visible2" 0.0;
420 transition: DECELERATE 0.20; 420 transition: DECELERATE 0.20 USE_DURATION_FACTOR 1;
421 target: "clipper"; 421 target: "clipper";
422 target: "shower"; 422 target: "shower";
423 target: "fader"; 423 target: "fader";
@@ -430,7 +430,7 @@ group { name: "e/comp/border/fullscreen";
430 name: "visible_off"; 430 name: "visible_off";
431 signal: "e,state,visible,off"; source: "e"; 431 signal: "e,state,visible,off"; source: "e";
432 action: STATE_SET "default" 0.0; 432 action: STATE_SET "default" 0.0;
433 transition: DECELERATE 0.25; 433 transition: DECELERATE 0.25 USE_DURATION_FACTOR 1;
434 target: "scr_shadow"; 434 target: "scr_shadow";
435 target: "scr_shade"; 435 target: "scr_shade";
436 } 436 }
@@ -438,7 +438,7 @@ group { name: "e/comp/border/fullscreen";
438 name: "visible_off2"; 438 name: "visible_off2";
439 signal: "e,state,visible,off"; source: "e"; 439 signal: "e,state,visible,off"; source: "e";
440 action: STATE_SET "visible1" 0.0; 440 action: STATE_SET "visible1" 0.0;
441 transition: DECELERATE 0.2; 441 transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
442 target: "clipper"; 442 target: "clipper";
443 target: "shower"; 443 target: "shower";
444 target: "fader"; 444 target: "fader";
@@ -446,7 +446,7 @@ group { name: "e/comp/border/fullscreen";
446 } 446 }
447 program { name: "hide2"; 447 program { name: "hide2";
448 action: STATE_SET "default" 0.0; 448 action: STATE_SET "default" 0.0;
449 transition: DECELERATE 0.05; 449 transition: DECELERATE 0.05 USE_DURATION_FACTOR 1;
450 target: "clipper"; 450 target: "clipper";
451 target: "shower"; 451 target: "shower";
452 target: "fader"; 452 target: "fader";
diff --git a/data/elementary/themes/edc/deskmirror.edc b/data/elementary/themes/edc/deskmirror.edc
index 2e5fab45db..c4f8f5d5ed 100644
--- a/data/elementary/themes/edc/deskmirror.edc
+++ b/data/elementary/themes/edc/deskmirror.edc
@@ -175,7 +175,7 @@ group { name: "e/deskmirror/frame/default";
175 } 175 }
176 program { name: "go_big2"; 176 program { name: "go_big2";
177 action: STATE_SET "urgent2" 0.0; 177 action: STATE_SET "urgent2" 0.0;
178 transition: LINEAR 0.5; 178 transition: LINEAR 0.5 USE_DURATION_FACTOR 1;
179 target: "clone"; 179 target: "clone";
180 after: "go_big"; 180 after: "go_big";
181 } 181 }
@@ -188,7 +188,7 @@ group { name: "e/deskmirror/frame/default";
188 } 188 }
189 program { name: "go_hid"; 189 program { name: "go_hid";
190 action: STATE_SET "default" 0.0; 190 action: STATE_SET "default" 0.0;
191 transition: LINEAR 0.5; 191 transition: LINEAR 0.5 USE_DURATION_FACTOR 1;
192 target: "clone"; 192 target: "clone";
193 } 193 }
194 program { name: "shon"; 194 program { name: "shon";
@@ -242,12 +242,12 @@ group { name: "e/deskmirror/frame/default";
242 } 242 }
243 program { name: "iconify"; 243 program { name: "iconify";
244 action: STATE_SET "iconic" 0.0; 244 action: STATE_SET "iconic" 0.0;
245 transition: ACCELERATE 0.2 CURRENT; 245 transition: ACCELERATE 0.2 CURRENT USE_DURATION_FACTOR 1;
246 target: "spacer"; 246 target: "spacer";
247 } 247 }
248 program { name: "uniconify"; 248 program { name: "uniconify";
249 action: STATE_SET "default" 0.0; 249 action: STATE_SET "default" 0.0;
250 transition: DECELERATE 0.2 CURRENT; 250 transition: DECELERATE 0.2 CURRENT USE_DURATION_FACTOR 1;
251 target: "spacer"; 251 target: "spacer";
252 } 252 }
253 program { 253 program {
@@ -426,12 +426,12 @@ group { "e/deskmirror/frame/borderless";
426 } 426 }
427 program { name: "iconify"; 427 program { name: "iconify";
428 action: STATE_SET "iconic" 0.0; 428 action: STATE_SET "iconic" 0.0;
429 transition: ACCELERATE 0.2 CURRENT; 429 transition: ACCELERATE 0.2 CURRENT USE_DURATION_FACTOR 1;
430 target: "spacer"; 430 target: "spacer";
431 } 431 }
432 program { name: "uniconify"; 432 program { name: "uniconify";
433 action: STATE_SET "default" 0.0; 433 action: STATE_SET "default" 0.0;
434 transition: DECELERATE 0.2 CURRENT; 434 transition: DECELERATE 0.2 CURRENT USE_DURATION_FACTOR 1;
435 target: "spacer"; 435 target: "spacer";
436 } 436 }
437 program { 437 program {
@@ -460,7 +460,7 @@ group { "e/deskmirror/frame/borderless";
460 } 460 }
461 program { name: "go_big2"; 461 program { name: "go_big2";
462 action: STATE_SET "urgent2" 0.0; 462 action: STATE_SET "urgent2" 0.0;
463 transition: LINEAR 0.5; 463 transition: LINEAR 0.5 USE_DURATION_FACTOR 1;
464 target: "clone"; 464 target: "clone";
465 after: "go_big"; 465 after: "go_big";
466 } 466 }
@@ -473,7 +473,7 @@ group { "e/deskmirror/frame/borderless";
473 } 473 }
474 program { name: "go_hid"; 474 program { name: "go_hid";
475 action: STATE_SET "default" 0.0; 475 action: STATE_SET "default" 0.0;
476 transition: LINEAR 0.5; 476 transition: LINEAR 0.5 USE_DURATION_FACTOR 1;
477 target: "clone"; 477 target: "clone";
478 } 478 }
479 } 479 }
diff --git a/data/elementary/themes/edc/efl/button.edc b/data/elementary/themes/edc/efl/button.edc
index eb28be4135..52193a8c16 100644
--- a/data/elementary/themes/edc/efl/button.edc
+++ b/data/elementary/themes/edc/efl/button.edc
@@ -154,7 +154,7 @@ group { name: "efl/button";
154 text { "efl.text"; nomouse; required; 154 text { "efl.text"; nomouse; required;
155 scale: 1; 155 scale: 1;
156 desc { "default"; 156 desc { "default";
157 fixed: 1 1; 157// fixed: 1 1;
158 color: 192 192 192 255; 158 color: 192 192 192 255;
159 rel1.offset: 0 6; 159 rel1.offset: 0 6;
160 rel1.relative: 1.0 0.0; 160 rel1.relative: 1.0 0.0;
diff --git a/data/elementary/themes/edc/efl/panel.edc b/data/elementary/themes/edc/efl/panel.edc
index 6ad3afc727..4dfc85a5a8 100644
--- a/data/elementary/themes/edc/efl/panel.edc
+++ b/data/elementary/themes/edc/efl/panel.edc
@@ -1,19 +1,18 @@
1group { name: "efl/panel"; data.item: "version" "123"; 1group { name: "efl/panel";
2 data { 2 data.item: "version" "123";
3 item: "handler_size" "30"; 3 data.item: "handler_size" "30";
4 }
5 parts { 4 parts {
6 part { name: "efl.content"; 5 part { name: "efl.content"; type: SWALLOW;
7 type: SWALLOW;
8 description { state: "default" 0.0; 6 description { state: "default" 0.0;
9 } 7 }
10 } 8 }
11 } 9 }
12} 10}
13group { name: "efl/panel/scrollable/left"; data.item: "version" "123"; 11
12group { name: "efl/scroller/panel/left";
13 data.item: "version" "123";
14 parts { 14 parts {
15 part { name: "efl.panel_area"; 15 part { name: "efl.panel_area"; type: SWALLOW;
16 type: SWALLOW;
17 description { state: "default" 0.0; 16 description { state: "default" 0.0;
18 rel2.relative: 0.0 1.0; 17 rel2.relative: 0.0 1.0;
19 align: 0.0 0.5; 18 align: 0.0 0.5;
@@ -25,17 +24,11 @@ group { name: "efl/panel/scrollable/left"; data.item: "version" "123";
25 visible: 1; 24 visible: 1;
26 } 25 }
27 } 26 }
28 part { name: "efl.event_area"; 27 part { name: "efl.event_area"; type: SWALLOW;
29 type: SWALLOW;
30 description { state: "default" 0.0; 28 description { state: "default" 0.0;
31 rel1 { 29 rel.to: "efl.panel_area";
32 relative: 1.0 0.0; 30 rel1.relative: 1.0 0.0;
33 to: "efl.panel_area"; 31 rel2.relative: 1.0 1.0;
34 }
35 rel2 {
36 relative: 1.0 1.0;
37 to: "efl.panel_area";
38 }
39 align: 0.0 0.5; 32 align: 0.0 0.5;
40 fixed: 1 1; 33 fixed: 1 1;
41 visible: 0; 34 visible: 0;
@@ -45,20 +38,16 @@ group { name: "efl/panel/scrollable/left"; data.item: "version" "123";
45 visible: 1; 38 visible: 1;
46 } 39 }
47 } 40 }
48 part { name: "access.outline"; 41 part { name: "access.outline"; type: RECT;
49 type: RECT;
50 repeat_events: 1; 42 repeat_events: 1;
51 description { state: "default" 0.0; 43 description { state: "default" 0.0;
52 rel1.to: "efl.panel_area"; 44 rel.to: "efl.panel_area";
53 rel2.to: "efl.panel_area";
54 color: 0 0 0 0; 45 color: 0 0 0 0;
55 } 46 }
56 } 47 }
57 part { name: "bg"; 48 part { name: "bg"; type: RECT;
58 type: RECT;
59 description { state: "default" 0.0; 49 description { state: "default" 0.0;
60 rel1.to: "efl.panel_area"; 50 rel.to: "efl.panel_area";
61 rel2.to: "efl.panel_area";
62 color: 64 64 64 255; 51 color: 64 64 64 255;
63 visible: 0; 52 visible: 0;
64 } 53 }
@@ -67,11 +56,9 @@ group { name: "efl/panel/scrollable/left"; data.item: "version" "123";
67 visible: 1; 56 visible: 1;
68 } 57 }
69 } 58 }
70 part { name: "efl.content"; 59 part { name: "efl.content"; type: SWALLOW;
71 type: SWALLOW;
72 description { state: "default" 0.0; 60 description { state: "default" 0.0;
73 rel1.to: "efl.panel_area"; 61 rel.to: "efl.panel_area";
74 rel2.to: "efl.panel_area";
75 visible: 0; 62 visible: 0;
76 } 63 }
77 description { state: "visible" 0.0; 64 description { state: "visible" 0.0;
@@ -81,18 +68,14 @@ group { name: "efl/panel/scrollable/left"; data.item: "version" "123";
81 } 68 }
82 } 69 }
83 programs { 70 programs {
84 program { name: "active"; 71 program { signal: "efl,state,content,visible"; source: "efl";
85 signal: "efl,state,content,visible";
86 source: "efl";
87 action: STATE_SET "visible" 0.0; 72 action: STATE_SET "visible" 0.0;
88 target: "efl.panel_area"; 73 target: "efl.panel_area";
89 target: "efl.event_area"; 74 target: "efl.event_area";
90 target: "bg"; 75 target: "bg";
91 target: "efl.content"; 76 target: "efl.content";
92 } 77 }
93 program { name: "inactive"; 78 program { signal: "efl,state,content,hidden"; source: "efl";
94 signal: "efl,state,content,hidden";
95 source: "efl";
96 action: STATE_SET "default" 0.0; 79 action: STATE_SET "default" 0.0;
97 target: "efl.panel_area"; 80 target: "efl.panel_area";
98 target: "efl.event_area"; 81 target: "efl.event_area";
@@ -102,10 +85,10 @@ group { name: "efl/panel/scrollable/left"; data.item: "version" "123";
102 } 85 }
103} 86}
104 87
105group { name: "efl/panel/scrollable/right"; data.item: "version" "123"; 88group { name: "efl/scroller/panel/right";
89 data.item: "version" "123";
106 parts { 90 parts {
107 part { name: "efl.event_area"; 91 part { name: "efl.event_area"; type: SWALLOW;
108 type: SWALLOW;
109 description { state: "default" 0.0; 92 description { state: "default" 0.0;
110 rel2.relative: 0.0 1.0; 93 rel2.relative: 0.0 1.0;
111 align: 0.0 0.5; 94 align: 0.0 0.5;
@@ -117,8 +100,7 @@ group { name: "efl/panel/scrollable/right"; data.item: "version" "123";
117 visible: 1; 100 visible: 1;
118 } 101 }
119 } 102 }
120 part { name: "efl.panel_area"; 103 part { name: "efl.panel_area"; type: SWALLOW;
121 type: SWALLOW;
122 description { state: "default" 0.0; 104 description { state: "default" 0.0;
123 rel1 { 105 rel1 {
124 relative: 1.0 0.0; 106 relative: 1.0 0.0;
@@ -137,8 +119,7 @@ group { name: "efl/panel/scrollable/right"; data.item: "version" "123";
137 visible: 1; 119 visible: 1;
138 } 120 }
139 } 121 }
140 part { name: "access.outline"; 122 part { name: "access.outline"; type: RECT;
141 type: RECT;
142 repeat_events: 1; 123 repeat_events: 1;
143 description { state: "default" 0.0; 124 description { state: "default" 0.0;
144 rel1.to: "efl.panel_area"; 125 rel1.to: "efl.panel_area";
@@ -146,8 +127,7 @@ group { name: "efl/panel/scrollable/right"; data.item: "version" "123";
146 color: 0 0 0 0; 127 color: 0 0 0 0;
147 } 128 }
148 } 129 }
149 part { name: "bg"; 130 part { name: "bg"; type: RECT;
150 type: RECT;
151 description { state: "default" 0.0; 131 description { state: "default" 0.0;
152 rel1.to: "efl.panel_area"; 132 rel1.to: "efl.panel_area";
153 rel2.to: "efl.panel_area"; 133 rel2.to: "efl.panel_area";
@@ -159,8 +139,7 @@ group { name: "efl/panel/scrollable/right"; data.item: "version" "123";
159 visible: 1; 139 visible: 1;
160 } 140 }
161 } 141 }
162 part { name: "efl.content"; 142 part { name: "efl.content"; type: SWALLOW;
163 type: SWALLOW;
164 description { state: "default" 0.0; 143 description { state: "default" 0.0;
165 rel1.to: "efl.panel_area"; 144 rel1.to: "efl.panel_area";
166 rel2.to: "efl.panel_area"; 145 rel2.to: "efl.panel_area";
@@ -173,18 +152,14 @@ group { name: "efl/panel/scrollable/right"; data.item: "version" "123";
173 } 152 }
174 } 153 }
175 programs { 154 programs {
176 program { name: "active"; 155 program { signal: "efl,state,content,visible"; source: "efl";
177 signal: "efl,state,content,visible";
178 source: "efl";
179 action: STATE_SET "visible" 0.0; 156 action: STATE_SET "visible" 0.0;
180 target: "efl.panel_area"; 157 target: "efl.panel_area";
181 target: "efl.event_area"; 158 target: "efl.event_area";
182 target: "bg"; 159 target: "bg";
183 target: "efl.content"; 160 target: "efl.content";
184 } 161 }
185 program { name: "inactive"; 162 program { signal: "efl,state,content,hidden"; source: "efl";
186 signal: "efl,state,content,hidden";
187 source: "efl";
188 action: STATE_SET "default" 0.0; 163 action: STATE_SET "default" 0.0;
189 target: "efl.panel_area"; 164 target: "efl.panel_area";
190 target: "efl.event_area"; 165 target: "efl.event_area";
@@ -194,10 +169,10 @@ group { name: "efl/panel/scrollable/right"; data.item: "version" "123";
194 } 169 }
195} 170}
196 171
197group { name: "efl/panel/scrollable/top"; data.item: "version" "123"; 172group { name: "efl/scroller/panel/top";
173 data.item: "version" "123";
198 parts { 174 parts {
199 part { name: "efl.panel_area"; 175 part { name: "efl.panel_area"; type: SWALLOW;
200 type: SWALLOW;
201 description { state: "default" 0.0; 176 description { state: "default" 0.0;
202 rel2.relative: 1.0 0.0; 177 rel2.relative: 1.0 0.0;
203 align: 0.5 0.0; 178 align: 0.5 0.0;
@@ -209,8 +184,7 @@ group { name: "efl/panel/scrollable/top"; data.item: "version" "123";
209 visible: 1; 184 visible: 1;
210 } 185 }
211 } 186 }
212 part { name: "efl.event_area"; 187 part { name: "efl.event_area"; type: SWALLOW;
213 type: SWALLOW;
214 description { state: "default" 0.0; 188 description { state: "default" 0.0;
215 rel1 { 189 rel1 {
216 relative: 0.0 1.0; 190 relative: 0.0 1.0;
@@ -229,8 +203,7 @@ group { name: "efl/panel/scrollable/top"; data.item: "version" "123";
229 visible: 1; 203 visible: 1;
230 } 204 }
231 } 205 }
232 part { name: "access.outline"; 206 part { name: "access.outline"; type: RECT;
233 type: RECT;
234 repeat_events: 1; 207 repeat_events: 1;
235 description { state: "default" 0.0; 208 description { state: "default" 0.0;
236 rel1.to: "efl.panel_area"; 209 rel1.to: "efl.panel_area";
@@ -238,8 +211,7 @@ group { name: "efl/panel/scrollable/top"; data.item: "version" "123";
238 color: 0 0 0 0; 211 color: 0 0 0 0;
239 } 212 }
240 } 213 }
241 part { name: "bg"; 214 part { name: "bg"; type: RECT;
242 type: RECT;
243 description { state: "default" 0.0; 215 description { state: "default" 0.0;
244 rel1.to: "efl.panel_area"; 216 rel1.to: "efl.panel_area";
245 rel2.to: "efl.panel_area"; 217 rel2.to: "efl.panel_area";
@@ -251,8 +223,7 @@ group { name: "efl/panel/scrollable/top"; data.item: "version" "123";
251 visible: 1; 223 visible: 1;
252 } 224 }
253 } 225 }
254 part { name: "efl.content"; 226 part { name: "efl.content"; type: SWALLOW;
255 type: SWALLOW;
256 description { state: "default" 0.0; 227 description { state: "default" 0.0;
257 rel1.to: "efl.panel_area"; 228 rel1.to: "efl.panel_area";
258 rel2.to: "efl.panel_area"; 229 rel2.to: "efl.panel_area";
@@ -265,18 +236,14 @@ group { name: "efl/panel/scrollable/top"; data.item: "version" "123";
265 } 236 }
266 } 237 }
267 programs { 238 programs {
268 program { name: "active"; 239 program { signal: "efl,state,content,visible"; source: "efl";
269 signal: "efl,state,content,visible";
270 source: "efl";
271 action: STATE_SET "visible" 0.0; 240 action: STATE_SET "visible" 0.0;
272 target: "efl.panel_area"; 241 target: "efl.panel_area";
273 target: "efl.event_area"; 242 target: "efl.event_area";
274 target: "bg"; 243 target: "bg";
275 target: "efl.content"; 244 target: "efl.content";
276 } 245 }
277 program { name: "inactive"; 246 program { signal: "efl,state,content,hidden"; source: "efl";
278 signal: "efl,state,content,hidden";
279 source: "efl";
280 action: STATE_SET "default" 0.0; 247 action: STATE_SET "default" 0.0;
281 target: "efl.panel_area"; 248 target: "efl.panel_area";
282 target: "efl.event_area"; 249 target: "efl.event_area";
@@ -286,10 +253,10 @@ group { name: "efl/panel/scrollable/top"; data.item: "version" "123";
286 } 253 }
287} 254}
288 255
289group { name: "efl/panel/scrollable/bottom"; data.item: "version" "123"; 256group { name: "efl/scroller/panel/bottom";
257 data.item: "version" "123";
290 parts { 258 parts {
291 part { name: "efl.event_area"; 259 part { name: "efl.event_area"; type: SWALLOW;
292 type: SWALLOW;
293 description { state: "default" 0.0; 260 description { state: "default" 0.0;
294 rel2.relative: 1.0 0.0; 261 rel2.relative: 1.0 0.0;
295 align: 0.5 0.0; 262 align: 0.5 0.0;
@@ -301,17 +268,11 @@ group { name: "efl/panel/scrollable/bottom"; data.item: "version" "123";
301 visible: 1; 268 visible: 1;
302 } 269 }
303 } 270 }
304 part { name: "efl.panel_area"; 271 part { name: "efl.panel_area"; type: SWALLOW;
305 type: SWALLOW;
306 description { state: "default" 0.0; 272 description { state: "default" 0.0;
307 rel1 { 273 rel.to: "efl.event_area";
308 relative: 0.0 1.0; 274 rel1.relative: 0.0 1.0;
309 to: "efl.event_area"; 275 rel2.relative: 1.0 1.0;
310 }
311 rel2 {
312 relative: 1.0 1.0;
313 to: "efl.event_area";
314 }
315 align: 0.5 0.0; 276 align: 0.5 0.0;
316 fixed: 1 1; 277 fixed: 1 1;
317 visible: 0; 278 visible: 0;
@@ -321,20 +282,15 @@ group { name: "efl/panel/scrollable/bottom"; data.item: "version" "123";
321 visible: 1; 282 visible: 1;
322 } 283 }
323 } 284 }
324 part { name: "access.outline"; 285 part { name: "access.outline"; type: RECT; repeat_events: 1;
325 type: RECT;
326 repeat_events: 1;
327 description { state: "default" 0.0; 286 description { state: "default" 0.0;
328 rel1.to: "efl.panel_area"; 287 rel.to: "efl.panel_area";
329 rel2.to: "efl.panel_area";
330 color: 0 0 0 0; 288 color: 0 0 0 0;
331 } 289 }
332 } 290 }
333 part { name: "bg"; 291 part { name: "bg"; type: RECT;
334 type: RECT;
335 description { state: "default" 0.0; 292 description { state: "default" 0.0;
336 rel1.to: "efl.panel_area"; 293 rel.to: "efl.panel_area";
337 rel2.to: "efl.panel_area";
338 color: 64 64 64 255; 294 color: 64 64 64 255;
339 visible: 0; 295 visible: 0;
340 } 296 }
@@ -343,11 +299,9 @@ group { name: "efl/panel/scrollable/bottom"; data.item: "version" "123";
343 visible: 1; 299 visible: 1;
344 } 300 }
345 } 301 }
346 part { name: "efl.content"; 302 part { name: "efl.content"; type: SWALLOW;
347 type: SWALLOW;
348 description { state: "default" 0.0; 303 description { state: "default" 0.0;
349 rel1.to: "efl.panel_area"; 304 rel.to: "efl.panel_area";
350 rel2.to: "efl.panel_area";
351 visible: 0; 305 visible: 0;
352 } 306 }
353 description { state: "visible" 0.0; 307 description { state: "visible" 0.0;
@@ -357,18 +311,14 @@ group { name: "efl/panel/scrollable/bottom"; data.item: "version" "123";
357 } 311 }
358 } 312 }
359 programs { 313 programs {
360 program { name: "active"; 314 program { signal: "efl,state,content,visible"; source: "efl";
361 signal: "efl,state,content,visible";
362 source: "efl";
363 action: STATE_SET "visible" 0.0; 315 action: STATE_SET "visible" 0.0;
364 target: "efl.panel_area"; 316 target: "efl.panel_area";
365 target: "efl.event_area"; 317 target: "efl.event_area";
366 target: "bg"; 318 target: "bg";
367 target: "efl.content"; 319 target: "efl.content";
368 } 320 }
369 program { name: "inactive"; 321 program { signal: "efl,state,content,hidden"; source: "efl";
370 signal: "efl,state,content,hidden";
371 source: "efl";
372 action: STATE_SET "default" 0.0; 322 action: STATE_SET "default" 0.0;
373 target: "efl.panel_area"; 323 target: "efl.panel_area";
374 target: "efl.event_area"; 324 target: "efl.event_area";
@@ -378,49 +328,32 @@ group { name: "efl/panel/scrollable/bottom"; data.item: "version" "123";
378 } 328 }
379} 329}
380 330
381group { name: "efl/panel/left"; data.item: "version" "123"; 331group { name: "efl/panel/left";
382 images.image: "bevel_out.png" COMP; 332 data.item: "version" "123";
383 images.image: "shine.png" COMP;
384 images.image: "shadow_square_tiny.png" COMP;
385 images.image: "holes_tiny_glow_vert.png" COMP;
386 images.image: "holes_tiny_glow_horiz.png" COMP;
387 images.image: "win_glow.png" COMP;
388 images.image: "icon_arrow_right.png" COMP;
389 images.image: "icon_arrow_left.png" COMP;
390 images.image: "icon_arrow_up.png" COMP;
391 images.image: "icon_arrow_down.png" COMP;
392 data.item: "focus_highlight" "on"; 333 data.item: "focus_highlight" "on";
393 script { 334 script {
394 public is_rtl = 0; 335 public is_rtl = 0;
395 } 336 }
396 parts { 337 parts {
397 part { name: "shadow"; mouse_events: 0; 338 part { name: "shadow"; mouse_events: 0;
339 scale: 1;
398 description { state: "default" 0.0; 340 description { state: "default" 0.0;
399 rel1.offset: -3 -2; 341 rel.to: "base";
400 rel1.to: "base"; 342 WIN_SHADOW_SMALL;
401 rel2.offset: 2 4;
402 rel2.to: "base";
403 image.normal: "shadow_square_tiny.png";
404 image.border: 6 6 6 6;
405 fill.smooth: 0;
406 } 343 }
407 } 344 }
408 part { name: "glow"; mouse_events: 0; 345 part { name: "glow"; type: RECT; mouse_events: 0;
346 scale: 1;
409 description { state: "default" 0.0; 347 description { state: "default" 0.0;
410 image.normal: "win_glow.png"; 348 rel.to: "base";
411 image.border: 9 9 9 9; 349 color: 51 153 255 255;
412 image.middle: 0;
413 rel1.offset: -5 -5;
414 rel1.to: "base";
415 rel2.offset: 4 4;
416 rel2.to: "base";
417 fill.smooth: 0;
418 color: 255 255 255 0;
419 visible: 0; 350 visible: 0;
351 offscale;
420 } 352 }
421 description { state: "focused" 0.0; 353 description { state: "focused" 0.0;
422 inherit: "default" 0.0; 354 inherit: "default" 0.0;
423 color: 255 255 255 255; 355 rel1.offset: -5 -5;
356 rel2.offset: 4 4;
424 visible: 1; 357 visible: 1;
425 } 358 }
426 } 359 }
@@ -433,44 +366,23 @@ group { name: "efl/panel/left"; data.item: "version" "123";
433 rel1.to_x: "all"; 366 rel1.to_x: "all";
434 rel2.to_x: "efl.swallow.event"; 367 rel2.to_x: "efl.swallow.event";
435 rel2.relative: 0.0 1.0; 368 rel2.relative: 0.0 1.0;
436 rel2.offset: -4 -1;
437 color: 64 64 64 255; 369 color: 64 64 64 255;
438 } 370 }
439 } 371 }
440 part { name: "efl.content"; type: SWALLOW; 372 part { name: "efl.content"; type: SWALLOW;
373 scale: 1;
441 description { state: "default" 0.0; 374 description { state: "default" 0.0;
375 rel.to: "base";
442 rel1.offset: 4 4; 376 rel1.offset: 4 4;
443 rel1.to: "base";
444 rel2.offset: -5 -5; 377 rel2.offset: -5 -5;
445 rel2.to: "base"; 378 offscale;
446 }
447 }
448 part { name: "bevel"; mouse_events: 0;
449 description { state: "default" 0.0;
450 rel1.to: "base";
451 rel2.to: "base";
452 image.normal: "bevel_out.png";
453 image.border: 1 1 1 1;
454 image.middle: 0;
455 fill.smooth: 0;
456 }
457 }
458 part { name: "shine"; mouse_events: 0;
459 description { state: "default" 0.0;
460 image.normal: "shine.png";
461 rel1.offset: 0 -2;
462 rel1.to: "base";
463 rel2.relative: 1.0 0.0;
464 rel2.offset: -1 2;
465 rel2.to: "base";
466 FIXED_SIZE(69, 5)
467 } 379 }
468 } 380 }
469 part { name: "efl.swallow.event"; type: SWALLOW; 381 part { name: "efl.swallow.event"; type: SWALLOW;
382 scale: 1;
470 description { state: "default" 0.0; 383 description { state: "default" 0.0;
471 fixed: 1 1; 384 fixed: 1 1;
472 min: 20 20; 385 min: 30 30; max: 30 999999;
473 max: 20 20;
474 align: 1.0 0.5; 386 align: 1.0 0.5;
475 rel1.relative: 1.0 0.0; 387 rel1.relative: 1.0 0.0;
476 rel2.relative: 1.0 1.0; 388 rel2.relative: 1.0 1.0;
@@ -485,54 +397,38 @@ group { name: "efl/panel/left"; data.item: "version" "123";
485 } 397 }
486 part { name: "btn"; type: RECT; 398 part { name: "btn"; type: RECT;
487 description { state: "default" 0.0; 399 description { state: "default" 0.0;
488 rel1.to: "efl.swallow.event"; 400 rel.to: "efl.swallow.event";
489 rel2.to: "efl.swallow.event";
490 color: 0 0 0 0; 401 color: 0 0 0 0;
491 } 402 }
492 description { state: "hidden" 0.0; 403 description { state: "hidden" 0.0;
493 rel1.to: "efl.swallow.event"; 404 rel.to: "efl.swallow.event";
494 rel2.to: "efl.swallow.event";
495 }
496 }
497 part { name: "dots"; mouse_events: 0;
498 description { state: "default" 0.0;
499 rel1.to: "icn";
500 rel2.to: "icn";
501 align: 0.0 0.5;
502 image.normal: "holes_tiny_glow_vert.png";
503 FIXED_SIZE(11, 17)
504 } 405 }
505 } 406 }
506 part { name: "icn"; mouse_events: 0; 407 part { name: "icn"; mouse_events: 0;
507 scale: 1; 408 scale: 1;
508 description { state: "default" 0.0; 409 description { state: "default" 0.0;
509 fixed: 1 1; 410 fixed: 1 1;
510 min: 20 20; 411 min: 30 30; max: 30 30;
511 max: 20 20; 412 rel.to: "btn";
512 rel1.to: "btn"; 413 image.normal: "i-arrow-l";
513 rel2.to: "btn";
514 image.normal: "icon_arrow_left.png";
515 } 414 }
516 description { state: "hidden" 0.0; 415 description { state: "hidden" 0.0;
517 inherit: "default" 0.0; 416 inherit: "default" 0.0;
518 image.normal: "icon_arrow_right.png"; 417 image.normal: "i-arrow-r";
519 } 418 }
520 } 419 }
521 } 420 }
522 programs { 421 programs {
523 program { 422 program { signal: "mouse,clicked,1"; source: "btn";
524 signal: "mouse,clicked,1"; source: "btn";
525 action: SIGNAL_EMIT "efl,action,panel,toggle" "efl"; 423 action: SIGNAL_EMIT "efl,action,panel,toggle" "efl";
526 } 424 }
527 program { 425 program { signal: "efl,action,show"; source: "efl";
528 signal: "efl,action,show"; source: "efl";
529 action: STATE_SET "default" 0.0; 426 action: STATE_SET "default" 0.0;
530 transition: DECELERATE 0.3; 427 transition: DECELERATE 0.2;
531 target: "efl.swallow.event"; 428 target: "efl.swallow.event";
532 target: "base"; 429 target: "base";
533 } 430 }
534 program { 431 program { signal: "efl,action,show"; source: "efl";
535 signal: "efl,action,show"; source: "efl";
536 script { 432 script {
537 if (get_int(is_rtl) == 0) 433 if (get_int(is_rtl) == 0)
538 set_state(PART:"icn", "default", 0.0); 434 set_state(PART:"icn", "default", 0.0);
@@ -540,9 +436,7 @@ group { name: "efl/panel/left"; data.item: "version" "123";
540 set_state(PART:"icn", "hidden", 0.0); 436 set_state(PART:"icn", "hidden", 0.0);
541 } 437 }
542 } 438 }
543 program { 439 program { signal: "edje,state,rtl"; source: "edje";
544 signal: "edje,state,rtl";
545 source: "edje";
546 script { 440 script {
547 new st[31]; 441 new st[31];
548 new Float:vl; 442 new Float:vl;
@@ -554,9 +448,7 @@ group { name: "efl/panel/left"; data.item: "version" "123";
554 set_int(is_rtl, 1); 448 set_int(is_rtl, 1);
555 } 449 }
556 } 450 }
557 program { 451 program { signal: "edje,state,ltr"; source: "edje";
558 signal: "edje,state,ltr";
559 source: "edje";
560 script { 452 script {
561 new st[31]; 453 new st[31];
562 new Float:vl; 454 new Float:vl;
@@ -568,14 +460,12 @@ group { name: "efl/panel/left"; data.item: "version" "123";
568 set_int(is_rtl, 0); 460 set_int(is_rtl, 0);
569 } 461 }
570 } 462 }
571 program { 463 program { signal: "efl,action,hide"; source: "efl";
572 signal: "efl,action,hide"; source: "efl";
573 action: STATE_SET "hidden" 0.0; 464 action: STATE_SET "hidden" 0.0;
574 transition: ACCELERATE 0.3; 465 transition: ACCELERATE 0.2;
575 target: "efl.swallow.event"; 466 target: "efl.swallow.event";
576 } 467 }
577 program { 468 program { signal: "efl,action,hide"; source: "efl";
578 signal: "efl,action,hide"; source: "efl";
579 script { 469 script {
580 if (get_int(is_rtl) == 0) 470 if (get_int(is_rtl) == 0)
581 set_state(PART:"icn", "hidden", 0.0); 471 set_state(PART:"icn", "hidden", 0.0);
@@ -587,21 +477,18 @@ group { name: "efl/panel/left"; data.item: "version" "123";
587 signal: "efl,action,hide"; source: "efl"; 477 signal: "efl,action,hide"; source: "efl";
588 script { 478 script {
589 new x, y, w, h; 479 new x, y, w, h;
590 if (get_int(is_rtl) == 0) 480 if (get_int(is_rtl) == 0) {
591 { 481 custom_state(PART:"base", "default", 0.0);
592 custom_state(PART:"base", "default", 0.0); 482 set_state_val(PART:"base", STATE_REL1, -1.0, 0.0);
593 set_state_val(PART:"base", STATE_REL1, -1.0, 0.0); 483 get_geometry(PART:"efl.swallow.event", x, y, w, h);
594 get_geometry(PART:"efl.swallow.event", x, y, w, h); 484 set_state_val(PART:"base", STATE_REL1_OFFSET, w, 0);
595 set_state_val(PART:"base", STATE_REL1_OFFSET, w, 0); 485 } else {
596 } 486 custom_state(PART:"base", "default", 0.0);
597 else 487 set_state_val(PART:"base", STATE_REL1, -1.0, 0.0);
598 { 488 set_state_val(PART:"base", STATE_REL2, -2.0, 1.0);
599 custom_state(PART:"base", "default", 0.0); 489 get_geometry(PART:"efl.swallow.event", x, y, w, h);
600 set_state_val(PART:"base", STATE_REL1, -1.0, 0.0); 490 set_state_val(PART:"base", STATE_REL2_OFFSET, -w, 0);
601 set_state_val(PART:"base", STATE_REL2, -2.0, 1.0); 491 }
602 get_geometry(PART:"efl.swallow.event", x, y, w, h);
603 set_state_val(PART:"base", STATE_REL2_OFFSET, -w, 0);
604 }
605 } 492 }
606 after: "hide2"; 493 after: "hide2";
607 } 494 }
@@ -610,14 +497,12 @@ group { name: "efl/panel/left"; data.item: "version" "123";
610 transition: ACCELERATE 0.3; 497 transition: ACCELERATE 0.3;
611 target: "base"; 498 target: "base";
612 } 499 }
613 program { 500 program { signal: "efl,action,focus_highlight,show"; source: "efl";
614 signal: "efl,action,focus_highlight,show"; source: "efl";
615 action: STATE_SET "focused" 0.0; 501 action: STATE_SET "focused" 0.0;
616 transition: ACCELERATE 0.2; 502 transition: ACCELERATE 0.2;
617 target: "glow"; 503 target: "glow";
618 } 504 }
619 program { 505 program { signal: "efl,action,focus_highlight,hide"; source: "efl";
620 signal: "efl,action,focus_highlight,hide"; source: "efl";
621 action: STATE_SET "default" 0.0; 506 action: STATE_SET "default" 0.0;
622 transition: DECELERATE 0.5; 507 transition: DECELERATE 0.5;
623 target: "glow"; 508 target: "glow";
@@ -626,8 +511,8 @@ group { name: "efl/panel/left"; data.item: "version" "123";
626} 511}
627 512
628group { name: "efl/panel/right"; 513group { name: "efl/panel/right";
629 inherit: "efl/panel/left";
630 data.item: "version" "123"; 514 data.item: "version" "123";
515 inherit: "efl/panel/left";
631 parts { 516 parts {
632 part { name: "base"; 517 part { name: "base";
633 description { state: "default" 0.0; 518 description { state: "default" 0.0;
@@ -651,17 +536,12 @@ group { name: "efl/panel/right";
651 rel2.relative: 1.0 1.0; 536 rel2.relative: 1.0 1.0;
652 } 537 }
653 } 538 }
654 part { name: "dots";
655 description { state: "default" 0.0;
656 align: 1.0 0.5;
657 }
658 }
659 part { name: "icn"; 539 part { name: "icn";
660 description { state: "default" 0.0; 540 description { state: "default" 0.0;
661 image.normal: "icon_arrow_right.png"; 541 image.normal: "i-arrow-r";
662 } 542 }
663 description { state: "hidden" 0.0; 543 description { state: "hidden" 0.0;
664 image.normal: "icon_arrow_left.png"; 544 image.normal: "i-arrow-l";
665 } 545 }
666 } 546 }
667 } 547 }
@@ -669,7 +549,7 @@ group { name: "efl/panel/right";
669 program { name: "hide1"; 549 program { name: "hide1";
670 script { 550 script {
671 new x, y, w, h; 551 new x, y, w, h;
672 552
673 custom_state(PART:"base", "default", 0.0); 553 custom_state(PART:"base", "default", 0.0);
674 set_state_val(PART:"base", STATE_REL1, 1.0, 0.0); 554 set_state_val(PART:"base", STATE_REL1, 1.0, 0.0);
675 set_state_val(PART:"base", STATE_REL2, 2.0, 1.0); 555 set_state_val(PART:"base", STATE_REL2, 2.0, 1.0);
@@ -681,23 +561,22 @@ group { name: "efl/panel/right";
681} 561}
682 562
683group { name: "efl/panel/top"; 563group { name: "efl/panel/top";
684 inherit: "efl/panel/left";
685 data.item: "version" "123"; 564 data.item: "version" "123";
565 inherit: "efl/panel/left";
686 parts { 566 parts {
687 part { name: "base"; 567 part { name: "base";
688 description { state: "default" 0.0; 568 description { state: "default" 0.0;
689 rel1.relative: 0.0 0.0; 569 rel1.relative: 0.0 0.0;
690 rel1.to_x: "all"; 570 rel1.to_x: "all";
691 rel1.to_y: "all"; 571 rel1.to_y: "all";
692 rel1.offset: 0 0;
693 rel2.relative: 1.0 0.0; 572 rel2.relative: 1.0 0.0;
694 rel2.to_x: "all"; 573 rel2.to_x: "all";
695 rel2.to_y: "efl.swallow.event"; 574 rel2.to_y: "efl.swallow.event";
696 rel2.offset: -1 -4;
697 } 575 }
698 } 576 }
699 part { name: "efl.swallow.event"; 577 part { name: "efl.swallow.event";
700 description { state: "default" 0.0; 578 description { state: "default" 0.0;
579 min: 30 30; max: 999999 30;
701 align: 0.5 1.0; 580 align: 0.5 1.0;
702 rel1.relative: 0.0 1.0; 581 rel1.relative: 0.0 1.0;
703 rel2.relative: 1.0 1.0; 582 rel2.relative: 1.0 1.0;
@@ -708,19 +587,12 @@ group { name: "efl/panel/top";
708 rel2.relative: 1.0 0.0; 587 rel2.relative: 1.0 0.0;
709 } 588 }
710 } 589 }
711 part { name: "dots";
712 description { state: "default" 0.0;
713 align: 0.5 0.0;
714 image.normal: "holes_tiny_glow_horiz.png";
715 FIXED_SIZE(17, 11)
716 }
717 }
718 part { name: "icn"; 590 part { name: "icn";
719 description { state: "default" 0.0; 591 description { state: "default" 0.0;
720 image.normal: "icon_arrow_up.png"; 592 image.normal: "i-arrow-u";
721 } 593 }
722 description { state: "hidden" 0.0; 594 description { state: "hidden" 0.0;
723 image.normal: "icon_arrow_down.png"; 595 image.normal: "i-arrow-d";
724 } 596 }
725 } 597 }
726 } 598 }
@@ -728,7 +600,6 @@ group { name: "efl/panel/top";
728 program { name: "hide1"; 600 program { name: "hide1";
729 script { 601 script {
730 new x, y, w, h; 602 new x, y, w, h;
731
732 custom_state(PART:"base", "default", 0.0); 603 custom_state(PART:"base", "default", 0.0);
733 set_state_val(PART:"base", STATE_REL1, 0.0, -1.0); 604 set_state_val(PART:"base", STATE_REL1, 0.0, -1.0);
734 set_state_val(PART:"base", STATE_REL2, 1.0, 0.0); 605 set_state_val(PART:"base", STATE_REL2, 1.0, 0.0);
@@ -736,14 +607,11 @@ group { name: "efl/panel/top";
736 set_state_val(PART:"base", STATE_REL1_OFFSET, 0, h); 607 set_state_val(PART:"base", STATE_REL1_OFFSET, 0, h);
737 } 608 }
738 } 609 }
739 program { 610 program { signal: "efl,action,show"; source: "efl";
740 signal: "efl,action,show"; source: "efl";
741 action: STATE_SET "default" 0.0; 611 action: STATE_SET "default" 0.0;
742 target: "icn"; 612 target: "icn";
743 } 613 }
744 program { 614 program { signal: "edje,state,rtl"; source: "edje";
745 signal: "edje,state,rtl";
746 source: "edje";
747 script { 615 script {
748 new st[31]; 616 new st[31];
749 new Float:vl; 617 new Float:vl;
@@ -754,9 +622,7 @@ group { name: "efl/panel/top";
754 set_state(PART:"icn", "hidden", 0.0); 622 set_state(PART:"icn", "hidden", 0.0);
755 } 623 }
756 } 624 }
757 program { 625 program { signal: "edje,state,ltr"; source: "edje";
758 signal: "edje,state,ltr";
759 source: "edje";
760 script { 626 script {
761 new st[31]; 627 new st[31];
762 new Float:vl; 628 new Float:vl;
@@ -767,8 +633,7 @@ group { name: "efl/panel/top";
767 set_state(PART:"icn", "hidden", 0.0); 633 set_state(PART:"icn", "hidden", 0.0);
768 } 634 }
769 } 635 }
770 program { 636 program { signal: "efl,action,hide"; source: "efl";
771 signal: "efl,action,hide"; source: "efl";
772 action: STATE_SET "hidden" 0.0; 637 action: STATE_SET "hidden" 0.0;
773 target: "icn"; 638 target: "icn";
774 } 639 }
@@ -776,19 +641,17 @@ group { name: "efl/panel/top";
776} 641}
777 642
778group { name: "efl/panel/bottom"; 643group { name: "efl/panel/bottom";
779 inherit: "efl/panel/top";
780 data.item: "version" "123"; 644 data.item: "version" "123";
645 inherit: "efl/panel/top";
781 parts { 646 parts {
782 part { name: "base"; 647 part { name: "base";
783 description { state: "default" 0.0; 648 description { state: "default" 0.0;
784 rel1.relative: 0.0 1.0; 649 rel1.relative: 0.0 1.0;
785 rel1.to_x: "all"; 650 rel1.to_x: "all";
786 rel1.to_y: "efl.swallow.event"; 651 rel1.to_y: "efl.swallow.event";
787 rel1.offset: 0 3;
788 rel2.relative: 1.0 1.0; 652 rel2.relative: 1.0 1.0;
789 rel2.to_x: "all"; 653 rel2.to_x: "all";
790 rel2.to_y: "all"; 654 rel2.to_y: "all";
791 rel2.offset: -1 -1;
792 } 655 }
793 } 656 }
794 part { name: "efl.swallow.event"; 657 part { name: "efl.swallow.event";
@@ -803,19 +666,12 @@ group { name: "efl/panel/bottom";
803 rel2.relative: 1.0 1.0; 666 rel2.relative: 1.0 1.0;
804 } 667 }
805 } 668 }
806 part { name: "dots";
807 description { state: "default" 0.0;
808 align: 0.5 0.0;
809 image.normal: "holes_tiny_glow_horiz.png";
810 FIXED_SIZE(17, 11)
811 }
812 }
813 part { name: "icn"; 669 part { name: "icn";
814 description { state: "default" 0.0; 670 description { state: "default" 0.0;
815 image.normal: "icon_arrow_down.png"; 671 image.normal: "i-arrow-d";
816 } 672 }
817 description { state: "hidden" 0.0; 673 description { state: "hidden" 0.0;
818 image.normal: "icon_arrow_up.png"; 674 image.normal: "i-arrow-u";
819 } 675 }
820 } 676 }
821 } 677 }
@@ -832,3 +688,4 @@ group { name: "efl/panel/bottom";
832 } 688 }
833 } 689 }
834} 690}
691
diff --git a/data/elementary/themes/edc/efl/panes.edc b/data/elementary/themes/edc/efl/panes.edc
index 186c1491aa..e9834af6f6 100644
--- a/data/elementary/themes/edc/efl/panes.edc
+++ b/data/elementary/themes/edc/efl/panes.edc
@@ -9,12 +9,13 @@
9 efl,action,unpress: Used for "unpress" smart callback. 9 efl,action,unpress: Used for "unpress" smart callback.
10*/ 10*/
11 11
12#define PANEMIN 10 12#define PANEMIN 8
13#define PANEMIN2 16 13#define PANEMIN2 24
14#define PANEWID 32 14#define PANEWID 24
15 15
16group { name: "efl/panes/vertical"; data.item: "version" "123"; 16group { name: "efl/panes/vertical";
17 images.image: "holes_vert.png" COMP; 17 data.item: "version" "123";
18 images.image: "pane_handle_v.png" COMP;
18 parts { 19 parts {
19 //TODO: remove left/right 20 //TODO: remove left/right
20 alias: "first" "efl.left"; 21 alias: "first" "efl.left";
@@ -55,31 +56,27 @@ group { name: "efl/panes/vertical"; data.item: "version" "123";
55 part { name: "whole_left"; type: RECT; 56 part { name: "whole_left"; type: RECT;
56 description { state: "default" 0.0; 57 description { state: "default" 0.0;
57 rel2.to_x: "efl.bar"; 58 rel2.to_x: "efl.bar";
58 rel2.relative: 1.0 1.0; 59 rel2.relative: 0.0 1.0;
59 rel2.offset: -4 -1;
60 } 60 }
61 } 61 }
62 part { name: "whole_right"; type: RECT; 62 part { name: "whole_right"; type: RECT;
63 description { state: "default" 0.0; 63 description { state: "default" 0.0;
64 rel1.to_x: "efl.bar"; 64 rel1.to_x: "efl.bar";
65 rel1.relative: 0.0 0.0; 65 rel1.relative: 1.0 0.0;
66 rel1.offset: 3 0;
67 } 66 }
68 } 67 }
69 part { name: "efl.left"; type: SWALLOW; 68 part { name: "efl.left"; type: SWALLOW;
70 clip_to: "whole_left"; 69 clip_to: "whole_left";
71 description { state: "default" 0.0; 70 description { state: "default" 0.0;
72 rel2.to_x: "efl.bar"; 71 rel2.to_x: "efl.bar";
73 rel2.relative: 1.0 1.0; 72 rel2.relative: 0.0 1.0;
74 rel2.offset: -4 -1;
75 } 73 }
76 } 74 }
77 part { name: "efl.right"; type: SWALLOW; 75 part { name: "efl.right"; type: SWALLOW;
78 clip_to: "whole_right"; 76 clip_to: "whole_right";
79 description { state: "default" 0.0; 77 description { state: "default" 0.0;
80 rel1.to_x: "efl.bar"; 78 rel1.to_x: "efl.bar";
81 rel1.relative: 0.0 0.0; 79 rel1.relative: 1.0 0.0;
82 rel1.offset: 3 0;
83 } 80 }
84 } 81 }
85 part { name: "efl.bar"; type: SPACER; 82 part { name: "efl.bar"; type: SPACER;
@@ -88,8 +85,8 @@ group { name: "efl/panes/vertical"; data.item: "version" "123";
88 y: 0 0 0; 85 y: 0 0 0;
89 } 86 }
90 description { state: "default" 0.0; 87 description { state: "default" 0.0;
91 max: 0 99999; 88 max: 8 99999;
92 min: 0 14; 89 min: 8 24;
93 fixed: 1 1; 90 fixed: 1 1;
94 rel1.relative: 0.0 0.5; 91 rel1.relative: 0.0 0.5;
95 rel2.relative: 1.0 0.5; 92 rel2.relative: 1.0 0.5;
@@ -97,10 +94,11 @@ group { name: "efl/panes/vertical"; data.item: "version" "123";
97 } 94 }
98 part { name: "dots"; mouse_events: 0; 95 part { name: "dots"; mouse_events: 0;
99 description { state: "default" 0.0; 96 description { state: "default" 0.0;
100 image.normal: "holes_vert.png"; 97 FIXED_SIZE(8, 24)
101 rel1.to: "efl.bar"; 98 image.normal: "pane_handle_v.png";
102 rel2.to: "efl.bar"; 99 fill.smooth: 0;
103 FIXED_SIZE(4, 14) 100 rel.to: "efl.bar";
101 color: 160 160 160 255;
104 } 102 }
105 } 103 }
106 part { name: "efl.event"; type: SWALLOW; 104 part { name: "efl.event"; type: SWALLOW;
@@ -108,8 +106,7 @@ group { name: "efl/panes/vertical"; data.item: "version" "123";
108 visible: 0; 106 visible: 0;
109 min: PANEMIN PANEMIN2; 107 min: PANEMIN PANEMIN2;
110 fixed: 1 1; 108 fixed: 1 1;
111 rel1.to: "efl.bar"; 109 rel.to: "efl.bar";
112 rel2.to: "efl.bar";
113 } 110 }
114 } 111 }
115 part { name: "bar"; type: RECT; 112 part { name: "bar"; type: RECT;
@@ -130,12 +127,12 @@ group { name: "efl/panes/vertical"; data.item: "version" "123";
130 } 127 }
131 programs { 128 programs {
132 EFL_UI_CLICKABLE_PART_BIND("bar") 129 EFL_UI_CLICKABLE_PART_BIND("bar")
133 program { // for elm_panes_fixed_set() 130 program { // for efl_panes_fixed_set()
134 signal: "efl,panes,fixed"; source: "efl"; 131 signal: "efl,panes,fixed"; source: "efl";
135 action: STATE_SET "disabled" 0.0; 132 action: STATE_SET "disabled" 0.0;
136 target: "bar"; 133 target: "bar";
137 } 134 }
138 program { // for elm_panes_fixed_set() 135 program { // for efl_panes_fixed_set()
139 signal: "efl,panes,unfixed"; source: "efl"; 136 signal: "efl,panes,unfixed"; source: "efl";
140 action: STATE_SET "default" 0.0; 137 action: STATE_SET "default" 0.0;
141 target: "bar"; 138 target: "bar";
@@ -143,8 +140,9 @@ group { name: "efl/panes/vertical"; data.item: "version" "123";
143 } 140 }
144} 141}
145 142
146group { name: "efl/panes/horizontal"; data.item: "version" "123"; 143group { name: "efl/panes/horizontal";
147 images.image: "holes_horiz.png" COMP; 144 data.item: "version" "123";
145 images.image: "pane_handle_h.png" COMP;
148 parts { 146 parts {
149 //TODO: remove left/right 147 //TODO: remove left/right
150 alias: "first" "efl.left"; 148 alias: "first" "efl.left";
@@ -185,31 +183,27 @@ group { name: "efl/panes/horizontal"; data.item: "version" "123";
185 part { name: "whole_left"; type: RECT; 183 part { name: "whole_left"; type: RECT;
186 description { state: "default" 0.0; 184 description { state: "default" 0.0;
187 rel2.to_y: "efl.bar"; 185 rel2.to_y: "efl.bar";
188 rel2.relative: 1.0 1.0; 186 rel2.relative: 1.0 0.0;
189 rel2.offset: -1 -4;
190 } 187 }
191 } 188 }
192 part { name: "whole_right"; type: RECT; 189 part { name: "whole_right"; type: RECT;
193 description { state: "default" 0.0; 190 description { state: "default" 0.0;
194 rel1.to_y: "efl.bar"; 191 rel1.to_y: "efl.bar";
195 rel1.relative: 0.0 0.0; 192 rel1.relative: 0.0 1.0;
196 rel1.offset: 0 3;
197 } 193 }
198 } 194 }
199 part { name: "efl.left"; type: SWALLOW; 195 part { name: "efl.left"; type: SWALLOW;
200 clip_to: "whole_left"; 196 clip_to: "whole_left";
201 description { state: "default" 0.0; 197 description { state: "default" 0.0;
202 rel2.to_y: "efl.bar"; 198 rel2.to_y: "efl.bar";
203 rel2.relative: 1.0 1.0; 199 rel2.relative: 1.0 0.0;
204 rel2.offset: -1 -4;
205 } 200 }
206 } 201 }
207 part { name: "efl.right"; type: SWALLOW; 202 part { name: "efl.right"; type: SWALLOW;
208 clip_to: "whole_right"; 203 clip_to: "whole_right";
209 description { state: "default" 0.0; 204 description { state: "default" 0.0;
210 rel1.to_y: "efl.bar"; 205 rel1.to_y: "efl.bar";
211 rel1.relative: 0.0 0.0; 206 rel1.relative: 0.0 1.0;
212 rel1.offset: 0 3;
213 } 207 }
214 } 208 }
215 part { name: "efl.bar"; type: SPACER; 209 part { name: "efl.bar"; type: SPACER;
@@ -218,8 +212,8 @@ group { name: "efl/panes/horizontal"; data.item: "version" "123";
218 y: 1 1 1; 212 y: 1 1 1;
219 } 213 }
220 description { state: "default" 0.0; 214 description { state: "default" 0.0;
221 max: 99999 0; 215 max: 99999 8;
222 min: 14 0; 216 min: 24 8;
223 fixed: 1 1; 217 fixed: 1 1;
224 rel1.relative: 0.5 0.0; 218 rel1.relative: 0.5 0.0;
225 rel2.relative: 0.5 1.0; 219 rel2.relative: 0.5 1.0;
@@ -227,10 +221,11 @@ group { name: "efl/panes/horizontal"; data.item: "version" "123";
227 } 221 }
228 part { name: "dots"; mouse_events: 0; 222 part { name: "dots"; mouse_events: 0;
229 description { state: "default" 0.0; 223 description { state: "default" 0.0;
230 image.normal: "holes_horiz.png"; 224 FIXED_SIZE(24, 8)
231 rel1.to: "efl.bar"; 225 image.normal: "pane_handle_h.png";
232 rel2.to: "efl.bar"; 226 fill.smooth: 0;
233 FIXED_SIZE(14, 4) 227 rel.to: "efl.bar";
228 color: 160 160 160 255;
234 } 229 }
235 } 230 }
236 part { name: "efl.event"; type: SWALLOW; 231 part { name: "efl.event"; type: SWALLOW;
@@ -238,8 +233,7 @@ group { name: "efl/panes/horizontal"; data.item: "version" "123";
238 visible: 0; 233 visible: 0;
239 min: PANEMIN2 PANEMIN; 234 min: PANEMIN2 PANEMIN;
240 fixed: 1 1; 235 fixed: 1 1;
241 rel1.to: "efl.bar"; 236 rel.to: "efl.bar";
242 rel2.to: "efl.bar";
243 } 237 }
244 } 238 }
245 part { name: "bar"; type: RECT; 239 part { name: "bar"; type: RECT;
@@ -260,12 +254,12 @@ group { name: "efl/panes/horizontal"; data.item: "version" "123";
260 } 254 }
261 programs { 255 programs {
262 EFL_UI_CLICKABLE_PART_BIND("bar") 256 EFL_UI_CLICKABLE_PART_BIND("bar")
263 program { // for elm_panes_fixed_set() 257 program { // for efl_panes_fixed_set()
264 signal: "efl,panes,fixed"; source: "efl"; 258 signal: "efl,panes,fixed"; source: "efl";
265 action: STATE_SET "disabled" 0.0; 259 action: STATE_SET "disabled" 0.0;
266 target: "bar"; 260 target: "bar";
267 } 261 }
268 program { // for elm_panes_fixed_set() 262 program { // for efl_panes_fixed_set()
269 signal: "efl,panes,unfixed"; source: "efl"; 263 signal: "efl,panes,unfixed"; source: "efl";
270 action: STATE_SET "default" 0.0; 264 action: STATE_SET "default" 0.0;
271 target: "bar"; 265 target: "bar";
@@ -273,9 +267,11 @@ group { name: "efl/panes/horizontal"; data.item: "version" "123";
273 } 267 }
274} 268}
275 269
276group { name: "efl/panes/vertical:flush"; data.item: "version" "123"; 270////////////////////////////////////////////////////////////////////////////
277 images.image: "downlight_glow_left.png" COMP; 271
278 images.image: "downlight_glow_right.png" COMP; 272group { name: "efl/panes/vertical:flush";
273 data.item: "version" "123";
274 images.image: "shadow_circle_vert.png" COMP;
279 parts { 275 parts {
280 part { name: "whole"; type: SPACER; 276 part { name: "whole"; type: SPACER;
281 description { state: "default" 0.0; 277 description { state: "default" 0.0;
@@ -353,8 +349,7 @@ group { name: "efl/panes/vertical:flush"; data.item: "version" "123";
353 visible: 0; 349 visible: 0;
354 min: PANEMIN PANEMIN2; 350 min: PANEMIN PANEMIN2;
355 fixed: 1 1; 351 fixed: 1 1;
356 rel1.to: "efl.bar"; 352 rel.to: "efl.bar";
357 rel2.to: "efl.bar";
358 } 353 }
359 } 354 }
360 part { name: "bar"; type: RECT; 355 part { name: "bar"; type: RECT;
@@ -375,64 +370,81 @@ group { name: "efl/panes/vertical:flush"; data.item: "version" "123";
375 } 370 }
376 } 371 }
377 part { name: "glow1a"; mouse_events: 0; 372 part { name: "glow1a"; mouse_events: 0;
373 clip_to: "whole_right";
374 scale: 1;
378 description { state: "default" 0.0; 375 description { state: "default" 0.0;
379 image.normal: "downlight_glow_left.png"; 376 image.normal: "shadow_circle_vert.png";
380 image.border: 0 3 0 0; 377 rel1.to_x: "efl.bar";
381 max: 32 99999;
382 rel2.to_x: "efl.bar"; 378 rel2.to_x: "efl.bar";
383 color: 255 255 255 0; 379 color: 255 255 255 0;
384 align: 1.0 0.5; 380 offscale;
381 visible: 0;
385 } 382 }
386 description { state: "active" 0.0; 383 description { state: "active" 0.0;
387 inherit: "default" 0.0; 384 inherit: "default" 0.0;
388 color: 255 255 255 255; 385 color: 255 255 255 128;
386 rel1.offset: -16 0;
387 rel2.offset: 15 -1;
388 visible: 1;
389 } 389 }
390 } 390 }
391 part { name: "glow1b"; mouse_events: 0; 391 part { name: "glow2a"; mouse_events: 0;
392 clip_to: "whole_left";
393 scale: 1;
392 description { state: "default" 0.0; 394 description { state: "default" 0.0;
393 image.normal: "downlight_glow_right.png"; 395 image.normal: "shadow_circle_vert.png";
394 max: 4 99999;
395 rel1.to_x: "efl.bar"; 396 rel1.to_x: "efl.bar";
397 rel2.to_x: "efl.bar";
396 color: 255 255 255 0; 398 color: 255 255 255 0;
397 align: 0.0 0.5; 399 offscale;
400 visible: 0;
398 } 401 }
399 description { state: "active" 0.0; 402 description { state: "active" 0.0;
400 inherit: "default" 0.0; 403 inherit: "default" 0.0;
401 color: 255 255 255 255; 404 color: 255 255 255 128;
405 rel1.offset: -16 0;
406 rel2.offset: 15 -1;
407 visible: 1;
402 } 408 }
403 } 409 }
404 part { name: "glow2a"; mouse_events: 0; 410 part { name: "glowbar1a"; type: RECT; mouse_events: 0;
411 clip_to: "whole_left";
412 scale: 1;
405 description { state: "default" 0.0; 413 description { state: "default" 0.0;
406 image.normal: "downlight_glow_left.png"; 414 rel1.to_x: "efl.bar";
407 max: 4 99999;
408 rel2.to_x: "efl.bar"; 415 rel2.to_x: "efl.bar";
409 color: 255 255 255 0; 416 color: 51 153 255 255;
410 align: 1.0 0.5; 417 offscale;
418 visible: 0;
411 } 419 }
412 description { state: "active" 0.0; 420 description { state: "active" 0.0;
413 inherit: "default" 0.0; 421 inherit: "default" 0.0;
414 color: 255 255 255 255; 422 rel1.offset: -5 0;
423 rel2.offset: 4 -1;
424 visible: 1;
415 } 425 }
416 } 426 }
417 part { name: "glow2b"; mouse_events: 0; 427 part { name: "glowbar2a"; type: RECT; mouse_events: 0;
428 clip_to: "whole_right";
429 scale: 1;
418 description { state: "default" 0.0; 430 description { state: "default" 0.0;
419 image.normal: "downlight_glow_right.png";
420 image.border: 3 0 0 0;
421 max: 32 99999;
422 rel1.to_x: "efl.bar"; 431 rel1.to_x: "efl.bar";
423 color: 255 255 255 0; 432 rel2.to_x: "efl.bar";
424 align: 0.0 0.5; 433 color: 51 153 255 255;
434 offscale;
435 visible: 0;
425 } 436 }
426 description { state: "active" 0.0; 437 description { state: "active" 0.0;
427 inherit: "default" 0.0; 438 inherit: "default" 0.0;
428 color: 255 255 255 255; 439 rel1.offset: -5 0;
440 rel2.offset: 4 -1;
441 visible: 1;
429 } 442 }
430 } 443 }
431 part { name: "bar1"; type: RECT; repeat_events: 1; 444 part { name: "bar1"; type: RECT; repeat_events: 1;
432 description { state: "default" 0.0; 445 description { state: "default" 0.0;
433 fixed: 1 1; 446 fixed: 1 1;
434 rel1.to: "bar"; 447 rel.to: "bar";
435 rel2.to: "bar";
436 rel2.relative: 0.5 1.0; 448 rel2.relative: 0.5 1.0;
437 color: 0 0 0 0; 449 color: 0 0 0 0;
438 } 450 }
@@ -440,21 +452,25 @@ group { name: "efl/panes/vertical:flush"; data.item: "version" "123";
440 part { name: "bar2"; type: RECT; repeat_events: 1; 452 part { name: "bar2"; type: RECT; repeat_events: 1;
441 description { state: "default" 0.0; 453 description { state: "default" 0.0;
442 fixed: 1 1; 454 fixed: 1 1;
443 rel1.to: "bar"; 455 rel.to: "bar";
444 rel1.relative: 0.5 0.0; 456 rel1.relative: 0.5 0.0;
445 rel2.to: "bar";
446 color: 0 0 0 0; 457 color: 0 0 0 0;
447 } 458 }
448 } 459 }
449 } 460 }
450 programs { 461 programs {
451 EFL_UI_CLICKABLE_PART_BIND("bar") 462 program {signal: "mouse,down,1"; source: "bar"; // for "press" smart callback
452 program { // for elm_panes_fixed_set() 463 action: SIGNAL_EMIT "efl,action,press" "efl";
464 }
465 program { signal: "mouse,up,1"; source: "bar"; // for "unpress" smart callback
466 action: SIGNAL_EMIT "efl,action,unpress" "efl";
467 }
468 program { // for efl_panes_fixed_set()
453 signal: "efl,panes,fixed"; source: "efl"; 469 signal: "efl,panes,fixed"; source: "efl";
454 action: STATE_SET "disabled" 0.0; 470 action: STATE_SET "disabled" 0.0;
455 target: "bar"; 471 target: "bar";
456 } 472 }
457 program { // for elm_panes_fixed_set() 473 program { // for efl_panes_fixed_set()
458 signal: "efl,panes,unfixed"; source: "efl"; 474 signal: "efl,panes,unfixed"; source: "efl";
459 action: STATE_SET "default" 0.0; 475 action: STATE_SET "default" 0.0;
460 target: "bar"; 476 target: "bar";
@@ -462,37 +478,37 @@ group { name: "efl/panes/vertical:flush"; data.item: "version" "123";
462 program { 478 program {
463 signal: "mouse,in"; source: "bar1"; 479 signal: "mouse,in"; source: "bar1";
464 action: STATE_SET "active" 0.0; 480 action: STATE_SET "active" 0.0;
465 transition: BOUNCE 0.4 0.5 4; 481 transition: DECELERATE 0.2;
466 target: "glow1a"; 482 target: "glow1a";
467 target: "glow1b"; 483 target: "glowbar1a";
468 } 484 }
469 program { 485 program {
470 signal: "mouse,out"; source: "bar1"; 486 signal: "mouse,out"; source: "bar1";
471 action: STATE_SET "default" 0.0; 487 action: STATE_SET "default" 0.0;
472 transition: DECELERATE 0.5; 488 transition: DECELERATE 0.5;
473 target: "glow1a"; 489 target: "glow1a";
474 target: "glow1b"; 490 target: "glowbar1a";
475 } 491 }
476 program { 492 program {
477 signal: "mouse,in"; source: "bar2"; 493 signal: "mouse,in"; source: "bar2";
478 action: STATE_SET "active" 0.0; 494 action: STATE_SET "active" 0.0;
479 transition: BOUNCE 0.4 0.5 4; 495 transition: DECELERATE 0.2;
480 target: "glow2a"; 496 target: "glow2a";
481 target: "glow2b"; 497 target: "glowbar2a";
482 } 498 }
483 program { 499 program {
484 signal: "mouse,out"; source: "bar2"; 500 signal: "mouse,out"; source: "bar2";
485 action: STATE_SET "default" 0.0; 501 action: STATE_SET "default" 0.0;
486 transition: DECELERATE 0.5; 502 transition: DECELERATE 0.5;
487 target: "glow2a"; 503 target: "glow2a";
488 target: "glow2b"; 504 target: "glowbar2a";
489 } 505 }
490 } 506 }
491} 507}
492 508
493group { name: "efl/panes/horizontal:flush"; data.item: "version" "123"; 509group { name: "efl/panes/horizontal:flush";
494 images.image: "downlight_glow.png" COMP; 510 data.item: "version" "123";
495 images.image: "downlight_glow_up.png" COMP; 511 images.image: "shadow_circle_horiz.png" COMP;
496 parts { 512 parts {
497 part { name: "whole"; type: SPACER; 513 part { name: "whole"; type: SPACER;
498 description { state: "default" 0.0; 514 description { state: "default" 0.0;
@@ -570,8 +586,7 @@ group { name: "efl/panes/horizontal:flush"; data.item: "version" "123";
570 visible: 0; 586 visible: 0;
571 min: PANEMIN2 PANEMIN; 587 min: PANEMIN2 PANEMIN;
572 fixed: 1 1; 588 fixed: 1 1;
573 rel1.to: "efl.bar"; 589 rel.to: "efl.bar";
574 rel2.to: "efl.bar";
575 } 590 }
576 } 591 }
577 part { name: "bar"; type: RECT; 592 part { name: "bar"; type: RECT;
@@ -592,64 +607,81 @@ group { name: "efl/panes/horizontal:flush"; data.item: "version" "123";
592 } 607 }
593 } 608 }
594 part { name: "glow1a"; mouse_events: 0; 609 part { name: "glow1a"; mouse_events: 0;
610 clip_to: "whole_right";
611 scale: 1;
595 description { state: "default" 0.0; 612 description { state: "default" 0.0;
596 image.normal: "downlight_glow_up.png"; 613 image.normal: "shadow_circle_horiz.png";
597 image.border: 0 0 0 3; 614 rel1.to_y: "efl.bar";
598 max: 99999 32;
599 rel2.to_y: "efl.bar"; 615 rel2.to_y: "efl.bar";
600 color: 255 255 255 0; 616 color: 255 255 255 0;
601 align: 0.5 1.0; 617 offscale;
618 visible: 0;
602 } 619 }
603 description { state: "active" 0.0; 620 description { state: "active" 0.0;
604 inherit: "default" 0.0; 621 inherit: "default" 0.0;
605 color: 255 255 255 255; 622 color: 255 255 255 128;
623 rel1.offset: 0 -16;
624 rel2.offset: -1 15;
625 visible: 1;
606 } 626 }
607 } 627 }
608 part { name: "glow1b"; mouse_events: 0; 628 part { name: "glow2a"; mouse_events: 0;
629 clip_to: "whole_left";
630 scale: 1;
609 description { state: "default" 0.0; 631 description { state: "default" 0.0;
610 image.normal: "downlight_glow.png"; 632 image.normal: "shadow_circle_horiz.png";
611 max: 99999 4;
612 rel1.to_y: "efl.bar"; 633 rel1.to_y: "efl.bar";
634 rel2.to_y: "efl.bar";
613 color: 255 255 255 0; 635 color: 255 255 255 0;
614 align: 0.5 0.0; 636 offscale;
637 visible: 0;
615 } 638 }
616 description { state: "active" 0.0; 639 description { state: "active" 0.0;
617 inherit: "default" 0.0; 640 inherit: "default" 0.0;
618 color: 255 255 255 255; 641 color: 255 255 255 128;
642 rel1.offset: 0 -16;
643 rel2.offset: -1 15;
644 visible: 1;
619 } 645 }
620 } 646 }
621 part { name: "glow2a"; mouse_events: 0; 647 part { name: "glowbar1a"; type: RECT; mouse_events: 0;
648 clip_to: "whole_left";
649 scale: 1;
622 description { state: "default" 0.0; 650 description { state: "default" 0.0;
623 image.normal: "downlight_glow_up.png"; 651 rel1.to_y: "efl.bar";
624 max: 99999 4;
625 rel2.to_y: "efl.bar"; 652 rel2.to_y: "efl.bar";
626 color: 255 255 255 0; 653 color: 51 153 255 255;
627 align: 0.5 1.0; 654 offscale;
655 visible: 0;
628 } 656 }
629 description { state: "active" 0.0; 657 description { state: "active" 0.0;
630 inherit: "default" 0.0; 658 inherit: "default" 0.0;
631 color: 255 255 255 255; 659 rel1.offset: 0 -5;
660 rel2.offset: -1 4;
661 visible: 1;
632 } 662 }
633 } 663 }
634 part { name: "glow2b"; mouse_events: 0; 664 part { name: "glowbar2a"; type: RECT; mouse_events: 0;
665 clip_to: "whole_right";
666 scale: 1;
635 description { state: "default" 0.0; 667 description { state: "default" 0.0;
636 image.normal: "downlight_glow.png";
637 image.border: 0 0 3 0;
638 max: 99999 32;
639 rel1.to_y: "efl.bar"; 668 rel1.to_y: "efl.bar";
640 color: 255 255 255 0; 669 rel2.to_y: "efl.bar";
641 align: 0.5 0.0; 670 color: 51 153 255 255;
671 offscale;
672 visible: 0;
642 } 673 }
643 description { state: "active" 0.0; 674 description { state: "active" 0.0;
644 inherit: "default" 0.0; 675 inherit: "default" 0.0;
645 color: 255 255 255 255; 676 rel1.offset: 0 -5;
677 rel2.offset: -1 4;
678 visible: 1;
646 } 679 }
647 } 680 }
648 part { name: "bar1"; type: RECT; repeat_events: 1; 681 part { name: "bar1"; type: RECT; repeat_events: 1;
649 description { state: "default" 0.0; 682 description { state: "default" 0.0;
650 fixed: 1 1; 683 fixed: 1 1;
651 rel1.to: "bar"; 684 rel.to: "bar";
652 rel2.to: "bar";
653 rel2.relative: 1.0 0.5; 685 rel2.relative: 1.0 0.5;
654 color: 0 0 0 0; 686 color: 0 0 0 0;
655 } 687 }
@@ -657,87 +689,85 @@ group { name: "efl/panes/horizontal:flush"; data.item: "version" "123";
657 part { name: "bar2"; type: RECT; repeat_events: 1; 689 part { name: "bar2"; type: RECT; repeat_events: 1;
658 description { state: "default" 0.0; 690 description { state: "default" 0.0;
659 fixed: 1 1; 691 fixed: 1 1;
660 rel1.to: "bar"; 692 rel.to: "bar";
661 rel1.relative: 0.0 0.5; 693 rel1.relative: 0.0 0.5;
662 rel2.to: "bar";
663 color: 0 0 0 0; 694 color: 0 0 0 0;
664 } 695 }
665 } 696 }
666 } 697 }
667 programs { 698 programs {
699 program {signal: "mouse,down,1"; source: "bar"; // for "press" smart callback
700 action: SIGNAL_EMIT "efl,action,press" "efl";
701 }
702 program { signal: "mouse,up,1"; source: "bar"; // for "unpress" smart callback
703 action: SIGNAL_EMIT "efl,action,unpress" "efl";
704 }
705 program { // for efl_panes_fixed_set()
706 signal: "efl,panes,fixed"; source: "efl";
707 action: STATE_SET "disabled" 0.0;
708 target: "bar";
709 }
710 program { // for efl_panes_fixed_set()
711 signal: "efl,panes,unfixed"; source: "efl";
712 action: STATE_SET "default" 0.0;
713 target: "bar";
714 }
668 program { 715 program {
669 signal: "mouse,in"; source: "bar1"; 716 signal: "mouse,in"; source: "bar1";
670 action: STATE_SET "active" 0.0; 717 action: STATE_SET "active" 0.0;
671 transition: BOUNCE 0.4 0.5 4; 718 transition: DECELERATE 0.2;
672 target: "glow1a"; 719 target: "glow1a";
673 target: "glow1b"; 720 target: "glowbar1a";
674 } 721 }
675 program { 722 program {
676 signal: "mouse,out"; source: "bar1"; 723 signal: "mouse,out"; source: "bar1";
677 action: STATE_SET "default" 0.0; 724 action: STATE_SET "default" 0.0;
678 transition: DECELERATE 0.5; 725 transition: DECELERATE 0.5;
679 target: "glow1a"; 726 target: "glow1a";
680 target: "glow1b"; 727 target: "glowbar1a";
681 } 728 }
682 program { 729 program {
683 signal: "mouse,in"; source: "bar2"; 730 signal: "mouse,in"; source: "bar2";
684 action: STATE_SET "active" 0.0; 731 action: STATE_SET "active" 0.0;
685 transition: BOUNCE 0.4 0.5 4; 732 transition: DECELERATE 0.2;
686 target: "glow2a"; 733 target: "glow2a";
687 target: "glow2b"; 734 target: "glowbar2a";
688 } 735 }
689 program { 736 program {
690 signal: "mouse,out"; source: "bar2"; 737 signal: "mouse,out"; source: "bar2";
691 action: STATE_SET "default" 0.0; 738 action: STATE_SET "default" 0.0;
692 transition: DECELERATE 0.5; 739 transition: DECELERATE 0.5;
693 target: "glow2a"; 740 target: "glow2a";
694 target: "glow2b"; 741 target: "glowbar2a";
695 }
696 EFL_UI_CLICKABLE_PART_BIND("bar")
697 program { // for elm_panes_fixed_set()
698 signal: "efl,panes,fixed"; source: "efl";
699 action: STATE_SET "disabled" 0.0;
700 target: "bar";
701 }
702 program { // for elm_panes_fixed_set()
703 signal: "efl,panes,unfixed"; source: "efl";
704 action: STATE_SET "default" 0.0;
705 target: "bar";
706 } 742 }
707 } 743 }
708} 744}
709 745
710group { name: "efl/panes/vertical:left-fold"; 746group { name: "efl/panes/vertical:left-fold";
711 inherit: "efl/panes/vertical";
712 data.item: "version" "123"; 747 data.item: "version" "123";
713 images.image: "icon_arrow_left.png" COMP; 748 inherit: "efl/panes/vertical";
714 images.image: "icon_arrow_right.png" COMP;
715 script { 749 script {
716 public open; 750 public open;
717 public drag_x; 751 public drag_x;
718 public drag_y; 752 public drag_y;
719 } 753 }
720 parts { 754 parts {
721 spacer { "sub_whole";
722 desc { "default";
723 rel1.offset: 3 0;
724 }
725 }
726 image { "dots"; 755 image { "dots";
756 scale;
727 desc { "default"; 757 desc { "default";
728 image.normal: "icon_arrow_left.png"; 758 image.normal: "i-arrow-l";
729 FIXED_SIZE(14, 14) 759 FIXED_SIZE(15, 15)
760 fill.smooth: 1;
730 } 761 }
731 desc { "closed"; 762 desc { "closed";
732 inherit: "default" 0.0; 763 inherit: "default" 0.0;
733 image.normal: "icon_arrow_right.png"; 764 image.normal: "i-arrow-r";
734 } 765 }
735 } 766 }
736 rect { "event"; 767 rect { "event";
737 repeat; 768 repeat;
738 desc { "default"; 769 desc { "default";
739 rel1.to: "dots"; 770 rel.to: "dots";
740 rel2.to: "dots";
741 color: 0 0 0 0; 771 color: 0 0 0 0;
742 } 772 }
743 } 773 }
@@ -750,8 +780,7 @@ group { name: "efl/panes/vertical:left-fold";
750 } 780 }
751 program { signal: "mouse,clicked,1"; source: "event"; 781 program { signal: "mouse,clicked,1"; source: "event";
752 script { 782 script {
753 if (get_int(open) == 1) 783 if (get_int(open) == 1) {
754 {
755 new Float: dx; 784 new Float: dx;
756 new Float: dy; 785 new Float: dy;
757 set_int(open, 0); 786 set_int(open, 0);
@@ -759,9 +788,7 @@ group { name: "efl/panes/vertical:left-fold";
759 set_float(drag_x, dx); 788 set_float(drag_x, dx);
760 set_drag(PART:"efl.bar", 0.0, 0.5); 789 set_drag(PART:"efl.bar", 0.0, 0.5);
761 set_state(PART:"dots", "closed", 0.0); 790 set_state(PART:"dots", "closed", 0.0);
762 } 791 } else if (get_int(open) == 0) {
763 else if (get_int(open) == 0)
764 {
765 set_int(open, 1); 792 set_int(open, 1);
766 set_drag(PART:"efl.bar", get_float(drag_x), 0.5); 793 set_drag(PART:"efl.bar", get_float(drag_x), 0.5);
767 set_state(PART:"dots", "default", 0.0); 794 set_state(PART:"dots", "default", 0.0);
@@ -772,36 +799,29 @@ group { name: "efl/panes/vertical:left-fold";
772} 799}
773 800
774group { name: "efl/panes/vertical:right-fold"; 801group { name: "efl/panes/vertical:right-fold";
775 inherit: "efl/panes/vertical";
776 data.item: "version" "123"; 802 data.item: "version" "123";
777 images.image: "icon_arrow_left.png" COMP; 803 inherit: "efl/panes/vertical";
778 images.image: "icon_arrow_right.png" COMP;
779 script { 804 script {
780 public open; 805 public open;
781 public drag_x; 806 public drag_x;
782 public drag_y; 807 public drag_y;
783 } 808 }
784 parts { 809 parts {
785 spacer { "sub_whole";
786 desc { "default";
787 rel2.offset: -4 0;
788 }
789 }
790 image { "dots"; 810 image { "dots";
791 desc { "default"; 811 desc { "default";
792 image.normal: "icon_arrow_right.png"; 812 image.normal: "i-arrow-r";
793 FIXED_SIZE(14, 17) 813 FIXED_SIZE(15, 15)
814 fill.smooth: 1;
794 } 815 }
795 desc { "closed"; 816 desc { "closed";
796 inherit: "default" 0.0; 817 inherit: "default" 0.0;
797 image.normal: "icon_arrow_left.png"; 818 image.normal: "i-arrow-l";
798 } 819 }
799 } 820 }
800 rect { "event"; 821 rect { "event";
801 repeat; 822 repeat;
802 desc { "default"; 823 desc { "default";
803 rel1.to: "dots"; 824 rel.to: "dots";
804 rel2.to: "dots";
805 color: 0 0 0 0; 825 color: 0 0 0 0;
806 } 826 }
807 } 827 }
@@ -814,8 +834,7 @@ group { name: "efl/panes/vertical:right-fold";
814 } 834 }
815 program { signal: "mouse,clicked,1"; source: "event"; 835 program { signal: "mouse,clicked,1"; source: "event";
816 script { 836 script {
817 if (get_int(open) == 1) 837 if (get_int(open) == 1) {
818 {
819 new Float: dx; 838 new Float: dx;
820 new Float: dy; 839 new Float: dy;
821 set_int(open, 0); 840 set_int(open, 0);
@@ -823,9 +842,7 @@ group { name: "efl/panes/vertical:right-fold";
823 set_float(drag_x, dx); 842 set_float(drag_x, dx);
824 set_drag(PART:"efl.bar", 1.0, 0.5); 843 set_drag(PART:"efl.bar", 1.0, 0.5);
825 set_state(PART:"dots", "closed", 0.0); 844 set_state(PART:"dots", "closed", 0.0);
826 } 845 } else if (get_int(open) == 0) {
827 else if (get_int(open) == 0)
828 {
829 set_int(open, 1); 846 set_int(open, 1);
830 set_drag(PART:"efl.bar", get_float(drag_x), 0.5); 847 set_drag(PART:"efl.bar", get_float(drag_x), 0.5);
831 set_state(PART:"dots", "default", 0.0); 848 set_state(PART:"dots", "default", 0.0);
@@ -836,36 +853,29 @@ group { name: "efl/panes/vertical:right-fold";
836} 853}
837 854
838group { name: "efl/panes/horizontal:up-fold"; 855group { name: "efl/panes/horizontal:up-fold";
839 inherit: "efl/panes/horizontal";
840 data.item: "version" "123"; 856 data.item: "version" "123";
841 images.image: "icon_arrow_up.png" COMP; 857 inherit: "efl/panes/horizontal";
842 images.image: "icon_arrow_down.png" COMP;
843 script { 858 script {
844 public open; 859 public open;
845 public drag_x; 860 public drag_x;
846 public drag_y; 861 public drag_y;
847 } 862 }
848 parts { 863 parts {
849 spacer { "sub_whole";
850 desc { "default";
851 rel1.offset: 0 3;
852 }
853 }
854 image { "dots"; 864 image { "dots";
855 desc { "default"; 865 desc { "default";
856 image.normal: "icon_arrow_up.png"; 866 image.normal: "i-arrow-u";
857 FIXED_SIZE(17, 14) 867 FIXED_SIZE(15, 15)
868 fill.smooth: 1;
858 } 869 }
859 desc { "closed"; 870 desc { "closed";
860 inherit: "default" 0.0; 871 inherit: "default" 0.0;
861 image.normal: "icon_arrow_down.png"; 872 image.normal: "i-arrow-d";
862 } 873 }
863 } 874 }
864 rect { "event"; 875 rect { "event";
865 repeat; 876 repeat;
866 desc { "default"; 877 desc { "default";
867 rel1.to: "dots"; 878 rel.to: "dots";
868 rel2.to: "dots";
869 color: 0 0 0 0; 879 color: 0 0 0 0;
870 } 880 }
871 } 881 }
@@ -878,8 +888,7 @@ group { name: "efl/panes/horizontal:up-fold";
878 } 888 }
879 program { signal: "mouse,clicked,1"; source: "event"; 889 program { signal: "mouse,clicked,1"; source: "event";
880 script { 890 script {
881 if (get_int(open) == 1) 891 if (get_int(open) == 1) {
882 {
883 new Float: dx; 892 new Float: dx;
884 new Float: dy; 893 new Float: dy;
885 set_int(open, 0); 894 set_int(open, 0);
@@ -887,9 +896,7 @@ group { name: "efl/panes/horizontal:up-fold";
887 set_float(drag_y, dy); 896 set_float(drag_y, dy);
888 set_drag(PART:"efl.bar", 0.5, 0.0); 897 set_drag(PART:"efl.bar", 0.5, 0.0);
889 set_state(PART:"dots", "closed", 0.0); 898 set_state(PART:"dots", "closed", 0.0);
890 } 899 } else if (get_int(open) == 0) {
891 else if (get_int(open) == 0)
892 {
893 set_int(open, 1); 900 set_int(open, 1);
894 set_drag(PART:"efl.bar", 0.5, get_float(drag_y)); 901 set_drag(PART:"efl.bar", 0.5, get_float(drag_y));
895 set_state(PART:"dots", "default", 0.0); 902 set_state(PART:"dots", "default", 0.0);
@@ -900,36 +907,29 @@ group { name: "efl/panes/horizontal:up-fold";
900} 907}
901 908
902group { name: "efl/panes/horizontal:down-fold"; 909group { name: "efl/panes/horizontal:down-fold";
903 inherit: "efl/panes/horizontal";
904 data.item: "version" "123"; 910 data.item: "version" "123";
905 images.image: "icon_arrow_up.png" COMP; 911 inherit: "efl/panes/horizontal";
906 images.image: "icon_arrow_down.png" COMP;
907 script { 912 script {
908 public open; 913 public open;
909 public drag_x; 914 public drag_x;
910 public drag_y; 915 public drag_y;
911 } 916 }
912 parts { 917 parts {
913 spacer { "sub_whole";
914 desc { "default";
915 rel2.offset: 0 -4;
916 }
917 }
918 image { "dots"; 918 image { "dots";
919 desc { "default"; 919 desc { "default";
920 image.normal: "icon_arrow_down.png"; 920 image.normal: "i-arrow-d";
921 FIXED_SIZE(17, 14) 921 FIXED_SIZE(15, 15)
922 fill.smooth: 1;
922 } 923 }
923 desc { "closed"; 924 desc { "closed";
924 inherit: "default" 0.0; 925 inherit: "default" 0.0;
925 image.normal: "icon_arrow_up.png"; 926 image.normal: "i-arrow-u";
926 } 927 }
927 } 928 }
928 rect { "event"; 929 rect { "event";
929 repeat; 930 repeat;
930 desc { "default"; 931 desc { "default";
931 rel1.to: "dots"; 932 rel.to: "dots";
932 rel2.to: "dots";
933 color: 0 0 0 0; 933 color: 0 0 0 0;
934 } 934 }
935 } 935 }
@@ -942,8 +942,7 @@ group { name: "efl/panes/horizontal:down-fold";
942 } 942 }
943 program { signal: "mouse,clicked,1"; source: "event"; 943 program { signal: "mouse,clicked,1"; source: "event";
944 script { 944 script {
945 if (get_int(open) == 1) 945 if (get_int(open) == 1) {
946 {
947 new Float: dx; 946 new Float: dx;
948 new Float: dy; 947 new Float: dy;
949 set_int(open, 0); 948 set_int(open, 0);
@@ -951,9 +950,7 @@ group { name: "efl/panes/horizontal:down-fold";
951 set_float(drag_y, dy); 950 set_float(drag_y, dy);
952 set_drag(PART:"efl.bar", 0.5, 1.0); 951 set_drag(PART:"efl.bar", 0.5, 1.0);
953 set_state(PART:"dots", "closed", 0.0); 952 set_state(PART:"dots", "closed", 0.0);
954 } 953 } else if (get_int(open) == 0) {
955 else if (get_int(open) == 0)
956 {
957 set_int(open, 1); 954 set_int(open, 1);
958 set_drag(PART:"efl.bar", 0.5, get_float(drag_y)); 955 set_drag(PART:"efl.bar", 0.5, get_float(drag_y));
959 set_state(PART:"dots", "default", 0.0); 956 set_state(PART:"dots", "default", 0.0);
diff --git a/data/elementary/themes/edc/efl/pointer.edc b/data/elementary/themes/edc/efl/pointer.edc
index d720005b90..4a9100139d 100644
--- a/data/elementary/themes/edc/efl/pointer.edc
+++ b/data/elementary/themes/edc/efl/pointer.edc
@@ -1,14 +1,9 @@
1group { name: "efl/pointer"; data.item: "version" "123"; 1group { name: "efl/pointer";
2 images { 2 data.item: "version" "123";
3 image: "pointer.png" COMP; 3 images.image: "pointer.png" COMP;
4 image: "pointer_glow.png" COMP;
5 }
6 parts { 4 parts {
7 part { 5 part { name: "base"; mouse_events: 0;
8 name: "base"; 6 description { state: "default" 0.0;
9 mouse_events: 0;
10 description {
11 state: "default" 0.0;
12 aspect: 1.0 1.0; 7 aspect: 1.0 1.0;
13 min: 32 32; 8 min: 32 32;
14 /* force a specific aspect ratio so 9 /* force a specific aspect ratio so
@@ -18,87 +13,46 @@ group { name: "efl/pointer"; data.item: "version" "123";
18 /* both axes control aspect - thus it 13 /* both axes control aspect - thus it
19 * will be WITHIN the bounds the axes 14 * will be WITHIN the bounds the axes
20 * of thre part describe */ 15 * of thre part describe */
21 image { 16 image.normal: "pointer.png";
22 normal: "pointer.png";
23 }
24 }
25 }
26 part { name: "glow";
27 description { state: "default" 0.0;
28 image.normal: "pointer_glow.png";
29 color: 255 255 255 0;
30 }
31 description { state: "visible" 0.0;
32 inherit: "default" 0.0;
33 color: 255 255 255 255;
34 } 17 }
35 description { state: "faded" 0.0; 18 description { state: "clicked" 0.0;
36 inherit: "default" 0.0; 19 inherit: "default" 0.0;
37 color: 255 255 255 128; 20 color: 51 153 255 255;
38 } 21 }
39 } 22 }
40 part { 23 part { name: "efl.hotspot"; type: SWALLOW;
41 name: "efl.hotspot";
42 /* this is a "fake" swallow part 24 /* this is a "fake" swallow part
43 * that is used by e to determine 25 * that is used by e to determine
44 * the pointer hotspot - or where 26 * the pointer hotspot - or where
45 * the actual mouse events get 27 * the actual mouse events get
46 * reported from on the cursor */ 28 * reported from on the cursor */
47 type: SWALLOW; 29 description { state: "default" 0.0;
48 description {
49 state: "default" 0.0;
50 visible: 0; 30 visible: 0;
51 fixed: 1 1; 31 fixed: 1 1;
52 rel1 { 32 rel1 {
53 /* the hotspot will scale with the cursor here */ 33 /* the hotspot will scale with the cursor here */
54 to: "base"; 34 to: "base";
55 relative: 0.1875 0.1875; 35 relative: (5/32) (5/32);
56 offset: 0 0; 36 offset: 0 0;
57 } 37 }
58 rel2 { 38 rel2 {
59 to: "base"; 39 to: "base";
60 relative: 0.1875 0.1875; 40 relative: (5/32) (5/32);
61 offset: 0 0; 41 offset: 0 0;
62 } 42 }
63 } 43 }
64 } 44 }
65 } 45 }
66 programs { 46 programs {
67 program { 47 program { signal: "efl,action,mouse,down"; source: "efl";
68 signal: "efl,action,mouse,down"; source: "efl"; 48 action: STATE_SET "clicked" 0.0;
69 action: STATE_SET "visible" 0.0; 49 target: "base";
70 target: "glow";
71 after: "fade"; 50 after: "fade";
72 } 51 }
73 program { name: "fade"; 52 program { name: "fade";
74 action: STATE_SET "default" 0.0; 53 action: STATE_SET "default" 0.0;
75 transition: SINUSOIDAL 0.5; 54 transition: SINUSOIDAL 0.5;
76 target: "glow"; 55 target: "base";
77 }
78 program { name: "pulse";
79 signal: "e,state,mouse,idle"; source: "e";
80 in: 10.0 0.0;
81 action: STATE_SET "faded" 0.0;
82 transition: SINUSOIDAL 0.25;
83 target: "glow";
84 after: "pulse2";
85 }
86 program { name: "pulse2";
87 action: STATE_SET "default" 0.0;
88 transition: SINUSOIDAL 0.5;
89 target: "glow";
90 after: "pulse";
91 }
92 program {
93 signal: "efl,action,mouse,move"; source: "efl";
94 action: STATE_SET "default" 0.0;
95 target: "glow";
96 after: "stop2";
97 }
98 program { name: "stop2";
99 action: ACTION_STOP;
100 target: "pulse";
101 target: "pulse2";
102 } 56 }
103 } 57 }
104} 58}
@@ -106,13 +60,11 @@ group { name: "efl/pointer"; data.item: "version" "123";
106group { name: "efl/pointer:bottom_right_corner"; 60group { name: "efl/pointer:bottom_right_corner";
107 inherit: "efl/pointer"; 61 inherit: "efl/pointer";
108 data.item: "version" "123"; 62 data.item: "version" "123";
109 images.image: "mini_box_glow.png" COMP;
110 parts { 63 parts {
111 part { name: "box"; 64 part { name: "box"; type: RECT;
112 insert_after: "glow"; 65 insert_after: "base";
113 description { state: "default" 0.0; 66 description { state: "default" 0.0;
114 image.normal: "mini_box_glow.png"; 67 color: 51 153 255 192;
115 image.border: 7 7 7 7;
116 rel1.relative: 0.3 0.3; 68 rel1.relative: 0.3 0.3;
117 rel2.relative: 0.7 0.7; 69 rel2.relative: 0.7 0.7;
118 } 70 }
diff --git a/data/elementary/themes/edc/efl/popup.edc b/data/elementary/themes/edc/efl/popup.edc
index 113fa52255..67641cf5ba 100644
--- a/data/elementary/themes/edc/efl/popup.edc
+++ b/data/elementary/themes/edc/efl/popup.edc
@@ -71,68 +71,93 @@ Group: efl/alert_popup/left_button (@since 1.23)
71*/ 71*/
72group { "efl/popup"; 72group { "efl/popup";
73 data.item: "version" "123"; 73 data.item: "version" "123";
74 images.image: "rounded_square.png" COMP;
75 parts { 74 parts {
76 spacer { "base"; 75 image { "shadow";
76 scale;
77 desc { "default"; 77 desc { "default";
78 rel1.offset: 10 10; 78 rel.to: "base";
79 rel2.offset: -11 -11; 79 WIN_SHADOW;
80 } 80 }
81 } 81 }
82 image { "bg"; 82 rect { "base";
83 scale;
83 desc { "default"; 84 desc { "default";
84 min: 100 100; 85 min: 100 100;
85 image.border: 15 15 15 15; 86 color: 0 0 0 192;
86 image.normal: "rounded_square.png"; 87 rel1.offset: 16 16;
88 rel2.offset: -17 -17;
89 offscale;
87 } 90 }
88 } 91 }
89 swallow { "efl.background"; required; 92 swallow { "efl.background"; required;
90 desc { "default"; 93 desc { "default";
91 rel.to: "bg"; 94 rel.to: "base";
92 } 95 }
93 } 96 }
94 swallow { "efl.content"; required; 97 swallow { "efl.content"; required;
98 scale;
95 desc { "default"; 99 desc { "default";
96 rel.to: "base"; 100 rel.to: "base";
101 rel1.offset: 4 4;
102 rel2.offset: -5 -5;
103 offscale;
97 } 104 }
98 } 105 }
99 } 106 }
100} 107}
101 108
102group { "efl/alert_popup"; data.item: "version" "123"; 109group { "efl/alert_popup";
103 images.image: "rounded_square.png" COMP; 110 data.item: "version" "123";
104 parts { 111 parts {
105 image { "bg"; 112 image { "shadow";
113 scale;
114 desc { "default";
115 rel.to: "base";
116 WIN_SHADOW;
117 }
118 }
119 rect { "base";
120 scale;
106 desc { "default"; 121 desc { "default";
107 min: 100 100; 122 min: 100 100;
108 image.border: 15 15 15 15; 123 color: 0 0 0 192;
109 image.normal: "rounded_square.png"; 124 rel1.offset: 16 16;
125 rel2.offset: -17 -17;
126 offscale;
110 } 127 }
111 } 128 }
112 swallow { "efl.background"; required; 129 swallow { "efl.background"; required;
113 desc { "default"; 130 desc { "default";
114 rel.to: "bg"; 131 rel.to: "base";
115 } 132 }
116 } 133 }
117 spacer { "base"; 134 swallow { "efl.content"; required;
135 scale;
118 desc { "default"; 136 desc { "default";
119 rel.to: "bg"; 137 rel1.to_x: "base";
120 rel1.offset: 10 10; 138 rel1.to_y: "title_bg";
121 rel2.offset: -11 -11; 139 rel2.to_x: "base";
140 rel2.to_y: "efl.buttons";
141 rel1.relative: 0.0 1.0;
142 rel2.relative: 1.0 0.0;
143 rel1.offset: 4 4;
144 rel2.offset: -5 -5;
145 offscale;
122 } 146 }
123 } 147 }
124 rect { "title_bg"; 148 rect { "title_bg";
149 scale;
125 desc { "default"; 150 desc { "default";
126 fixed: 0 1; 151 fixed: 0 1;
127 min: 0 0; 152 min: 0 0;
128 rel.to: "base"; 153 rel.to: "base";
129 rel2.relative: 1.0 0.0; 154 rel2.relative: 1.0 0.0;
130 align: 0.5 0.0; 155 align: 0.0 0.0;
131 color: 0 0 0 0; 156 color: 32 32 32 255;
132 } 157 }
133 desc { "title_visible"; 158 desc { "title_visible";
134 inherit: "default"; 159 inherit: "default";
135 min: 0 20; 160 min: 0 24;
136 } 161 }
137 } 162 }
138 textblock { "efl.text.title"; required; 163 textblock { "efl.text.title"; required;
@@ -143,6 +168,9 @@ group { "efl/alert_popup"; data.item: "version" "123";
143 style: "popup_title_style_ellipsis"; 168 style: "popup_title_style_ellipsis";
144 } 169 }
145 rel.to: "title_bg"; 170 rel.to: "title_bg";
171 rel1.offset: 4 4;
172 rel2.offset: -5 -5;
173 offscale;
146 hid; 174 hid;
147 } 175 }
148 desc { "title_visible"; 176 desc { "title_visible";
@@ -151,51 +179,45 @@ group { "efl/alert_popup"; data.item: "version" "123";
151 } 179 }
152 } 180 }
153 swallow { "efl.buttons"; required; 181 swallow { "efl.buttons"; required;
182 scale;
154 desc { "default"; 183 desc { "default";
155 fixed: 0 1; 184 fixed: 0 1;
156 rel.to: "base"; 185 rel.to: "base";
157 rel1.relative: 0.0 1.0; 186 rel1.relative: 0.0 1.0;
187 rel1.offset: 4 0;
188 rel2.offset: -5 0;
158 align: 0.5 1.0; 189 align: 0.5 1.0;
159 min: 0 0; 190 min: 0 0;
191 offscale;
160 } 192 }
161 desc { "button_visible"; 193 desc { "button_visible";
162 inherit: "default"; 194 inherit: "default";
163 min: 0 30; 195 min: 80 24;
164 } 196 rel1.offset: 4 -5;
165 } 197 rel2.offset: -5 -5;
166 swallow { "efl.content"; required;
167 desc { "default";
168 rel1.to_x: "base";
169 rel1.to_y: "title_bg";
170 rel2.to_x: "base";
171 rel2.to_y: "efl.buttons";
172 rel1.relative: 0.0 1.0;
173 rel2.relative: 1.0 0.0;
174 } 198 }
175 } 199 }
176 } 200 }
177 programs { 201 programs {
178 program { 202 program { signal: "efl,title,visible,on"; source: "efl";
179 signal: "efl,title,visible,on"; source: "efl";
180 action: STATE_SET "title_visible" 0.0; 203 action: STATE_SET "title_visible" 0.0;
181 target: "title_bg"; 204 target: "title_bg";
182 target: "efl.text.title"; 205 target: "efl.text.title";
183 } 206 }
184 program { 207 program { signal: "efl,title,visible,off"; source: "efl";
185 signal: "efl,title,visible,off"; source: "efl";
186 action: STATE_SET "default" 0.0; 208 action: STATE_SET "default" 0.0;
187 target: "title_bg"; 209 target: "title_bg";
188 target: "efl.text.title"; 210 target: "efl.text.title";
189 } 211 }
190 program { 212 program { signal: "efl,buttons,visible,on"; source: "efl";
191 signal: "efl,buttons,visible,on"; source: "efl";
192 action: STATE_SET "button_visible" 0.0; 213 action: STATE_SET "button_visible" 0.0;
193 target: "efl.buttons"; 214 target: "efl.buttons";
194 } 215 }
195 } 216 }
196} 217}
197 218
198group { "efl/popup/backwall"; data.item: "version" "123"; 219group { "efl/popup/backwall";
220 data.item: "version" "123";
199 alias: "efl/alert_popup/backwall"; 221 alias: "efl/alert_popup/backwall";
200 parts { 222 parts {
201 rect { "base"; 223 rect { "base";
@@ -208,9 +230,13 @@ group { "efl/popup/backwall"; data.item: "version" "123";
208 } 230 }
209 } 231 }
210 swallow { "efl.content"; required; 232 swallow { "efl.content"; required;
233 scale;
211 desc { "default"; 234 desc { "default";
212 rel.to: "base"; 235 rel.to: "base";
236 rel1.offset: 4 4;
237 rel2.offset: -5 -5;
213 hid; 238 hid;
239 offscale;
214 } 240 }
215 desc { "content_visible"; 241 desc { "content_visible";
216 inherit: "default"; 242 inherit: "default";
@@ -226,33 +252,32 @@ group { "efl/popup/backwall"; data.item: "version" "123";
226 } 252 }
227 253
228 programs { 254 programs {
229 program { 255 program { signal: "efl,content,set"; source: "efl";
230 signal: "efl,content,set"; source: "efl";
231 action: STATE_SET "content_visible" 0.0; 256 action: STATE_SET "content_visible" 0.0;
232 target: "base"; 257 target: "base";
233 target: "efl.content"; 258 target: "efl.content";
234 } 259 }
235 program { 260 program { signal: "efl,content,unset"; source: "efl";
236 signal: "efl,content,unset"; source: "efl";
237 action: STATE_SET "default" 0.0; 261 action: STATE_SET "default" 0.0;
238 target: "base"; 262 target: "base";
239 target: "efl.content"; 263 target: "efl.content";
240 } 264 }
241 program { 265 program { signal: "mouse,clicked,1"; source: "block";
242 signal: "mouse,clicked,1"; source: "block";
243 action: SIGNAL_EMIT "efl,action,click" "efl"; 266 action: SIGNAL_EMIT "efl,action,click" "efl";
244 } 267 }
245 } 268 }
246} 269}
247 270
248group { "efl/alert_popup/button_layout1"; data.item: "version" "123"; 271group { "efl/alert_popup/button_layout1";
272 data.item: "version" "123";
249 parts { 273 parts {
250 swallow { "efl.button1"; required; 274 swallow { "efl.button1"; required;
251 } 275 }
252 } 276 }
253} 277}
254 278
255group { "efl/alert_popup/button_layout2"; data.item: "version" "123"; 279group { "efl/alert_popup/button_layout2";
280 data.item: "version" "123";
256 parts { 281 parts {
257 spacer { "div1"; 282 spacer { "div1";
258 desc { "default"; 283 desc { "default";
@@ -276,20 +301,23 @@ group { "efl/alert_popup/button_layout2"; data.item: "version" "123";
276 } 301 }
277} 302}
278 303
279group { "efl/alert_popup/button_layout3"; data.item: "version" "123"; 304group { "efl/alert_popup/button_layout3";
305 data.item: "version" "123";
280 parts { 306 parts {
281 spacer { "div1"; 307 spacer { "div1";
308 scale;
282 desc { "default"; 309 desc { "default";
283 rel1.relative: 0.333 0.5; 310 rel1.relative: 0.333 0.5;
284 rel2.relative: 0.333 0.5; 311 rel2.relative: 0.333 0.5;
285 min: 5 5; 312 min: 4 4;
286 } 313 }
287 } 314 }
288 spacer { "div2"; 315 spacer { "div2";
316 scale;
289 desc { "default"; 317 desc { "default";
290 rel1.relative: 0.666 0.5; 318 rel1.relative: 0.666 0.5;
291 rel2.relative: 0.666 0.5; 319 rel2.relative: 0.666 0.5;
292 min: 5 5; 320 min: 4 4;
293 } 321 }
294 } 322 }
295 swallow { "efl.button1"; required; 323 swallow { "efl.button1"; required;
diff --git a/data/elementary/themes/edc/efl/progress.edc b/data/elementary/themes/edc/efl/progress.edc
index c3d044a0e2..fcd333622f 100644
--- a/data/elementary/themes/edc/efl/progress.edc
+++ b/data/elementary/themes/edc/efl/progress.edc
@@ -1,18 +1,8 @@
1group { "efl/progressbar/horizontal"; 1group { name: "efl/progressbar/horizontal";
2 data.item: "version" "123";
3 images.image: "inset_bar_horiz_base.png" COMP;
4 images.image: "inset_bar_horiz_light.png" COMP;
5 images.image: "inset_bar_horiz_inside_base.png" COMP;
6 images.image: "inset_bar_horiz_inside_light.png" COMP;
7 images.image: "inset_bar_horiz_glow_base.png" COMP;
8 images.image: "inset_bar_horiz_glow_light.png" COMP;
9 images.image: "inset_bar_horiz_glow_inv_base.png" COMP;
10 images.image: "inset_bar_horiz_glow_inv_light.png" COMP;
11 images.image: "inset_bar_horiz_glow_mid_base.png" COMP;
12 images.image: "inset_bar_horiz_glow_mid_light.png" COMP;
13#define ICON 1 2#define ICON 1
14#define LABEL 2 3#define LABEL 2
15#define DISABLE 4 4#define DISABLE 4
5 data.item: "version" "123";
16 script { 6 script {
17 public slmode; 7 public slmode;
18 public eval_mode(m) { 8 public eval_mode(m) {
@@ -31,9 +21,16 @@ group { "efl/progressbar/horizontal";
31 if (ic) { 21 if (ic) {
32 set_state(PART:"efl.content", "visible", 0.0); 22 set_state(PART:"efl.content", "visible", 0.0);
33 set_state(PART:"sizer_content", "visible", 0.0); 23 set_state(PART:"sizer_content", "visible", 0.0);
24 set_state(PART:"bg", "iclabel", 0.0);
34 } else { 25 } else {
35 set_state(PART:"efl.content", "default", 0.0); 26 set_state(PART:"efl.content", "default", 0.0);
36 set_state(PART:"sizer_content", "default", 0.0); 27 set_state(PART:"sizer_content", "default", 0.0);
28 if (l) {
29 set_state(PART:"bg", "iclabel", 0.0);
30 }
31 else {
32 set_state(PART:"bg", "default", 0.0);
33 }
37 } 34 }
38 if (!d) { 35 if (!d) {
39 set_state(PART:"dis_clip", "default", 0.0); 36 set_state(PART:"dis_clip", "default", 0.0);
@@ -45,8 +42,7 @@ group { "efl/progressbar/horizontal";
45 parts { 42 parts {
46 part { name: "dis_clip"; type: RECT; 43 part { name: "dis_clip"; type: RECT;
47 description { state: "default" 0.0; 44 description { state: "default" 0.0;
48 rel1.to: "efl.content"; 45 rel.to: "efl.content";
49 rel2.to: "efl.content";
50 } 46 }
51 description { state: "disabled" 0.0; 47 description { state: "disabled" 0.0;
52 inherit: "default" 0.0; 48 inherit: "default" 0.0;
@@ -75,22 +71,23 @@ group { "efl/progressbar/horizontal";
75 } 71 }
76 } 72 }
77 part { name: "efl.content"; type: SWALLOW; 73 part { name: "efl.content"; type: SWALLOW;
74 scale: 1;
78 clip_to: "dis_clip"; 75 clip_to: "dis_clip";
79 required;
80 description { state: "default" 0.0; 76 description { state: "default" 0.0;
81 visible: 0; 77 visible: 0;
82 align: 0.0 0.5; 78 align: 0.0 0.5;
83 fixed: 1 0; 79 fixed: 1 0;
84 rel1.offset: 0 2; 80 rel1.offset: -1 4;
85 rel2.offset: -1 -3; 81 rel2.offset: -1 -5;
86 rel2.relative: 0.0 1.0; 82 rel2.relative: 0.0 1.0;
83 offscale;
87 } 84 }
88 description { state: "visible" 0.0; 85 description { state: "visible" 0.0;
89 inherit: "default" 0.0; 86 inherit: "default" 0.0;
90 visible: 1; 87 visible: 1;
91 aspect: 1.0 1.0; aspect_preference: VERTICAL; 88// aspect: 1.0 1.0; aspect_preference: VERTICAL;
92 rel1.offset: 2 2; 89 rel1.offset: 4 4;
93 rel2.offset: 2 -3; 90 rel2.offset: 4 -5;
94 } 91 }
95 } 92 }
96 part { name: "sizer_content"; type: TEXT; mouse_events: 0; 93 part { name: "sizer_content"; type: TEXT; mouse_events: 0;
@@ -105,224 +102,119 @@ group { "efl/progressbar/horizontal";
105 } 102 }
106 description { state: "visible" 0.0; 103 description { state: "visible" 0.0;
107 inherit: "default" 0.0; 104 inherit: "default" 0.0;
108 rel1.to: "efl.content"; 105 rel.to: "efl.content";
109 rel2.to: "efl.content";
110 text { 106 text {
111 min: 1 1; 107 min: 1 1;
112 ellipsis: -1; 108 ellipsis: -1;
113 text: "M"; 109 text: SPACER_TEXT;
114 } 110 }
115 } 111 }
116 } 112 }
117 part { name: "efl.text"; type: TEXT; mouse_events: 0; 113 part { name: "efl.text"; type: TEXT; mouse_events: 0;
118 effect: SHADOW BOTTOM;
119 scale: 1; 114 scale: 1;
120 required;
121 description { state: "default" 0.0; 115 description { state: "default" 0.0;
122 fixed: 1 1; 116 fixed: 1 1;
123 align: 0.0 0.5; 117 align: 0.0 0.5;
124 rel1.to_x: "efl.content"; 118 rel1.to_x: "efl.content";
125 rel1.relative: 1.0 0.0; 119 rel1.relative: 1.0 0.0;
126 rel1.offset: -1 2; 120 rel1.offset: -1 4;
127 rel2.to_x: "efl.content"; 121 rel2.to_x: "efl.content";
128 rel2.relative: 1.0 1.0; 122 rel2.relative: 1.0 1.0;
129 rel2.offset: -1 -3; 123 rel2.offset: -1 -5;
130 color: FN_COL_DEFAULT; 124 color: 160 160 160 255;
131 color_class: "progressbar_text";
132 text { font: FN; size: 10; 125 text { font: FN; size: 10;
133 text_class: "progressbar"; 126 text_class: "progressbar";
134 min: 0 0; 127 min: 0 0;
135 align: 0.0 0.5; 128 align: 0.0 0.5;
136 } 129 }
137 visible: 0; 130 visible: 0;
131 offscale;
138 } 132 }
139 description { state: "visible" 0.0; 133 description { state: "visible" 0.0;
140 inherit: "default" 0.0; 134 inherit: "default" 0.0;
141 fixed: 1 0; 135 fixed: 1 0;
142 visible: 1; 136 visible: 1;
143 rel1.offset: 2 2; 137 rel1.offset: 4 4;
144 rel2.offset: 2 -3; 138 rel2.offset: 4 -5;
145 text.min: 1 1; 139 text.min: 1 1;
146 text.ellipsis: -1; 140 text.ellipsis: -1;
147 } 141 }
148 description { state: "disabled_visible" 0.0; 142 description { state: "disabled_visible" 0.0;
149 inherit: "visible" 0.0; 143 inherit: "visible" 0.0;
150 color_class: "progressbar_text_disabled"; 144 color: 80 80 80 255;
151 color: FN_COL_DISABLE_LIGHTER_SHADOW;
152 }
153 }
154 part { name: "bg-hi";
155 description { state: "default" 0.0;
156 rel1.to: "bg";
157 rel1.offset: 0 1;
158 rel2.to: "bg";
159 rel2.offset: -1 0;
160 image.normal: "inset_bar_horiz_light.png";
161 image.border: 32 32 0 0;
162 image.border_scale_by: 0.25; image.border_scale: 1;
163 } 145 }
164 } 146 }
165 part { name: "bg"; 147 part { name: "bg"; type: RECT;
166 scale: 1; 148 scale: 1;
167 description { state: "default" 0.0; 149 description { state: "default" 0.0;
168 min: 16 16; 150 min: 16 16;
169 max: -1 16; 151 max: -1 16;
170 rel1.to_x: "efl.text"; 152 rel1.offset: 4 4;
171 rel1.relative: 1.0 0.0; 153 rel2.offset: -5 -5;
172 rel1.offset: 3 3; 154 color: DARK_GREY_BG_COLOR;
173 rel2.offset: -4 -4; 155 offscale;
174 image.normal: "inset_bar_horiz_base.png";
175 image.border: 32 32 0 0;
176 image.border_scale_by: 0.25; image.border_scale: 1;
177 } 156 }
178 } 157 description { state: "iclabel" 0.0;
179 part { name: "ins0"; type: SPACER; 158 inherit: "default" 0.0;
180 scale: 1; 159 rel1.to_x: "efl.text";
181 description { state: "default" 0.0;
182 fixed: 1 0;
183 rel1.to: "bg";
184 rel2.to: "bg";
185 rel2.relative: 0.0 1.0;
186 min: 5 16;
187 align: 0.0 0.5;
188 }
189 }
190 part { name: "ins1"; type: SPACER;
191 scale: 1;
192 description { state: "default" 0.0;
193 fixed: 1 0;
194 rel1.to: "bg";
195 rel1.relative: 1.0 0.0; 160 rel1.relative: 1.0 0.0;
196 rel2.to: "bg";
197 min: 5 16;
198 align: 1.0 0.5;
199 }
200 }
201 part { name: "inside-hi";
202 scale: 1;
203 description { state: "default" 0.0;
204 rel1.to: "inside";
205 rel1.offset: 0 1;
206 rel2.to: "inside";
207 rel2.offset: -1 0;
208 image.normal: "inset_bar_horiz_inside_light.png";
209 image.border: 8 8 0 0;
210 image.border_scale_by: 0.25; image.border_scale: 1;
211 }
212 }
213 part { name: "inside";
214 scale: 1;
215 description { state: "default" 0.0;
216 min: 4 4;
217 rel1.to: "ins0";
218 rel1.relative: 1.0 (6/16);
219 rel2.to: "ins1";
220 rel2.relative: 0.0 (10/16);
221 image.normal: "inset_bar_horiz_inside_base.png";
222 image.border: 8 8 0 0;
223 image.border_scale_by: 0.25; image.border_scale: 1;
224 } 161 }
225 } 162 }
226 part { name: "efl.bar"; type: SWALLOW; mouse_events: 0; 163 part { name: "efl.bar"; type: SWALLOW; mouse_events: 0;
227 description { state: "default" 0.0; 164 description { state: "default" 0.0;
228 rel1.to: "inside"; 165 rel.to: "bg";
229 rel2.to: "inside";
230 } 166 }
231 } 167 }
232 part { name: "efl.cur.progressbar"; mouse_events: 0; type: SPACER; 168 part { name: "efl.cur.progressbar"; mouse_events: 0; type: SPACER;
233 scale: 1; 169 dragable.confine: "efl.bar";
234 dragable.confine: "inside";
235 dragable.x: 1 1 1; 170 dragable.x: 1 1 1;
236 dragable.y: 0 0 0; 171 dragable.y: 0 0 0;
237 description { state: "default" 0.0; 172 description { state: "default" 0.0;
238 fixed: 1 1; 173 fixed: 1 1;
239 min: 8 4; 174 min: 1 1;
240 max: 8 4; 175 max: 1 9999;
241 rel1.to: "inside"; 176 rel.to: "efl.bar";
242 rel2.to: "inside";
243 } 177 }
244 } 178 }
245 part { name: "barend"; type: SPACER; 179 part { name: "barend"; type: SPACER;
246 scale: 1;
247 description { state: "default" 0.0; 180 description { state: "default" 0.0;
248 fixed: 1 0; 181 fixed: 1 0;
249 min: 14 16; 182 max: 1 9999;
250 rel1.to_x: "efl.cur.progressbar"; 183 rel1.to_x: "efl.cur.progressbar";
251 rel1.relative: 1.0 0.0;
252 rel2.to_x: "efl.cur.progressbar"; 184 rel2.to_x: "efl.cur.progressbar";
253 rel2.relative: 1.0 1.0; 185 align: 1.0 0.5;
254 align: 0.0 0.5;
255 } 186 }
256 description { state: "inv" 0.0; 187 description { state: "inv" 0.0;
257 inherit: "default" 0.0; 188 inherit: "default" 0.0;
258 rel1.relative: 0.0 0.0; 189 align: 0.0 0.5;
259 rel2.relative: 0.0 1.0;
260 align: 1.0 0.5;
261 } 190 }
262 } 191 }
263 part { name: "bar"; 192 part { name: "bar"; type: RECT;
264 clip_to: "fract_clip";
265 scale: 1; 193 scale: 1;
194 clip_to: "fract_clip";
266 description { state: "default" 0.0; 195 description { state: "default" 0.0;
267 rel1.to_x: "ins0"; 196 rel1.to: "bg";
268 rel1.to_y: "bg";
269 rel1.relative: (12/16) -0.25;
270 rel2.to_x: "barend"; 197 rel2.to_x: "barend";
271 rel2.to_y: "bg"; 198 rel2.to_y: "bg";
272 rel2.relative: 1.0 1.25; 199 color: 51 153 255 255;
273 image.normal: "inset_bar_horiz_glow_base.png"; 200 offscale;
274 image.border: 0 72 0 0;
275 image.border_scale_by: 0.25; image.border_scale: 1;
276 } 201 }
277 description { state: "inv" 0.0; 202 description { state: "inv" 0.0;
278 inherit: "default" 0.0; 203 inherit: "default" 0.0;
279 rel1.to_x: "barend"; 204 rel1.to_x: "barend";
280 rel1.relative: 0.0 -0.25; 205 rel2.to_x: "bg";
281 rel2.to_x: "ins1";
282 rel2.relative: (4/16) 1.25;
283 image.normal: "inset_bar_horiz_glow_inv_base.png";
284 image.border: 72 0 0 0;
285 }
286 }
287 part { name: "insidep0"; type: SPACER;
288 scale: 1;
289 description { state: "default" 0.0;
290 fixed: 1 0;
291 min: 20 16;
292 rel1.to_x: "inside";
293 rel1.relative: 0.0 0.0;
294 rel2.to_x: "inside";
295 rel2.relative: 0.0 1.0;
296 align: 1.0 0.5;
297 }
298 }
299 part { name: "insidep1"; type: SPACER;
300 scale: 1;
301 description { state: "default" 0.0;
302 fixed: 1 0;
303 min: 20 16;
304 rel1.to_x: "inside";
305 rel1.relative: 1.0 0.0;
306 rel2.to_x: "inside";
307 rel2.relative: 1.0 1.0;
308 align: 0.0 0.5;
309 } 206 }
310 } 207 }
311 part { name: "pulse"; 208 part { name: "pulse"; type: RECT;
312 clip_to: "pulse_clip"; 209 clip_to: "pulse_clip";
313 scale: 1; 210 scale: 1;
314 description { state: "default" 0.0; 211 description { state: "default" 0.0;
315 fixed: 1 1; 212 fixed: 1 1;
316 min: 64 24; 213 min: 16 8;
317 max: 64 24; 214 max: 16 9999;
318 rel1.to_x: "insidep0"; 215 rel.to: "efl.bar";
319 rel1.to_y: "bar";
320 rel1.relative: 0.0 0.0;
321 rel2.to_x: "insidep1";
322 rel2.to_y: "bar";
323 rel2.relative: 1.0 1.0;
324 image.normal: "inset_bar_horiz_glow_mid_base.png";
325 align: 0.0 0.5; 216 align: 0.0 0.5;
217 color: 51 153 255 255;
326 } 218 }
327 description { state: "end" 0.0; 219 description { state: "end" 0.0;
328 inherit: "default" 0.0; 220 inherit: "default" 0.0;
@@ -331,73 +223,25 @@ group { "efl/progressbar/horizontal";
331 } 223 }
332 part { name: "efl.text.status"; type: TEXT; mouse_events: 0; 224 part { name: "efl.text.status"; type: TEXT; mouse_events: 0;
333 scale: 1; 225 scale: 1;
334 effect: GLOW;
335 description { state: "default" 0.0; 226 description { state: "default" 0.0;
336 fixed: 1 1; 227 fixed: 1 1;
337 rel1.to: "inside"; 228 rel.to: "efl.bar";
338 rel2.to: "inside"; 229 rel1.offset: 4 0;
339 color_class: "progress_status"; 230 rel2.offset: -5 -1;
340 align: 1.0 0.5; 231 align: 1.0 0.5;
341 text { font: FN; size: 10; 232 text { font: FN; size: 10;
342 min: 0 1; 233 min: 0 1;
343 text_class: "progress_status"; 234 text_class: "progress_status";
344 align: 1.0 0.5; 235 align: 1.0 0.5;
345 } 236 }
346 color: FN_COL_HIGHLIGHT_CLICKED; 237 color: 255 255 255 255;
347 visible: 1; 238 offscale;
348 } 239 }
349 description { state: "hidden" 0.0; 240 description { state: "hidden" 0.0;
350 inherit: "default" 0.0; 241 inherit: "default" 0.0;
351 visible: 0; 242 visible: 0;
352 } 243 }
353 } 244 }
354 part { name: "pulse2";
355 clip_to: "pulse_clip";
356 scale: 1;
357 description { state: "default" 0.0;
358 fixed: 1 1;
359 min: 36 14;
360 max: 36 14;
361 rel1.to: "pulse";
362 rel2.to: "pulse";
363 image.normal: "inset_bar_horiz_glow_mid_light.png";
364 color: 255 255 255 0;
365 }
366 description { state: "glow" 0.0;
367 inherit: "default" 0.0;
368 color: 255 255 255 255;
369 }
370 }
371 part { name: "light";
372 clip_to: "fract_clip";
373 scale: 1;
374 description { state: "default" 0.0;
375 max: 36 11;
376 rel1.to_x: "bar";
377 rel1.to_y: "bar";
378 rel1.relative: 0.0 (26/96);
379 rel2.to_x: "barend";
380 rel2.to_y: "bar";
381 rel2.relative: 0.2 ((26+44)/96);
382 align: 1.0 0.0;
383 image.normal: "inset_bar_horiz_glow_light.png";
384 image.border: 0 20 0 0;
385 image.border_scale_by: 0.25; image.border_scale: 1;
386 color: 255 255 255 0;
387 }
388 description { state: "inv" 0.0;
389 inherit: "default" 0.0;
390 rel1.to_x: "barend";
391 rel1.to_y: "bar";
392 rel1.relative: 0.8 (26/96);
393 rel2.to_x: "bar";
394 rel2.to_y: "bar";
395 rel2.relative: 1.0 ((26+44)/96);
396 align: 0.0 0.0;
397 image.normal: "inset_bar_horiz_glow_inv_light.png";
398 image.border: 20 0 0 0;
399 }
400 }
401 } 245 }
402 programs { 246 programs {
403 program { name: "inverted-on"; 247 program { name: "inverted-on";
@@ -405,33 +249,12 @@ group { "efl/progressbar/horizontal";
405 action: STATE_SET "inv" 0.0; 249 action: STATE_SET "inv" 0.0;
406 target: "bar"; 250 target: "bar";
407 target: "barend"; 251 target: "barend";
408 target: "light";
409 } 252 }
410 program { name: "inverted-off"; 253 program { name: "inverted-off";
411 signal: "efl,state,inverted,off"; source: "efl"; 254 signal: "efl,state,inverted,off"; source: "efl";
412 action: STATE_SET "default" 0.0; 255 action: STATE_SET "default" 0.0;
413 target: "bar"; 256 target: "bar";
414 target: "barend"; 257 target: "barend";
415 target: "light";
416 }
417 program { name: "drag-set";
418 signal: "drag,set"; source: "efl.cur.progressbar";
419 script {
420 new a, Float:dx, Float:dy, Float:vl, st[20];
421
422 get_drag(PART:"efl.cur.progressbar", dx, dy);
423 get_state(PART:"bar", st, 19, vl);
424 if (!strcmp(st, "inv")) {
425 a = round(((1.0 - dx) * 255) / 0.2);
426 custom_state(PART:"light", "inv", 0.0);
427 } else {
428 a = round((dx * 255) / 0.2);
429 custom_state(PART:"light", "default", 0.0);
430 }
431 if (a > 255) { a = 255; }
432 set_state_val(PART:"light", STATE_COLOR, 255, 255, 255, a);
433 set_state(PART:"light", "custom", 0.0);
434 }
435 } 258 }
436 program { name: "pulse-mode0"; 259 program { name: "pulse-mode0";
437 signal: "efl,state,pulse"; source: "efl"; 260 signal: "efl,state,pulse"; source: "efl";
@@ -450,32 +273,18 @@ group { "efl/progressbar/horizontal";
450 target: "pulse_clip"; 273 target: "pulse_clip";
451 target: "fract_clip"; 274 target: "fract_clip";
452 after: "pulse0"; 275 after: "pulse0";
453 after: "pulse0.1";
454 }
455 program { name: "pulse0.1";
456 action: STATE_SET "glow" 0.0;
457 transition: ACCELERATE 0.4;
458 target: "pulse2";
459 after: "pulse0.2";
460 }
461 program { name: "pulse0.2";
462 action: STATE_SET "default" 0.0;
463 transition: DECELERATE 0.4;
464 target: "pulse2";
465 } 276 }
466 program { name: "pulse0"; 277 program { name: "pulse0";
467 action: STATE_SET "end" 0.0; 278 action: STATE_SET "end" 0.0;
468 transition: SINUSOIDAL 0.8; 279 transition: SINUSOIDAL 0.8;
469 target: "pulse"; 280 target: "pulse";
470 after: "pulse1"; 281 after: "pulse1";
471 after: "pulse0.1";
472 } 282 }
473 program { name: "pulse1"; 283 program { name: "pulse1";
474 action: STATE_SET "default" 0.0; 284 action: STATE_SET "default" 0.0;
475 transition: SINUSOIDAL 0.8; 285 transition: SINUSOIDAL 0.8;
476 target: "pulse"; 286 target: "pulse";
477 after: "pulse0"; 287 after: "pulse0";
478 after: "pulse0.1";
479 } 288 }
480 program { name: "fraction"; 289 program { name: "fraction";
481 signal: "efl,state,fraction"; source: "efl"; 290 signal: "efl,state,fraction"; source: "efl";
@@ -483,7 +292,7 @@ group { "efl/progressbar/horizontal";
483 target: "efl.text.status"; 292 target: "efl.text.status";
484 after: "pulse-stop"; 293 after: "pulse-stop";
485 } 294 }
486 program { name: "elmpulse-stop"; 295 program { name: "eflpulse-stop";
487 signal: "efl,state,pulse,stop"; source: "efl"; 296 signal: "efl,state,pulse,stop"; source: "efl";
488 action: ACTION_STOP; 297 action: ACTION_STOP;
489 target: "pulse0"; 298 target: "pulse0";
@@ -505,7 +314,7 @@ group { "efl/progressbar/horizontal";
505 target: "efl.text.status"; 314 target: "efl.text.status";
506 } 315 }
507 program { name: "text-visible"; 316 program { name: "text-visible";
508 signal: "efl,text,set"; source: "efl"; 317 signal: "efl,state,text,visible"; source: "efl";
509 script { 318 script {
510 new m = get_int(slmode); 319 new m = get_int(slmode);
511 m |= LABEL; set_int(slmode, m); 320 m |= LABEL; set_int(slmode, m);
@@ -513,7 +322,7 @@ group { "efl/progressbar/horizontal";
513 } 322 }
514 } 323 }
515 program { name: "text-hidden"; 324 program { name: "text-hidden";
516 signal: "efl,text,unset"; source: "efl"; 325 signal: "efl,state,text,hidden"; source: "efl";
517 script { 326 script {
518 new m = get_int(slmode); 327 new m = get_int(slmode);
519 m &= ~LABEL; set_int(slmode, m); 328 m &= ~LABEL; set_int(slmode, m);
@@ -521,7 +330,7 @@ group { "efl/progressbar/horizontal";
521 } 330 }
522 } 331 }
523 program { name: "icon-visible"; 332 program { name: "icon-visible";
524 signal: "efl,content,set"; source: "efl"; 333 signal: "efl,state,icon,visible"; source: "efl";
525 script { 334 script {
526 new m = get_int(slmode); 335 new m = get_int(slmode);
527 m |= ICON; set_int(slmode, m); 336 m |= ICON; set_int(slmode, m);
@@ -529,7 +338,7 @@ group { "efl/progressbar/horizontal";
529 } 338 }
530 } 339 }
531 program { name: "icon-hidden"; 340 program { name: "icon-hidden";
532 signal: "efl,content,unset"; source: "efl"; 341 signal: "efl,state,icon,hidden"; source: "efl";
533 script { 342 script {
534 new m = get_int(slmode); 343 new m = get_int(slmode);
535 m &= ~ICON; set_int(slmode, m); 344 m &= ~ICON; set_int(slmode, m);
@@ -555,25 +364,14 @@ group { "efl/progressbar/horizontal";
555 } 364 }
556#undef ICON 365#undef ICON
557#undef LABEL 366#undef LABEL
558#undef UNITS
559#undef DISABLE 367#undef DISABLE
560} 368}
561 369
562group { "efl/progressbar/vertical"; 370group { name: "efl/progressbar/vertical";
563 data.item: "version" "123";
564 images.image: "inset_bar_vert_base.png" COMP;
565 images.image: "inset_bar_vert_light.png" COMP;
566 images.image: "inset_bar_vert_inside_base.png" COMP;
567 images.image: "inset_bar_vert_inside_light.png" COMP;
568 images.image: "inset_bar_vert_glow_base.png" COMP;
569 images.image: "inset_bar_vert_glow_light.png" COMP;
570 images.image: "inset_bar_vert_glow_inv_base.png" COMP;
571 images.image: "inset_bar_vert_glow_inv_light.png" COMP;
572 images.image: "inset_bar_vert_glow_mid_base.png" COMP;
573 images.image: "inset_bar_vert_glow_mid_light.png" COMP;
574#define ICON 1 371#define ICON 1
575#define LABEL 2 372#define LABEL 2
576#define DISABLE 4 373#define DISABLE 4
374 data.item: "version" "123";
577 script { 375 script {
578 public slmode; 376 public slmode;
579 public eval_mode(m) { 377 public eval_mode(m) {
@@ -592,9 +390,16 @@ group { "efl/progressbar/vertical";
592 if (ic) { 390 if (ic) {
593 set_state(PART:"efl.content", "visible", 0.0); 391 set_state(PART:"efl.content", "visible", 0.0);
594 set_state(PART:"sizer_content", "visible", 0.0); 392 set_state(PART:"sizer_content", "visible", 0.0);
393 set_state(PART:"bg", "iclabel", 0.0);
595 } else { 394 } else {
596 set_state(PART:"efl.content", "default", 0.0); 395 set_state(PART:"efl.content", "default", 0.0);
597 set_state(PART:"sizer_content", "default", 0.0); 396 set_state(PART:"sizer_content", "default", 0.0);
397 if (l) {
398 set_state(PART:"bg", "iclabel", 0.0);
399 }
400 else {
401 set_state(PART:"bg", "default", 0.0);
402 }
598 } 403 }
599 if (!d) { 404 if (!d) {
600 set_state(PART:"dis_clip", "default", 0.0); 405 set_state(PART:"dis_clip", "default", 0.0);
@@ -636,28 +441,29 @@ group { "efl/progressbar/vertical";
636 } 441 }
637 } 442 }
638 part { name: "efl.content"; type: SWALLOW; 443 part { name: "efl.content"; type: SWALLOW;
444 scale: 1;
639 clip_to: "dis_clip"; 445 clip_to: "dis_clip";
640 required;
641 description { state: "default" 0.0; 446 description { state: "default" 0.0;
642 visible: 0; 447 visible: 0;
643 align: 0.5 0.0; 448 align: 0.5 0.0;
644 fixed: 0 1; 449 fixed: 1 1;
645 rel1.offset: 2 0; 450 rel1.offset: 4 0;
646 rel2.offset: -3 -1; 451 rel2.offset: -5 -1;
647 rel2.relative: 1.0 0.0; 452 rel2.relative: 1.0 0.0;
453 offscale;
648 } 454 }
649 description { state: "visible" 0.0; 455 description { state: "visible" 0.0;
650 inherit: "default" 0.0; 456 inherit: "default" 0.0;
651 visible: 1; 457 visible: 1;
652 aspect: 1.0 1.0; aspect_preference: HORIZONTAL; 458// aspect: 1.0 1.0; aspect_preference: HORIZONTAL;