summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorHosang Kim <hosang12.kim@samsung.com>2018-05-15 14:16:00 +0900
committerJaehyun Cho <jae_hyun.cho@samsung.com>2018-05-15 14:16:00 +0900
commit5db61e4d64f684a8eaf4b75ebceb18d8708ac8d5 (patch)
tree923f851151ef84ae0e12b8952ec09e5852bd1bfa /data
parent9c7f5ca33b1af207a7cc98bd170547d7cf4b4fd4 (diff)
efl_ui_slider: refactor slider widget.
Test Plan: elementary_test -> Efl.Ui.Slider, Efl.Ui.Slider_Interval, slider Reviewers: woohyun, cedric, Jaehyun_Cho Reviewed By: Jaehyun_Cho Subscribers: zmike, cedric Tags: #efl Differential Revision: https://phab.enlightenment.org/D5908
Diffstat (limited to 'data')
-rw-r--r--data/elementary/config/default/base.src.in55
-rw-r--r--data/elementary/config/mobile/base.src.in55
-rw-r--r--data/elementary/config/standard/base.src.in55
-rw-r--r--data/elementary/themes/edc/efl/slider.edc2320
-rw-r--r--data/elementary/themes/edc/elm/slider.edc18
5 files changed, 346 insertions, 2157 deletions
diff --git a/data/elementary/config/default/base.src.in b/data/elementary/config/default/base.src.in
index ad01206c7c..e95d7faadd 100644
--- a/data/elementary/config/default/base.src.in
+++ b/data/elementary/config/default/base.src.in
@@ -1,5 +1,5 @@
1group "Elm_Config" struct { 1group "Elm_Config" struct {
2 value "config_version" int: 131088; 2 value "config_version" int: 131089;
3 value "entry_select_allow" uchar: 1; 3 value "entry_select_allow" uchar: 1;
4 value "engine" string: ""; 4 value "engine" string: "";
5 value "vsync" uchar: 0; 5 value "vsync" uchar: 0;
@@ -2276,6 +2276,59 @@ group "Elm_Config" struct {
2276 } 2276 }
2277 } 2277 }
2278 group "Elm_Config_Bindings_Widget" struct { 2278 group "Elm_Config_Bindings_Widget" struct {
2279 value "name" string: "Elm_Slider";
2280 group "key_bindings" list {
2281 group "Elm_Config_Binding_Key" struct {
2282 value "context" int: 0;
2283 value "key" string: "Left";
2284 value "action" string: "drag";
2285 value "params" string: "left";
2286 }
2287 group "Elm_Config_Binding_Key" struct {
2288 value "context" int: 0;
2289 value "key" string: "KP_Left";
2290 value "action" string: "drag";
2291 value "params" string: "left";
2292 }
2293 group "Elm_Config_Binding_Key" struct {
2294 value "context" int: 0;
2295 value "key" string: "Right";
2296 value "action" string: "drag";
2297 value "params" string: "right";
2298 }
2299 group "Elm_Config_Binding_Key" struct {
2300 value "context" int: 0;
2301 value "key" string: "KP_Right";
2302 value "action" string: "drag";
2303 value "params" string: "right";
2304 }
2305 group "Elm_Config_Binding_Key" struct {
2306 value "context" int: 0;
2307 value "key" string: "Up";
2308 value "action" string: "drag";
2309 value "params" string: "up";
2310 }
2311 group "Elm_Config_Binding_Key" struct {
2312 value "context" int: 0;
2313 value "key" string: "KP_Up";
2314 value "action" string: "drag";
2315 value "params" string: "up";
2316 }
2317 group "Elm_Config_Binding_Key" struct {
2318 value "context" int: 0;
2319 value "key" string: "Down";
2320 value "action" string: "drag";
2321 value "params" string: "down";
2322 }
2323 group "Elm_Config_Binding_Key" struct {
2324 value "context" int: 0;
2325 value "key" string: "KP_Down";
2326 value "action" string: "drag";
2327 value "params" string: "down";
2328 }
2329 }
2330 }
2331 group "Elm_Config_Bindings_Widget" struct {
2279 value "name" string: "Efl.Ui.Slider"; 2332 value "name" string: "Efl.Ui.Slider";
2280 group "key_bindings" list { 2333 group "key_bindings" list {
2281 group "Elm_Config_Binding_Key" struct { 2334 group "Elm_Config_Binding_Key" struct {
diff --git a/data/elementary/config/mobile/base.src.in b/data/elementary/config/mobile/base.src.in
index c09b2b2c5b..abccea5b14 100644
--- a/data/elementary/config/mobile/base.src.in
+++ b/data/elementary/config/mobile/base.src.in
@@ -1,5 +1,5 @@
1group "Elm_Config" struct { 1group "Elm_Config" struct {
2 value "config_version" int: 131088; 2 value "config_version" int: 131089;
3 value "entry_select_allow" uchar: 1; 3 value "entry_select_allow" uchar: 1;
4 value "engine" string: ""; 4 value "engine" string: "";
5 value "vsync" uchar: 0; 5 value "vsync" uchar: 0;
@@ -2280,6 +2280,59 @@ group "Elm_Config" struct {
2280 } 2280 }
2281 } 2281 }
2282 group "Elm_Config_Bindings_Widget" struct { 2282 group "Elm_Config_Bindings_Widget" struct {
2283 value "name" string: "Elm_Slider";
2284 group "key_bindings" list {
2285 group "Elm_Config_Binding_Key" struct {
2286 value "context" int: 0;
2287 value "key" string: "Left";
2288 value "action" string: "drag";
2289 value "params" string: "left";
2290 }
2291 group "Elm_Config_Binding_Key" struct {
2292 value "context" int: 0;
2293 value "key" string: "KP_Left";
2294 value "action" string: "drag";
2295 value "params" string: "left";
2296 }
2297 group "Elm_Config_Binding_Key" struct {
2298 value "context" int: 0;
2299 value "key" string: "Right";
2300 value "action" string: "drag";
2301 value "params" string: "right";
2302 }
2303 group "Elm_Config_Binding_Key" struct {
2304 value "context" int: 0;
2305 value "key" string: "KP_Right";
2306 value "action" string: "drag";
2307 value "params" string: "right";
2308 }
2309 group "Elm_Config_Binding_Key" struct {
2310 value "context" int: 0;
2311 value "key" string: "Up";
2312 value "action" string: "drag";
2313 value "params" string: "up";
2314 }
2315 group "Elm_Config_Binding_Key" struct {
2316 value "context" int: 0;
2317 value "key" string: "KP_Up";
2318 value "action" string: "drag";
2319 value "params" string: "up";
2320 }
2321 group "Elm_Config_Binding_Key" struct {
2322 value "context" int: 0;
2323 value "key" string: "Down";
2324 value "action" string: "drag";
2325 value "params" string: "down";
2326 }
2327 group "Elm_Config_Binding_Key" struct {
2328 value "context" int: 0;
2329 value "key" string: "KP_Down";
2330 value "action" string: "drag";
2331 value "params" string: "down";
2332 }
2333 }
2334 }
2335 group "Elm_Config_Bindings_Widget" struct {
2283 value "name" string: "Efl.Ui.Slider"; 2336 value "name" string: "Efl.Ui.Slider";
2284 group "key_bindings" list { 2337 group "key_bindings" list {
2285 group "Elm_Config_Binding_Key" struct { 2338 group "Elm_Config_Binding_Key" struct {
diff --git a/data/elementary/config/standard/base.src.in b/data/elementary/config/standard/base.src.in
index cde1824eec..ae0de27562 100644
--- a/data/elementary/config/standard/base.src.in
+++ b/data/elementary/config/standard/base.src.in
@@ -1,5 +1,5 @@
1group "Elm_Config" struct { 1group "Elm_Config" struct {
2 value "config_version" int: 131088; 2 value "config_version" int: 131089;
3 value "entry_select_allow" uchar: 1; 3 value "entry_select_allow" uchar: 1;
4 value "engine" string: ""; 4 value "engine" string: "";
5 value "vsync" uchar: 0; 5 value "vsync" uchar: 0;
@@ -2277,6 +2277,59 @@ group "Elm_Config" struct {
2277 } 2277 }
2278 } 2278 }
2279 group "Elm_Config_Bindings_Widget" struct { 2279 group "Elm_Config_Bindings_Widget" struct {
2280 value "name" string: "Elm_Slider";
2281 group "key_bindings" list {
2282 group "Elm_Config_Binding_Key" struct {
2283 value "context" int: 0;
2284 value "key" string: "Left";
2285 value "action" string: "drag";
2286 value "params" string: "left";
2287 }
2288 group "Elm_Config_Binding_Key" struct {
2289 value "context" int: 0;
2290 value "key" string: "KP_Left";
2291 value "action" string: "drag";
2292 value "params" string: "left";
2293 }
2294 group "Elm_Config_Binding_Key" struct {
2295 value "context" int: 0;
2296 value "key" string: "Right";
2297 value "action" string: "drag";
2298 value "params" string: "right";
2299 }
2300 group "Elm_Config_Binding_Key" struct {
2301 value "context" int: 0;
2302 value "key" string: "KP_Right";
2303 value "action" string: "drag";
2304 value "params" string: "right";
2305 }
2306 group "Elm_Config_Binding_Key" struct {
2307 value "context" int: 0;
2308 value "key" string: "Up";
2309 value "action" string: "drag";
2310 value "params" string: "up";
2311 }
2312 group "Elm_Config_Binding_Key" struct {
2313 value "context" int: 0;
2314 value "key" string: "KP_Up";
2315 value "action" string: "drag";
2316 value "params" string: "up";
2317 }
2318 group "Elm_Config_Binding_Key" struct {
2319 value "context" int: 0;
2320 value "key" string: "Down";
2321 value "action" string: "drag";
2322 value "params" string: "down";
2323 }
2324 group "Elm_Config_Binding_Key" struct {
2325 value "context" int: 0;
2326 value "key" string: "KP_Down";
2327 value "action" string: "drag";
2328 value "params" string: "down";
2329 }
2330 }
2331 }
2332 group "Elm_Config_Bindings_Widget" struct {
2280 value "name" string: "Efl.Ui.Slider"; 2333 value "name" string: "Efl.Ui.Slider";
2281 group "key_bindings" list { 2334 group "key_bindings" list {
2282 group "Elm_Config_Binding_Key" struct { 2335 group "Elm_Config_Binding_Key" struct {
diff --git a/data/elementary/themes/edc/efl/slider.edc b/data/elementary/themes/edc/efl/slider.edc
index 0c0609668b..095e3aca33 100644
--- a/data/elementary/themes/edc/efl/slider.edc
+++ b/data/elementary/themes/edc/efl/slider.edc
@@ -1,292 +1,3 @@
1group { name: "efl/slider/hidden/limit";
2 parts {
3 part { name: "elm.units.min"; type: TEXT; mouse_events: 0;
4 scale: 1;
5 description { state: "default" 0.0;
6 visible: 0;
7 align: 1.0 0.5;
8 text { font: FN; size: 10;
9 text_class: "slider_text";
10 min: 1 1;
11 align: 0.0 0.5;
12 ellipsis: -1;
13 }
14 }
15 }
16 part { name: "elm.units.max"; type: TEXT; mouse_events: 0;
17 scale: 1;
18 description { state: "default" 0.0;
19 visible: 0;
20 align: 1.0 0.5;
21 text { font: FN; size: 10;
22 text_class: "slider_text";
23 min: 1 1;
24 align: 0.0 0.5;
25 ellipsis: -1;
26 }
27 }
28 }
29 }
30}
31
32group { "efl/slider/horizontal/indicator";
33 alias: "efl/slider/horizontal/indicator:disabled";
34 alias: "efl/slider/horizontal/popup";
35 alias: "efl/slider_interval/horizontal/indicator";
36 alias: "efl/slider_interval/horizontal/popup";
37 images.image: "darken_rounded_square.png" COMP;
38 parts {
39 part { name: "base"; type: SPACER;
40 scale: 1;
41 description { state: "default" 0.0;
42 fixed: 1 1;
43 min: 16 16;
44 }
45 description { state: "disabled" 0.0;
46 inherit: "default" 0.0;
47 }
48 }
49 part { name: "clip"; type: RECT;
50 description { state: "default" 0.0;
51 fixed: 1 1;
52 rel1.to: "elm.indicator";
53 rel1.offset: -100 -100;
54 rel2.to: "elm.indicator";
55 rel2.offset: 99 99;
56 visible: 0;
57 }
58 description { state: "visible" 0.0;
59 inherit: "default" 0.0;
60 visible: 1;
61 }
62 }
63 part { name: "bevel"; mouse_events: 0;
64 clip_to: "clip";
65 description { state: "default" 0.0;
66 rel1.offset: -12 -12;
67 rel1.to: "elm.indicator";
68 rel2.offset: 11 11;
69 rel2.to: "elm.indicator";
70 image.normal: "darken_rounded_square.png";
71 image.border: 15 15 15 15;
72 fill.smooth: 0;
73 visible: 0;
74 }
75 description { state: "visible" 0.0;
76 inherit: "default" 0.0;
77 visible: 1;
78 }
79 }
80 part { name: "elm.indicator"; type: TEXT; mouse_events: 0;
81 clip_to: "clip";
82 effect: SHADOW BOTTOM;
83 scale: 1;
84 description { state: "default" 0.0;
85 fixed: 1 1;
86 align: 0.5 1.0;
87 rel1.to: "base";
88 rel1.relative: 0.0 -0.1;
89 rel1.offset: 0 -12;
90 rel2.to: "base";
91 rel2.relative: 1.0 -0.1;
92 rel2.offset: -1 -12;
93 color_class: "slider_indicator";
94 color: FN_COL_DEFAULT;
95 text { font: FNBD; size: 10;
96 min: 1 1;
97 align: 0.5 1.0;
98 text_class: "slider_indicator";
99 ellipsis: -1;
100 }
101 visible: 0;
102 }
103 description { state: "visible" 0.0;
104 inherit: "default" 0.0;
105 visible: 1;
106 }
107 }
108 }
109 programs {
110 program {
111 signal: "elm,popup,show"; source: "elm";
112 action: STATE_SET "visible" 0.0;
113 target: "elm.indicator";
114 target: "bevel";
115 }
116 program {
117 signal: "elm,popup,hide"; source: "elm";
118 action: STATE_SET "default" 0.0;
119 target: "elm.indicator";
120 target: "bevel";
121 }
122 program {
123 signal: "elm,popup,hide"; source: "elm";
124 action: SIGNAL_EMIT "elm,popup,hide,done" "elm";
125 }
126 program {
127 signal: "elm,state,val,show"; source: "elm";
128 action: STATE_SET "visible" 0.0;
129 target: "clip";
130 }
131 program {
132 signal: "elm,state,val,hide"; source: "elm";
133 action: STATE_SET "default" 0.0;
134 target: "clip";
135 }
136 program {
137 signal: "elm,state,indicator,show"; source: "elm";
138 action: STATE_SET "visible" 0.0;
139 target: "elm.indicator";
140 target: "bevel";
141 }
142 program {
143 signal: "elm,state,indicator,hide"; source: "elm";
144 action: STATE_SET "visible" 0.0;
145 target: "elm.indicator";
146 target: "bevel";
147 }
148 program {
149 signal: "elm,state,disabled"; source: "elm";
150 action: STATE_SET "disabled" 0.0;
151 target: "base";
152 }
153 program {
154 signal: "elm,state,enabled"; source: "elm";
155 action: STATE_SET "default" 0.0;
156 target: "base";
157 }
158 }
159}
160
161group { "efl/slider/vertical/indicator";
162 alias: "efl/slider/vertical/indicator:disabled";
163 alias: "efl/slider/vertical/popup";
164 alias: "efl/slider_interval/vertical/indicator";
165 alias: "efl/slider_interval/vertical/popup";
166 images.image: "darken_rounded_square.png" COMP;
167 parts {
168 part { name: "base"; type: SPACER;
169 scale: 1;
170 description { state: "default" 0.0;
171 fixed: 1 1;
172 min: 16 16;
173 }
174 description { state: "disabled" 0.0;
175 inherit: "default" 0.0;
176 }
177 }
178 part { name: "clip"; type: RECT;
179 description { state: "default" 0.0;
180 fixed: 1 1;
181 rel1.to: "elm.indicator";
182 rel1.offset: -100 -100;
183 rel2.to: "elm.indicator";
184 rel2.offset: 99 99;
185 visible: 0;
186 }
187 description { state: "visible" 0.0;
188 inherit: "default" 0.0;
189 visible: 1;
190 }
191 }
192 part { name: "bevel"; mouse_events: 0;
193 clip_to: "clip";
194 description { state: "default" 0.0;
195 rel1.offset: -12 -12;
196 rel1.to: "elm.indicator";
197 rel2.offset: 11 11;
198 rel2.to: "elm.indicator";
199 image.normal: "darken_rounded_square.png";
200 image.border: 15 15 15 15;
201 fill.smooth: 0;
202 visible: 0;
203 }
204 description { state: "visible" 0.0;
205 inherit: "default" 0.0;
206 visible: 1;
207 }
208 }
209 part { name: "elm.indicator"; type: TEXT; mouse_events: 0;
210 clip_to: "clip";
211 effect: SHADOW BOTTOM;
212 scale: 1;
213 description { state: "default" 0.0;
214 fixed: 1 1;
215 align: 0.0 0.5;
216 rel1.to: "base";
217 rel1.relative: 1.1 0.0;
218 rel1.offset: 11 0;
219 rel2.to: "base";
220 rel2.relative: 1.1 1.0;
221 rel2.offset: 11 -1;
222 color_class: "slider_indicator";
223 color: FN_COL_DEFAULT;
224 text { font: FNBD; size: 10;
225 min: 1 1;
226 align: 0.0 0.5;
227 text_class: "slider_indicator";
228 ellipsis: -1;
229 }
230 visible: 0;
231 }
232 description { state: "visible" 0.0;
233 inherit: "default" 0.0;
234 visible: 1;
235 }
236 }
237 }
238 programs {
239 program {
240 signal: "elm,popup,show"; source: "elm";
241 action: STATE_SET "visible" 0.0;
242 target: "elm.indicator";
243 target: "bevel";
244 }
245 program {
246 signal: "elm,popup,hide"; source: "elm";
247 action: STATE_SET "default" 0.0;
248 target: "elm.indicator";
249 target: "bevel";
250 }
251 program {
252 signal: "elm,popup,hide"; source: "elm";
253 action: SIGNAL_EMIT "elm,popup,hide,done" "elm";
254 }
255 program {
256 signal: "elm,state,val,show"; source: "elm";
257 action: STATE_SET "visible" 0.0;
258 target: "clip";
259 }
260 program {
261 signal: "elm,state,val,hide"; source: "elm";
262 action: STATE_SET "default" 0.0;
263 target: "clip";
264 }
265 program {
266 signal: "elm,state,indicator,show"; source: "elm";
267 action: STATE_SET "visible" 0.0;
268 target: "elm.indicator";
269 target: "bevel";
270 }
271 program {
272 signal: "elm,state,indicator,hide"; source: "elm";
273 action: STATE_SET "visible" 0.0;
274 target: "elm.indicator";
275 target: "bevel";
276 }
277 program {
278 signal: "elm,state,disabled"; source: "elm";
279 action: STATE_SET "disabled" 0.0;
280 target: "base";
281 }
282 program {
283 signal: "elm,state,enabled"; source: "elm";
284 action: STATE_SET "default" 0.0;
285 target: "base";
286 }
287 }
288}
289
290group { "efl/slider/horizontal"; 1group { "efl/slider/horizontal";
291 alias: "efl/slider/horizontal:disabled"; 2 alias: "efl/slider/horizontal:disabled";
292 images.image: "slider_run_base_horiz.png" COMP; 3 images.image: "slider_run_base_horiz.png" COMP;
@@ -310,20 +21,12 @@ group { "efl/slider/horizontal";
310 image { image: "knob_sz_06.png" COMP; size: 13 13 14 14; } 21 image { image: "knob_sz_06.png" COMP; size: 13 13 14 14; }
311 image { image: "knob_sz_04.png" COMP; size: 0 0 12 12; } 22 image { image: "knob_sz_04.png" COMP; size: 0 0 12 12; }
312 } 23 }
313#define ICON 1
314#define LABEL 2
315#define END 4
316#define UNITS 8
317#define MASK 15 24#define MASK 15
318#define INVERT 16 25#define INVERT 16
319#define DISABLE 32 26#define DISABLE 32
320 script { 27 script {
321 public slmode; 28 public slmode;
322 public eval_mode(m) { 29 public eval_mode(m) {
323 new ic = m & ICON;
324 new l = m & LABEL;
325 new e = m & END;
326 new u = m & UNITS;
327 new d = m & DISABLE; 30 new d = m & DISABLE;
328 new i = m & INVERT; 31 new i = m & INVERT;
329 if (i) { 32 if (i) {
@@ -343,69 +46,30 @@ group { "efl/slider/horizontal";
343 set_state(PART:"glow", "disabled", 0.0); 46 set_state(PART:"glow", "disabled", 0.0);
344 } 47 }
345 } 48 }
346 if (l) {
347 if (!d) {
348 set_state(PART:"elm.text", "visible", 0.0);
349 } else {
350 set_state(PART:"elm.text", "disabled_visible", 0.0);
351 }
352 } else {
353 set_state(PART:"elm.text", "default", 0.0);
354 }
355 if (u) {
356 if (!d) {
357 set_state(PART:"elm.units", "visible", 0.0);
358 set_state(PART:"limits", "visible", 0.0);
359 } else {
360 set_state(PART:"elm.units", "disabled_visible", 0.0);
361 set_state(PART:"limits", "disabled_visible", 0.0);
362 }
363 } else {
364 set_state(PART:"elm.units", "default", 0.0);
365 set_state(PART:"limits", "default", 0.0);
366 }
367 if (ic) {
368 set_state(PART:"elm.swallow.icon", "visible", 0.0);
369 set_state(PART:"sizer.content", "visible", 0.0);
370 } else {
371 set_state(PART:"elm.swallow.icon", "default", 0.0);
372 set_state(PART:"sizer.content", "default", 0.0);
373 }
374 if (e) {
375 set_state(PART:"elm.swallow.end", "visible", 0.0);
376 set_state(PART:"sizer.content.end", "visible", 0.0);
377 } else {
378 set_state(PART:"elm.swallow.end", "default", 0.0);
379 set_state(PART:"sizer.content.end", "default", 0.0);
380 }
381 if (!d) { 49 if (!d) {
382 set_state(PART:"event", "default", 0.0); 50 set_state(PART:"event", "default", 0.0);
383 set_state(PART:"dis_clip", "default", 0.0);
384 } else { 51 } else {
385 set_state(PART:"event", "disabled", 0.0); 52 set_state(PART:"event", "disabled", 0.0);
386 set_state(PART:"dis_clip", "disabled", 0.0);
387 } 53 }
388 } 54 }
389 } 55 }
390 parts { 56 parts {
391 part { name: "elm.swallow.bar"; type: SWALLOW; 57 part { name: "efl.bar"; type: SWALLOW;
392 scale: 1; 58 scale: 1;
393 description { state: "default" 0.0; 59 description { state: "default" 0.0;
394 min: 42 21; 60 min: 42 21;
395 max: 99999 21; 61 max: 99999 21;
396 align: 1.0 0.5; 62 align: 1.0 0.5;
397 rel1.to_x: "elm.text"; 63 rel1.relative: 0.0 0.0;
398 rel1.relative: 1.0 0.0;
399 rel1.offset: 2 0; 64 rel1.offset: 2 0;
400 rel2.to_x: "limits"; 65 rel2.relative: 1.0 1.0;
401 rel2.relative: 0.0 1.0;
402 rel2.offset: -3 -1; 66 rel2.offset: -3 -1;
403 } 67 }
404 } 68 }
405 part { name: "base"; mouse_events: 0; 69 part { name: "base"; mouse_events: 0;
406 description { state: "default" 0.0; 70 description { state: "default" 0.0;
407 rel1.to: "elm.swallow.bar"; 71 rel1.to: "efl.bar";
408 rel2.to: "elm.swallow.bar"; 72 rel2.to: "efl.bar";
409 image.normal: "slider_run_base_horiz.png"; 73 image.normal: "slider_run_base_horiz.png";
410 image.border: 4 4 0 0; 74 image.border: 4 4 0 0;
411 fill.smooth: 0; 75 fill.smooth: 0;
@@ -425,7 +89,7 @@ group { "efl/slider/horizontal";
425 rel1.to: "base"; 89 rel1.to: "base";
426 rel2.relative: 0.5 1.0; 90 rel2.relative: 0.5 1.0;
427 rel2.offset: -1 -2; 91 rel2.offset: -1 -2;
428 rel2.to_x: "button"; 92 rel2.to_x: "efl.dragable.slider";
429 rel2.to_y: "base"; 93 rel2.to_y: "base";
430 image.border: 0 4 0 0; 94 image.border: 0 4 0 0;
431 } 95 }
@@ -437,7 +101,7 @@ group { "efl/slider/horizontal";
437 image.normal: "horiz_glow_run_rev.png"; 101 image.normal: "horiz_glow_run_rev.png";
438 rel1.relative: 0.5 0.0; 102 rel1.relative: 0.5 0.0;
439 rel1.offset: 0 1; 103 rel1.offset: 0 1;
440 rel1.to_x: "button"; 104 rel1.to_x: "efl.dragable.slider";
441 rel1.to_y: "base"; 105 rel1.to_y: "base";
442 rel2.offset: -2 -2; 106 rel2.offset: -2 -2;
443 rel2.to: "base"; 107 rel2.to: "base";
@@ -457,229 +121,34 @@ group { "efl/slider/horizontal";
457 fill.smooth: 0; 121 fill.smooth: 0;
458 } 122 }
459 } 123 }
460 part { name: "dis_clip"; type: RECT; 124 part { name: "efl.dragable.slider"; type: RECT;
461 description { state: "default" 0.0; 125 nomouse;
462 rel1.to: "elm.swallow.icon";
463 rel2.to: "elm.swallow.end";
464 }
465 description { state: "disabled" 0.0;
466 inherit: "default" 0.0;
467 color: 255 255 255 64;
468 }
469 }
470 part { name: "elm.swallow.icon"; type: SWALLOW;
471 clip_to: "dis_clip";
472 required;
473 description { state: "default" 0.0;
474 fixed: 1 0;
475 visible: 0;
476 align: 0.0 0.5;
477 rel1.offset: 0 2;
478 rel1.to_y: "elm.swallow.bar";
479 rel2.offset: -1 -3;
480 rel2.relative: 0.0 1.0;
481 rel2.to_y: "elm.swallow.bar";
482 }
483 description { state: "visible" 0.0;
484 inherit: "default" 0.0;
485 visible: 1;
486 aspect: 1.0 1.0; aspect_preference: VERTICAL;
487 rel1.offset: 2 2;
488 rel2.offset: 2 -3;
489 }
490 }
491 part { name: "sizer.content"; type: TEXT; mouse_events: 0;
492 scale: 1;
493 description { state: "default" 0.0;
494 fixed: 1 1;
495 visible: 0;
496 text { font: FN; size: 10;
497 min: 0 0;
498 text_class: "slider_text";
499 }
500 }
501 description { state: "visible" 0.0;
502 inherit: "default" 0.0;
503 rel1.to: "elm.swallow.icon";
504 rel2.to: "elm.swallow.icon";
505 text {
506 min: 1 1;
507 ellipsis: -1;
508 text: "M";
509 }
510 }
511 }
512 part { name: "elm.text"; type: TEXT; mouse_events: 0;
513 effect: SHADOW BOTTOM;
514 scale: 1;
515 required;
516 description { state: "default" 0.0;
517 fixed: 1 1;
518 align: 0.0 0.5;
519 rel1.to_x: "elm.swallow.icon";
520 rel1.relative: 1.0 0.0;
521 rel1.offset: -1 2;
522 rel2.to_x: "elm.swallow.icon";
523 rel2.relative: 1.0 1.0;
524 rel2.offset: -1 -3;
525 color: FN_COL_DEFAULT;
526 color_class: "slider_text";
527 text { font: FN; size: 10;
528 text_class: "slider";
529 min: 0 0;
530 align: 0.0 0.5;
531 }
532 visible: 0;
533 }
534 description { state: "visible" 0.0;
535 inherit: "default" 0.0;
536 fixed: 1 0;
537 visible: 1;
538 rel1.offset: 2 2;
539 rel2.offset: 2 -3;
540 text.min: 1 1;
541 text.ellipsis: -1;
542 }
543 description { state: "disabled_visible" 0.0;
544 inherit: "visible" 0.0;
545 color_class: "slider_text_disabled";
546 color3: 255 255 255 255;
547 }
548 }
549 part { name: "elm.swallow.end"; type: SWALLOW;
550 clip_to: "dis_clip";
551 description { state: "default" 0.0;
552 fixed: 1 0;
553 visible: 0;
554 align: 1.0 0.5;
555 rel1.offset: 0 2;
556 rel1.relative: 1.0 0.0;
557 rel2.offset: -1 -3;
558 }
559 description { state: "visible" 0.0;
560 inherit: "default" 0.0;
561 visible: 1;
562 aspect: 1.0 1.0;
563 aspect_preference: VERTICAL;
564 rel1.offset: -3 2;
565 rel2.offset: -3 -3;
566 }
567 }
568 part { name: "sizer.content.end"; type: TEXT; mouse_events: 0;
569 scale: 1;
570 description { state: "default" 0.0;
571 fixed: 1 1;
572 visible: 0;
573 text { font: FN; size: 10;
574 min: 0 0;
575 text_class: "slider_text";
576 }
577 }
578 description { state: "visible" 0.0;
579 inherit: "default" 0.0;
580 rel1.to: "elm.swallow.end";
581 rel2.to: "elm.swallow.end";
582 text {
583 min: 1 1;
584 ellipsis: -1;
585 text: "M";
586 }
587 }
588 }
589 alias: "elm.units.min" "limits:elm.units.min";
590 alias: "elm.units.max" "limits:elm.units.max";
591 part { name: "limits"; type: GROUP; mouse_events: 0;
592 source: "efl/slider/hidden/limit";
593 scale: 1;
594 description { state: "default" 0.0;
595 visible: 0;
596 align: 1.0 0.5;
597 min: SOURCE;
598 fixed: 1 1;
599 rel1.to_x: "elm.swallow.end";
600 rel1.relative: 0.0 0.0;
601 rel1.offset: 0 2;
602 rel2.to_x: "elm.swallow.end";
603 rel2.relative: 0.0 1.0;
604 rel2.offset: -1 -3;
605 }
606 description { state: "visible" 0.0;
607 inherit: "default" 0.0;
608 rel1.offset: -3 2;
609 rel2.offset: -3 -3;
610 }
611 description { state: "disabled_visible" 0.0;
612 inherit: "default" 0.0;
613 rel1.offset: -3 2;
614 rel2.offset: -3 -3;
615 color: 255 255 255 64;
616 }
617 }
618 part { name: "elm.units"; type: TEXT; mouse_events: 0;
619 effect: SHADOW BOTTOM;
620 scale: 1;
621 description { state: "default" 0.0;
622 visible: 0;
623 fixed: 1 1;
624 rel1.to_x: "limits";
625 rel2.to_x: "limits";
626 color: FN_COL_DEFAULT;
627 color_class: "slider_text";
628 text { font: FN; size: 10;
629 text_class: "slider";
630 align: 1.0 0.5;
631 min: 1 1;
632 ellipsis: -1;
633 }
634 }
635 description { state: "visible" 0.0;
636 inherit: "default" 0.0;
637 visible: 1;
638 }
639 description { state: "disabled_visible" 0.0;
640 inherit: "visible" 0.0;
641 color_class: "slider_text_disabled";
642 color3: 255 255 255 255;
643 }
644 }
645 part { name: "button"; type: GROUP; mouse_events: 0;
646 source: "efl/slider/horizontal/indicator";
647 description { state: "default" 0.0;
648 fixed: 1 1;
649 rel1.to: "elm.dragable.slider";
650 rel2.to: "elm.dragable.slider";
651 }
652 description { state: "hidden" 0.0;
653 inherit: "default" 0.0;
654 visible: 0;
655 }
656 }
657 part { name: "elm.dragable.slider"; type: RECT;
658 scale: 1; 126 scale: 1;
659 dragable.x: 1 1 0; 127 dragable.x: 1 1 0;
660 dragable.y: 0 0 0; 128 dragable.y: 0 0 0;
661 dragable.confine: "elm.swallow.bar"; 129 dragable.confine: "efl.bar";
662 description { state: "default" 0.0; 130 description { state: "default" 0.0;
663 color: 0 0 0 0; 131 color: 0 0 0 0;
664 min: 16 16; 132 min: 16 16;
665 max: 16 16; 133 max: 16 16;
666 fixed: 1 1; 134 fixed: 1 1;
667 rel1.relative: 0.5 0.0; 135 rel1.relative: 0.5 0.0;
668 rel1.to_x: "elm.swallow.bar"; 136 rel1.to_x: "efl.bar";
669 rel2.relative: 0.5 1.0; 137 rel2.relative: 0.5 1.0;
670 rel2.to_x: "elm.swallow.bar"; 138 rel2.to_x: "efl.bar";
671 } 139 }
672 } 140 }
673 part { name: "knob"; 141 part { name: "knob";
142 nomouse;
674 description { state: "default" 0.0; 143 description { state: "default" 0.0;
675 image.normal: "knob"; 144 image.normal: "knob";
676 fixed: 1 1; 145 fixed: 1 1;
677 min: 12 12; 146 min: 12 12;
678 step: 2 2; 147 step: 2 2;
679 max: 32 32; // XXX allow bigger sizes with more knob images 148 max: 32 32; // XXX allow bigger sizes with more knob images
680 rel1.to: "elm.dragable.slider"; 149 rel1.to: "efl.dragable.slider";
681 rel1.offset: -4 -4; 150 rel1.offset: -4 -4;
682 rel2.to: "elm.dragable.slider"; 151 rel2.to: "efl.dragable.slider";
683 rel2.offset: 3 3; 152 rel2.offset: 3 3;
684 } 153 }
685 description { state: "clicked" 0.0; 154 description { state: "clicked" 0.0;
@@ -687,21 +156,22 @@ group { "efl/slider/horizontal";
687 } 156 }
688 } 157 }
689 part { name: "slideevent"; type: RECT; repeat_events: 1; 158 part { name: "slideevent"; type: RECT; repeat_events: 1;
159 nomouse;
690 scale: 1; 160 scale: 1;
691 ignore_flags: ON_HOLD; 161 ignore_flags: ON_HOLD;
692 dragable.events: "elm.dragable.slider"; 162 dragable.events: "efl.dragable.slider";
693 description { state: "default" 0.0; 163 description { state: "default" 0.0;
694 fixed: 1 1; 164 fixed: 1 1;
695 rel1.to: "elm.dragable.slider"; 165 rel1.to: "efl.dragable.slider";
696 rel2.to: "elm.dragable.slider"; 166 rel2.to: "efl.dragable.slider";
697 color: 0 0 0 0; 167 color: 0 0 0 0;
698 } 168 }
699 } 169 }
700 part { name: "elm.track.slider"; type: SWALLOW; mouse_events: 0; 170 part { name: "efl.track.slider"; type: SWALLOW; mouse_events: 0;
701 description { state: "default" 0.0; 171 description { state: "default" 0.0;
702 max: 0 0; 172 max: 0 0;
703 rel1.to: "elm.dragable.slider"; 173 rel1.to: "efl.dragable.slider";
704 rel2.to: "elm.dragable.slider"; 174 rel2.to: "efl.dragable.slider";
705 } 175 }
706 } 176 }
707 part { name: "event"; type: RECT; 177 part { name: "event"; type: RECT;
@@ -717,120 +187,17 @@ group { "efl/slider/horizontal";
717 } 187 }
718 programs { 188 programs {
719 program { 189 program {
720 signal: "mouse,down,1"; source: "elm.dragable.slider"; 190 signal: "mouse,down,1"; source: "efl.dragable.slider";
721 action: STATE_SET "clicked" 0.0; 191 action: STATE_SET "clicked" 0.0;
722 target: "knob"; 192 target: "knob";
723 } 193 }
724 program { 194 program {
725 signal: "mouse,up,1"; source: "elm.dragable.slider"; 195 signal: "mouse,up,1"; source: "efl.dragable.slider";
726 action: STATE_SET "default" 0.0; 196 action: STATE_SET "default" 0.0;
727 target: "knob"; 197 target: "knob";
728 } 198 }
729 program { 199 program {
730 signal: "elm,state,indicator,show"; source: "elm"; 200 signal: "efl,state,inverted,on"; source: "efl";
731 action: SIGNAL_EMIT "elm,popup,show" "elm";
732 after: "popup_show2";
733 }
734 program {
735 signal: "elm,state,indicator,hide"; source: "elm";
736 action: SIGNAL_EMIT "elm,popup,hide" "elm";
737 after: "popup_hide2";
738 }
739 program {
740 signal: "mouse,down,1"; source: "slideevent";
741 action: SIGNAL_EMIT "elm,popup,show" "elm";
742 after: "popup_show2";
743 }
744 program { name: "popup_show2";
745 action: STATE_SET "hidden" 0.0;
746 target: "button";
747 }
748 program {
749 signal: "mouse,up,1"; source: "slideevent";
750 action: SIGNAL_EMIT "elm,popup,hide" "elm";
751 after: "popup_hide2";
752 }
753 program { name: "popup_hide2";
754 action: STATE_SET "default" 0.0;
755 target: "button";
756 }
757 program {
758 signal: "elm,state,elm.text,set"; source: "elm";
759 script {
760 new m = get_int(slmode);
761 m |= LABEL; set_int(slmode, m);
762 eval_mode(m);
763 }
764 }
765 program {
766 signal: "elm,state,elm.text,unset"; source: "elm";
767 script {
768 new m = get_int(slmode);
769 m &= ~LABEL; set_int(slmode, m);
770 eval_mode(m);
771 }
772 }
773 program {
774 signal: "elm,state,icon,set"; source: "elm";
775 script {
776 new m = get_int(slmode);
777 m |= ICON; set_int(slmode, m);
778 eval_mode(m);
779 }
780 }
781 program {
782 signal: "elm,state,icon,unset"; source: "elm";
783 script {
784 new m = get_int(slmode);
785 m &= ~ICON; set_int(slmode, m);
786 eval_mode(m);
787 }
788 }
789 program { name: "end_show";
790 signal: "elm,state,end,visible"; source: "elm";
791 script {
792 new m = get_int(slmode);
793 m |= END; set_int(slmode, m);
794 eval_mode(m);
795 }
796 }
797 program { name: "end_hide";
798 signal: "elm,state,end,hidden"; source: "elm";
799 script {
800 new m = get_int(slmode);
801 m &= ~END; set_int(slmode, m);
802 eval_mode(m);
803 }
804 }
805 program {
806 signal: "elm,state,units,visible"; source: "elm";
807 script {
808 new m = get_int(slmode);
809 m |= UNITS; set_int(slmode, m);
810 eval_mode(m);
811 }
812 }
813 program {
814 signal: "elm,state,units,visible"; source: "elm";
815 action: SIGNAL_EMIT "limits,visible" "elm";
816 target: "limits";
817 }
818 program {
819 signal: "elm,state,units,hidden"; source: "elm";
820 action: STATE_SET "default" 0.0;
821 script {
822 new m = get_int(slmode);
823 m &= ~UNITS; set_int(slmode, m);
824 eval_mode(m);
825 }
826 }
827 program {
828 signal: "elm,state,units,hidden"; source: "elm";
829 action: SIGNAL_EMIT "limits,hide" "elm";
830 target: "limits";
831 }
832 program {
833 signal: "elm,state,inverted,on"; source: "elm";
834 script { 201 script {
835 new m = get_int(slmode); 202 new m = get_int(slmode);
836 m |= INVERT; set_int(slmode, m); 203 m |= INVERT; set_int(slmode, m);
@@ -838,7 +205,7 @@ group { "efl/slider/horizontal";
838 } 205 }
839 } 206 }
840 program { 207 program {
841 signal: "elm,state,inverted,off"; source: "elm"; 208 signal: "efl,state,inverted,off"; source: "efl";
842 script { 209 script {
843 new m = get_int(slmode); 210 new m = get_int(slmode);
844 m &= ~INVERT; set_int(slmode, m); 211 m &= ~INVERT; set_int(slmode, m);
@@ -846,7 +213,7 @@ group { "efl/slider/horizontal";
846 } 213 }
847 } 214 }
848 program { 215 program {
849 signal: "elm,state,disabled"; source: "elm"; 216 signal: "efl,state,disabled"; source: "efl";
850 script { 217 script {
851 new m = get_int(slmode); 218 new m = get_int(slmode);
852 m |= DISABLE; set_int(slmode, m); 219 m |= DISABLE; set_int(slmode, m);
@@ -854,7 +221,7 @@ group { "efl/slider/horizontal";
854 } 221 }
855 } 222 }
856 program { 223 program {
857 signal: "elm,state,enabled"; source: "elm"; 224 signal: "efl,state,enabled"; source: "efl";
858 script { 225 script {
859 new m = get_int(slmode); 226 new m = get_int(slmode);
860 m &= ~DISABLE; set_int(slmode, m); 227 m &= ~DISABLE; set_int(slmode, m);
@@ -862,10 +229,6 @@ group { "efl/slider/horizontal";
862 } 229 }
863 } 230 }
864 } 231 }
865#undef ICON
866#undef LABEL
867#undef END
868#undef UNITS
869#undef MASK 232#undef MASK
870#undef INVERT 233#undef INVERT
871#undef DISABLE 234#undef DISABLE
@@ -894,20 +257,12 @@ group { "efl/slider/vertical";
894 image { image: "knob_sz_06.png" COMP; size: 13 13 14 14; } 257 image { image: "knob_sz_06.png" COMP; size: 13 13 14 14; }
895 image { image: "knob_sz_04.png" COMP; size: 0 0 12 12; } 258 image { image: "knob_sz_04.png" COMP; size: 0 0 12 12; }
896 } 259 }
897#define ICON 1
898#define LABEL 2
899#define END 4
900#define UNITS 8
901#define MASK 15 260#define MASK 15
902#define INVERT 16 261#define INVERT 16
903#define DISABLE 32 262#define DISABLE 32
904 script { 263 script {
905 public slmode; 264 public slmode;
906 public eval_mode(m) { 265 public eval_mode(m) {
907 new ic = m & ICON;
908 new l = m & LABEL;
909 new e = m & END;
910 new u = m & UNITS;
911 new d = m & DISABLE; 266 new d = m & DISABLE;
912 new i = m & INVERT; 267 new i = m & INVERT;
913 if (i) { 268 if (i) {
@@ -927,69 +282,30 @@ group { "efl/slider/vertical";
927 set_state(PART:"glow", "disabled", 0.0); 282 set_state(PART:"glow", "disabled", 0.0);
928 } 283 }
929 } 284 }
930 if (l) {
931 if (!d) {
932 set_state(PART:"elm.text", "visible", 0.0);
933 } else {
934 set_state(PART:"elm.text", "disabled_visible", 0.0);
935 }
936 } else {
937 set_state(PART:"elm.text", "default", 0.0);
938 }
939 if (u) {
940 if (!d) {
941 set_state(PART:"elm.units", "visible", 0.0);
942 set_state(PART:"limits", "visible", 0.0);
943 } else {
944 set_state(PART:"elm.units", "disabled_visible", 0.0);
945 set_state(PART:"limits", "disabled_visible", 0.0);
946 }
947 } else {
948 set_state(PART:"elm.units", "default", 0.0);
949 set_state(PART:"limits", "default", 0.0);
950 }
951 if (ic) {
952 set_state(PART:"elm.swallow.icon", "visible", 0.0);
953 set_state(PART:"sizer.content", "visible", 0.0);
954 } else {
955 set_state(PART:"elm.swallow.icon", "default", 0.0);
956 set_state(PART:"sizer.content", "default", 0.0);
957 }
958 if (e) {
959 set_state(PART:"elm.swallow.end", "visible", 0.0);
960 set_state(PART:"sizer.content.end", "visible", 0.0);
961 } else {
962 set_state(PART:"elm.swallow.end", "default", 0.0);
963 set_state(PART:"sizer.content.end", "default", 0.0);
964 }
965 if (!d) { 285 if (!d) {
966 set_state(PART:"event", "default", 0.0); 286 set_state(PART:"event", "default", 0.0);
967 set_state(PART:"dis_clip", "default", 0.0);
968 } else { 287 } else {
969 set_state(PART:"event", "disabled", 0.0); 288 set_state(PART:"event", "disabled", 0.0);
970 set_state(PART:"dis_clip", "disabled", 0.0);
971 } 289 }
972 } 290 }
973 } 291 }
974 parts { 292 parts {
975 part { name: "elm.swallow.bar"; type: SWALLOW; 293 part { name: "efl.bar"; type: SWALLOW;
976 scale: 1; 294 scale: 1;
977 description { state: "default" 0.0; 295 description { state: "default" 0.0;
978 min: 21 42; 296 min: 21 42;
979 max: 21 99999; 297 max: 21 99999;
980 align: 0.5 1.0; 298 align: 0.5 1.0;
981 rel1.to_y: "elm.text"; 299 rel1.relative: 0.0 0.0;
982 rel1.relative: 0.0 1.0;
983 rel1.offset: 0 2; 300 rel1.offset: 0 2;
984 rel2.to_y: "limits"; 301 rel2.relative: 1.0 1.0;
985 rel2.relative: 1.0 0.0;
986 rel2.offset: -1 -3; 302 rel2.offset: -1 -3;
987 } 303 }
988 } 304 }
989 part { name: "base"; mouse_events: 0; 305 part { name: "base"; mouse_events: 0;
990 description { state: "default" 0.0; 306 description { state: "default" 0.0;
991 rel1.to: "elm.swallow.bar"; 307 rel1.to: "efl.bar";
992 rel2.to: "elm.swallow.bar"; 308 rel2.to: "efl.bar";
993 image.normal: "slider_run_base_vert.png"; 309 image.normal: "slider_run_base_vert.png";
994 image.border: 0 0 4 4; 310 image.border: 0 0 4 4;
995 fill.smooth: 0; 311 fill.smooth: 0;
@@ -1005,13 +321,13 @@ group { "efl/slider/vertical";
1005 part { name: "glow"; mouse_events: 0; 321 part { name: "glow"; mouse_events: 0;
1006 description { state: "default" 0.0; 322 description { state: "default" 0.0;
1007 image.normal: "vert_glow_run.png"; 323 image.normal: "vert_glow_run.png";
1008 rel1.offset: 1 1; 324 rel1.relative: 0.0 0.5;
1009 rel1.to: "base"; 325 rel1.offset: 1 0;
1010 rel2.relative: 1.0 0.5; 326 rel1.to_y: "efl.dragable.slider";
1011 rel2.offset: -2 -1; 327 rel1.to_x: "base";
1012 rel2.to_y: "button"; 328 rel2.offset: -2 -2;
1013 rel2.to_x: "base"; 329 rel2.to: "base";
1014 image.border: 0 0 0 4; 330 image.border: 0 0 4 0;
1015 } 331 }
1016 description { state: "disabled" 0.0; 332 description { state: "disabled" 0.0;
1017 inherit: "default" 0.0; 333 inherit: "default" 0.0;
@@ -1019,13 +335,13 @@ group { "efl/slider/vertical";
1019 } 335 }
1020 description { state: "inverted" 0.0; 336 description { state: "inverted" 0.0;
1021 image.normal: "vert_glow_run_rev.png"; 337 image.normal: "vert_glow_run_rev.png";
1022 rel1.relative: 0.0 0.5; 338 rel1.offset: 1 1;
1023 rel1.offset: 1 0; 339 rel1.to: "base";
1024 rel1.to_y: "button"; 340 rel2.relative: 1.0 0.5;
1025 rel1.to_x: "base"; 341 rel2.offset: -2 -1;
1026 rel2.offset: -2 -2; 342 rel2.to_y: "efl.dragable.slider";
1027 rel2.to: "base"; 343 rel2.to_x: "base";
1028 image.border: 0 0 4 0; 344 image.border: 0 0 0 4;
1029 } 345 }
1030 description { state: "disabled_inverted" 0.0; 346 description { state: "disabled_inverted" 0.0;
1031 inherit: "inverted" 0.0; 347 inherit: "inverted" 0.0;
@@ -1041,232 +357,34 @@ group { "efl/slider/vertical";
1041 fill.smooth: 0; 357 fill.smooth: 0;
1042 } 358 }
1043 } 359 }
1044 part { name: "dis_clip"; type: RECT; 360 part { name: "efl.dragable.slider"; type: RECT;
1045 description { state: "default" 0.0; 361 nomouse;
1046 rel1.to: "elm.swallow.icon";
1047 rel2.to: "elm.swallow.end";
1048 }
1049 description { state: "disabled" 0.0;
1050 inherit: "default" 0.0;
1051 color: 255 255 255 64;
1052 }
1053 }
1054 part { name: "elm.swallow.icon"; type: SWALLOW;
1055 clip_to: "dis_clip";
1056 required;
1057 description { state: "default" 0.0;
1058 fixed: 0 1;
1059 visible: 0;
1060 align: 0.5 0.0;
1061 rel1.offset: 2 0;
1062 rel1.to_x: "elm.swallow.bar";
1063 rel2.offset: -3 -1;
1064 rel2.relative: 1.0 0.0;
1065 rel2.to_x: "elm.swallow.bar";
1066 }
1067 description { state: "visible" 0.0;
1068 inherit: "default" 0.0;
1069 visible: 1;
1070 aspect: 1.0 1.0; aspect_preference: VERTICAL;
1071 rel1.offset: 2 2;
1072 rel2.offset: -3 2;
1073 }
1074 }
1075 part { name: "sizer.content"; type: TEXT; mouse_events: 0;
1076 scale: 1;
1077 description { state: "default" 0.0;
1078 fixed: 1 1;
1079 visible: 0;
1080 text { font: FN; size: 10;
1081 min: 0 0;
1082 text_class: "slider_text";
1083 }
1084 }
1085 description { state: "visible" 0.0;
1086 inherit: "default" 0.0;
1087 rel1.to: "elm.swallow.icon";
1088 rel2.to: "elm.swallow.icon";
1089 text {
1090 min: 1 1;
1091 ellipsis: -1;
1092 text: "M";
1093 }
1094 }
1095 }
1096 part { name: "elm.text"; type: TEXT; mouse_events: 0;
1097 effect: SHADOW BOTTOM;
1098 scale: 1;
1099 required;
1100 description { state: "default" 0.0;
1101 fixed: 0 1;
1102 align: 0.5 0.0;
1103 rel1.to_y: "elm.swallow.icon";
1104 rel1.relative: 0.0 1.0;
1105 rel1.offset: 2 -1;
1106 rel2.to_y: "elm.swallow.icon";
1107 rel2.relative: 1.0 1.0;
1108 rel2.offset: -3 -1;
1109 color: FN_COL_DEFAULT;
1110 color_class: "slider_text";
1111 text { font: FN; size: 10;
1112 text_class: "slider";
1113 min: 1 0;
1114 ellipsis: -1;
1115 align: 0.5 0.0;
1116 }
1117 visible: 0;
1118 }
1119 description { state: "visible" 0.0;
1120 inherit: "default" 0.0;
1121 visible: 1;
1122 rel1.offset: 2 2;
1123 rel2.offset: -3 2;
1124 text.min: 1 1;
1125 text.ellipsis: -1;
1126
1127 }
1128 description { state: "disabled_visible" 0.0;
1129 inherit: "visible" 0.0;
1130 color_class: "slider_text_disabled";
1131 color3: 255 255 255 255;
1132 }
1133 }
1134 part { name: "elm.swallow.end"; type: SWALLOW;
1135 clip_to: "dis_clip";
1136 description { state: "default" 0.0;
1137 fixed: 0 1;
1138 visible: 0;
1139 align: 0.5 1.0;
1140 rel1.offset: 2 0;
1141 rel1.relative: 0.0 1.0;
1142 rel2.offset: -3 -1;
1143 }
1144 description { state: "visible" 0.0;
1145 inherit: "default" 0.0;
1146 visible: 1;
1147 aspect: 1.0 1.0;
1148 aspect_preference: VERTICAL;
1149 rel2.offset: 2 -3;
1150 rel2.offset: -3 -3;
1151 }
1152 }
1153 part { name: "sizer.content.end"; type: TEXT; mouse_events: 0;
1154 scale: 1;
1155 description { state: "default" 0.0;
1156 fixed: 1 1;
1157 visible: 0;
1158 text { font: FN; size: 10;
1159 min: 0 0;
1160 text_class: "slider_text";
1161 }
1162 }
1163 description { state: "visible" 0.0;
1164 inherit: "default" 0.0;
1165 rel1.to: "elm.swallow.end";
1166 rel2.to: "elm.swallow.end";
1167 text {
1168 min: 1 1;
1169 ellipsis: -1;
1170 text: "M";
1171 }
1172 }
1173 }
1174 alias: "elm.units.min" "limits:elm.units.min";
1175 alias: "elm.units.max" "limits:elm.units.max";
1176 part { name: "limits"; type: GROUP; mouse_events: 0;
1177 source: "efl/slider/hidden/limit";
1178 scale: 1;
1179 description { state: "default" 0.0;
1180 align: 0.5 1.0;
1181 fixed: 1 1;
1182 max: 0 0;
1183 rel1.to_y: "elm.swallow.end";
1184 rel1.relative: 0.0 0.0;
1185 rel1.offset: 2 1;
1186 rel2.to_y: "elm.swallow.end";
1187 rel2.relative: 1.0 0.0;
1188 rel2.offset: -3 0;
1189 }
1190 description { state: "visible" 0.0;
1191 inherit: "default" 0.0;
1192 min: SOURCE;
1193 rel1.offset: 2 -3;
1194 rel2.offset: -3 -3;
1195 }
1196 description { state: "disabled_visible" 0.0;
1197 inherit: "default" 0.0;
1198 rel1.offset: 2 -3;
1199 rel2.offset: -3 -3;
1200 color: 255 255 255 64;
1201 }
1202 }
1203 part { name: "elm.units"; type: TEXT; mouse_events: 0;
1204 effect: SHADOW BOTTOM;
1205 scale: 1;
1206 description { state: "default" 0.0;
1207 visible: 0;
1208 fixed: 1 1;
1209 rel1.to_y: "limits";
1210 rel2.to_y: "limits";
1211 color: FN_COL_DEFAULT;
1212 color_class: "slider_text";
1213 text { font: FN; size: 10;
1214 text_class: "slider";
1215 min: 0 0;
1216 align: 0.5 1.0;
1217 ellipsis: -1;
1218 }
1219 }
1220 description { state: "visible" 0.0;
1221 inherit: "default" 0.0;
1222 visible: 1;
1223 text.min: 1 1;
1224 text.ellipsis: -1;
1225 }
1226 description { state: "disabled_visible" 0.0;
1227 inherit: "visible" 0.0;
1228 color_class: "slider_text_disabled";
1229 color3: 255 255 255 255;
1230 }
1231 }
1232 part { name: "button"; type: GROUP; mouse_events: 0;
1233 source: "efl/slider/vertical/indicator";
1234 description { state: "default" 0.0;
1235 fixed: 1 1;
1236 rel1.to: "elm.dragable.slider";
1237 rel2.to: "elm.dragable.slider";
1238 }
1239 description { state: "hidden" 0.0;
1240 inherit: "default" 0.0;
1241 visible: 0;
1242 }
1243 }
1244 part { name: "elm.dragable.slider"; type: RECT;
1245 scale: 1; 362 scale: 1;
1246 dragable.x: 0 0 0; 363 dragable.x: 0 0 0;
1247 dragable.y: 1 1 0; 364 dragable.y: 1 1 0;
1248 dragable.confine: "elm.swallow.bar"; 365 dragable.confine: "efl.bar";
1249 description { state: "default" 0.0; 366 description { state: "default" 0.0;
1250 color: 0 0 0 0; 367 color: 0 0 0 0;
1251 min: 16 16; 368 min: 16 16;
1252 max: 16 16; 369 max: 16 16;
1253 fixed: 1 1; 370 fixed: 1 1;
1254 rel1.relative: 0.0 0.5; 371 rel1.relative: 0.0 0.5;
1255 rel1.to_x: "elm.swallow.bar"; 372 rel1.to_x: "efl.bar";
1256 rel2.relative: 1.0 0.5; 373 rel2.relative: 1.0 0.5;
1257 rel2.to_x: "elm.swallow.bar"; 374 rel2.to_x: "efl.bar";
1258 } 375 }
1259 } 376 }
1260 part { name: "knob"; 377 part { name: "knob";
378 nomouse;
1261 description { state: "default" 0.0; 379 description { state: "default" 0.0;
1262 image.normal: "knob"; 380 image.normal: "knob";
1263 fixed: 1 1; 381 fixed: 1 1;
1264 min: 12 12; 382 min: 12 12;
1265 step: 2 2; 383 step: 2 2;
1266 max: 32 32; // XXX allow bigger sizes with more knob images 384 max: 32 32; // XXX allow bigger sizes with more knob images
1267 rel1.to: "elm.dragable.slider"; 385 rel1.to: "efl.dragable.slider";
1268 rel1.offset: -4 -4; 386 rel1.offset: -4 -4;
1269 rel2.to: "elm.dragable.slider"; 387 rel2.to: "efl.dragable.slider";
1270 rel2.offset: 3 3; 388 rel2.offset: 3 3;
1271 } 389 }
1272 description { state: "clicked" 0.0; 390 description { state: "clicked" 0.0;
@@ -1274,21 +392,22 @@ group { "efl/slider/vertical";
1274 } 392 }
1275 } 393 }
1276 part { name: "slideevent"; type: RECT; repeat_events: 1; 394 part { name: "slideevent"; type: RECT; repeat_events: 1;
395 nomouse;
1277 scale: 1; 396 scale: 1;
1278 ignore_flags: ON_HOLD; 397 ignore_flags: ON_HOLD;
1279 dragable.events: "elm.dragable.slider"; 398 dragable.events: "efl.dragable.slider";
1280 description { state: "default" 0.0; 399 description { state: "default" 0.0;
1281 fixed: 1 1; 400 fixed: 1 1;
1282 rel1.to: "elm.dragable.slider"; 401 rel1.to: "efl.dragable.slider";
1283 rel2.to: "elm.dragable.slider"; 402 rel2.to: "efl.dragable.slider";
1284 color: 0 0 0 0; 403 color: 0 0 0 0;
1285 } 404 }
1286 } 405 }
1287 part { name: "elm.track.slider"; type: SWALLOW; mouse_events: 0; 406 part { name: "efl.track.slider"; type: SWALLOW; mouse_events: 0;
1288 description { state: "default" 0.0; 407 description { state: "default" 0.0;
1289 max: 0 0; 408 max: 0 0;
1290 rel1.to: "elm.dragable.slider"; 409 rel1.to: "efl.dragable.slider";
1291 rel2.to: "elm.dragable.slider"; 410 rel2.to: "efl.dragable.slider";
1292 } 411 }
1293 } 412 }
1294 part { name: "event"; type: RECT; 413 part { name: "event"; type: RECT;
@@ -1304,118 +423,17 @@ group { "efl/slider/vertical";
1304 } 423 }
1305 programs { 424 programs {
1306 program { 425 program {
1307 signal: "mouse,down,1"; source: "elm.dragable.slider"; 426 signal: "mouse,down,1"; source: "efl.dragable.slider";
1308 action: STATE_SET "clicked" 0.0; 427 action: STATE_SET "clicked" 0.0;
1309 target: "knob"; 428 target: "knob";
1310 } 429 }
1311 program { 430 program {
1312 signal: "mouse,up,1"; source: "elm.dragable.slider"; 431 signal: "mouse,up,1"; source: "efl.dragable.slider";
1313 action: STATE_SET "default" 0.0; 432 action: STATE_SET "default" 0.0;
1314 target: "knob"; 433 target: "knob";
1315 } 434 }
1316 program { 435 program {
1317 signal: "elm,state,indicator,show"; source: "elm"; 436 signal: "efl,state,inverted,on"; source: "efl";
1318 action: SIGNAL_EMIT "elm,popup,show" "elm";
1319 after: "popup_show2";
1320 }
1321 program {
1322 signal: "elm,state,indicator,hide"; source: "elm";
1323 action: SIGNAL_EMIT "elm,popup,hide" "elm";
1324 after: "popup_hide2";
1325 }
1326 program {
1327 signal: "mouse,down,1"; source: "slideevent";
1328 action: SIGNAL_EMIT "elm,popup,show" "elm";
1329 after: "popup_show2";
1330 }
1331 program { name: "popup_show2";
1332 action: STATE_SET "hidden" 0.0;
1333 target: "button";
1334 }
1335 program {
1336 signal: "mouse,up,1"; source: "slideevent";
1337 action: SIGNAL_EMIT "elm,popup,hide" "elm";
1338 after: "popup_hide2";
1339 }
1340 program { name: "popup_hide2";
1341 action: STATE_SET "default" 0.0;
1342 target: "button";
1343 }
1344 program {
1345 signal: "elm,state,elm.text,set"; source: "elm";
1346 script {
1347 new m = get_int(slmode);
1348 m |= LABEL; set_int(slmode, m);
1349 eval_mode(m);
1350 }
1351 }
1352 program {
1353 signal: "elm,state,elm.text,unset"; source: "elm";
1354 script {
1355 new m = get_int(slmode);
1356 m &= ~LABEL; set_int(slmode, m);
1357 eval_mode(m);
1358 }
1359 }
1360 program {
1361 signal: "elm,state,icon,set"; source: "elm";
1362 script {
1363 new m = get_int(slmode);
1364 m |= ICON; set_int(slmode, m);
1365 eval_mode(m);
1366 }
1367 }
1368 program {
1369 signal: "elm,state,icon,unset"; source: "elm";
1370 script {
1371 new m = get_int(slmode);
1372 m &= ~ICON; set_int(slmode, m);
1373 eval_mode(m);
1374 }
1375 }
1376 program { name: "end_show";
1377 signal: "elm,state,end,visible"; source: "elm";
1378 script {
1379 new m = get_int(slmode);
1380 m |= END; set_int(slmode, m);
1381 eval_mode(m);
1382 }
1383 }
1384 program { name: "end_hide";
1385 signal: "elm,state,end,hidden"; source: "elm";
1386 script {
1387 new m = get_int(slmode);
1388 m &= ~END; set_int(slmode, m);
1389 eval_mode(m);
1390 }
1391 }
1392 program {
1393 signal: "elm,state,units,visible"; source: "elm";
1394 script {
1395 new m = get_int(slmode);
1396 m |= UNITS; set_int(slmode, m);
1397 eval_mode(m);
1398 }
1399 }
1400 program {
1401 signal: "elm,state,units,visible"; source: "elm";
1402 action: SIGNAL_EMIT "limits:limits,visible" "elm";
1403 }
1404 program {
1405 signal: "elm,state,units,hidden"; source: "elm";
1406 action: STATE_SET "default" 0.0;
1407 script {
1408 new m = get_int(slmode);
1409 m &= ~UNITS; set_int(slmode, m);
1410 eval_mode(m);
1411 }
1412 }
1413 program {
1414 signal: "elm,state,units,hidden"; source: "elm";
1415 action: SIGNAL_EMIT "limits:limits,hide" "elm";
1416 }
1417 program {
1418 signal: "elm,state,inverted,on"; source: "elm";
1419 script { 437 script {
1420 new m = get_int(slmode); 438 new m = get_int(slmode);
1421 m |= INVERT; set_int(slmode, m); 439 m |= INVERT; set_int(slmode, m);
@@ -1423,7 +441,7 @@ group { "efl/slider/vertical";
1423 } 441 }
1424 } 442 }
1425 program { 443 program {
1426 signal: "elm,state,inverted,off"; source: "elm"; 444 signal: "efl,state,inverted,off"; source: "efl";
1427 script { 445 script {
1428 new m = get_int(slmode); 446 new m = get_int(slmode);
1429 m &= ~INVERT; set_int(slmode, m); 447 m &= ~INVERT; set_int(slmode, m);
@@ -1431,7 +449,7 @@ group { "efl/slider/vertical";
1431 } 449 }
1432 } 450 }
1433 program { 451 program {
1434 signal: "elm,state,disabled"; source: "elm"; 452 signal: "efl,state,disabled"; source: "efl";
1435 script { 453 script {
1436 new m = get_int(slmode); 454 new m = get_int(slmode);
1437 m |= DISABLE; set_int(slmode, m); 455 m |= DISABLE; set_int(slmode, m);
@@ -1439,7 +457,7 @@ group { "efl/slider/vertical";
1439 } 457 }
1440 } 458 }
1441 program { 459 program {
1442 signal: "elm,state,enabled"; source: "elm"; 460 signal: "efl,state,enabled"; source: "efl";
1443 script { 461 script {
1444 new m = get_int(slmode); 462 new m = get_int(slmode);
1445 m &= ~DISABLE; set_int(slmode, m); 463 m &= ~DISABLE; set_int(slmode, m);
@@ -1447,10 +465,6 @@ group { "efl/slider/vertical";
1447 } 465 }
1448 } 466 }
1449 } 467 }
1450#undef ICON
1451#undef LABEL
1452#undef END
1453#undef UNITS
1454#undef MASK 468#undef MASK
1455#undef INVERT 469#undef INVERT
1456#undef DISABLE 470#undef DISABLE
@@ -1482,16 +496,10 @@ group { "efl/slider_interval/horizontal";
1482 image { image: "knob_sz_06.png" COMP; size: 13 13 14 14; } 496 image { image: "knob_sz_06.png" COMP; size: 13 13 14 14; }
1483 image { image: "knob_sz_04.png" COMP; size: 0 0 12 12; } 497 image { image: "knob_sz_04.png" COMP; size: 0 0 12 12; }
1484 } 498 }
1485#define ICON 1
1486#define LABEL 2
1487#define END 4
1488#define UNITS 8
1489#define MASK 15 499#define MASK 15
1490#define INVERT 16
1491#define DISABLE 32 500#define DISABLE 32
1492 script { 501 script {
1493 public slmode; 502 public slmode;
1494 public range;
1495 public g_timer_id; 503 public g_timer_id;
1496 public update_glow() 504 public update_glow()
1497 { 505 {
@@ -1502,35 +510,11 @@ group { "efl/slider_interval/horizontal";
1502 if(x2 < x1) 510 if(x2 < x1)
1503 set_state(PART:"glow", "range_reverse", 0.0); 511 set_state(PART:"glow", "range_reverse", 0.0);
1504 else 512 else
1505 set_state(PART:"glow", "range", 0.0); 513 set_state(PART:"glow", "default", 0.0);
1506 } 514 }
1507 public eval_mode(m) { 515 public eval_mode(m) {
1508 new ic = m & ICON;
1509 new l = m & LABEL;
1510 new e = m & END;
1511 new u = m & UNITS;
1512 new d = m & DISABLE; 516 new d = m & DISABLE;
1513 new i = m & INVERT; 517 if (d) {
1514 new r = get_int(range);
1515 if (!r) {
1516 if (i) {
1517 if (!d) {
1518 set_state(PART:"base", "default", 0.0);
1519 set_state(PART:"glow", "inverted", 0.0);
1520 } else {
1521 set_state(PART:"base", "disabled", 0.0);
1522 set_state(PART:"glow", "disabled_inverted", 0.0);
1523 }
1524 } else {
1525 if (!d) {
1526 set_state(PART:"base", "default", 0.0);
1527 set_state(PART:"glow", "default", 0.0);
1528 } else {
1529 set_state(PART:"base", "disabled", 0.0);
1530 set_state(PART:"glow", "disabled", 0.0);
1531 }
1532 }
1533 } else if (d) {
1534 new x1,y1,w1,h1; 518 new x1,y1,w1,h1;
1535 new x2,y2,w2,h2; 519 new x2,y2,w2,h2;
1536 get_geometry(PART:"knob", x1, y1, w1, h1); 520 get_geometry(PART:"knob", x1, y1, w1, h1);
@@ -1540,71 +524,31 @@ group { "efl/slider_interval/horizontal";
1540 set_state(PART:"glow", "disabled_range_reverse", 0.0); 524 set_state(PART:"glow", "disabled_range_reverse", 0.0);
1541 else 525 else
1542 set_state(PART:"glow", "disabled_range", 0.0); 526 set_state(PART:"glow", "disabled_range", 0.0);
1543
1544 }
1545 if (l) {
1546 if (!d) {
1547 set_state(PART:"elm.text", "visible", 0.0);
1548 } else {
1549 set_state(PART:"elm.text", "disabled_visible", 0.0);
1550 }
1551 } else {
1552 set_state(PART:"elm.text", "default", 0.0);
1553 }
1554 if (u) {
1555 if (!d) {
1556 set_state(PART:"elm.units", "visible", 0.0);
1557 set_state(PART:"limits", "visible", 0.0);
1558 } else {
1559 set_state(PART:"elm.units", "disabled_visible", 0.0);
1560 set_state(PART:"limits", "disabled_visible", 0.0);
1561 }
1562 } else {
1563 set_state(PART:"elm.units", "default", 0.0);
1564 set_state(PART:"limits", "default", 0.0);
1565 }
1566 if (ic) {
1567 set_state(PART:"elm.swallow.icon", "visible", 0.0);
1568 set_state(PART:"sizer.content", "visible", 0.0);
1569 } else {
1570 set_state(PART:"elm.swallow.icon", "default", 0.0);
1571 set_state(PART:"sizer.content", "default", 0.0);
1572 }
1573 if (e) {
1574 set_state(PART:"elm.swallow.end", "visible", 0.0);
1575 set_state(PART:"sizer.content.end", "visible", 0.0);
1576 } else {
1577 set_state(PART:"elm.swallow.end", "default", 0.0);
1578 set_state(PART:"sizer.content.end", "default", 0.0);
1579 } 527 }
1580 if (!d) { 528 if (!d) {
1581 set_state(PART:"event", "default", 0.0); 529 set_state(PART:"event", "default", 0.0);
1582 set_state(PART:"dis_clip", "default", 0.0);
1583 } else { 530 } else {
1584 set_state(PART:"event", "disabled", 0.0); 531 set_state(PART:"event", "disabled", 0.0);
1585 set_state(PART:"dis_clip", "disabled", 0.0);
1586 } 532 }
1587 } 533 }
1588 } 534 }
1589 parts { 535 parts {
1590 part { name: "elm.swallow.bar"; type: SWALLOW; 536 part { name: "efl.bar"; type: SWALLOW;
1591 scale: 1; 537 scale: 1;
1592 description { state: "default" 0.0; 538 description { state: "default" 0.0;
1593 min: 42 21; 539 min: 42 21;
1594 max: 99999 21; 540 max: 99999 21;
1595 align: 1.0 0.5; 541 align: 1.0 0.5;
1596 rel1.to_x: "elm.text"; 542 rel1.relative: 0.0 0.0;
1597 rel1.relative: 1.0 0.0;
1598 rel1.offset: 2 0; 543 rel1.offset: 2 0;
1599 rel2.to_x: "limits"; 544 rel2.relative: 1.0 1.0;
1600 rel2.relative: 0.0 1.0;
1601 rel2.offset: -3 -1; 545 rel2.offset: -3 -1;
1602 } 546 }
1603 } 547 }
1604 part { name: "base"; mouse_events: 0; 548 part { name: "base"; mouse_events: 0;
1605 description { state: "default" 0.0; 549 description { state: "default" 0.0;
1606 rel1.to: "elm.swallow.bar"; 550 rel1.to: "efl.bar";
1607 rel2.to: "elm.swallow.bar"; 551 rel2.to: "efl.bar";
1608 image.normal: "slider_run_base_horiz.png"; 552 image.normal: "slider_run_base_horiz.png";
1609 image.border: 4 4 0 0; 553 image.border: 4 4 0 0;
1610 fill.smooth: 0; 554 fill.smooth: 0;
@@ -1619,59 +563,31 @@ group { "efl/slider_interval/horizontal";
1619 } 563 }
1620 part { name: "glow"; mouse_events: 0; 564 part { name: "glow"; mouse_events: 0;
1621 description { state: "default" 0.0; 565 description { state: "default" 0.0;
1622 image.normal: "horiz_glow_run.png";
1623 rel1.offset: 1 1;
1624 rel1.to: "base";
1625 rel2.relative: 0.5 1.0;
1626 rel2.offset: -1 -2;
1627 rel2.to_x: "button";
1628 rel2.to_y: "base";
1629 image.border: 0 4 0 0;
1630 }
1631 description { state: "disabled" 0.0;
1632 inherit: "default" 0.0;
1633 color: 255 255 255 64;
1634 }
1635 description { state: "inverted" 0.0;
1636 image.normal: "horiz_glow_run_rev.png";
1637 rel1.relative: 0.5 0.0;
1638 rel1.offset: 0 1;
1639 rel1.to_x: "button";
1640 rel1.to_y: "base";
1641 rel2.offset: -2 -2;
1642 rel2.to: "base";
1643 image.border: 4 0 0 0;
1644 }
1645 description { state: "range" 0.0;
1646 image.normal: "horiz_glow_range.png"; 566 image.normal: "horiz_glow_range.png";
1647 rel1.relative: 0.5 1.0; 567 rel1.relative: 0.5 1.0;
1648 rel1.offset: -1 -2; 568 rel1.offset: -1 -2;
1649 rel1.to_x: "button"; 569 rel1.to_x: "efl.dragable.slider";
1650 rel1.to_y: "base"; 570 rel1.to_y: "base";
1651 rel2.relative: 0.5 1.0; 571 rel2.relative: 0.5 1.0;
1652 rel2.offset: -1 -2; 572 rel2.offset: -1 -2;
1653 rel2.to_x: "button2"; 573 rel2.to_x: "efl.dragable2.slider";
1654 rel2.to_y: "base"; 574 rel2.to_y: "base";
1655 fixed: 0 1; 575 fixed: 0 1;
1656 image.border: 0 4 0 0; 576 image.border: 0 4 0 0;
1657 } 577 }
1658 description { state: "disabled_range" 0.0; 578 description { state: "disabled_range" 0.0;
1659 inherit: "range" 0.0; 579 inherit: "default" 0.0;
1660 color: 255 255 255 64; 580 color: 255 255 255 64;
1661 } 581 }
1662 description { state: "range_reverse" 0.0; 582 description { state: "range_reverse" 0.0;
1663 inherit: "range" 0.0; 583 inherit: "default" 0.0;
1664 rel1.to_x: "button2"; 584 rel1.to_x: "efl.dragable2.slider";
1665 rel2.to_x: "button"; 585 rel2.to_x: "efl.dragable.slider";
1666 } 586 }
1667 description { state: "disabled_range_reverse" 0.0; 587 description { state: "disabled_range_reverse" 0.0;
1668 inherit: "range_reverse" 0.0; 588 inherit: "range_reverse" 0.0;
1669 color: 255 255 255 64; 589 color: 255 255 255 64;
1670 } 590 }
1671 description { state: "disabled_inverted" 0.0;
1672 inherit: "inverted" 0.0;
1673 color: 255 255 255 64;
1674 }
1675 } 591 }
1676 part { name: "bevel"; mouse_events: 0; 592 part { name: "bevel"; mouse_events: 0;
1677 description { state: "default" 0.0; 593 description { state: "default" 0.0;
@@ -1682,229 +598,34 @@ group { "efl/slider_interval/horizontal";
1682 fill.smooth: 0; 598 fill.smooth: 0;
1683 } 599 }
1684 } 600 }
1685 part { name: "dis_clip"; type: RECT; 601 part { name: "efl.dragable.slider"; type: RECT;
1686 description { state: "default" 0.0; 602 nomouse;
1687 rel1.to: "elm.swallow.icon";
1688 rel2.to: "elm.swallow.end";
1689 }
1690 description { state: "disabled" 0.0;
1691 inherit: "default" 0.0;
1692 color: 255 255 255 64;
1693 }
1694 }
1695 part { name: "elm.swallow.icon"; type: SWALLOW;
1696 clip_to: "dis_clip";
1697 required;
1698 description { state: "default" 0.0;
1699 visible: 0;
1700 align: 0.0 0.5;
1701 rel1.offset: 0 2;
1702 rel1.to_y: "elm.swallow.bar";
1703 rel2.offset: -1 -3;
1704 rel2.relative: 0.0 1.0;
1705 rel2.to_y: "elm.swallow.bar";
1706 fixed: 1 0;
1707 }
1708 description { state: "visible" 0.0;
1709 inherit: "default" 0.0;
1710 visible: 1;
1711 aspect: 1.0 1.0; aspect_preference: VERTICAL;
1712 rel1.offset: 2 2;
1713 rel2.offset: 2 -3;
1714 }
1715 }
1716 part { name: "sizer.content"; type: TEXT; mouse_events: 0;
1717 scale: 1;
1718 description { state: "default" 0.0;
1719 fixed: 1 1;
1720 visible: 0;
1721 text { font: FN; size: 10;
1722 min: 0 0;
1723 text_class: "slider_text";
1724 }
1725 }
1726 description { state: "visible" 0.0;
1727 inherit: "default" 0.0;
1728 rel1.to: "elm.swallow.icon";
1729 rel2.to: "elm.swallow.icon";
1730 text {
1731 min: 1 1;
1732 ellipsis: -1;
1733 text: "M";
1734 }
1735 }
1736 }
1737 part { name: "elm.text"; type: TEXT; mouse_events: 0;
1738 effect: SHADOW BOTTOM;
1739 scale: 1;
1740 required;
1741 description { state: "default" 0.0;
1742 fixed: 1 1;
1743 align: 0.0 0.5;
1744 rel1.to_x: "elm.swallow.icon";
1745 rel1.relative: 1.0 0.0;
1746 rel1.offset: -1 2;
1747 rel2.to_x: "elm.swallow.icon";
1748 rel2.relative: 1.0 1.0;
1749 rel2.offset: -1 -3;
1750 color: FN_COL_DEFAULT;
1751 color_class: "slider_text";
1752 text { font: FN; size: 10;
1753 text_class: "slider";
1754 min: 0 0;
1755 align: 0.0 0.5;
1756 }
1757 visible: 0;
1758 }
1759 description { state: "visible" 0.0;
1760 inherit: "default" 0.0;
1761 fixed: 1 0;
1762 visible: 1;
1763 rel1.offset: 2 2;
1764 rel2.offset: 2 -3;
1765 text.min: 1 1;
1766 text.ellipsis: -1;
1767 }
1768 description { state: "disabled_visible" 0.0;
1769 inherit: "visible" 0.0;
1770 color_class: "slider_text_disabled";
1771 color3: 255 255 255 255;
1772 }
1773 }
1774 part { name: "elm.swallow.end"; type: SWALLOW;
1775 clip_to: "dis_clip";
1776 description { state: "default" 0.0;
1777 visible: 0;
1778 align: 1.0 0.5;
1779 rel1.offset: 0 2;
1780 rel1.relative: 1.0 0.0;
1781 rel2.offset: -1 -3;
1782 fixed: 1 0;
1783 }
1784 description { state: "visible" 0.0;
1785 inherit: "default" 0.0;
1786 visible: 1;
1787 aspect: 1.0 1.0;
1788 aspect_preference: VERTICAL;
1789 rel1.offset: -3 2;
1790 rel2.offset: -3 -3;
1791 }
1792 }
1793 part { name: "sizer.content.end"; type: TEXT; mouse_events: 0;
1794 scale: 1;
1795 description { state: "default" 0.0;
1796 fixed: 1 1;
1797 visible: 0;
1798 text { font: FN; size: 10;
1799 min: 0 0;
1800 text_class: "slider_text";
1801 }
1802 }
1803 description { state: "visible" 0.0;
1804 inherit: "default" 0.0;
1805 rel1.to: "elm.swallow.end";
1806 rel2.to: "elm.swallow.end";
1807 text {
1808 min: 1 1;
1809 ellipsis: -1;
1810 text: "M";
1811 }
1812 }
1813 }
1814 alias: "elm.units.min" "limits:elm.units.min";
1815 alias: "elm.units.max" "limits:elm.units.max";
1816 part { name: "limits"; type: GROUP; mouse_events: 0;
1817 source: "efl/slider/hidden/limit";
1818 scale: 1;
1819 description { state: "default" 0.0;
1820 visible: 0;
1821 align: 1.0 0.5;
1822 min: SOURCE;
1823 fixed: 1 1;
1824 rel1.to_x: "elm.swallow.end";
1825 rel1.relative: 0.0 0.0;
1826 rel1.offset: 0 2;
1827 rel2.to_x: "elm.swallow.end";
1828 rel2.relative: 0.0 1.0;
1829 rel2.offset: -1 -3;
1830 }
1831 description { state: "visible" 0.0;
1832 inherit: "default" 0.0;
1833 rel1.offset: -3 2;
1834 rel2.offset: -3 -3;
1835 }
1836 description { state: "disabled_visible" 0.0;
1837 inherit: "default" 0.0;
1838 rel1.offset: -3 2;
1839 rel2.offset: -3 -3;
1840 color: 255 255 255 64;
1841 }
1842 }
1843 part { name: "elm.units"; type: TEXT; mouse_events: 0;
1844 effect: SHADOW BOTTOM;
1845 scale: 1;
1846 description { state: "default" 0.0;
1847 visible: 0;
1848 fixed: 1 1;
1849 rel1.to_x: "limits";
1850 rel2.to_x: "limits";
1851 color: FN_COL_DEFAULT;
1852 color_class: "slider_text";
1853 text { font: FN; size: 10;
1854 text_class: "slider";
1855 align: 1.0 0.5;
1856 min: 1 1;
1857 ellipsis: -1;
1858 }
1859 }
1860 description { state: "visible" 0.0;
1861 inherit: "default" 0.0;
1862 visible: 1;
1863 }
1864 description { state: "disabled_visible" 0.0;
1865 inherit: "visible" 0.0;
1866 color_class: "slider_text_disabled";
1867 color3: 255 255 255 255;
1868 }
1869 }
1870 part { name: "button"; type: GROUP; mouse_events: 0;
1871 source: "efl/slider_interval/horizontal/indicator";
1872 description { state: "default" 0.0;
1873 fixed: 1 1;
1874 rel1.to: "elm.dragable.slider";
1875 rel2.to: "elm.dragable.slider";
1876 }
1877 description { state: "hidden" 0.0;
1878 inherit: "default" 0.0;
1879 visible: 0;
1880 }
1881 }
1882 part { name: "elm.dragable.slider"; type: RECT;
1883 scale: 1; 603 scale: 1;
1884 dragable.x: 1 1 0; 604 dragable.x: 1 1 0;
1885 dragable.y: 0 0 0; 605 dragable.y: 0 0 0;
1886 dragable.confine: "elm.swallow.bar"; 606 dragable.confine: "efl.bar";
1887 description { state: "default" 0.0; 607 description { state: "default" 0.0;
1888 color: 0 0 0 0; 608 color: 0 0 0 0;
1889 min: 16 16; 609 min: 16 16;
1890 max: 16 16; 610 max: 16 16;
1891 fixed: 1 1; 611 fixed: 1 1;
1892 rel1.relative: 0.5 0.0; 612 rel1.relative: 0.5 0.0;
1893 rel1.to_x: "elm.swallow.bar"; 613 rel1.to_x: "efl.bar";
1894 rel2.relative: 0.5 1.0; 614 rel2.relative: 0.5 1.0;
1895 rel2.to_x: "elm.swallow.bar"; 615 rel2.to_x: "efl.bar";
1896 } 616 }
1897 } 617 }
1898 part { name: "knob"; 618 part { name: "knob";
619 nomouse;
1899 description { state: "default" 0.0; 620 description { state: "default" 0.0;
1900 image.normal: "knob"; 621 image.normal: "knob";
1901 fixed: 1 1; 622 fixed: 1 1;
1902 min: 12 12; 623 min: 12 12;
1903 step: 2 2; 624 step: 2 2;
1904 max: 32 32; // XXX allow bigger sizes with more knob images 625 max: 32 32; // XXX allow bigger sizes with more knob images
1905 rel1.to: "elm.dragable.slider"; 626 rel1.to: "efl.dragable.slider";
1906 rel1.offset: -4 -4; 627 rel1.offset: -4 -4;
1907 rel2.to: "elm.dragable.slider"; 628 rel2.to: "efl.dragable.slider";
1908 rel2.offset: 3 3; 629 rel2.offset: 3 3;
1909 } 630 }
1910 description { state: "clicked" 0.0; 631 description { state: "clicked" 0.0;
@@ -1912,108 +633,75 @@ group { "efl/slider_interval/horizontal";
1912 } 633 }
1913 } 634 }
1914 part { name: "slideevent"; type: RECT; repeat_events: 1; 635 part { name: "slideevent"; type: RECT; repeat_events: 1;
636 nomouse;
1915 scale: 1; 637 scale: 1;
1916 ignore_flags: ON_HOLD; 638 ignore_flags: ON_HOLD;
1917 dragable.events: "elm.dragable.slider"; 639 dragable.events: "efl.dragable.slider";
1918 description { state: "default" 0.0; 640 description { state: "default" 0.0;
1919 fixed: 1 1; 641 fixed: 1 1;
1920 rel1.to: "elm.dragable.slider"; 642 rel1.to: "efl.dragable.slider";
1921 rel2.to: "elm.dragable.slider"; 643 rel2.to: "efl.dragable.slider";
1922 color: 0 0 0 0; 644 color: 0 0 0 0;
1923 } 645 }
1924 } 646 }
1925 part { name: "elm.track.slider"; type: SWALLOW; mouse_events: 0; 647 part { name: "efl.track.slider"; type: SWALLOW; mouse_events: 0;
1926 description { state: "default" 0.0; 648 description { state: "default" 0.0;
1927 max: 0 0; 649 max: 0 0;
1928 rel1.to: "elm.dragable.slider"; 650 rel1.to: "efl.dragable.slider";
1929 rel2.to: "elm.dragable.slider"; 651 rel2.to: "efl.dragable.slider";
1930 } 652 }
1931 } 653 }
1932 part { name: "button2"; type: GROUP; mouse_events: 0; 654 part { name: "efl.dragable2.slider"; type: RECT;
1933 source: "efl/slider_interval/horizontal/indicator"; 655 nomouse;
1934 description { state: "default" 0.0;
1935 fixed: 1 1;
1936 rel1.to: "elm.dragable2.slider";
1937 rel2.to: "elm.dragable2.slider";
1938 visible: 0;
1939 }
1940 description { state: "show" 0.0;
1941 inherit: "default" 0.0;
1942 visible: 1;
1943 }
1944 description { state: "hidden" 0.0;
1945 inherit: "default" 0.0;
1946 visible: 0;
1947 }
1948 }
1949 part { name: "elm.dragable2.slider"; type: RECT;
1950 scale: 1; 656 scale: 1;
1951 dragable.x: 1 1 0; 657 dragable.x: 1 1 0;
1952 dragable.y: 0 0 0; 658 dragable.y: 0 0 0;
1953 dragable.confine: "elm.swallow.bar"; 659 dragable.confine: "efl.bar";
1954 description { state: "default" 0.0; 660 description { state: "default" 0.0;
1955 color: 0 0 0 0; 661 color: 0 0 0 0;
1956 min: 16 16; 662 min: 16 16;
1957 max: 16 16; 663 max: 16 16;
1958 fixed: 1 1; 664 fixed: 1 1;
1959 rel1.relative: 0.5 0.0; 665 rel1.relative: 0.5 0.0;
1960 rel1.to_x: "elm.swallow.bar"; 666 rel1.to_x: "efl.bar";
1961 rel2.relative: 0.5 1.0; 667 rel2.relative: 0.5 1.0;
1962 rel2.to_x: "elm.swallow.bar"; 668 rel2.to_x: "efl.bar";
1963 visible: 0;
1964 }
1965 description { state: "show" 0.0;
1966 inherit: "default" 0.0;
1967 visible: 1;
1968 } 669 }
1969 } 670 }
1970 part { name: "knob2"; 671 part { name: "knob2";
672 nomouse;
1971 description { state: "default" 0.0; 673 description { state: "default" 0.0;
1972 image.normal: "knob"; 674 image.normal: "knob";
1973 fixed: 1 1; 675 fixed: 1 1;
1974 min: 12 12; 676 min: 12 12;
1975 step: 2 2; 677 step: 2 2;
1976 max: 32 32; // XXX allow bigger sizes with more knob images 678 max: 32 32; // XXX allow bigger sizes with more knob images
1977 rel1.to: "elm.dragable2.slider"; 679 rel1.to: "efl.dragable2.slider";
1978 rel1.offset: -4 -4; 680 rel1.offset: -4 -4;
1979 rel2.to: "elm.dragable2.slider"; 681 rel2.to: "efl.dragable2.slider";
1980 rel2.offset: 3 3; 682 rel2.offset: 3 3;
1981 visible: 0;
1982 }
1983 description { state: "show" 0.0;
1984 inherit: "default" 0.0;
1985 visible: 1;
1986 } 683 }
1987 description { state: "clicked" 0.0; 684 description { state: "clicked" 0.0;
1988 inherit: "default" 0.0; 685 inherit: "default" 0.0;
1989 } 686 }
1990 } 687 }
1991 part { name: "slideevent2"; type: RECT; repeat_events: 1; 688 part { name: "slideevent2"; type: RECT; repeat_events: 1;
689 nomouse;
1992 scale: 1; 690 scale: 1;
1993 ignore_flags: ON_HOLD; 691 ignore_flags: ON_HOLD;
1994 dragable.events: "elm.dragable2.slider"; 692 dragable.events: "efl.dragable2.slider";
1995 description { state: "default" 0.0; 693 description { state: "default" 0.0;
1996 fixed: 1 1; 694 fixed: 1 1;
1997 rel1.to: "elm.dragable2.slider"; 695 rel1.to: "efl.dragable2.slider";
1998 rel2.to: "elm.dragable2.slider"; 696 rel2.to: "efl.dragable2.slider";
1999 color: 0 0 0 0; 697 color: 0 0 0 0;
2000 visible: 0;
2001 }
2002 description { state: "show" 0.0;
2003 inherit: "default" 0.0;
2004 visible: 1;
2005 } 698 }
2006 } 699 }
2007 part { name: "elm.track2.slider"; type: SWALLOW; mouse_events: 0; 700 part { name: "efl.track2.slider"; type: SWALLOW; mouse_events: 0;
2008 description { state: "default" 0.0; 701 description { state: "default" 0.0;
2009 max: 0 0; 702 max: 0 0;
2010 rel1.to: "elm.dragable2.slider"; 703 rel1.to: "efl.dragable2.slider";
2011 rel2.to: "elm.dragable2.slider"; 704 rel2.to: "efl.dragable2.slider";
2012 visible: 0;
2013 }
2014 description { state: "show" 0.0;
2015 inherit: "default" 0.0;
2016 visible: 1;
2017 } 705 }
2018 } 706 }
2019 part { name: "event"; type: RECT; 707 part { name: "event"; type: RECT;
@@ -2029,194 +717,24 @@ group { "efl/slider_interval/horizontal";
2029 } 717 }
2030 programs { 718 programs {
2031 program { 719 program {
2032 signal: "mouse,down,1"; source: "elm.dragable.slider"; 720 signal: "mouse,down,1"; source: "efl.dragable.slider";
2033 action: STATE_SET "clicked" 0.0; 721 action: STATE_SET "clicked" 0.0;
2034 target: "knob"; 722 target: "knob";
2035 } 723 }
2036 program { 724 program {
2037 signal: "mouse,up,1"; source: "elm.dragable.slider"; 725 signal: "mouse,up,1"; source: "efl.dragable.slider";
2038 action: STATE_SET "default" 0.0; 726 action: STATE_SET "default" 0.0;
2039 target: "knob"; 727 target: "knob";
2040 } 728 }
2041 program { 729 program {
2042 signal: "elm,slider,range,enable";
2043 source: "elm";
2044 script {
2045 set_int(range, 1);
2046 set_state(PART:"button2", "show", 0.0);
2047 set_state(PART:"elm.dragable2.slider", "show", 0.0);
2048 set_state(PART:"knob2", "show", 0.0);
2049 set_state(PART:"slideevent2", "show", 0.0);
2050 set_state(PART:"elm.track2.slider", "show", 0.0);
2051 update_glow();
2052 new m = get_int(slmode);
2053 eval_mode(m);
2054 }
2055 }
2056 program {
2057 signal: "elm,slider,range,disable";
2058 source: "elm";
2059 script {
2060 set_int(range, 0);
2061 set_state(PART:"button2", "default", 0.0);
2062 set_state(PART:"elm.dragable2.slider", "default", 0.0);
2063 set_state(PART:"knob2", "default", 0.0);
2064 set_state(PART:"slideevent2", "default", 0.0);
2065 set_state(PART:"elm.track2.slider", "default", 0.0);
2066 set_state(PART:"glow", "default", 0.0);
2067 new m = get_int(slmode);
2068 eval_mode(m);
2069 }
2070 }
2071 program {
2072 signal: "drag"; 730 signal: "drag";
2073 source: "elm.dragable*"; 731 source: "efl.dragable*";
2074 script { 732 script {
2075 new r; 733 update_glow();
2076 r = get_int(range);
2077 if (r)
2078 update_glow();
2079 } 734 }
2080 } 735 }
2081 program { 736 program {
2082 signal: "elm,state,indicator,show"; source: "elm"; 737 signal: "efl,state,disabled"; source: "efl";
2083 action: SIGNAL_EMIT "elm,popup,show" "elm";
2084 after: "popup_show2";
2085 }
2086 program {
2087 signal: "elm,state,indicator,hide"; source: "elm";
2088 action: SIGNAL_EMIT "elm,popup,hide" "elm";
2089 after: "popup_hide2";
2090 }
2091 program {
2092 signal: "mouse,down,1"; source: "slideevent";
2093 action: SIGNAL_EMIT "elm,popup,show" "elm";
2094 after: "popup_show2";
2095 }
2096 program { name: "popup_show2";
2097 action: STATE_SET "hidden" 0.0;
2098 target: "button";
2099 }
2100 program {
2101 signal: "mouse,up,1"; source: "slideevent";
2102 action: SIGNAL_EMIT "elm,popup,hide" "elm";
2103 after: "popup_hide2";
2104 }
2105 program { name: "popup_hide2";
2106 action: STATE_SET "default" 0.0;
2107 target: "button";
2108 }
2109 program {
2110 signal: "mouse,down,1"; source: "slideevent2";
2111 action: SIGNAL_EMIT "elm,popup,show" "elm";
2112 after: "popup2_show2";
2113 }
2114 program { name: "popup2_show2";
2115 action: STATE_SET "show" 0.0;
2116 target: "button2";
2117 }
2118 program {
2119 signal: "mouse,up,1"; source: "slideevent2";
2120 action: SIGNAL_EMIT "elm,popup,hide" "elm";
2121 after: "popup2_hide2";
2122 }
2123 program { name: "popup2_hide2";
2124 action: STATE_SET "hidden" 0.0;
2125 target: "button2";
2126 }
2127 program {
2128 signal: "elm,state,elm.text,set"; source: "elm";
2129 script {
2130 new m = get_int(slmode);
2131 m |= LABEL; set_int(slmode, m);
2132 eval_mode(m);
2133 }
2134 }
2135 program {
2136 signal: "elm,state,elm.text,unset"; source: "elm";
2137 script {
2138 new m = get_int(slmode);
2139 m &= ~LABEL; set_int(slmode, m);
2140 eval_mode(m);
2141 }
2142 }
2143 program {
2144 signal: "elm,state,icon,set"; source: "elm";
2145 script {
2146 new m = get_int(slmode);
2147 m |= ICON; set_int(slmode, m);
2148 eval_mode(m);
2149 }
2150 }
2151 program {
2152 signal: "elm,state,icon,unset"; source: "elm";
2153 script {
2154 new m = get_int(slmode);
2155 m &= ~ICON; set_int(slmode, m);
2156 eval_mode(m);
2157 }
2158 }
2159 program { name: "end_show";
2160 signal: "elm,state,end,visible"; source: "elm";
2161 script {
2162 new m = get_int(slmode);
2163 m |= END; set_int(slmode, m);
2164 eval_mode(m);
2165 }
2166 }
2167 program { name: "end_hide";
2168 signal: "elm,state,end,hidden"; source: "elm";
2169 script {
2170 new m = get_int(slmode);
2171 m &= ~END; set_int(slmode, m);
2172 eval_mode(m);
2173 }
2174 }
2175 program {
2176 signal: "elm,state,units,visible"; source: "elm";
2177 script {
2178 new m = get_int(slmode);
2179 m |= UNITS; set_int(slmode, m);
2180 eval_mode(m);
2181 }
2182 }
2183 program {
2184 signal: "elm,state,units,visible"; source: "elm";
2185 action: SIGNAL_EMIT "limits,visible" "elm";
2186 target: "limits";
2187 }
2188 program {
2189 signal: "elm,state,units,hidden"; source: "elm";
2190 action: STATE_SET "default" 0.0;
2191 script {
2192 new m = get_int(slmode);
2193 m &= ~UNITS; set_int(slmode, m);
2194 eval_mode(m);
2195 }
2196 }
2197 program {
2198 signal: "elm,state,units,hidden"; source: "elm";
2199 action: SIGNAL_EMIT "limits,hide" "elm";
2200 target: "limits";
2201 }
2202 program {
2203 signal: "elm,state,inverted,on"; source: "elm";
2204 script {
2205 new m = get_int(slmode);
2206 m |= INVERT; set_int(slmode, m);
2207 eval_mode(m);
2208 }
2209 }
2210 program {
2211 signal: "elm,state,inverted,off"; source: "elm";
2212 script {
2213 new m = get_int(slmode);
2214 m &= ~INVERT; set_int(slmode, m);
2215 eval_mode(m);
2216 }
2217 }
2218 program {
2219 signal: "elm,state,disabled"; source: "elm";
2220 script { 738 script {
2221 new m = get_int(slmode); 739 new m = get_int(slmode);
2222 m |= DISABLE; set_int(slmode, m); 740 m |= DISABLE; set_int(slmode, m);
@@ -2224,7 +742,7 @@ group { "efl/slider_interval/horizontal";
2224 } 742 }
2225 } 743 }
2226 program { 744 program {
2227 signal: "elm,state,enabled"; source: "elm"; 745 signal: "efl,state,enabled"; source: "efl";
2228 script { 746 script {
2229 new m = get_int(slmode); 747 new m = get_int(slmode);
2230 m &= ~DISABLE; set_int(slmode, m); 748 m &= ~DISABLE; set_int(slmode, m);
@@ -2232,12 +750,7 @@ group { "efl/slider_interval/horizontal";
2232 } 750 }
2233 } 751 }
2234 } 752 }
2235#undef ICON
2236#undef LABEL
2237#undef END
2238#undef UNITS
2239#undef MASK 753#undef MASK
2240#undef INVERT
2241#undef DISABLE 754#undef DISABLE
2242} 755}
2243 756
@@ -2265,16 +778,10 @@ group { "efl/slider_interval/vertical";
2265 image { image: "knob_sz_06.png" COMP; size: 13 13 14 14; } 778 image { image: "knob_sz_06.png" COMP; size: 13 13 14 14; }
2266 image { image: "knob_sz_04.png" COMP; size: 0 0 12 12; } 779 image { image: "knob_sz_04.png" COMP; size: 0 0 12 12; }
2267 } 780 }
2268#define ICON 1
2269#define LABEL 2
2270#define END 4
2271#define UNITS 8
2272#define MASK 15 781#define MASK 15
2273#define INVERT 16
2274#define DISABLE 32 782#define DISABLE 32
2275 script { 783 script {
2276 public slmode; 784 public slmode;
2277 public range;
2278 public g_timer_id; 785 public g_timer_id;
2279 public update_glow() 786 public update_glow()
2280 { 787 {
@@ -2285,35 +792,11 @@ group { "efl/slider_interval/vertical";
2285 if(y2 < y1) 792 if(y2 < y1)
2286 set_state(PART:"glow", "range_reverse", 0.0); 793 set_state(PART:"glow", "range_reverse", 0.0);
2287 else 794 else
2288 set_state(PART:"glow", "range", 0.0); 795 set_state(PART:"glow", "default", 0.0);
2289 } 796 }
2290 public eval_mode(m) { 797 public eval_mode(m) {
2291 new ic = m & ICON;
2292 new l = m & LABEL;
2293 new e = m & END;
2294 new u = m & UNITS;
2295 new d = m & DISABLE; 798 new d = m & DISABLE;
2296 new i = m & INVERT; 799 if (d) {
2297 new r = get_int(range);
2298 if (!r) {
2299 if (i) {
2300 if (!d) {
2301 set_state(PART:"base", "default", 0.0);
2302 set_state(PART:"glow", "inverted", 0.0);
2303 } else {
2304 set_state(PART:"base", "disabled", 0.0);
2305 set_state(PART:"glow", "disabled_inverted", 0.0);
2306 }
2307 } else {
2308 if (!d) {
2309 set_state(PART:"base", "default", 0.0);
2310 set_state(PART:"glow", "default", 0.0);
2311 } else {
2312 set_state(PART:"base", "disabled", 0.0);
2313 set_state(PART:"glow", "disabled", 0.0);
2314 }
2315 }
2316 } else if (d) {
2317 new x1,y1,w1,h1; 800 new x1,y1,w1,h1;
2318 new x2,y2,w2,h2; 801 new x2,y2,w2,h2;
2319 get_geometry(PART:"knob", x1, y1, w1, h1); 802 get_geometry(PART:"knob", x1, y1, w1, h1);
@@ -2324,69 +807,30 @@ group { "efl/slider_interval/vertical";
2324 else 807 else
2325 set_state(PART:"glow", "disabled_range", 0.0); 808 set_state(PART:"glow", "disabled_range", 0.0);
2326 } 809 }
2327 if (l) {
2328 if (!d) {
2329 set_state(PART:"elm.text", "visible", 0.0);
2330 } else {
2331 set_state(PART:"elm.text", "disabled_visible", 0.0);
2332 }
2333 } else {
2334 set_state(PART:"elm.text", "default", 0.0);
2335 }
2336 if (u) {
2337 if (!d) {
2338 set_state(PART:"elm.units", "visible", 0.0);
2339 set_state(PART:"limits", "visible", 0.0);
2340 } else {
2341 set_state(PART:"elm.units", "disabled_visible", 0.0);
2342 set_state(PART:"limits", "disabled_visible", 0.0);
2343 }
2344 } else {
2345 set_state(PART:"elm.units", "default", 0.0);
2346 set_state(PART:"limits", "default", 0.0);
2347 }
2348 if (ic) {
2349 set_state(PART:"elm.swallow.icon", "visible", 0.0);
2350 set_state(PART:"sizer.content", "visible", 0.0);
2351 } else {
2352 set_state(PART:"elm.swallow.icon", "default", 0.0);
2353 set_state(PART:"sizer.content", "default", 0.0);
2354 }
2355 if (e) {
2356 set_state(PART:"elm.swallow.end", "visible", 0.0);
2357 set_state(PART:"sizer.content.end", "visible", 0.0);
2358 } else {
2359 set_state(PART:"elm.swallow.end", "default", 0.0);
2360 set_state(PART:"sizer.content.end", "default", 0.0);
2361 }
2362 if (!d) { 810 if (!d) {
2363 set_state(PART:"event", "default", 0.0); 811 set_state(PART:"event", "default", 0.0);
2364 set_state(PART:"dis_clip", "default", 0.0);
2365 } else { 812 } else {
2366 set_state(PART:"event", "disabled", 0.0); 813 set_state(PART:"event", "disabled", 0.0);
2367 set_state(PART:"dis_clip", "disabled", 0.0);
2368 } 814 }
2369 } 815 }
2370 } 816 }
2371 parts { 817 parts {
2372 part { name: "elm.swallow.bar"; type: SWALLOW; 818 part { name: "efl.bar"; type: SWALLOW;
2373 scale: 1; 819 scale: 1;
2374 description { state: "default" 0.0; 820 description { state: "default" 0.0;
2375 min: 21 42; 821 min: 21 42;
2376 max: 21 99999; 822 max: 21 99999;
2377 align: 0.5 1.0; 823 align: 0.5 1.0;
2378 rel1.to_y: "elm.text"; 824 rel1.relative: 0.0 0.0;
2379 rel1.relative: 0.0 1.0;
2380 rel1.offset: 0 2; 825 rel1.offset: 0 2;
2381 rel2.to_y: "limits"; 826 rel2.relative: 1.0 1.0;
2382 rel2.relative: 1.0 0.0;
2383 rel2.offset: -1 -3; 827 rel2.offset: -1 -3;
2384 } 828 }
2385 } 829 }
2386 part { name: "base"; mouse_events: 0; 830 part { name: "base"; mouse_events: 0;
2387 description { state: "default" 0.0; 831 description { state: "default" 0.0;
2388 rel1.to: "elm.swallow.bar"; 832 rel1.to: "efl.bar";
2389 rel2.to: "elm.swallow.bar"; 833 rel2.to: "efl.bar";
2390 image.normal: "slider_run_base_vert.png"; 834 image.normal: "slider_run_base_vert.png";
2391 image.border: 0 0 4 4; 835 image.border: 0 0 4 4;
2392 fill.smooth: 0; 836 fill.smooth: 0;
@@ -2401,59 +845,31 @@ group { "efl/slider_interval/vertical";
2401 } 845 }
2402 part { name: "glow"; mouse_events: 0; 846 part { name: "glow"; mouse_events: 0;
2403 description { state: "default" 0.0; 847 description { state: "default" 0.0;
2404 image.normal: "vert_glow_run.png";
2405 rel1.offset: 1 1;
2406 rel1.to: "base";
2407 rel2.relative: 1.0 0.5;
2408 rel2.offset: -2 -1;
2409 rel2.to_y: "button";
2410 rel2.to_x: "base";
2411 image.border: 0 0 0 4;
2412 }
2413 description { state: "disabled" 0.0;
2414 inherit: "default" 0.0;
2415 color: 255 255 255 64;
2416 }
2417 description { state: "inverted" 0.0;
2418 image.normal: "vert_glow_run_rev.png";
2419 rel1.relative: 0.0 0.5;
2420 rel1.offset: 1 0;
2421 rel1.to_y: "button";
2422 rel1.to_x: "base";
2423 rel2.offset: -2 -2;
2424 rel2.to: "base";
2425 image.border: 0 0 4 0;
2426 }
2427 description { state: "range" 0.0;
2428 image.normal: "vert_glow_range.png"; 848 image.normal: "vert_glow_range.png";
2429 rel1.relative: 0.5 1.0; 849 rel1.relative: 0.5 1.0;
2430 rel1.offset: -1 -2; 850 rel1.offset: -1 -2;
2431 rel1.to_x: "base"; 851 rel1.to_x: "base";
2432 rel1.to_y: "button"; 852 rel1.to_y: "efl.dragable.slider";
2433 rel2.relative: 0.5 1.0; 853 rel2.relative: 0.5 1.0;
2434 rel2.offset: -1 -2; 854 rel2.offset: -1 -2;
2435 rel2.to_x: "base"; 855 rel2.to_x: "base";
2436 rel2.to_y: "button2"; 856 rel2.to_y: "efl.dragable2.slider";
2437 fixed: 1 0; 857 fixed: 1 0;
2438 image.border: 0 4 0 0; 858 image.border: 0 4 0 0;
2439 } 859 }
2440 description { state: "disabled_range" 0.0; 860 description { state: "disabled_range" 0.0;
2441 inherit: "range" 0.0; 861 inherit: "default" 0.0;
2442 color: 255 255 255 64; 862 color: 255 255 255 64;
2443 } 863 }
2444 description { state: "range_reverse" 0.0; 864 description { state: "range_reverse" 0.0;
2445 inherit: "range" 0.0; 865 inherit: "default" 0.0;
2446 rel1.to_y: "button2"; 866 rel1.to_y: "efl.dragable2.slider";
2447 rel2.to_y: "button"; 867 rel2.to_y: "efl.dragable.slider";
2448 } 868 }
2449 description { state: "disabled_range_reverse" 0.0; 869 description { state: "disabled_range_reverse" 0.0;
2450 inherit: "range_reverse" 0.0; 870 inherit: "range_reverse" 0.0;
2451 color: 255 255 255 64; 871 color: 255 255 255 64;
2452 } 872 }
2453 description { state: "disabled_inverted" 0.0;
2454 inherit: "inverted" 0.0;
2455 color: 255 255 255 64;
2456 }
2457 } 873 }
2458 part { name: "bevel"; mouse_events: 0; 874 part { name: "bevel"; mouse_events: 0;
2459 description { state: "default" 0.0; 875 description { state: "default" 0.0;
@@ -2464,232 +880,34 @@ group { "efl/slider_interval/vertical";
2464 fill.smooth: 0; 880 fill.smooth: 0;
2465 } 881 }
2466 } 882 }
2467 part { name: "dis_clip"; type: RECT; 883 part { name: "efl.dragable.slider"; type: RECT;
2468 description { state: "default" 0.0; 884 nomouse;
2469 rel1.to: "elm.swallow.icon";
2470 rel2.to: "elm.swallow.end";
2471 }
2472 description { state: "disabled" 0.0;
2473 inherit: "default" 0.0;
2474 color: 255 255 255 64;
2475 }
2476 }
2477 part { name: "elm.swallow.icon"; type: SWALLOW;
2478 clip_to: "dis_clip";
2479 required;
2480 description { state: "default" 0.0;
2481 visible: 0;
2482 align: 0.5 0.0;
2483 rel1.offset: 2 0;
2484 rel1.to_x: "elm.swallow.bar";
2485 rel2.offset: -3 -1;
2486 rel2.relative: 1.0 0.0;
2487 rel2.to_x: "elm.swallow.bar";
2488 fixed: 0 1;
2489 }
2490 description { state: "visible" 0.0;
2491 inherit: "default" 0.0;
2492 visible: 1;
2493 aspect: 1.0 1.0; aspect_preference: VERTICAL;
2494 rel1.offset: 2 2;
2495 rel2.offset: -3 2;
2496 }
2497 }
2498 part { name: "sizer.content"; type: TEXT; mouse_events: 0;
2499 scale: 1;
2500 description { state: "default" 0.0;
2501 fixed: 1 1;
2502 visible: 0;
2503 text { font: FN; size: 10;
2504 min: 0 0;
2505 text_class: "slider_text";
2506 }
2507 }
2508 description { state: "visible" 0.0;
2509 inherit: "default" 0.0;
2510 rel1.to: "elm.swallow.icon";
2511 rel2.to: "elm.swallow.icon";
2512 text {
2513 min: 1 1;
2514 ellipsis: -1;
2515 text: "M";
2516 }
2517 }
2518 }
2519 part { name: "elm.text"; type: TEXT; mouse_events: 0;
2520 effect: SHADOW BOTTOM;
2521 scale: 1;
2522 required;
2523 description { state: "default" 0.0;
2524 fixed: 0 1;
2525 align: 0.5 0.0;
2526 rel1.to_y: "elm.swallow.icon";
2527 rel1.relative: 0.0 1.0;
2528 rel1.offset: 2 -1;
2529 rel2.to_y: "elm.swallow.icon";
2530 rel2.relative: 1.0 1.0;
2531 rel2.offset: -3 -1;
2532 color: FN_COL_DEFAULT;
2533 color_class: "slider_text";
2534 text { font: FN; size: 10;
2535 text_class: "slider";
2536 min: 1 0;
2537 ellipsis: -1;
2538 align: 0.5 0.0;
2539 }
2540 visible: 0;
2541 }
2542 description { state: "visible" 0.0;
2543 inherit: "default" 0.0;
2544 visible: 1;
2545 rel1.offset: 2 2;
2546 rel2.offset: -3 2;
2547 text.min: 1 1;
2548 text.ellipsis: -1;
2549
2550 }
2551 description { state: "disabled_visible" 0.0;
2552 inherit: "visible" 0.0;
2553 color_class: "slider_text_disabled";
2554 color3: 255 255 255 255;
2555 }
2556 }
2557 part { name: "elm.swallow.end"; type: SWALLOW;
2558 clip_to: "dis_clip";
2559 description { state: "default" 0.0;
2560 visible: 0;
2561 align: 0.5 1.0;
2562 rel1.offset: 2 0;
2563 rel1.relative: 0.0 1.0;
2564 rel2.offset: -3 -1;
2565 fixed: 0 1;
2566 }
2567 description { state: "visible" 0.0;
2568 inherit: "default" 0.0;
2569 visible: 1;
2570 aspect: 1.0 1.0;
2571 aspect_preference: VERTICAL;
2572 rel2.offset: 2 -3;
2573 rel2.offset: -3 -3;
2574 }
2575 }
2576 part { name: "sizer.content.end"; type: TEXT; mouse_events: 0;
2577 scale: 1;
2578 description { state: "default" 0.0;
2579 fixed: 1 1;
2580 visible: 0;
2581 text { font: FN; size: 10;
2582 min: 0 0;
2583 text_class: "slider_text";
2584 }
2585 }
2586 description { state: "visible" 0.0;
2587 inherit: "default" 0.0;
2588 rel1.to: "elm.swallow.end";
2589 rel2.to: "elm.swallow.end";
2590 text {
2591 min: 1 1;
2592 ellipsis: -1;
2593 text: "M";
2594 }
2595 }
2596 }
2597 alias: "elm.units.min" "limits:elm.units.min";
2598 alias: "elm.units.max" "limits:elm.units.max";
2599 part { name: "limits"; type: GROUP; mouse_events: 0;
2600 source: "efl/slider/hidden/limit";
2601 scale: 1;
2602 description { state: "default" 0.0;
2603 align: 0.5 1.0;
2604 fixed: 1 1;
2605 max: 0 0;
2606 rel1.to_y: "elm.swallow.end";
2607 rel1.relative: 0.0 0.0;
2608 rel1.offset: 2 1;
2609 rel2.to_y: "elm.swallow.end";
2610 rel2.relative: 1.0 0.0;
2611 rel2.offset: -3 0;
2612 }
2613 description { state: "visible" 0.0;
2614 inherit: "default" 0.0;
2615 min: SOURCE;
2616 rel1.offset: 2 -3;
2617 rel2.offset: -3 -3;
2618 }
2619 description { state: "disabled_visible" 0.0;
2620 inherit: "default" 0.0;
2621 rel1.offset: -3 2;
2622 rel2.offset: -3 -3;
2623 color: 255 255 255 64;
2624 }
2625 }
2626 part { name: "elm.units"; type: TEXT; mouse_events: 0;
2627 effect: SHADOW BOTTOM;
2628 scale: 1;
2629 description { state: "default" 0.0;
2630 visible: 0;
2631 fixed: 1 1;
2632 rel1.to_y: "limits";
2633 rel2.to_y: "limits";
2634 color: FN_COL_DEFAULT;
2635 color_class: "slider_text";
2636 text { font: FN; size: 10;
2637 text_class: "slider";
2638 min: 0 0;
2639 align: 0.5 1.0;
2640 ellipsis: -1;
2641 }
2642 }
2643 description { state: "visible" 0.0;
2644 inherit: "default" 0.0;
2645 visible: 1;
2646 text.min: 1 1;
2647 text.ellipsis: -1;
2648 }
2649 description { state: "disabled_visible" 0.0;
2650 inherit: "visible" 0.0;
2651 color_class: "slider_text_disabled";
2652 color3: 255 255 255 255;
2653 }
2654 }
2655 part { name: "button"; type: GROUP; mouse_events: 0;
2656 source: "efl/slider_interval/vertical/indicator";
2657 description { state: "default" 0.0;
2658 fixed: 1 1;
2659 rel1.to: "elm.dragable.slider";
2660 rel2.to: "elm.dragable.slider";
2661 }
2662 description { state: "hidden" 0.0;
2663 inherit: "default" 0.0;
2664 visible: 0;
2665 }
2666 }
2667 part { name: "elm.dragable.slider"; type: RECT;
2668 scale: 1; 885 scale: 1;
2669 dragable.x: 0 0 0; 886 dragable.x: 0 0 0;
2670 dragable.y: 1 1 0; 887 dragable.y: 1 1 0;
2671 dragable.confine: "elm.swallow.bar"; 888 dragable.confine: "efl.bar";
2672 description { state: "default" 0.0; 889 description { state: "default" 0.0;
2673 color: 0 0 0 0; 890 color: 0 0 0 0;
2674 min: 16 16; 891 min: 16 16;
2675 max: 16 16; 892 max: 16 16;
2676 fixed: 1 1; 893 fixed: 1 1;
2677 rel1.relative: 0.0 0.5; 894 rel1.relative: 0.0 0.5;
2678 rel1.to_x: "elm.swallow.bar"; 895 rel1.to_x: "efl.bar";
2679 rel2.relative: 1.0 0.5; 896 rel2.relative: 1.0 0.5;
2680 rel2.to_x: "elm.swallow.bar"; 897 rel2.to_x: "efl.bar";
2681 } 898 }
2682 } 899 }
2683 part { name: "knob"; 900 part { name: "knob";
901 nomouse;
2684 description { state: "default" 0.0; 902 description { state: "default" 0.0;
2685 image.normal: "knob"; 903 image.normal: "knob";
2686 fixed: 1 1; 904 fixed: 1 1;
2687 min: 12 12; 905 min: 12 12;
2688 step: 2 2; 906 step: 2 2;
2689 max: 32 32; // XXX allow bigger sizes with more knob images 907 max: 32 32; // XXX allow bigger sizes with more knob images
2690 rel1.to: "elm.dragable.slider"; 908 rel1.to: "efl.dragable.slider";
2691 rel1.offset: -4 -4; 909 rel1.offset: -4 -4;
2692 rel2.to: "elm.dragable.slider"; 910 rel2.to: "efl.dragable.slider";
2693 rel2.offset: 3 3; 911 rel2.offset: 3 3;
2694 } 912 }
2695 description { state: "clicked" 0.0; 913 description { state: "clicked" 0.0;
@@ -2697,108 +915,75 @@ group { "efl/slider_interval/vertical";
2697 } 915 }
2698 } 916 }
2699 part { name: "slideevent"; type: RECT; repeat_events: 1; 917 part { name: "slideevent"; type: RECT; repeat_events: 1;
918 nomouse;
2700 scale: 1; 919 scale: 1;
2701 ignore_flags: ON_HOLD; 920 ignore_flags: ON_HOLD;
2702 dragable.events: "elm.dragable.slider"; 921 dragable.events: "efl.dragable.slider";
2703 description { state: "default" 0.0; 922 description { state: "default" 0.0;
2704 fixed: 1 1; 923 fixed: 1 1;
2705 rel1.to: "elm.dragable.slider"; 924 rel1.to: "efl.dragable.slider";
2706 rel2.to: "elm.dragable.slider"; 925 rel2.to: "efl.dragable.slider";
2707 color: 0 0 0 0; 926 color: 0 0 0 0;
2708 } 927 }
2709 } 928 }
2710 part { name: "elm.track.slider"; type: SWALLOW; mouse_events: 0; 929 part { name: "efl.track.slider"; type: SWALLOW; mouse_events: 0;
2711 description { state: "default" 0.0; 930 description { state: "default" 0.0;
2712 max: 0 0; 931 max: 0 0;
2713 rel1.to: "elm.dragable.slider"; 932 rel1.to: "efl.dragable.slider";
2714 rel2.to: "elm.dragable.slider"; 933 rel2.to: "efl.dragable.slider";
2715 } 934 }
2716 } 935 }
2717 part { name: "button2"; type: GROUP; mouse_events: 0; 936 part { name: "efl.dragable2.slider"; type: RECT;
2718 source: "efl/slider_interval/vertical/indicator"; 937 nomouse;
2719 description { state: "default" 0.0;
2720 fixed: 1 1;
2721 rel1.to: "elm.dragable2.slider";
2722 rel2.to: "elm.dragable2.slider";
2723 visible: 0;
2724 }
2725 description { state: "hidden" 0.0;
2726 inherit: "default" 0.0;
2727 visible: 0;
2728 }
2729 description { state: "show" 0.0;
2730 inherit: "default" 0.0;
2731 visible: 1;
2732 }
2733 }
2734 part { name: "elm.dragable2.slider"; type: RECT;
2735 scale: 1; 938 scale: 1;
2736 dragable.x: 0 0 0; 939 dragable.x: 0 0 0;
2737 dragable.y: 1 1 0; 940 dragable.y: 1 1 0;
2738 dragable.confine: "elm.swallow.bar"; 941 dragable.confine: "efl.bar";
2739 description { state: "default" 0.0; 942 description { state: "default" 0.0;
2740 color: 0 0 0 0; 943 color: 0 0 0 0;
2741 min: 16 16; 944 min: 16 16;
2742 max: 16 16; 945 max: 16 16;
2743 fixed: 1 1; 946 fixed: 1 1;
2744 rel1.relative: 0.0 0.5; 947 rel1.relative: 0.0 0.5;
2745 rel1.to_x: "elm.swallow.bar"; 948 rel1.to_x: "efl.bar";
2746 rel2.relative: 1.0 0.5; 949 rel2.relative: 1.0 0.5;
2747 rel2.to_x: "elm.swallow.bar"; 950 rel2.to_x: "efl.bar";
2748 visible: 0;
2749 }
2750 description { state: "show" 0.0;
2751 inherit: "default" 0.0;
2752 visible: 1;
2753 } 951 }
2754 } 952 }
2755 part { name: "knob2"; 953 part { name: "knob2";
954 nomouse;
2756 description { state: "default" 0.0; 955 description { state: "default" 0.0;
2757 image.normal: "knob"; 956 image.normal: "knob";
2758 fixed: 1 1; 957 fixed: 1 1;
2759 min: 12 12; 958 min: 12 12;
2760 step: 2 2; 959 step: 2 2;
2761 max: 32 32; // XXX allow bigger sizes with more knob images 960 max: 32 32; // XXX allow bigger sizes with more knob images
2762 rel1.to: "elm.dragable2.slider"; 961 rel1.to: "efl.dragable2.slider";
2763 rel1.offset: -4 -4; 962 rel1.offset: -4 -4;
2764 rel2.to: "elm.dragable2.slider"; 963 rel2.to: "efl.dragable2.slider";
2765 rel2.offset: 3 3; 964 rel2.offset: 3 3;
2766 visible: 0;
2767 }
2768 description { state: "show" 0.0;
2769 inherit: "default" 0.0;
2770 visible: 1;
2771 } 965 }
2772 description { state: "clicked" 0.0; 966 description { state: "clicked" 0.0;
2773 inherit: "default" 0.0; 967 inherit: "default" 0.0;
2774 } 968 }
2775 } 969 }
2776 part { name: "slideevent2"; type: RECT; repeat_events: 1; 970 part { name: "slideevent2"; type: RECT; repeat_events: 1;
971 nomouse;
2777 scale: 1; 972 scale: 1;
2778 ignore_flags: ON_HOLD; 973 ignore_flags: ON_HOLD;
2779 dragable.events: "elm.dragable2.slider"; 974 dragable.events: "efl.dragable2.slider";
2780 description { state: "default" 0.0; 975 description { state: "default" 0.0;
2781 fixed: 1 1; 976 fixed: 1 1;
2782 rel1.to: "elm.dragable2.slider"; 977 rel1.to: "efl.dragable2.slider";
2783 rel2.to: "elm.dragable2.slider"; 978 rel2.to: "efl.dragable2.slider";
2784 color: 0 0 0 0; 979 color: 0 0 0 0;
2785 visible: 0;
2786 }
2787 description { state: "show" 0.0;
2788 inherit: "default" 0.0;
2789 visible: 1;
2790 } 980 }
2791 } 981 }
2792 part { name: "elm.track2.slider"; type: SWALLOW; mouse_events: 0; 982 part { name: "efl.track2.slider"; type: SWALLOW; mouse_events: 0;
2793 description { state: "default" 0.0; 983 description { state: "default" 0.0;
2794 max: 0 0; 984 max: 0 0;
2795 rel1.to: "elm.dragable2.slider"; 985 rel1.to: "efl.dragable2.slider";
2796 rel2.to: "elm.dragable2.slider"; 986 rel2.to: "efl.dragable2.slider";
2797 visible: 0;
2798 }
2799 description { state: "show" 0.0;
2800 inherit: "default" 0.0;
2801 visible: 1;
2802 } 987 }
2803 } 988 }
2804 part { name: "event"; type: RECT; 989 part { name: "event"; type: RECT;
@@ -2814,192 +999,24 @@ group { "efl/slider_interval/vertical";
2814 } 999 }
2815 programs { 1000 programs {
2816 program { 1001 program {
2817 signal: "mouse,down,1"; source: "elm.dragable.slider"; 1002 signal: "mouse,down,1"; source: "efl.dragable.slider";
2818 action: STATE_SET "clicked" 0.0; 1003 action: STATE_SET "clicked" 0.0;
2819 target: "knob"; 1004 target: "knob";
2820 } 1005 }
2821 program { 1006 program {
2822 signal: "mouse,up,1"; source: "elm.dragable.slider"; 1007 signal: "mouse,up,1"; source: "efl.dragable.slider";
2823 action: STATE_SET "default" 0.0; 1008 action: STATE_SET "default" 0.0;
2824 target: "knob"; 1009 target: "knob";
2825 } 1010 }
2826 program { 1011 program {
2827 signal: "elm,slider,range,enable";
2828 source: "elm";
2829 script {
2830 set_int(range, 1);
2831 set_state(PART:"button2", "show", 0.0);
2832 set_state(PART:"elm.dragable2.slider", "show", 0.0);
2833 set_state(PART:"knob2", "show", 0.0);
2834 set_state(PART:"slideevent2", "show", 0.0);
2835 set_state(PART:"elm.track2.slider", "show", 0.0);
2836 update_glow();
2837 new m = get_int(slmode);
2838 eval_mode(m);
2839 }
2840 }
2841 program {
2842 signal: "elm,slider,range,disable";
2843 source: "elm";
2844 script {
2845 set_int(range, 0);
2846 set_state(PART:"button2", "default", 0.0);
2847 set_state(PART:"elm.dragable2.slider", "default", 0.0);
2848 set_state(PART:"knob2", "default", 0.0);
2849 set_state(PART:"slideevent2", "default", 0.0);
2850 set_state(PART:"elm.track2.slider", "default", 0.0);
2851 set_state(PART:"glow", "default", 0.0);
2852 new m = get_int(slmode);
2853 eval_mode(m);
2854 }
2855 }
2856 program {
2857 signal: "drag"; 1012 signal: "drag";
2858 source: "elm.dragable*"; 1013 source: "efl.dragable*";
2859 script { 1014 script {
2860 new r; 1015 update_glow();
2861 r = get_int(range);
2862 if (r)
2863 update_glow();
2864 } 1016 }
2865 } 1017 }
2866 program { 1018 program {
2867 signal: "elm,state,indicator,show"; source: "elm"; 1019 signal: "efl,state,disabled"; source: "efl";
2868 action: SIGNAL_EMIT "elm,popup,show" "elm";
2869 after: "popup_show2";
2870 }
2871 program {
2872 signal: "elm,state,indicator,hide"; source: "elm";
2873 action: SIGNAL_EMIT "elm,popup,hide" "elm";
2874 after: "popup_hide2";
2875 }
2876 program {
2877 signal: "mouse,down,1"; source: "slideevent";
2878 action: SIGNAL_EMIT "elm,popup,show" "elm";
2879 after: "popup_show2";
2880 }
2881 program { name: "popup_show2";
2882 action: STATE_SET "hidden" 0.0;
2883 target: "button";
2884 }
2885 program {
2886 signal: "mouse,up,1"; source: "slideevent";
2887 action: SIGNAL_EMIT "elm,popup,hide" "elm";
2888 after: "popup_hide2";
2889 }
2890 program { name: "popup_hide2";
2891 action: STATE_SET "default" 0.0;
2892 target: "button";
2893 }
2894 program {
2895 signal: "mouse,down,1"; source: "slideevent2";
2896 action: SIGNAL_EMIT "elm,popup,show" "elm";
2897 after: "popup2_show2";
2898 }
2899 program { name: "popup2_show2";
2900 action: STATE_SET "show" 0.0;
2901 target: "button2";
2902 }
2903 program {
2904 signal: "mouse,up,1"; source: "slideevent2";
2905 action: SIGNAL_EMIT "elm,popup,hide" "elm";
2906 after: "popup2_hide2";
2907 }
2908 program { name: "popup2_hide2";
2909 action: STATE_SET "hidden" 0.0;
2910 target: "button2";
2911 }
2912 program {
2913 signal: "elm,state,elm.text,set"; source: "elm";
2914 script {
2915 new m = get_int(slmode);
2916 m |= LABEL; set_int(slmode, m);
2917 eval_mode(m);
2918 }
2919 }
2920 program {
2921 signal: "elm,state,elm.text,unset"; source: "elm";
2922 script {
2923 new m = get_int(slmode);
2924 m &= ~LABEL; set_int(slmode, m);
2925 eval_mode(m);
2926 }
2927 }
2928 program {
2929 signal: "elm,state,icon,set"; source: "elm";
2930 script {
2931 new m = get_int(slmode);
2932 m |= ICON; set_int(slmode, m);
2933 eval_mode(m);
2934 }
2935 }
2936 program {
2937 signal: "elm,state,icon,unset"; source: "elm";
2938 script {
2939 new m = get_int(slmode);
2940 m &= ~ICON; set_int(slmode, m);
2941 eval_mode(m);
2942 }
2943 }
2944 program { name: "end_show";
2945 signal: "elm,state,end,visible"; source: "elm";
2946 script {
2947 new m = get_int(slmode);
2948 m |= END; set_int(slmode, m);
2949 eval_mode(m);
2950 }
2951 }
2952 program { name: "end_hide";
2953 signal: "elm,state,end,hidden"; source: "elm";
2954 script {
2955 new m = get_int(slmode);
2956 m &= ~END; set_int(slmode, m);
2957 eval_mode(m);
2958 }
2959 }
2960 program {
2961 signal: "elm,state,units,visible"; source: "elm";
2962 script {
2963 new m = get_int(slmode);
2964 m |= UNITS; set_int(slmode, m);
2965 eval_mode(m);
2966 }
2967 }
2968 program {
2969 signal: "elm,state,units,visible"; source: "elm";
2970 action: SIGNAL_EMIT "limits:limits,visible" "elm";
2971 }
2972 program {
2973 signal: "elm,state,units,hidden"; source: "elm";
2974 action: STATE_SET "default" 0.0;
2975 script {
2976 new m = get_int(slmode);
2977 m &= ~UNITS; set_int(slmode, m);
2978 eval_mode(m);
2979 }
2980 }
2981 program {
2982 signal: "elm,state,units,hidden"; source: "elm";
2983 action: SIGNAL_EMIT "limits:limits,hide" "elm";
2984 }
2985 program {
2986 signal: "elm,state,inverted,on"; source: "elm";
2987 script {
2988 new m = get_int(slmode);
2989 m |= INVERT; set_int(slmode, m);
2990 eval_mode(m);
2991 }
2992 }
2993 program {
2994 signal: "elm,state,inverted,off"; source: "elm";
2995 script {
2996 new m = get_int(slmode);
2997 m &= ~INVERT; set_int(slmode, m);
2998 eval_mode(m);
2999 }
3000 }
3001 program {
3002 signal: "elm,state,disabled"; source: "elm";
3003 script { 1020 script {
3004 new m = get_int(slmode); 1021 new m = get_int(slmode);
3005 m |= DISABLE; set_int(slmode, m); 1022 m |= DISABLE; set_int(slmode, m);
@@ -3007,7 +1024,7 @@ group { "efl/slider_interval/vertical";
3007 } 1024 }
3008 } 1025 }
3009 program { 1026 program {
3010 signal: "elm,state,enabled"; source: "elm"; 1027 signal: "efl,state,enabled"; source: "efl";
3011 script { 1028 script {
3012 new m = get_int(slmode); 1029 new m = get_int(slmode);
3013 m &= ~DISABLE; set_int(slmode, m); 1030 m &= ~DISABLE; set_int(slmode, m);
@@ -3015,11 +1032,6 @@ group { "efl/slider_interval/vertical";
3015 } 1032 }
3016 } 1033 }
3017 } 1034 }
3018#undef ICON
3019#undef LABEL
3020#undef END
3021#undef UNITS
3022#undef MASK 1035#undef MASK
3023#undef INVERT
3024#undef DISABLE 1036#undef DISABLE
3025} 1037}
diff --git a/data/elementary/themes/edc/elm/slider.edc b/data/elementary/themes/edc/elm/slider.edc
index ff19ce8ab6..ecce7a0907 100644
--- a/data/elementary/themes/edc/elm/slider.edc
+++ b/data/elementary/themes/edc/elm/slider.edc
@@ -399,6 +399,7 @@ group { name: "elm/slider/horizontal/default";
399 } 399 }
400 } 400 }
401 part { name: "elm.dragable.slider"; type: RECT; 401 part { name: "elm.dragable.slider"; type: RECT;
402 nomouse;
402 scale: 1; 403 scale: 1;
403 dragable.x: 1 1 0; 404 dragable.x: 1 1 0;
404 dragable.y: 0 0 0; 405 dragable.y: 0 0 0;
@@ -415,6 +416,7 @@ group { name: "elm/slider/horizontal/default";
415 } 416 }
416 } 417 }
417 part { name: "knob"; 418 part { name: "knob";
419 nomouse;
418 description { state: "default" 0.0; 420 description { state: "default" 0.0;
419 image.normal: "knob"; 421 image.normal: "knob";
420 fixed: 1 1; 422 fixed: 1 1;
@@ -432,6 +434,7 @@ group { name: "elm/slider/horizontal/default";
432 } 434 }
433 part { name: "slideevent"; type: RECT; repeat_events: 1; 435 part { name: "slideevent"; type: RECT; repeat_events: 1;
434 scale: 1; 436 scale: 1;
437 nomouse;
435 ignore_flags: ON_HOLD; 438 ignore_flags: ON_HOLD;
436 dragable.events: "elm.dragable.slider"; 439 dragable.events: "elm.dragable.slider";
437 description { state: "default" 0.0; 440 description { state: "default" 0.0;
@@ -1120,6 +1123,7 @@ group { name: "elm/slider/vertical/default";
1120 } 1123 }
1121 part { name: "elm.dragable.slider"; type: RECT; 1124 part { name: "elm.dragable.slider"; type: RECT;
1122 scale: 1; 1125 scale: 1;
1126 nomouse;
1123 dragable.x: 0 0 0; 1127 dragable.x: 0 0 0;
1124 dragable.y: 1 1 0; 1128 dragable.y: 1 1 0;
1125 dragable.confine: "elm.swallow.bar"; 1129 dragable.confine: "elm.swallow.bar";
@@ -1135,6 +1139,7 @@ group { name: "elm/slider/vertical/default";
1135 } 1139 }
1136 } 1140 }
1137 part { name: "knob"; 1141 part { name: "knob";
1142 nomouse;
1138 description { state: "default" 0.0; 1143 description { state: "default" 0.0;
1139 image.normal: "knob"; 1144 image.normal: "knob";
1140 fixed: 1 1; 1145 fixed: 1 1;
@@ -1152,6 +1157,7 @@ group { name: "elm/slider/vertical/default";
1152 } 1157 }
1153 part { name: "slideevent"; type: RECT; repeat_events: 1; 1158 part { name: "slideevent"; type: RECT; repeat_events: 1;
1154 scale: 1; 1159 scale: 1;
1160 nomouse;
1155 ignore_flags: ON_HOLD; 1161 ignore_flags: ON_HOLD;
1156 dragable.events: "elm.dragable.slider"; 1162 dragable.events: "elm.dragable.slider";
1157 description { state: "default" 0.0; 1163 description { state: "default" 0.0;
@@ -1891,6 +1897,7 @@ group { name: "elm/slider/range/horizontal/default";
1891 } 1897 }
1892 part { name: "elm.dragable.slider"; type: RECT; 1898 part { name: "elm.dragable.slider"; type: RECT;
1893 scale: 1; 1899 scale: 1;
1900 nomouse;
1894 dragable.x: 1 1 0; 1901 dragable.x: 1 1 0;
1895 dragable.y: 0 0 0; 1902 dragable.y: 0 0 0;
1896 dragable.confine: "elm.swallow.bar"; 1903 dragable.confine: "elm.swallow.bar";
@@ -1906,6 +1913,7 @@ group { name: "elm/slider/range/horizontal/default";
1906 } 1913 }
1907 } 1914 }
1908 part { name: "knob"; 1915 part { name: "knob";
1916 nomouse;
1909 description { state: "default" 0.0; 1917 description { state: "default" 0.0;
1910 image.normal: "knob"; 1918 image.normal: "knob";
1911 fixed: 1 1; 1919 fixed: 1 1;
@@ -1923,6 +1931,7 @@ group { name: "elm/slider/range/horizontal/default";
1923 } 1931 }
1924 part { name: "slideevent"; type: RECT; repeat_events: 1; 1932 part { name: "slideevent"; type: RECT; repeat_events: 1;
1925 scale: 1; 1933