summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2021-07-30 11:51:11 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2021-07-30 11:51:11 +0100
commitd109e1a057ade46074a69f4d70bded56c7f5b6e3 (patch)
tree7d875a1f84690be321b2f0a6033fddfead9d1a6f
parent2efabb074ba5cfb26e15aae335427f299d385688 (diff)
elm theme - more cc work
-rw-r--r--data/elementary/themes/colorclasses.edc7
-rw-r--r--data/elementary/themes/edc/elm/genlist.edc6
-rw-r--r--data/elementary/themes/edc/elm/pointer.edc4
-rw-r--r--data/elementary/themes/edc/elm/slider.edc572
-rw-r--r--data/elementary/themes/edc/elm/thumb.edc9
-rw-r--r--data/elementary/themes/edc/elm/toolbar.edc296
-rw-r--r--data/elementary/themes/edc/slider.edc6
7 files changed, 401 insertions, 499 deletions
diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc
index bf8cade741..2bb1eff68a 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -161,6 +161,8 @@ color_classes {
161 color: 51 153 255 255; } 161 color: 51 153 255 255; }
162 color_class { name: "/fg/disabled/slider/bar"; 162 color_class { name: "/fg/disabled/slider/bar";
163 color: 80 80 80 255; } 163 color: 80 80 80 255; }
164 color_class { name: "/fg/normal/slider/indicator";
165 color: 255 255 255 255; }
164/////////////////////////////////////////////////////////////////////////////// 166///////////////////////////////////////////////////////////////////////////////
165 color_class { name: "/bg/normal/entry"; 167 color_class { name: "/bg/normal/entry";
166 color: 48 48 48 255; } 168 color: 48 48 48 255; }
@@ -244,6 +246,9 @@ color_classes {
244 color_class { name: "/fg/selected/menu/item"; 246 color_class { name: "/fg/selected/menu/item";
245 color: 255 255 255 255; } 247 color: 255 255 255 255; }
246/////////////////////////////////////////////////////////////////////////////// 248///////////////////////////////////////////////////////////////////////////////
249 color_class { name: "/fg/selected/thumb/bar";
250 color: 51 153 255 255; }
251///////////////////////////////////////////////////////////////////////////////
247 color_class { name: "/bg/normal/list/group"; 252 color_class { name: "/bg/normal/list/group";
248 color: 32 32 32 255; } 253 color: 32 32 32 255; }
249 color_class { name: "/fg/normal/list/toggle"; 254 color_class { name: "/fg/normal/list/toggle";
@@ -439,6 +444,8 @@ color_classes {
439/////////////////////////////////////////////////////////////////////////////// 444///////////////////////////////////////////////////////////////////////////////
440 color_class { name: "/bg/selected/toolbar/base"; 445 color_class { name: "/bg/selected/toolbar/base";
441 color: 32 32 32 255; } 446 color: 32 32 32 255; }
447 color_class { name: "/fg/selected/toolbar/separator";
448 color: 80 80 80 255; }
442/////////////////////////////////////////////////////////////////////////////// 449///////////////////////////////////////////////////////////////////////////////
443 color_class { name: "/fg/normal/winlist/text/title"; 450 color_class { name: "/fg/normal/winlist/text/title";
444 color: 255 255 255 255; } 451 color: 255 255 255 255; }
diff --git a/data/elementary/themes/edc/elm/genlist.edc b/data/elementary/themes/edc/elm/genlist.edc
index 280695c7d5..290cf0b651 100644
--- a/data/elementary/themes/edc/elm/genlist.edc
+++ b/data/elementary/themes/edc/elm/genlist.edc
@@ -406,7 +406,7 @@ group { "elm/genlist/item/default_style/default"; nomouse;
406 data.item: "treesize" TREEPAD; 406 data.item: "treesize" TREEPAD;
407 data.item: "flips" "elm.text.flip"; 407 data.item: "flips" "elm.text.flip";
408 styles.style { "genlist_style"; 408 styles.style { "genlist_style";
409 base: "font="FN" font_size=10 align=left valign=0.5 color=#a0a0a0 text_class=list_item"; 409 base: "font="FN" font_size=10 align=left valign=0.5 color=cc:/fg/normal/list/item text_class=list_item";
410 tag: "br" "\n"; 410 tag: "br" "\n";
411 tag: "ps" "ps"; 411 tag: "ps" "ps";
412 tag: "hilight" "+ font_weight=Bold"; 412 tag: "hilight" "+ font_weight=Bold";
@@ -414,7 +414,7 @@ group { "elm/genlist/item/default_style/default"; nomouse;
414 tag: "tab" "\t"; 414 tag: "tab" "\t";
415 } 415 }
416 styles.style { "genlist_style_selected"; 416 styles.style { "genlist_style_selected";
417 base: "font="FN" font_size=10 align=left valign=0.5 color=#ffffff text_class=list_item_selected"; 417 base: "font="FN" font_size=10 align=left valign=0.5 color=cc:/fg/selected/list/item text_class=list_item_selected";
418 tag: "br" "\n"; 418 tag: "br" "\n";
419 tag: "ps" "ps"; 419 tag: "ps" "ps";
420 tag: "hilight" "+ font_weight=Bold"; 420 tag: "hilight" "+ font_weight=Bold";
@@ -422,7 +422,7 @@ group { "elm/genlist/item/default_style/default"; nomouse;
422 tag: "tab" "\t"; 422 tag: "tab" "\t";
423 } 423 }
424 styles.style { "genlist_style_disabled"; 424 styles.style { "genlist_style_disabled";
425 base: "font="FN" font_size=10 align=left valign=0.5 color=#505050 text_class=list_item"; 425 base: "font="FN" font_size=10 align=left valign=0.5 color=cc:/fg/disabled/list/item text_class=list_item";
426 tag: "br" "\n"; 426 tag: "br" "\n";
427 tag: "ps" "ps"; 427 tag: "ps" "ps";
428 tag: "hilight" "+ font_weight=Bold"; 428 tag: "hilight" "+ font_weight=Bold";
diff --git a/data/elementary/themes/edc/elm/pointer.edc b/data/elementary/themes/edc/elm/pointer.edc
index afa13b36b6..9c91737108 100644
--- a/data/elementary/themes/edc/elm/pointer.edc
+++ b/data/elementary/themes/edc/elm/pointer.edc
@@ -49,7 +49,7 @@ group { name: "elm/pointer/base/bottom_right_corner";
49 part { name: "box"; type: RECT; 49 part { name: "box"; type: RECT;
50 insert_after: "base"; 50 insert_after: "base";
51 description { state: "default" 0.0; 51 description { state: "default" 0.0;
52 color: 51 153 255 192; 52 color_class: "/fg/normal/pointer/manipulator";
53 rel1.relative: 0.3 0.3; 53 rel1.relative: 0.3 0.3;
54 rel2.relative: 0.7 0.7; 54 rel2.relative: 0.7 0.7;
55 } 55 }
@@ -195,7 +195,7 @@ group { name: "elm/pointer/base/hand1";
195 part { name: "box"; type: RECT; 195 part { name: "box"; type: RECT;
196 insert_after: "base"; 196 insert_after: "base";
197 description { state: "default" 0.0; 197 description { state: "default" 0.0;
198 color: 51 153 255 192; 198 color_class: "/fg/normal/pointer/manipulator";
199 rel1.relative: 0.5 0.5; 199 rel1.relative: 0.5 0.5;
200 rel2.relative: 1.0 1.0; 200 rel2.relative: 1.0 1.0;
201 } 201 }
diff --git a/data/elementary/themes/edc/elm/slider.edc b/data/elementary/themes/edc/elm/slider.edc
index 7ea8d24aae..babbd13f8d 100644
--- a/data/elementary/themes/edc/elm/slider.edc
+++ b/data/elementary/themes/edc/elm/slider.edc
@@ -129,21 +129,20 @@ group { name: "elm/slider/horizontal/default";
129 part { name: "base"; type: RECT; mouse_events: 0; 129 part { name: "base"; type: RECT; mouse_events: 0;
130 scale: 1; 130 scale: 1;
131 description { state: "default" 0.0; 131 description { state: "default" 0.0;
132 rel1.to: "elm.swallow.bar"; 132 rel.to: "elm.swallow.bar";
133 rel2.to: "elm.swallow.bar"; 133 color_class: "/bg/normal/slider/base";
134 color: 48 48 48 255;
135 min: 8 4; 134 min: 8 4;
136 max: 99999 4; 135 max: 99999 4;
137 fixed: 0 1; 136 fixed: 0 1;
138 } 137 }
139 description { state: "disabled" 0.0; 138 description { state: "disabled" 0.0;
140 inherit: "default" 0.0; 139 inherit: "default" 0.0;
141 color: 56 56 56 255; 140 color_class: "/bg/disabled/slider/base";
142 } 141 }
143 } 142 }
144 part { name: "glow"; type: RECT; mouse_events: 0; 143 part { name: "glow"; type: RECT; mouse_events: 0;
145 description { state: "default" 0.0; 144 description { state: "default" 0.0;
146 color: 53 153 255 255; 145 color_class: "/fg/normal/slider/bar";
147 rel1.to: "base"; 146 rel1.to: "base";
148 rel2.relative: 0.5 1.0; 147 rel2.relative: 0.5 1.0;
149 rel2.to_x: "button"; 148 rel2.to_x: "button";
@@ -151,10 +150,10 @@ group { name: "elm/slider/horizontal/default";
151 } 150 }
152 description { state: "disabled" 0.0; 151 description { state: "disabled" 0.0;
153 inherit: "default" 0.0; 152 inherit: "default" 0.0;
154 color: 192 192 192 64; 153 color_class: "/fg/disabled/slider/bar";
155 } 154 }
156 description { state: "inverted" 0.0; 155 description { state: "inverted" 0.0;
157 color: 53 153 255 255; 156 color_class: "/fg/normal/slider/bar";
158 rel1.relative: 0.5 0.0; 157 rel1.relative: 0.5 0.0;
159 rel1.to_x: "button"; 158 rel1.to_x: "button";
160 rel1.to_y: "base"; 159 rel1.to_y: "base";
@@ -162,7 +161,7 @@ group { name: "elm/slider/horizontal/default";
162 } 161 }
163 description { state: "disabled_inverted" 0.0; 162 description { state: "disabled_inverted" 0.0;
164 inherit: "inverted" 0.0; 163 inherit: "inverted" 0.0;
165 color: 192 192 192 64; 164 color_class: "/fg/disabled/slider/bar";
166 } 165 }
167 } 166 }
168 part { name: "dis_clip"; type: RECT; 167 part { name: "dis_clip"; type: RECT;
@@ -172,7 +171,7 @@ group { name: "elm/slider/horizontal/default";
172 } 171 }
173 description { state: "disabled" 0.0; 172 description { state: "disabled" 0.0;
174 inherit: "default" 0.0; 173 inherit: "default" 0.0;
175 color: 255 255 255 64; 174 color_class: "/fg/disabled/slider/bar";
176 } 175 }
177 } 176 }
178 part { name: "elm.swallow.icon"; type: SWALLOW; 177 part { name: "elm.swallow.icon"; type: SWALLOW;
@@ -207,7 +206,7 @@ group { name: "elm/slider/horizontal/default";
207 rel2.to_x: "elm.swallow.icon"; 206 rel2.to_x: "elm.swallow.icon";
208 rel2.relative: 1.0 1.0; 207 rel2.relative: 1.0 1.0;
209 rel2.offset: -1 -5; 208 rel2.offset: -1 -5;
210 color: 160 160 160 255; 209 color_class: "/fg/normal/slider/text";
211 text { font: FN; size: 10; 210 text { font: FN; size: 10;
212 text_class: "slider"; 211 text_class: "slider";
213 min: 0 0; 212 min: 0 0;
@@ -228,7 +227,7 @@ group { name: "elm/slider/horizontal/default";
228 } 227 }
229 description { state: "disabled_visible" 0.0; 228 description { state: "disabled_visible" 0.0;
230 inherit: "visible" 0.0; 229 inherit: "visible" 0.0;
231 color: 96 96 96 255; 230 color_class: "/fg/disabled/slider/text";
232 } 231 }
233 } 232 }
234 part { name: "elm.swallow.end"; type: SWALLOW; 233 part { name: "elm.swallow.end"; type: SWALLOW;
@@ -282,7 +281,7 @@ group { name: "elm/slider/horizontal/default";
282 visible: 1; 281 visible: 1;
283 rel1.offset: -5 4; 282 rel1.offset: -5 4;
284 rel2.offset: -5 -5; 283 rel2.offset: -5 -5;
285 color: 255 255 255 64; 284 color: 255 255 255 64; // no cc
286 } 285 }
287 } 286 }
288 part { name: "elm.units"; type: TEXT; mouse_events: 0; 287 part { name: "elm.units"; type: TEXT; mouse_events: 0;
@@ -292,7 +291,7 @@ group { name: "elm/slider/horizontal/default";
292 fixed: 1 1; 291 fixed: 1 1;
293 rel1.to_x: "limits"; 292 rel1.to_x: "limits";
294 rel2.to_x: "limits"; 293 rel2.to_x: "limits";
295 color: 160 160 160 255; 294 color_class: "/fg/normal/slider/text/units";
296 text { font: FN; size: 10; 295 text { font: FN; size: 10;
297 text_class: "slider"; 296 text_class: "slider";
298 align: 1.0 0.5; 297 align: 1.0 0.5;
@@ -306,15 +305,14 @@ group { name: "elm/slider/horizontal/default";
306 } 305 }
307 description { state: "disabled_visible" 0.0; 306 description { state: "disabled_visible" 0.0;
308 inherit: "visible" 0.0; 307 inherit: "visible" 0.0;
309 color: 96 96 96 255; 308 color_class: "/fg/disabled/slider/text/units";
310 } 309 }
311 } 310 }
312 part { name: "button"; type: GROUP; mouse_events: 0; 311 part { name: "button"; type: GROUP; mouse_events: 0;
313 source: "elm/slider/horizontal/indicator/default"; 312 source: "elm/slider/horizontal/indicator/default";
314 description { state: "default" 0.0; 313 description { state: "default" 0.0;
315 fixed: 1 1; 314 fixed: 1 1;
316 rel1.to: "elm.dragable.slider"; 315 rel.to: "elm.dragable.slider";
317 rel2.to: "elm.dragable.slider";
318 } 316 }
319 description { state: "hidden" 0.0; 317 description { state: "hidden" 0.0;
320 inherit: "default" 0.0; 318 inherit: "default" 0.0;
@@ -327,7 +325,7 @@ group { name: "elm/slider/horizontal/default";
327 dragable.y: 0 0 0; 325 dragable.y: 0 0 0;
328 dragable.confine: "elm.swallow.bar"; 326 dragable.confine: "elm.swallow.bar";
329 description { state: "default" 0.0; 327 description { state: "default" 0.0;
330 color: 0 0 0 0; 328 color: 0 0 0 0; // no cc
331 min: 16 16; 329 min: 16 16;
332 max: 16 16; 330 max: 16 16;
333 fixed: 1 1; 331 fixed: 1 1;
@@ -341,20 +339,19 @@ group { name: "elm/slider/horizontal/default";
341 scale: 1; 339 scale: 1;
342 description { state: "default" 0.0; 340 description { state: "default" 0.0;
343 fixed: 1 1; 341 fixed: 1 1;
344 rel1.to: "elm.dragable.slider"; 342 rel.to: "elm.dragable.slider";
345 rel2.to: "elm.dragable.slider";
346 image.normal: "i-radio"; 343 image.normal: "i-radio";
347 min: 16 16; 344 min: 16 16;
348 max: 16 16; 345 max: 16 16;
349 color: 160 160 160 255; 346 color_class: "/fg/normal/slider/knob";
350 } 347 }
351 description { state: "clicked" 0.0; 348 description { state: "clicked" 0.0;
352 inherit: "default" 0.0; 349 inherit: "default" 0.0;
353 color: 255 255 255 255; 350 color_class: "/fg/pressed/slider/knob";
354 } 351 }
355 description { state: "disabled" 0.0; 352 description { state: "disabled" 0.0;
356 inherit: "default" 0.0; 353 inherit: "default" 0.0;
357 color: 96 96 96 255; 354 color_class: "/fg/disabled/slider/knob";
358 } 355 }
359 } 356 }
360 part { name: "slideevent"; type: RECT; repeat_events: 1; 357 part { name: "slideevent"; type: RECT; repeat_events: 1;
@@ -363,20 +360,18 @@ group { name: "elm/slider/horizontal/default";
363 dragable.events: "elm.dragable.slider"; 360 dragable.events: "elm.dragable.slider";
364 description { state: "default" 0.0; 361 description { state: "default" 0.0;
365 fixed: 1 1; 362 fixed: 1 1;
366 rel1.to: "elm.dragable.slider"; 363 rel.to: "elm.dragable.slider";
367 rel2.to: "elm.dragable.slider"; 364 color: 0 0 0 0; // no cc
368 color: 0 0 0 0;
369 } 365 }
370 } 366 }
371 part { name: "elm.track.slider"; type: SWALLOW; mouse_events: 0; 367 part { name: "elm.track.slider"; type: SWALLOW; mouse_events: 0;
372 description { state: "default" 0.0; 368 description { state: "default" 0.0;
373 rel1.to: "elm.dragable.slider"; 369 rel.to: "elm.dragable.slider";
374 rel2.to: "elm.dragable.slider";
375 } 370 }
376 } 371 }
377 part { name: "event"; type: RECT; 372 part { name: "event"; type: RECT;
378 description { state: "default" 0.0; 373 description { state: "default" 0.0;
379 color: 0 0 0 0; 374 color: 0 0 0 0; // no cc
380 visible: 0; 375 visible: 0;
381 } 376 }
382 description { state: "disabled" 0.0; 377 description { state: "disabled" 0.0;
@@ -386,28 +381,23 @@ group { name: "elm/slider/horizontal/default";
386 } 381 }
387 } 382 }
388 programs { 383 programs {
389 program { 384 program { signal: "mouse,down,1"; source: "elm.dragable.slider";
390 signal: "mouse,down,1"; source: "elm.dragable.slider";
391 action: STATE_SET "clicked" 0.0; 385 action: STATE_SET "clicked" 0.0;
392 target: "knob"; 386 target: "knob";
393 } 387 }
394 program { 388 program { signal: "mouse,up,1"; source: "elm.dragable.slider";
395 signal: "mouse,up,1"; source: "elm.dragable.slider";
396 action: STATE_SET "default" 0.0; 389 action: STATE_SET "default" 0.0;
397 target: "knob"; 390 target: "knob";
398 } 391 }
399 program { 392 program { signal: "elm,state,indicator,show"; source: "elm";
400 signal: "elm,state,indicator,show"; source: "elm";
401 action: SIGNAL_EMIT "elm,popup,show" "elm"; 393 action: SIGNAL_EMIT "elm,popup,show" "elm";
402 after: "popup_show2"; 394 after: "popup_show2";
403 } 395 }
404 program { 396 program { signal: "elm,state,indicator,hide"; source: "elm";
405 signal: "elm,state,indicator,hide"; source: "elm";
406 action: SIGNAL_EMIT "elm,popup,hide" "elm"; 397 action: SIGNAL_EMIT "elm,popup,hide" "elm";
407 after: "popup_hide2"; 398 after: "popup_hide2";
408 } 399 }
409 program { 400 program { signal: "mouse,down,1"; source: "slideevent";
410 signal: "mouse,down,1"; source: "slideevent";
411 action: SIGNAL_EMIT "elm,popup,show" "elm"; 401 action: SIGNAL_EMIT "elm,popup,show" "elm";
412 after: "popup_show2"; 402 after: "popup_show2";
413 } 403 }
@@ -415,8 +405,7 @@ group { name: "elm/slider/horizontal/default";
415 action: STATE_SET "hidden" 0.0; 405 action: STATE_SET "hidden" 0.0;
416 target: "button"; 406 target: "button";
417 } 407 }
418 program { 408 program { signal: "mouse,up,1"; source: "slideevent";
419 signal: "mouse,up,1"; source: "slideevent";
420 action: SIGNAL_EMIT "elm,popup,hide" "elm"; 409 action: SIGNAL_EMIT "elm,popup,hide" "elm";
421 after: "popup_hide2"; 410 after: "popup_hide2";
422 } 411 }
@@ -424,32 +413,28 @@ group { name: "elm/slider/horizontal/default";
424 action: STATE_SET "default" 0.0; 413 action: STATE_SET "default" 0.0;
425 target: "button"; 414 target: "button";
426 } 415 }
427 program { 416 program { signal: "elm,state,text,visible"; source: "elm";
428 signal: "elm,state,text,visible"; source: "elm";
429 script { 417 script {
430 new m = get_int(slmode); 418 new m = get_int(slmode);
431 m |= LABEL; set_int(slmode, m); 419 m |= LABEL; set_int(slmode, m);
432 eval_mode(m); 420 eval_mode(m);
433 } 421 }
434 } 422 }
435 program { 423 program { signal: "elm,state,text,hidden"; source: "elm";
436 signal: "elm,state,text,hidden"; source: "elm";
437 script { 424 script {
438 new m = get_int(slmode); 425 new m = get_int(slmode);
439 m &= ~LABEL; set_int(slmode, m); 426 m &= ~LABEL; set_int(slmode, m);
440 eval_mode(m); 427 eval_mode(m);
441 } 428 }
442 } 429 }
443 program { 430 program { signal: "elm,state,icon,visible"; source: "elm";
444 signal: "elm,state,icon,visible"; source: "elm";
445 script { 431 script {
446 new m = get_int(slmode); 432 new m = get_int(slmode);
447 m |= ICON; set_int(slmode, m); 433 m |= ICON; set_int(slmode, m);
448 eval_mode(m); 434 eval_mode(m);
449 } 435 }
450 } 436 }
451 program { 437 program { signal: "elm,state,icon,hidden"; source: "elm";
452 signal: "elm,state,icon,hidden"; source: "elm";
453 script { 438 script {
454 new m = get_int(slmode); 439 new m = get_int(slmode);
455 m &= ~ICON; set_int(slmode, m); 440 m &= ~ICON; set_int(slmode, m);
@@ -472,21 +457,18 @@ group { name: "elm/slider/horizontal/default";
472 eval_mode(m); 457 eval_mode(m);
473 } 458 }
474 } 459 }
475 program { 460 program { signal: "elm,state,units,visible"; source: "elm";
476 signal: "elm,state,units,visible"; source: "elm";
477 script { 461 script {
478 new m = get_int(slmode); 462 new m = get_int(slmode);
479 m |= UNITS; set_int(slmode, m); 463 m |= UNITS; set_int(slmode, m);
480 eval_mode(m); 464 eval_mode(m);
481 } 465 }
482 } 466 }
483 program { 467 program { signal: "elm,state,units,visible"; source: "elm";
484 signal: "elm,state,units,visible"; source: "elm";
485 action: SIGNAL_EMIT "limits,visible" "elm"; 468 action: SIGNAL_EMIT "limits,visible" "elm";
486 target: "limits"; 469 target: "limits";
487 } 470 }
488 program { 471 program { signal: "elm,state,units,hidden"; source: "elm";
489 signal: "elm,state,units,hidden"; source: "elm";
490 action: STATE_SET "default" 0.0; 472 action: STATE_SET "default" 0.0;
491 script { 473 script {
492 new m = get_int(slmode); 474 new m = get_int(slmode);
@@ -494,37 +476,32 @@ group { name: "elm/slider/horizontal/default";
494 eval_mode(m); 476 eval_mode(m);
495 } 477 }
496 } 478 }
497 program { 479 program { signal: "elm,state,units,hidden"; source: "elm";
498 signal: "elm,state,units,hidden"; source: "elm";
499 action: SIGNAL_EMIT "limits,hide" "elm"; 480 action: SIGNAL_EMIT "limits,hide" "elm";
500 target: "limits"; 481 target: "limits";
501 } 482 }
502 program { 483 program { signal: "elm,state,inverted,on"; source: "elm";
503 signal: "elm,state,inverted,on"; source: "elm";
504 script { 484 script {
505 new m = get_int(slmode); 485 new m = get_int(slmode);
506 m |= INVERT; set_int(slmode, m); 486 m |= INVERT; set_int(slmode, m);
507 eval_mode(m); 487 eval_mode(m);
508 } 488 }
509 } 489 }
510 program { 490 program { signal: "elm,state,inverted,off"; source: "elm";
511 signal: "elm,state,inverted,off"; source: "elm";
512 script { 491 script {
513 new m = get_int(slmode); 492 new m = get_int(slmode);
514 m &= ~INVERT; set_int(slmode, m); 493 m &= ~INVERT; set_int(slmode, m);
515 eval_mode(m); 494 eval_mode(m);
516 } 495 }
517 } 496 }
518 program { 497 program { signal: "elm,state,disabled"; source: "elm";
519 signal: "elm,state,disabled"; source: "elm";
520 script { 498 script {
521 new m = get_int(slmode); 499 new m = get_int(slmode);
522 m |= DISABLE; set_int(slmode, m); 500 m |= DISABLE; set_int(slmode, m);
523 eval_mode(m); 501 eval_mode(m);
524 } 502 }
525 } 503 }
526 program { 504 program { signal: "elm,state,enabled"; source: "elm";
527 signal: "elm,state,enabled"; source: "elm";
528 script { 505 script {
529 new m = get_int(slmode); 506 new m = get_int(slmode);
530 m &= ~DISABLE; set_int(slmode, m); 507 m &= ~DISABLE; set_int(slmode, m);
@@ -562,9 +539,8 @@ group { name: "elm/slider/horizontal/indicator/default";
562 part { name: "clip"; type: RECT; 539 part { name: "clip"; type: RECT;
563 description { state: "default" 0.0; 540 description { state: "default" 0.0;
564 fixed: 1 1; 541 fixed: 1 1;
565 rel1.to: "elm.indicator"; 542 rel.to: "elm.indicator";
566 rel1.offset: -100 -100; 543 rel1.offset: -100 -100;
567 rel2.to: "elm.indicator";
568 rel2.offset: 99 99; 544 rel2.offset: 99 99;
569 visible: 0; 545 visible: 0;
570 offscale; 546 offscale;
@@ -578,10 +554,9 @@ group { name: "elm/slider/horizontal/indicator/default";
578 clip_to: "clip"; 554 clip_to: "clip";
579 description { state: "default" 0.0; 555 description { state: "default" 0.0;
580 rel1.offset: -10 -10; 556 rel1.offset: -10 -10;
581 rel1.to: "elm.indicator"; 557 rel.to: "elm.indicator";
582 rel2.offset: 9 9; 558 rel2.offset: 9 9;
583 rel2.to: "elm.indicator"; 559 color_class: "/dim/normal/slider/indicator";
584 color: 0 0 0 64;
585 offscale; 560 offscale;
586 visible: 0; 561 visible: 0;
587 } 562 }
@@ -602,7 +577,7 @@ group { name: "elm/slider/horizontal/indicator/default";
602 rel2.to: "base"; 577 rel2.to: "base";
603 rel2.relative: 1.0 -0.1; 578 rel2.relative: 1.0 -0.1;
604 rel2.offset: -1 -12; 579 rel2.offset: -1 -12;
605 color: 255 255 255 255; 580 color_class: "/fg/normal/slider/indicator";
606 text { font: FNBD; size: 10; 581 text { font: FNBD; size: 10;
607 min: 1 1; 582 min: 1 1;
608 align: 0.5 1.0; 583 align: 0.5 1.0;
@@ -619,51 +594,42 @@ group { name: "elm/slider/horizontal/indicator/default";
619 } 594 }
620 } 595 }
621 programs { 596 programs {
622 program { 597 program { signal: "elm,popup,show"; source: "elm";
623 signal: "elm,popup,show"; source: "elm";
624 action: STATE_SET "visible" 0.0; 598 action: STATE_SET "visible" 0.0;
625 target: "elm.indicator"; 599 target: "elm.indicator";
626 target: "bevel"; 600 target: "bevel";
627 } 601 }
628 program { 602 program { signal: "elm,popup,hide"; source: "elm";
629 signal: "elm,popup,hide"; source: "elm";
630 action: STATE_SET "default" 0.0; 603 action: STATE_SET "default" 0.0;
631 target: "elm.indicator"; 604 target: "elm.indicator";
632 target: "bevel"; 605 target: "bevel";
633 } 606 }
634 program { 607 program { signal: "elm,popup,hide"; source: "elm";
635 signal: "elm,popup,hide"; source: "elm";
636 action: SIGNAL_EMIT "elm,popup,hide,done" "elm"; 608 action: SIGNAL_EMIT "elm,popup,hide,done" "elm";
637 } 609 }
638 program { 610 program { signal: "elm,state,val,show"; source: "elm";
639 signal: "elm,state,val,show"; source: "elm";
640 action: STATE_SET "visible" 0.0; 611 action: STATE_SET "visible" 0.0;
641 target: "clip"; 612 target: "clip";
642 } 613 }
643 program { 614 program { signal: "elm,state,val,hide"; source: "elm";
644 signal: "elm,state,val,hide"; source: "elm";
645 action: STATE_SET "default" 0.0; 615 action: STATE_SET "default" 0.0;
646 target: "clip"; 616 target: "clip";
647 } 617 }
648 program { 618 program { signal: "elm,state,indicator,show"; source: "elm";
649 signal: "elm,state,indicator,show"; source: "elm";
650 action: STATE_SET "visible" 0.0; 619 action: STATE_SET "visible" 0.0;
651 target: "elm.indicator"; 620 target: "elm.indicator";
652 target: "bevel"; 621 target: "bevel";
653 } 622 }
654 program { 623 program { signal: "elm,state,indicator,hide"; source: "elm";
655 signal: "elm,state,indicator,hide"; source: "elm";
656 action: STATE_SET "visible" 0.0; 624 action: STATE_SET "visible" 0.0;
657 target: "elm.indicator"; 625 target: "elm.indicator";
658 target: "bevel"; 626 target: "bevel";
659 } 627 }
660 program { 628 program { signal: "elm,state,disabled"; source: "elm";
661 signal: "elm,state,disabled"; source: "elm";
662 action: STATE_SET "disabled" 0.0; 629 action: STATE_SET "disabled" 0.0;
663 target: "base"; 630 target: "base";
664 } 631 }
665 program { 632 program { signal: "elm,state,enabled"; source: "elm";
666 signal: "elm,state,enabled"; source: "elm";
667 action: STATE_SET "default" 0.0; 633 action: STATE_SET "default" 0.0;
668 target: "base"; 634 target: "base";
669 } 635 }
@@ -770,21 +736,20 @@ group { name: "elm/slider/vertical/default";
770 part { name: "base"; type: RECT; mouse_events: 0; 736 part { name: "base"; type: RECT; mouse_events: 0;
771 scale: 1; 737 scale: 1;
772 description { state: "default" 0.0; 738 description { state: "default" 0.0;
773 rel1.to: "elm.swallow.bar"; 739 rel.to: "elm.swallow.bar";
774 rel2.to: "elm.swallow.bar"; 740 color_class: "/bg/normal/slider/base";
775 color: 48 48 48 255;
776 min: 4 8; 741 min: 4 8;
777 max: 4 99999; 742 max: 4 99999;
778 fixed: 1 0; 743 fixed: 1 0;
779 } 744 }
780 description { state: "disabled" 0.0; 745 description { state: "disabled" 0.0;
781 inherit: "default" 0.0; 746 inherit: "default" 0.0;
782 color: 56 56 56 255; 747 color_class: "/bg/disabled/slider/base";
783 } 748 }
784 } 749 }
785 part { name: "glow"; type: RECT; mouse_events: 0; 750 part { name: "glow"; type: RECT; mouse_events: 0;
786 description { state: "default" 0.0; 751 description { state: "default" 0.0;
787 color: 53 153 255 255; 752 color_class: "/fg/normal/slider/bar";
788 rel1.to: "base"; 753 rel1.to: "base";
789 rel2.relative: 1.0 0.5; 754 rel2.relative: 1.0 0.5;
790 rel2.to_y: "button"; 755 rel2.to_y: "button";
@@ -792,10 +757,10 @@ group { name: "elm/slider/vertical/default";
792 } 757 }
793 description { state: "disabled" 0.0; 758 description { state: "disabled" 0.0;
794 inherit: "default" 0.0; 759 inherit: "default" 0.0;
795 color: 192 192 192 64; 760 color_class: "/fg/disabled/slider/bar";
796 } 761 }
797 description { state: "inverted" 0.0; 762 description { state: "inverted" 0.0;
798 color: 53 153 255 255; 763 color_class: "/fg/normal/slider/bar";
799 rel1.relative: 0.0 0.5; 764 rel1.relative: 0.0 0.5;
800 rel1.to_y: "button"; 765 rel1.to_y: "button";
801 rel1.to_x: "base"; 766 rel1.to_x: "base";
@@ -803,7 +768,7 @@ group { name: "elm/slider/vertical/default";
803 } 768 }
804 description { state: "disabled_inverted" 0.0; 769 description { state: "disabled_inverted" 0.0;
805 inherit: "inverted" 0.0; 770 inherit: "inverted" 0.0;
806 color: 192 192 192 64; 771 color_class: "/fg/disabled/slider/bar";
807 } 772 }
808 } 773 }
809 part { name: "dis_clip"; type: RECT; 774 part { name: "dis_clip"; type: RECT;
@@ -813,7 +778,7 @@ group { name: "elm/slider/vertical/default";
813 } 778 }
814 description { state: "disabled" 0.0; 779 description { state: "disabled" 0.0;
815 inherit: "default" 0.0; 780 inherit: "default" 0.0;
816 color: 255 255 255 64; 781 color: 255 255 255 64; // no cc
817 } 782 }
818 } 783 }
819 part { name: "elm.swallow.icon"; type: SWALLOW; 784 part { name: "elm.swallow.icon"; type: SWALLOW;
@@ -850,7 +815,7 @@ group { name: "elm/slider/vertical/default";
850 rel2.to_y: "elm.swallow.icon"; 815 rel2.to_y: "elm.swallow.icon";
851 rel2.relative: 1.0 1.0; 816 rel2.relative: 1.0 1.0;
852 rel2.offset: -5 -1; 817 rel2.offset: -5 -1;
853 color: 160 160 160 255; 818 color_class: "/fg/normal/slider/text";
854 text { font: FN; size: 10; 819 text { font: FN; size: 10;
855 text_class: "slider"; 820 text_class: "slider";
856 min: 0 0; 821 min: 0 0;
@@ -870,7 +835,7 @@ group { name: "elm/slider/vertical/default";
870 } 835 }
871 description { state: "disabled_visible" 0.0; 836 description { state: "disabled_visible" 0.0;
872 inherit: "visible" 0.0; 837 inherit: "visible" 0.0;
873 color: 96 96 96 255; 838 color_class: "/fg/disabled/slider/text";
874 } 839 }
875 } 840 }
876 part { name: "elm.swallow.end"; type: SWALLOW; 841 part { name: "elm.swallow.end"; type: SWALLOW;
@@ -928,7 +893,7 @@ group { name: "elm/slider/vertical/default";
928 max: 9999 9999; 893 max: 9999 9999;
929 rel1.offset: 4 -5; 894 rel1.offset: 4 -5;
930 rel2.offset: -5 -5; 895 rel2.offset: -5 -5;
931 color: 255 255 255 64; 896 color: 255 255 255 64; // no cc
932 } 897 }
933 } 898 }
934 part { name: "elm.units"; type: TEXT; mouse_events: 0; 899 part { name: "elm.units"; type: TEXT; mouse_events: 0;
@@ -938,7 +903,7 @@ group { name: "elm/slider/vertical/default";
938 fixed: 1 1; 903 fixed: 1 1;
939 rel1.to_y: "limits"; 904 rel1.to_y: "limits";
940 rel2.to_y: "limits"; 905 rel2.to_y: "limits";
941 color: 160 160 160 255; 906 color_class: "/fg/normal/slider/text/units";
942 text { font: FN; size: 10; 907 text { font: FN; size: 10;
943 text_class: "slider"; 908 text_class: "slider";
944 align: 0.5 1.0; 909 align: 0.5 1.0;
@@ -952,15 +917,14 @@ group { name: "elm/slider/vertical/default";
952 } 917 }
953 description { state: "disabled_visible" 0.0; 918 description { state: "disabled_visible" 0.0;
954 inherit: "visible" 0.0; 919 inherit: "visible" 0.0;
955 color: 96 96 96 255; 920 color_class: "/fg/disabled/slider/text/units";
956 } 921 }
957 } 922 }
958 part { name: "button"; type: GROUP; mouse_events: 0; 923 part { name: "button"; type: GROUP; mouse_events: 0;
959 source: "elm/slider/vertical/indicator/default"; 924 source: "elm/slider/vertical/indicator/default";
960 description { state: "default" 0.0; 925 description { state: "default" 0.0;
961 fixed: 1 1; 926 fixed: 1 1;
962 rel1.to: "elm.dragable.slider"; 927 rel.to: "elm.dragable.slider";
963 rel2.to: "elm.dragable.slider";
964 } 928 }
965 description { state: "hidden" 0.0; 929 description { state: "hidden" 0.0;
966 inherit: "default" 0.0; 930 inherit: "default" 0.0;
@@ -973,7 +937,7 @@ group { name: "elm/slider/vertical/default";
973 dragable.y: 1 1 0; 937 dragable.y: 1 1 0;
974 dragable.confine: "elm.swallow.bar"; 938 dragable.confine: "elm.swallow.bar";
975 description { state: "default" 0.0; 939 description { state: "default" 0.0;
976 color: 0 0 0 0; 940 color: 0 0 0 0; // no cc
977 min: 16 16; 941 min: 16 16;
978 max: 16 16; 942 max: 16 16;
979 fixed: 1 1; 943 fixed: 1 1;
@@ -987,20 +951,19 @@ group { name: "elm/slider/vertical/default";
987 scale: 1; 951 scale: 1;
988 description { state: "default" 0.0; 952 description { state: "default" 0.0;
989 fixed: 1 1; 953 fixed: 1 1;
990 rel1.to: "elm.dragable.slider"; 954 rel.to: "elm.dragable.slider";
991 rel2.to: "elm.dragable.slider";
992 image.normal: "i-radio"; 955 image.normal: "i-radio";
993 min: 16 16; 956 min: 16 16;
994 max: 16 16; 957 max: 16 16;
995 color: 160 160 160 255; 958 color_class: "/fg/normal/slider/knob";
996 } 959 }
997 description { state: "clicked" 0.0; 960 description { state: "clicked" 0.0;
998 inherit: "default" 0.0; 961 inherit: "default" 0.0;
999 color: 255 255 255 255; 962 color_class: "/fg/pressed/slider/knob";
1000 } 963 }
1001 description { state: "disabled" 0.0; 964 description { state: "disabled" 0.0;
1002 inherit: "default" 0.0; 965 inherit: "default" 0.0;
1003 color: 96 96 96 255; 966 color_class: "/fg/disabled/slider/knob";
1004 } 967 }
1005 } 968 }
1006 part { name: "slideevent"; type: RECT; repeat_events: 1; 969 part { name: "slideevent"; type: RECT; repeat_events: 1;
@@ -1009,20 +972,18 @@ group { name: "elm/slider/vertical/default";
1009 dragable.events: "elm.dragable.slider"; 972 dragable.events: "elm.dragable.slider";
1010 description { state: "default" 0.0; 973 description { state: "default" 0.0;
1011 fixed: 1 1; 974 fixed: 1 1;
1012 rel1.to: "elm.dragable.slider"; 975 rel.to: "elm.dragable.slider";
1013 rel2.to: "elm.dragable.slider"; 976 color: 0 0 0 0; // no cc
1014 color: 0 0 0 0;
1015 } 977 }
1016 } 978 }
1017 part { name: "elm.track.slider"; type: SWALLOW; mouse_events: 0; 979 part { name: "elm.track.slider"; type: SWALLOW; mouse_events: 0;
1018 description { state: "default" 0.0; 980 description { state: "default" 0.0;
1019 rel1.to: "elm.dragable.slider"; 981 rel.to: "elm.dragable.slider";
1020 rel2.to: "elm.dragable.slider";
1021 } 982 }
1022 } 983 }
1023 part { name: "event"; type: RECT; 984 part { name: "event"; type: RECT;
1024 description { state: "default" 0.0; 985 description { state: "default" 0.0;
1025 color: 0 0 0 0; 986 color: 0 0 0 0; // no cc
1026 visible: 0; 987 visible: 0;
1027 } 988 }
1028 description { state: "disabled" 0.0; 989 description { state: "disabled" 0.0;
@@ -1032,28 +993,23 @@ group { name: "elm/slider/vertical/default";
1032 } 993 }
1033 } 994 }
1034 programs { 995 programs {
1035 program { 996 program { signal: "mouse,down,1"; source: "elm.dragable.slider";
1036 signal: "mouse,down,1"; source: "elm.dragable.slider";
1037 action: STATE_SET "clicked" 0.0; 997 action: STATE_SET "clicked" 0.0;
1038 target: "knob"; 998 target: "knob";
1039 } 999 }
1040 program { 1000 program { signal: "mouse,up,1"; source: "elm.dragable.slider";
1041 signal: "mouse,up,1"; source: "elm.dragable.slider";
1042 action: STATE_SET "default" 0.0; 1001 action: STATE_SET "default" 0.0;
1043 target: "knob"; 1002 target: "knob";
1044 } 1003 }
1045 program { 1004 program { signal: "elm,state,indicator,show"; source: "elm";
1046 signal: "elm,state,indicator,show"; source: "elm";
1047 action: SIGNAL_EMIT "elm,popup,show" "elm"; 1005 action: SIGNAL_EMIT "elm,popup,show" "elm";
1048 after: "popup_show2"; 1006 after: "popup_show2";
1049 } 1007 }
1050 program { 1008 program { signal: "elm,state,indicator,hide"; source: "elm";
1051 signal: "elm,state,indicator,hide"; source: "elm";
1052 action: SIGNAL_EMIT "elm,popup,hide" "elm"; 1009 action: SIGNAL_EMIT "elm,popup,hide" "elm";
1053 after: "popup_hide2"; 1010 after: "popup_hide2";
1054 } 1011 }
1055 program { 1012 program { signal: "mouse,down,1"; source: "slideevent";
1056 signal: "mouse,down,1"; source: "slideevent";
1057 action: SIGNAL_EMIT "elm,popup,show" "elm"; 1013 action: SIGNAL_EMIT "elm,popup,show" "elm";
1058 after: "popup_show2"; 1014 after: "popup_show2";
1059 } 1015 }
@@ -1061,8 +1017,7 @@ group { name: "elm/slider/vertical/default";
1061 action: STATE_SET "hidden" 0.0; 1017 action: STATE_SET "hidden" 0.0;
1062 target: "button"; 1018 target: "button";
1063 } 1019 }
1064 program { 1020 program { signal: "mouse,up,1"; source: "slideevent";
1065 signal: "mouse,up,1"; source: "slideevent";
1066 action: SIGNAL_EMIT "elm,popup,hide" "elm"; 1021 action: SIGNAL_EMIT "elm,popup,hide" "elm";
1067 after: "popup_hide2"; 1022 after: "popup_hide2";
1068 } 1023 }
@@ -1070,32 +1025,28 @@ group { name: "elm/slider/vertical/default";
1070 action: STATE_SET "default" 0.0; 1025 action: STATE_SET "default" 0.0;
1071 target: "button"; 1026 target: "button";
1072 } 1027 }
1073 program { 1028 program { signal: "elm,state,text,visible"; source: "elm";
1074 signal: "elm,state,text,visible"; source: "elm";
1075 script { 1029 script {
1076 new m = get_int(slmode); 1030 new m = get_int(slmode);
1077 m |= LABEL; set_int(slmode, m); 1031 m |= LABEL; set_int(slmode, m);
1078 eval_mode(m); 1032 eval_mode(m);
1079 } 1033 }
1080 } 1034 }
1081 program { 1035 program { signal: "elm,state,text,hidden"; source: "elm";
1082 signal: "elm,state,text,hidden"; source: "elm";
1083 script { 1036 script {
1084 new m = get_int(slmode); 1037 new m = get_int(slmode);
1085 m &= ~LABEL; set_int(slmode, m); 1038 m &= ~LABEL; set_int(slmode, m);
1086 eval_mode(m); 1039 eval_mode(m);
1087 } 1040 }
1088 } 1041 }
1089 program { 1042 program { signal: "elm,state,icon,visible"; source: "elm";
1090 signal: "elm,state,icon,visible"; source: "elm";
1091 script { 1043 script {
1092 new m = get_int(slmode); 1044 new m = get_int(slmode);
1093 m |= ICON; set_int(slmode, m); 1045 m |= ICON; set_int(slmode, m);
1094 eval_mode(m); 1046 eval_mode(m);
1095 } 1047 }
1096 } 1048 }
1097 program { 1049 program { signal: "elm,state,icon,hidden"; source: "elm";
1098 signal: "elm,state,icon,hidden"; source: "elm";
1099 script { 1050 script {
1100 new m = get_int(slmode); 1051 new m = get_int(slmode);
1101 m &= ~ICON; set_int(slmode, m); 1052 m &= ~ICON; set_int(slmode, m);
@@ -1118,21 +1069,18 @@ group { name: "elm/slider/vertical/default";
1118 eval_mode(m); 1069 eval_mode(m);
1119 } 1070 }
1120 } 1071 }
1121 program { 1072 program { signal: "elm,state,units,visible"; source: "elm";
1122 signal: "elm,state,units,visible"; source: "elm";
1123 script { 1073 script {
1124 new m = get_int(slmode); 1074 new m = get_int(slmode);
1125 m |= UNITS; set_int(slmode, m); 1075 m |= UNITS; set_int(slmode, m);
1126 eval_mode(m); 1076 eval_mode(m);
1127 } 1077 }
1128 } 1078 }
1129 program { 1079 program { signal: "elm,state,units,visible"; source: "elm";
1130 signal: "elm,state,units,visible"; source: "elm";
1131 action: SIGNAL_EMIT "limits,visible" "elm"; 1080 action: SIGNAL_EMIT "limits,visible" "elm";
1132 target: "limits"; 1081 target: "limits";
1133 } 1082 }
1134 program { 1083 program { signal: "elm,state,units,hidden"; source: "elm";
1135 signal: "elm,state,units,hidden"; source: "elm";
1136 action: STATE_SET "default" 0.0; 1084 action: STATE_SET "default" 0.0;
1137 script { 1085 script {
1138 new m = get_int(slmode); 1086 new m = get_int(slmode);
@@ -1140,37 +1088,32 @@ group { name: "elm/slider/vertical/default";
1140 eval_mode(m); 1088 eval_mode(m);
1141 } 1089 }
1142 } 1090 }
1143 program { 1091 program { signal: "elm,state,units,hidden"; source: "elm";
1144 signal: "elm,state,units,hidden"; source: "elm";
1145 action: SIGNAL_EMIT "limits,hide" "elm"; 1092 action: SIGNAL_EMIT "limits,hide" "elm";
1146 target: "limits"; 1093 target: "limits";
1147 } 1094 }
1148 program { 1095 program { signal: "elm,state,inverted,on"; source: "elm";
1149 signal: "elm,state,inverted,on"; source: "elm";
1150 script { 1096 script {
1151 new m = get_int(slmode); 1097 new m = get_int(slmode);
1152 m |= INVERT; set_int(slmode, m); 1098 m |= INVERT; set_int(slmode, m);
1153 eval_mode(m); 1099 eval_mode(m);
1154 } 1100 }
1155 } 1101 }
1156 program { 1102 program { signal: "elm,state,inverted,off"; source: "elm";
1157 signal: "elm,state,inverted,off"; source: "elm";
1158 script { 1103 script {
1159 new m = get_int(slmode); 1104 new m = get_int(slmode);
1160 m &= ~INVERT; set_int(slmode, m); 1105 m &= ~INVERT; set_int(slmode, m);
1161 eval_mode(m); 1106 eval_mode(m);
1162 } 1107 }
1163 } 1108 }
1164 program { 1109 program { signal: "elm,state,disabled"; source: "elm";
1165 signal: "elm,state,disabled"; source: "elm";
1166 script { 1110 script {
1167 new m = get_int(slmode); 1111 new m = get_int(slmode);
1168 m |= DISABLE; set_int(slmode, m); 1112 m |= DISABLE; set_int(slmode, m);
1169 eval_mode(m); 1113 eval_mode(m);
1170 } 1114 }
1171 } 1115 }
1172 program { 1116 program { signal: "elm,state,enabled"; source: "elm";
1173 signal: "elm,state,enabled"; source: "elm";
1174 script { 1117 script {
1175 new m = get_int(slmode); 1118 new m = get_int(slmode);
1176 m &= ~DISABLE; set_int(slmode, m); 1119 m &= ~DISABLE; set_int(slmode, m);
@@ -1208,9 +1151,8 @@ group { name: "elm/slider/vertical/indicator/default";
1208 part { name: "clip"; type: RECT; 1151 part { name: "clip"; type: RECT;
1209 description { state: "default" 0.0; 1152 description { state: "default" 0.0;
1210 fixed: 1 1; 1153 fixed: 1 1;
1211 rel1.to: "elm.indicator"; 1154 rel.to: "elm.indicator";
1212 rel1.offset: -100 -100; 1155 rel1.offset: -100 -100;
1213 rel2.to: "elm.indicator";
1214 rel2.offset: 99 99; 1156 rel2.offset: 99 99;
1215 visible: 0; 1157 visible: 0;
1216 offscale; 1158 offscale;
@@ -1224,10 +1166,9 @@ group { name: "elm/slider/vertical/indicator/default";
1224 clip_to: "clip"; 1166 clip_to: "clip";
1225 description { state: "default" 0.0; 1167 description { state: "default" 0.0;
1226 rel1.offset: -10 -10; 1168 rel1.offset: -10 -10;
1227 rel1.to: "elm.indicator"; 1169 rel.to: "elm.indicator";
1228 rel2.offset: 9 9; 1170 rel2.offset: 9 9;
1229 rel2.to: "elm.indicator"; 1171 color_class: "/dim/normal/slider/indicator";
1230 color: 0 0 0 64;
1231 visible: 0; 1172 visible: 0;
1232 offscale; 1173 offscale;
1233 } 1174 }
@@ -1248,7 +1189,7 @@ group { name: "elm/slider/vertical/indicator/default";
1248 rel2.to: "base"; 1189 rel2.to: "base";
1249 rel2.relative: 1.1 1.0; 1190 rel2.relative: 1.1 1.0;
1250 rel2.offset: 11 -1; 1191 rel2.offset: 11 -1;
1251 color: 255 255 255 255; 1192 color_class: "/fg/normal/slider/indicator";
1252 text { font: FNBD; size: 10; 1193 text { font: FNBD; size: 10;
1253 min: 1 1; 1194 min: 1 1;
1254 align: 0.0 0.5; 1195 align: 0.0 0.5;
@@ -1265,51 +1206,42 @@ group { name: "elm/slider/vertical/indicator/default";
1265 } 1206 }
1266 } 1207 }
1267 programs { 1208 programs {
1268 program { 1209 program { signal: "elm,popup,show"; source: "elm";
1269 signal: "elm,popup,show"; source: "elm";
1270 action: STATE_SET "visible" 0.0; 1210 action: STATE_SET "visible" 0.0;
1271 target: "elm.indicator"; 1211 target: "elm.indicator";
1272 target: "bevel"; 1212 target: "bevel";
1273 } 1213 }
1274 program { 1214 program { signal: "elm,popup,hide"; source: "elm";
1275 signal: "elm,popup,hide"; source: "elm";
1276 action: STATE_SET "default" 0.0; 1215 action: STATE_SET "default" 0.0;
1277 target: "elm.indicator"; 1216 target: "elm.indicator";
1278 target: "bevel"; 1217 target: "bevel";
1279 } 1218 }
1280 program { 1219 program { signal: "elm,popup,hide"; source: "elm";
1281 signal: "elm,popup,hide"; source: "elm";
1282 action: SIGNAL_EMIT "elm,popup,hide,done" "elm"; 1220 action: SIGNAL_EMIT "elm,popup,hide,done" "elm";
1283 } 1221 }
1284 program { 1222 program { signal: "elm,state,val,show"; source: "elm";
1285 signal: "elm,state,val,show"; source: "elm";
1286 action: STATE_SET "visible" 0.0; 1223 action: STATE_SET "visible" 0.0;
1287 target: "clip"; 1224 target: "clip";
1288 } 1225 }
1289 program { 1226 program { signal: "elm,state,val,hide"; source: "elm";
1290 signal: "elm,state,val,hide"; source: "elm";
1291 action: STATE_SET "default" 0.0; 1227 action: STATE_SET "default" 0.0;
1292 target: "clip"; 1228 target: "clip";
1293 } 1229 }
1294 program { 1230 program { signal: "elm,state,indicator,show"; source: "elm";
1295 signal: "elm,state,indicator,show"; source: "elm";
1296 action: STATE_SET "visible" 0.0; 1231 action: STATE_SET "visible" 0.0;
1297 target: "elm.indicator"; 1232 target: "elm.indicator";
1298 target: "bevel"; 1233 target: "bevel";
1299 } 1234 }
1300 program { 1235 program { signal: "elm,state,indicator,hide"; source: "elm";
1301 signal: "elm,state,indicator,hide"; source: "elm";
1302 action: STATE_SET "visible" 0.0; 1236 action: STATE_SET "visible" 0.0;
1303 target: "elm.indicator"; 1237 target: "elm.indicator";
1304 target: "bevel"; 1238 target: "bevel";
1305 } 1239 }
1306 program { 1240 program { signal: "elm,state,disabled"; source: "elm";
1307 signal: "elm,state,disabled"; source: "elm";
1308 action: STATE_SET "disabled" 0.0; 1241 action: STATE_SET "disabled" 0.0;
1309 target: "base"; 1242 target: "base";
1310 } 1243 }
1311 program { 1244 program { signal: "elm,state,enabled"; source: "elm";
1312 signal: "elm,state,enabled"; source: "elm";
1313 action: STATE_SET "default" 0.0; 1245 action: STATE_SET "default" 0.0;
1314 target: "base"; 1246 target: "base";
1315 } 1247 }
@@ -1450,21 +1382,20 @@ group { name: "elm/slider/range/horizontal/default";
1450 part { name: "base"; type: RECT; mouse_events: 0; 1382 part { name: "base"; type: RECT; mouse_events: 0;
1451 scale: 1; 1383 scale: 1;
1452 description { state: "default" 0.0; 1384 description { state: "default" 0.0;
1453 rel1.to: "elm.swallow.bar"; 1385 rel.to: "elm.swallow.bar";
1454 rel2.to: "elm.swallow.bar"; 1386 color_class: "/bg/normal/slider/base";
1455 color: 48 48 48 255;
1456 min: 8 4; 1387 min: 8 4;
1457 max: 99999 4; 1388 max: 99999 4;
1458 fixed: 0 1; 1389 fixed: 0 1;
1459 } 1390 }
1460 description { state: "disabled" 0.0; 1391 description { state: "disabled" 0.0;
1461 inherit: "default" 0.0; 1392 inherit: "default" 0.0;
1462 color: 56 56 56 255; 1393 color_class: "/bg/disabled/slider/base";
1463 } 1394 }
1464 } 1395 }
1465 part { name: "glow"; type: RECT; mouse_events: 0; 1396 part { name: "glow"; type: RECT; mouse_events: 0;
1466 description { state: "default" 0.0; 1397 description { state: "default" 0.0;
1467 color: 53 153 255 255; 1398 color_class: "/fg/normal/slider/bar";
1468 rel1.to: "base"; 1399 rel1.to: "base";
1469 rel2.relative: 0.5 1.0; 1400 rel2.relative: 0.5 1.0;
1470 rel2.to_x: "button"; 1401 rel2.to_x: "button";
@@ -1472,10 +1403,10 @@ group { name: "elm/slider/range/horizontal/default";
1472 } 1403 }
1473 description { state: "disabled" 0.0; 1404 description { state: "disabled" 0.0;
1474 inherit: "default" 0.0; 1405 inherit: "default" 0.0;
1475 color: 192 192 192 64; 1406 color_class: "/fg/disabled/slider/bar";
1476 } 1407 }
1477 description { state: "inverted" 0.0; 1408 description { state: "inverted" 0.0;
1478 color: 53 153 255 255; 1409 color_class: "/fg/normal/slider/bar";
1479 rel1.relative: 0.5 0.0; 1410 rel1.relative: 0.5 0.0;
1480 rel1.to_x: "button"; 1411 rel1.to_x: "button";
1481 rel1.to_y: "base"; 1412 rel1.to_y: "base";
@@ -1483,10 +1414,10 @@ group { name: "elm/slider/range/horizontal/default";
1483 } 1414 }
1484 description { state: "disabled_inverted" 0.0; 1415 description { state: "disabled_inverted" 0.0;
1485 inherit: "inverted" 0.0; 1416 inherit: "inverted" 0.0;
1486 color: 192 192 192 64; 1417 color_class: "/fg/disabled/slider/bar";
1487 } 1418 }
1488 description { state: "range" 0.0; 1419 description { state: "range" 0.0;
1489 color: 53 153 255 255; 1420 color_class: "/fg/normal/slider/bar";
1490 rel1.relative: 0.5 0.0; 1421 rel1.relative: 0.5 0.0;
1491 rel2.relative: 0.5 1.0; 1422 rel2.relative: 0.5 1.0;
1492 rel1.to_x: "button"; 1423 rel1.to_x: "button";
@@ -1496,10 +1427,10 @@ group { name: "elm/slider/range/horizontal/default";
1496 } 1427 }
1497 description { state: "disabled_range" 0.0; 1428 description { state: "disabled_range" 0.0;
1498 inherit: "range" 0.0; 1429 inherit: "range" 0.0;
1499 color: 192 192 192 64; 1430 color_class: "/fg/disabled/slider/bar";
1500 } 1431 }
1501 description { state: "range_reverse" 0.0; 1432 description { state: "range_reverse" 0.0;
1502 color: 53 153 255 255; 1433 color_class: "/fg/normal/slider/bar";
1503 rel1.relative: 0.5 0.0; 1434 rel1.relative: 0.5 0.0;
1504 rel2.relative: 0.5 1.0; 1435 rel2.relative: 0.5 1.0;
1505 rel1.to_x: "button2"; 1436 rel1.to_x: "button2";
@@ -1509,7 +1440,7 @@ group { name: "elm/slider/range/horizontal/default";
1509 } 1440 }
1510 description { state: "disabled_range_reverse" 0.0; 1441 description { state: "disabled_range_reverse" 0.0;
1511 inherit: "range_reverse" 0.0; 1442 inherit: "range_reverse" 0.0;
1512 color: 192 192 192 64; 1443 color_class: "/fg/disabled/slider/bar";
1513 } 1444 }
1514 } 1445 }
1515 part { name: "dis_clip"; type: RECT; 1446 part { name: "dis_clip"; type: RECT;
@@ -1519,7 +1450,7 @@ group { name: "elm/slider/range/horizontal/default";
1519 } 1450 }
1520 description { state: "disabled" 0.0; 1451 description { state: "disabled" 0.0;
1521 inherit: "default" 0.0; 1452 inherit: "default" 0.0;
1522 color: 255 255 255 64; 1453 color: 255 255 255 64; // no cc
1523 } 1454 }
1524 } 1455 }
1525 part { name: "elm.swallow.icon"; type: SWALLOW; 1456 part { name: "elm.swallow.icon"; type: SWALLOW;
@@ -1554,7 +1485,7 @@ group { name: "elm/slider/range/horizontal/default";
1554 rel2.to_x: "elm.swallow.icon"; 1485 rel2.to_x: "elm.swallow.icon";
1555 rel2.relative: 1.0 1.0; 1486 rel2.relative: 1.0 1.0;
1556 rel2.offset: -1 -5; 1487 rel2.offset: -1 -5;
1557 color: 160 160 160 255; 1488 color_class: "/fg/normal/slider/text";
1558 text { font: FN; size: 10; 1489 text { font: FN; size: 10;
1559 text_class: "slider"; 1490 text_class: "slider";
1560 min: 0 0; 1491 min: 0 0;
@@ -1575,7 +1506,7 @@ group { name: "elm/slider/range/horizontal/default";
1575 } 1506 }
1576 description { state: "disabled_visible" 0.0; 1507 description { state: "disabled_visible" 0.0;
1577 inherit: "visible" 0.0; 1508 inherit: "visible" 0.0;
1578 color: 96 96 96 255; 1509 color_class: "/fg/disabled/slider/text";
1579 } 1510 }
1580 } 1511 }
1581 part { name: "elm.swallow.end"; type: SWALLOW; 1512 part { name: "elm.swallow.end"; type: SWALLOW;
@@ -1629,7 +1560,7 @@ group { name: "elm/slider/range/horizontal/default";
1629 visible: 1; 1560 visible: 1;
1630 rel1.offset: -5 4; 1561 rel1.offset: -5 4;
1631 rel2.offset: -5 -5; 1562 rel2.offset: -5 -5;
1632 color: 255 255 255 64; 1563 color: 255 255 255 64; // no cc
1633 } 1564 }
1634 } 1565 }
1635 part { name: "elm.units"; type: TEXT; mouse_events: 0; 1566 part { name: "elm.units"; type: TEXT; mouse_events: 0;
@@ -1639,7 +1570,7 @@ group { name: "elm/slider/range/horizontal/default";
1639 fixed: 1 1; 1570 fixed: 1 1;
1640 rel1.to_x: "limits"; 1571 rel1.to_x: "limits";
1641 rel2.to_x: "limits"; 1572 rel2.to_x: "limits";
1642 color: 160 160 160 255; 1573 color_class: "/fg/normal/slider/text/units";
1643 text { font: FN; size: 10; 1574 text { font: FN; size: 10;
1644 text_class: "slider"; 1575 text_class: "slider";
1645 align: 1.0 0.5; 1576 align: 1.0 0.5;
@@ -1653,15 +1584,14 @@ group { name: "elm/slider/range/horizontal/default";
1653 } 1584 }
1654 description { state: "disabled_visible" 0.0; 1585 description { state: "disabled_visible" 0.0;
1655 inherit: "visible" 0.0; 1586 inherit: "visible" 0.0;
1656 color: 96 96 96 255; 1587 color_class: "/fg/disabled/slider/text/units";
1657 } 1588 }
1658 } 1589 }
1659 part { name: "button"; type: GROUP; mouse_events: 0; 1590 part { name: "button"; type: GROUP; mouse_events: 0;
1660 source: "elm/slider/horizontal/indicator/default"; 1591 source: "elm/slider/horizontal/indicator/default";
1661 description { state: "default" 0.0; 1592 description { state: "default" 0.0;
1662 fixed: 1 1; 1593 fixed: 1 1;
1663 rel1.to: "elm.dragable.slider"; 1594 rel.to: "elm.dragable.slider";
1664 rel2.to: "elm.dragable.slider";
1665 } 1595 }
1666 description { state: "hidden" 0.0; 1596 description { state: "hidden" 0.0;
1667 inherit: "default" 0.0; 1597 inherit: "default" 0.0;
@@ -1674,7 +1604,7 @@ group { name: "elm/slider/range/horizontal/default";
1674 dragable.y: 0 0 0; 1604 dragable.y: 0 0 0;
1675 dragable.confine: "elm.swallow.bar"; 1605 dragable.confine: "elm.swallow.bar";
1676 description { state: "default" 0.0; 1606 description { state: "default" 0.0;
1677 color: 0 0 0 0; 1607 color: 0 0 0 0; // no cc
1678 min: 16 16; 1608 min: 16 16;
1679 max: 16 16; 1609 max: 16 16;
1680 fixed: 1 1; 1610 fixed: 1 1;
@@ -1688,20 +1618,19 @@ group { name: "elm/slider/range/horizontal/default";
1688 scale: 1; 1618 scale: 1;
1689 description { state: "default" 0.0; 1619 description { state: "default" 0.0;
1690 fixed: 1 1; 1620 fixed: 1 1;
1691 rel1.to: "elm.dragable.slider"; 1621 rel.to: "elm.dragable.slider";
1692 rel2.to: "elm.dragable.slider";
1693 image.normal: "i-radio"; 1622 image.normal: "i-radio";
1694 min: 16 16; 1623 min: 16 16;
1695 max: 16 16; 1624 max: 16 16;
1696 color: 160 160 160 255; 1625 color_class: "/fg/normal/slider/knob";
1697 } 1626 }
1698 description { state: "clicked" 0.0; 1627 description { state: "clicked" 0.0;
1699 inherit: "default" 0.0; 1628 inherit: "default" 0.0;
1700 color: 255 255 255 255; 1629 color_class: "/fg/pressed/slider/knob";
1701 } 1630 }
1702 description { state: "disabled" 0.0; 1631 description { state: "disabled" 0.0;
1703 inherit: "default" 0.0; 1632 inherit: "default" 0.0;
1704 color: 96 96 96 255; 1633 color_class: "/fg/disabled/slider/knob";
1705 } 1634 }
1706 } 1635 }
1707 part { name: "slideevent"; type: RECT; repeat_events: 1; 1636 part { name: "slideevent"; type: RECT; repeat_events: 1;
@@ -1710,15 +1639,13 @@ group { name: "elm/slider/range/horizontal/default";
1710 dragable.events: "elm.dragable.slider"; 1639 dragable.events: "elm.dragable.slider";
1711 description { state: "default" 0.0; 1640 description { state: "default" 0.0;
1712 fixed: 1 1; 1641 fixed: 1 1;
1713 rel1.to: "elm.dragable.slider"; 1642 rel.to: "elm.dragable.slider";
1714 rel2.to: "elm.dragable.slider"; 1643 color: 0 0 0 0; // no cc
1715 color: 0 0 0 0;
1716 } 1644 }
1717 } 1645 }
1718 part { name: "elm.track.slider"; type: SWALLOW; mouse_events: 0; 1646 part { name: "elm.track.slider"; type: SWALLOW; mouse_events: 0;
1719 description { state: "default" 0.0; 1647 description { state: "default" 0.0;
1720 rel1.to: "elm.dragable.slider"; 1648 rel.to: "elm.dragable.slider";
1721 rel2.to: "elm.dragable.slider";
1722 } 1649 }
1723 } 1650 }
1724 part { name: "button2"; type: GROUP; mouse_events: 0; 1651 part { name: "button2"; type: GROUP; mouse_events: 0;
@@ -1726,8 +1653,7 @@ group { name: "elm/slider/range/horizontal/default";
1726 source: "elm/slider/horizontal/indicator/default"; 1653 source: "elm/slider/horizontal/indicator/default";
1727 description { state: "default" 0.0; 1654 description { state: "default" 0.0;
1728 fixed: 1 1; 1655 fixed: 1 1;
1729 rel1.to: "elm.dragable2.slider"; 1656 rel.to: "elm.dragable2.slider";
1730 rel2.to: "elm.dragable2.slider";
1731 } 1657 }
1732 description { state: "hidden" 0.0; 1658 description { state: "hidden" 0.0;
1733 inherit: "default" 0.0; 1659 inherit: "default" 0.0;
@@ -1741,7 +1667,7 @@ group { name: "elm/slider/range/horizontal/default";
1741 dragable.y: 0 0 0; 1667 dragable.y: 0 0 0;
1742 dragable.confine: "elm.swallow.bar"; 1668 dragable.confine: "elm.swallow.bar";
1743 description { state: "default" 0.0; 1669 description { state: "default" 0.0;
1744 color: 0 0 0 0; 1670 color: 0 0 0 0; // no cc
1745 min: 16 16; 1671 min: 16 16;
1746 max: 16 16; 1672 max: 16 16;
1747 fixed: 1 1; 1673 fixed: 1 1;
@@ -1761,15 +1687,15 @@ group { name: "elm/slider/range/horizontal/default";
1761 image.normal: "i-radio"; 1687 image.normal: "i-radio";
1762 min: 16 16; 1688 min: 16 16;
1763 max: 16 16; 1689 max: 16 16;
1764 color: 160 160 160 255; 1690 color_class: "/fg/normal/slider/knob";
1765 } 1691 }
1766 description { state: "clicked" 0.0; 1692 description { state: "clicked" 0.0;
1767 inherit: "default" 0.0; 1693 inherit: "default" 0.0;
1768 color: 255 255 255 255; 1694 color_class: "/fg/pressed/slider/knob";
1769 } 1695 }
1770 description { state: "disabled" 0.0; 1696 description { state: "disabled" 0.0;
1771 inherit: "default" 0.0; 1697 inherit: "default" 0.0;
1772 color: 96 96 96 255; 1698 color_class: "/fg/disabled/slider/knob";
1773 } 1699 }
1774 } 1700 }
1775 part { name: "slideevent2"; type: RECT; repeat_events: 1; 1701 part { name: "slideevent2"; type: RECT; repeat_events: 1;
@@ -1779,9 +1705,8 @@ group { name: "elm/slider/range/horizontal/default";
1779 dragable.events: "elm.dragable2.slider"; 1705 dragable.events: "elm.dragable2.slider";
1780 description { state: "default" 0.0; 1706 description { state: "default" 0.0;
1781 fixed: 1 1; 1707 fixed: 1 1;
1782 rel1.to: "elm.dragable2.slider"; 1708 rel.to: "elm.dragable2.slider";
1783 rel2.to: "elm.dragable2.slider"; 1709 color: 0 0 0 0; // no cc
1784 color: 0 0 0 0;
1785 } 1710 }
1786 } 1711 }
1787 part { name: "elm.track2.slider"; type: SWALLOW; mouse_events: 0; 1712 part { name: "elm.track2.slider"; type: SWALLOW; mouse_events: 0;
@@ -1804,7 +1729,7 @@ group { name: "elm/slider/range/horizontal/default";
1804 } 1729 }
1805 part { name: "event"; type: RECT; 1730 part { name: "event"; type: RECT;
1806 description { state: "default" 0.0; 1731 description { state: "default" 0.0;
1807 color: 0 0 0 0; 1732 color: 0 0 0 0; // no cc
1808 visible: 0; 1733 visible: 0;
1809 } 1734 }
1810 description { state: "disabled" 0.0; 1735 description { state: "disabled" 0.0;
@@ -1839,38 +1764,31 @@ group { name: "elm/slider/range/horizontal/default";
1839 if (r) update_glow(m); 1764 if (r) update_glow(m);
1840 } 1765 }
1841 } 1766 }
1842 program { 1767 program { signal: "mouse,down,1"; source: "elm.dragable.slider";
1843 signal: "mouse,down,1"; source: "elm.dragable.slider";
1844 action: STATE_SET "clicked" 0.0; 1768 action: STATE_SET "clicked" 0.0;
1845 target: "knob"; 1769 target: "knob";
1846 } 1770 }
1847 program { 1771 program { signal: "mouse,up,1"; source: "elm.dragable.slider";
1848 signal: "mouse,up,1"; source: "elm.dragable.slider";
1849 action: STATE_SET "default" 0.0; 1772 action: STATE_SET "default" 0.0;
1850 target: "knob"; 1773 target: "knob";
1851 } 1774 }
1852 program { 1775 program { signal: "mouse,down,1"; source: "elm.dragable2.slider";
1853 signal: "mouse,down,1"; source: "elm.dragable2.slider";
1854 action: STATE_SET "clicked" 0.0; 1776 action: STATE_SET "clicked" 0.0;
1855 target: "knob2"; 1777 target: "knob2";
1856 } 1778 }
1857 program { 1779 program { signal: "mouse,up,1"; source: "elm.dragable2.slider";
1858 signal: "mouse,up,1"; source: "elm.dragable2.slider";
1859 action: STATE_SET "default" 0.0; 1780 action: STATE_SET "default" 0.0;
1860 target: "knob2"; 1781 target: "knob2";
1861 } 1782 }
1862 program { 1783 program { signal: "elm,state,indicator,show"; source: "elm";
1863 signal: "elm,state,indicator,show"; source: "elm";
1864 action: SIGNAL_EMIT "elm,popup,show" "elm"; 1784 action: SIGNAL_EMIT "elm,popup,show" "elm";
1865 after: "popup_show2"; 1785 after: "popup_show2";
1866 } 1786 }
1867 program { 1787 program { signal: "elm,state,indicator,hide"; source: "elm";
1868 signal: "elm,state,indicator,hide"; source: "elm";
1869 action: SIGNAL_EMIT "elm,popup,hide" "elm"; 1788 action: SIGNAL_EMIT "elm,popup,hide" "elm";
1870 after: "popup_hide2"; 1789 after: "popup_hide2";
1871 } 1790 }
1872 program { 1791 program { signal: "mouse,down,1"; source: "slideevent";
1873 signal: "mouse,down,1"; source: "slideevent";
1874 action: SIGNAL_EMIT "elm,popup,show" "elm"; 1792 action: SIGNAL_EMIT "elm,popup,show" "elm";
1875 after: "popup_show2"; 1793 after: "popup_show2";
1876 } 1794 }
@@ -1878,8 +1796,7 @@ group { name: "elm/slider/range/horizontal/default";
1878 action: STATE_SET "hidden" 0.0; 1796 action: STATE_SET "hidden" 0.0;
1879 target: "button"; 1797 target: "button";
1880 } 1798 }
1881 program { 1799 program { signal: "mouse,up,1"; source: "slideevent";
1882 signal: "mouse,up,1"; source: "slideevent";
1883 action: SIGNAL_EMIT "elm,popup,hide" "elm"; 1800 action: SIGNAL_EMIT "elm,popup,hide" "elm";
1884 after: "popup_hide2"; 1801 after: "popup_hide2";
1885 } 1802 }
@@ -1887,18 +1804,15 @@ group { name: "elm/slider/range/horizontal/default";
1887 action: STATE_SET "default" 0.0; 1804 action: STATE_SET "default" 0.0;
1888 target: "button"; 1805 target: "button";
1889 } 1806 }
1890 program { 1807 program { signal: "mouse,down,1"; source: "slideevent2";
1891 signal: "mouse,down,1"; source: "slideevent2";
1892 action: SIGNAL_EMIT "elm,popup,show" "elm"; 1808 action: SIGNAL_EMIT "elm,popup,show" "elm";
1893 after: "popup_show2"; 1809 after: "popup_show2";
1894 } 1810 }
1895 program { 1811 program { signal: "mouse,up,1"; source: "slideevent2";
1896 signal: "mouse,up,1"; source: "slideevent2";
1897 action: SIGNAL_EMIT "elm,popup,hide" "elm"; 1812 action: SIGNAL_EMIT "elm,popup,hide" "elm";
1898 after: "popup_hide2"; 1813 after: "popup_hide2";
1899 } 1814 }
1900 program { 1815 program { signal: "elm,state,text,visible"; source: "elm";
1901 signal: "elm,state,text,visible"; source: "elm";
1902 script { 1816 script {
1903 new m = get_int(slmode); 1817 new m = get_int(slmode);
1904 m |= LABEL; set_int(slmode, m); 1818 m |= LABEL; set_int(slmode, m);
@@ -1906,8 +1820,7 @@ group { name: "elm/slider/range/horizontal/default";
1906 update_glow(m); 1820 update_glow(m);
1907 } 1821 }
1908 } 1822 }
1909 program { 1823 program { signal: "elm,state,text,hidden"; source: "elm";
1910 signal: "elm,state,text,hidden"; source: "elm";
1911 script { 1824 script {
1912 new m = get_int(slmode); 1825 new m = get_int(slmode);
1913 m &= ~LABEL; set_int(slmode, m); 1826 m &= ~LABEL; set_int(slmode, m);
@@ -1915,8 +1828,7 @@ group { name: "elm/slider/range/horizontal/default";
1915 update_glow(m); 1828 update_glow(m);
1916 } 1829 }
1917 } 1830 }
1918 program { 1831 program { signal: "elm,state,icon,visible"; source: "elm";
1919 signal: "elm,state,icon,visible"; source: "elm";
1920 script { 1832 script {
1921 new m = get_int(slmode); 1833 new m = get_int(slmode);
1922 m |= ICON; set_int(slmode, m); 1834 m |= ICON; set_int(slmode, m);
@@ -1924,8 +1836,7 @@ group { name: "elm/slider/range/horizontal/default";
1924 update_glow(m); 1836 update_glow(m);
1925 } 1837 }
1926 } 1838 }
1927 program { 1839 program { signal: "elm,state,icon,hidden"; source: "elm";
1928 signal: "elm,state,icon,hidden"; source: "elm";
1929 script { 1840 script {
1930 new m = get_int(slmode); 1841 new m = get_int(slmode);
1931 m &= ~ICON; set_int(slmode, m); 1842 m &= ~ICON; set_int(slmode, m);
@@ -1951,8 +1862,7 @@ group { name: "elm/slider/range/horizontal/default";
1951 update_glow(m); 1862 update_glow(m);
1952 } 1863 }
1953 } 1864 }
1954 program { 1865 program { signal: "elm,state,units,visible"; source: "elm";
1955 signal: "elm,state,units,visible"; source: "elm";
1956 script { 1866 script {
1957 new m = get_int(slmode); 1867 new m = get_int(slmode);
1958 m |= UNITS; set_int(slmode, m); 1868 m |= UNITS; set_int(slmode, m);
@@ -1960,13 +1870,11 @@ group { name: "elm/slider/range/horizontal/default";
1960 update_glow(m); 1870 update_glow(m);
1961 } 1871 }
1962 } 1872 }
1963 program { 1873 program { signal: "elm,state,units,visible"; source: "elm";
1964 signal: "elm,state,units,visible"; source: "elm";
1965 action: SIGNAL_EMIT "limits,visible" "elm"; 1874 action: SIGNAL_EMIT "limits,visible" "elm";
1966 target: "limits"; 1875 target: "limits";
1967 } 1876 }
1968 program { 1877 program { signal: "elm,state,units,hidden"; source: "elm";
1969 signal: "elm,state,units,hidden"; source: "elm";
1970 action: STATE_SET "default" 0.0; 1878 action: STATE_SET "default" 0.0;
1971 script { 1879 script {
1972 new m = get_int(slmode); 1880 new m = get_int(slmode);
@@ -1975,13 +1883,11 @@ group { name: "elm/slider/range/horizontal/default";
1975 update_glow(m); 1883 update_glow(m);
1976 } 1884 }
1977 } 1885 }
1978 program { 1886 program { signal: "elm,state,units,hidden"; source: "elm";
1979 signal: "elm,state,units,hidden"; source: "elm";
1980 action: SIGNAL_EMIT "limits,hide" "elm"; 1887 action: SIGNAL_EMIT "limits,hide" "elm";
1981 target: "limits"; 1888 target: "limits";
1982 } 1889 }
1983 program { 1890 program { signal: "elm,state,inverted,on"; source: "elm";
1984 signal: "elm,state,inverted,on"; source: "elm";
1985 script { 1891 script {
1986 new m = get_int(slmode); 1892 new m = get_int(slmode);
1987 m |= INVERT; set_int(slmode, m); 1893 m |= INVERT; set_int(slmode, m);
@@ -1989,8 +1895,7 @@ group { name: "elm/slider/range/horizontal/default";
1989 update_glow(m); 1895 update_glow(m);
1990 } 1896 }
1991 } 1897 }
1992 program { 1898 program { signal: "elm,state,inverted,off"; source: "elm";
1993 signal: "elm,state,inverted,off"; source: "elm";
1994 script { 1899 script {
1995 new m = get_int(slmode); 1900 new m = get_int(slmode);
1996 m &= ~INVERT; set_int(slmode, m); 1901 m &= ~INVERT; set_int(slmode, m);
@@ -1998,8 +1903,7 @@ group { name: "elm/slider/range/horizontal/default";
1998 update_glow(m); 1903 update_glow(m);
1999 } 1904 }
2000 } 1905 }
2001 program { 1906 program { signal: "elm,state,disabled"; source: "elm";
2002 signal: "elm,state,disabled"; source: "elm";
2003 script { 1907 script {
2004 new m = get_int(slmode); 1908 new m = get_int(slmode);
2005 m |= DISABLE; set_int(slmode, m); 1909 m |= DISABLE; set_int(slmode, m);
@@ -2007,8 +1911,7 @@ group { name: "elm/slider/range/horizontal/default";
2007 update_glow(m); 1911 update_glow(m);
2008 } 1912 }
2009 } 1913 }
2010 program { 1914 program { signal: "elm,state,enabled"; source: "elm";
2011 signal: "elm,state,enabled"; source: "elm";
2012 script { 1915 script {
2013 new m = get_int(slmode); 1916 new m = get_int(slmode);
2014 m &= ~DISABLE; set_int(slmode, m); 1917 m &= ~DISABLE; set_int(slmode, m);
@@ -2158,21 +2061,20 @@ group { name: "elm/slider/range/vertical/default";
2158 part { name: "base"; type: RECT; mouse_events: 0; 2061 part { name: "base"; type: RECT; mouse_events: 0;
2159 scale: 1; 2062 scale: 1;
2160 description { state: "default" 0.0; 2063 description { state: "default" 0.0;
2161 rel1.to: "elm.swallow.bar"; 2064 rel.to: "elm.swallow.bar";
2162 rel2.to: "elm.swallow.bar"; 2065 color_class: "/bg/normal/slider/base";
2163 color: 48 48 48 255;
2164 min: 4 8; 2066 min: 4 8;
2165 max: 4 99999; 2067 max: 4 99999;
2166 fixed: 1 0; 2068 fixed: 1 0;
2167 } 2069 }
2168 description { state: "disabled" 0.0; 2070 description { state: "disabled" 0.0;
2169 inherit: "default" 0.0; 2071 inherit: "default" 0.0;
2170 color: 56 56 56 255; 2072 color_class: "/bg/disabled/slider/base";
2171 } 2073 }
2172 } 2074 }
2173 part { name: "glow"; type: RECT; mouse_events: 0; 2075 part { name: "glow"; type: RECT; mouse_events: 0;
2174 description { state: "default" 0.0; 2076 description { state: "default" 0.0;
2175 color: 53 153 255 255; 2077 color_class: "/fg/normal/slider/bar";
2176 rel1.to: "base"; 2078 rel1.to: "base";
2177 rel2.relative: 1.0 0.5; 2079 rel2.relative: 1.0 0.5;
2178 rel2.to_y: "button"; 2080 rel2.to_y: "button";
@@ -2180,10 +2082,10 @@ group { name: "elm/slider/range/vertical/default";
2180 } 2082 }
2181 description { state: "disabled" 0.0; 2083 description { state: "disabled" 0.0;
2182 inherit: "default" 0.0; 2084 inherit: "default" 0.0;
2183 color: 192 192 192 64; 2085 color_class: "/fg/disabled/slider/bar";
2184 } 2086 }
2185 description { state: "inverted" 0.0; 2087 description { state: "inverted" 0.0;
2186 color: 53 153 255 255; 2088 color_class: "/fg/normal/slider/bar";
2187 rel1.relative: 0.0 0.5; 2089 rel1.relative: 0.0 0.5;
2188 rel1.to_y: "button"; 2090 rel1.to_y: "button";
2189 rel1.to_x: "base"; 2091 rel1.to_x: "base";
@@ -2191,10 +2093,10 @@ group { name: "elm/slider/range/vertical/default";
2191 } 2093 }
2192 description { state: "disabled_inverted" 0.0; 2094 description { state: "disabled_inverted" 0.0;
2193 inherit: "inverted" 0.0; 2095 inherit: "inverted" 0.0;
2194 color: 192 192 192 64; 2096 color_class: "/fg/disabled/slider/bar";
2195 } 2097 }
2196 description { state: "range" 0.0; 2098 description { state: "range" 0.0;
2197 color: 53 153 255 255; 2099 color_class: "/fg/normal/slider/bar";
2198 rel1.relative: 0.0 0.5; 2100 rel1.relative: 0.0 0.5;
2199 rel2.relative: 1.0 0.5; 2101 rel2.relative: 1.0 0.5;
2200 rel1.to_y: "button"; 2102 rel1.to_y: "button";
@@ -2204,10 +2106,10 @@ group { name: "elm/slider/range/vertical/default";
2204 } 2106 }
2205 description { state: "disabled_range" 0.0; 2107 description { state: "disabled_range" 0.0;
2206 inherit: "range" 0.0; 2108 inherit: "range" 0.0;
2207 color: 192 192 192 64; 2109 color_class: "/fg/disabled/slider/bar";
2208 } 2110 }
2209 description { state: "range_reverse" 0.0; 2111 description { state: "range_reverse" 0.0;
2210 color: 53 153 255 255; 2112 color_class: "/fg/normal/slider/bar";
2211 rel1.relative: 0.0 0.5; 2113 rel1.relative: 0.0 0.5;
2212 rel2.relative: 1.0 0.5; 2114 rel2.relative: 1.0 0.5;
2213 rel1.to_y: "button2"; 2115 rel1.to_y: "button2";
@@ -2217,7 +2119,7 @@ group { name: "elm/slider/range/vertical/default";
2217 } 2119 }
2218 description { state: "disabled_range_reverse" 0.0; 2120 description { state: "disabled_range_reverse" 0.0;
2219 inherit: "range_reverse" 0.0; 2121 inherit: "range_reverse" 0.0;
2220 color: 192 192 192 64; 2122 color_class: "/fg/disabled/slider/bar";
2221 } 2123 }
2222 } 2124 }
2223 part { name: "dis_clip"; type: RECT; 2125 part { name: "dis_clip"; type: RECT;
@@ -2227,7 +2129,7 @@ group { name: "elm/slider/range/vertical/default";
2227 } 2129 }
2228 description { state: "disabled" 0.0; 2130 description { state: "disabled" 0.0;
2229 inherit: "default" 0.0; 2131 inherit: "default" 0.0;
2230 color: 255 255 255 64; 2132 color: 255 255 255 64; // no cc
2231 } 2133 }
2232 } 2134 }
2233 part { name: "elm.swallow.icon"; type: SWALLOW; 2135 part { name: "elm.swallow.icon"; type: SWALLOW;
@@ -2264,7 +2166,7 @@ group { name: "elm/slider/range/vertical/default";
2264 rel2.to_y: "elm.swallow.icon"; 2166 rel2.to_y: "elm.swallow.icon";
2265 rel2.relative: 1.0 1.0; 2167 rel2.relative: 1.0 1.0;
2266 rel2.offset: -5 -1; 2168 rel2.offset: -5 -1;
2267 color: 160 160 160 255; 2169 color_class: "/fg/normal/slider/text";
2268 text { font: FN; size: 10; 2170 text { font: FN; size: 10;
2269 text_class: "slider"; 2171 text_class: "slider";
2270 min: 0 0; 2172 min: 0 0;
@@ -2284,7 +2186,7 @@ group { name: "elm/slider/range/vertical/default";
2284 } 2186 }
2285 description { state: "disabled_visible" 0.0; 2187 description { state: "disabled_visible" 0.0;
2286 inherit: "visible" 0.0; 2188 inherit: "visible" 0.0;
2287 color: 96 96 96 255; 2189 color_class: "/fg/disabled/slider/text";
2288 } 2190 }
2289 } 2191 }
2290 part { name: "elm.swallow.end"; type: SWALLOW; 2192 part { name: "elm.swallow.end"; type: SWALLOW;
@@ -2342,7 +2244,7 @@ group { name: "elm/slider/range/vertical/default";
2342 max: 9999 9999; 2244 max: 9999 9999;
2343 rel1.offset: 4 -5; 2245 rel1.offset: 4 -5;
2344 rel2.offset: -5 -5; 2246 rel2.offset: -5 -5;
2345 color: 255 255 255 64; 2247 color: 255 255 255 64; // no cc
2346 } 2248 }
2347 } 2249 }
2348 part { name: "elm.units"; type: TEXT; mouse_events: 0; 2250 part { name: "elm.units"; type: TEXT; mouse_events: 0;
@@ -2352,7 +2254,7 @@ group { name: "elm/slider/range/vertical/default";
2352 fixed: 1 1; 2254 fixed: 1 1;
2353 rel1.to_y: "limits"; 2255 rel1.to_y: "limits";
2354 rel2.to_y: "limits"; 2256 rel2.to_y: "limits";
2355 color: 160 160 160 255; 2257 color_class: "/fg/normal/slider/text/units";
2356 text { font: FN; size: 10; 2258 text { font: FN; size: 10;
2357 text_class: "slider"; 2259 text_class: "slider";
2358 align: 0.5 1.0; 2260 align: 0.5 1.0;
@@ -2366,15 +2268,14 @@ group { name: "elm/slider/range/vertical/default";
2366 } 2268 }
2367 description { state: "disabled_visible" 0.0; 2269 description { state: "disabled_visible" 0.0;
2368 inherit: "visible" 0.0; 2270 inherit: "visible" 0.0;
2369 color: 96 96 96 255; 2271 color_class: "/fg/disabled/slider/text/units";
2370 } 2272 }
2371 } 2273 }
2372 part { name: "button"; type: GROUP; mouse_events: 0; 2274 part { name: "button"; type: GROUP; mouse_events: 0;
2373 source: "elm/slider/vertical/indicator/default"; 2275 source: "elm/slider/vertical/indicator/default";
2374 description { state: "default" 0.0; 2276 description { state: "default" 0.0;
2375 fixed: 1 1; 2277 fixed: 1 1;
2376 rel1.to: "elm.dragable.slider"; 2278 rel.to: "elm.dragable.slider";
2377 rel2.to: "elm.dragable.slider";
2378 } 2279 }
2379 description { state: "hidden" 0.0; 2280 description { state: "hidden" 0.0;
2380 inherit: "default" 0.0; 2281 inherit: "default" 0.0;
@@ -2387,7 +2288,7 @@ group { name: "elm/slider/range/vertical/default";
2387 dragable.y: 1 1 0; 2288 dragable.y: 1 1 0;
2388 dragable.confine: "elm.swallow.bar"; 2289 dragable.confine: "elm.swallow.bar";
2389 description { state: "default" 0.0; 2290 description { state: "default" 0.0;
2390 color: 0 0 0 0; 2291 color: 0 0 0 0; // no cc
2391 min: 16 16; 2292 min: 16 16;
2392 max: 16 16; 2293 max: 16 16;
2393 fixed: 1 1; 2294 fixed: 1 1;
@@ -2401,20 +2302,19 @@ group { name: "elm/slider/range/vertical/default";
2401 scale: 1; 2302 scale: 1;
2402 description { state: "default" 0.0; 2303 description { state: "default" 0.0;
2403 fixed: 1 1; 2304 fixed: 1 1;
2404 rel1.to: "elm.dragable.slider"; 2305 rel.to: "elm.dragable.slider";
2405 rel2.to: "elm.dragable.slider";
2406 image.normal: "i-radio"; 2306 image.normal: "i-radio";
2407 min: 16 16; 2307 min: 16 16;
2408 max: 16 16; 2308 max: 16 16;
2409 color: 160 160 160 255; 2309 color_class: "/fg/normal/slider/knob";
2410 } 2310 }
2411 description { state: "clicked" 0.0; 2311 description { state: "clicked" 0.0;
2412 inherit: "default" 0.0; 2312 inherit: "default" 0.0;
2413 color: 255 255 255 255; 2313 color_class: "/fg/pressed/slider/knob";
2414 } 2314 }
2415 description { state: "disabled" 0.0; 2315 description { state: "disabled" 0.0;
2416 inherit: "default" 0.0; 2316 inherit: "default" 0.0;
2417 color: 96 96 96 255; 2317 color_class: "/fg/disabled/slider/knob";
2418 } 2318 }
2419 } 2319 }
2420 part { name: "slideevent"; type: RECT; repeat_events: 1; 2320 part { name: "slideevent"; type: RECT; repeat_events: 1;
@@ -2423,24 +2323,21 @@ group { name: "elm/slider/range/vertical/default";
2423 dragable.events: "elm.dragable.slider"; 2323 dragable.events: "elm.dragable.slider";
2424 description { state: "default" 0.0; 2324 description { state: "default" 0.0;
2425 fixed: 1 1; 2325 fixed: 1 1;
2426 rel1.to: "elm.dragable.slider"; 2326 rel.to: "elm.dragable.slider";
2427 rel2.to: "elm.dragable.slider"; 2327 color: 0 0 0 0; // no cc
2428 color: 0 0 0 0;
2429 } 2328 }
2430 } 2329 }
2431 part { name: "elm.track.slider"; type: SWALLOW; mouse_events: 0; 2330 part { name: "elm.track.slider"; type: SWALLOW; mouse_events: 0;
2432 description { state: "default" 0.0; 2331 description { state: "default" 0.0;
2433 max: 0 0; 2332 max: 0 0;
2434 rel1.to: "elm.dragable.slider"; 2333 rel.to: "elm.dragable.slider";
2435 rel2.to: "elm.dragable.slider";
2436 } 2334 }
2437 } 2335 }
2438 part { name: "button2"; type: GROUP; mouse_events: 0; 2336 part { name: "button2"; type: GROUP; mouse_events: 0;
2439 source: "elm/slider/vertical/indicator/default"; 2337 source: "elm/slider/vertical/indicator/default";
2440 description { state: "default" 0.0; 2338 description { state: "default" 0.0;
2441 fixed: 1 1; 2339 fixed: 1 1;
2442 rel1.to: "elm.dragable2.slider"; 2340 rel.to: "elm.dragable2.slider";
2443 rel2.to: "elm.dragable2.slider";
2444 } 2341 }
2445 description { state: "hidden" 0.0; 2342 description { state: "hidden" 0.0;
2446 inherit: "default" 0.0; 2343 inherit: "default" 0.0;
@@ -2454,7 +2351,7 @@ group { name: "elm/slider/range/vertical/default";
2454 dragable.y: 1 1 0; 2351 dragable.y: 1 1 0;
2455 dragable.confine: "elm.swallow.bar"; 2352 dragable.confine: "elm.swallow.bar";
2456 description { state: "default" 0.0; 2353 description { state: "default" 0.0;
2457 color: 0 0 0 0; 2354 color: 0 0 0 0; // no cc
2458 min: 16 16; 2355 min: 16 16;
2459 max: 16 16; 2356 max: 16 16;
2460 fixed: 1 1; 2357 fixed: 1 1;
@@ -2469,20 +2366,19 @@ group { name: "elm/slider/range/vertical/default";
2469 scale: 1; 2366 scale: 1;
2470 description { state: "default" 0.0; 2367 description { state: "default" 0.0;
2471 fixed: 1 1; 2368 fixed: 1 1;
2472 rel1.to: "elm.dragable2.slider"; 2369 rel.to: "elm.dragable2.slider";
2473 rel2.to: "elm.dragable2.slider";
2474 image.normal: "i-radio"; 2370 image.normal: "i-radio";
2475 min: 16 16; 2371 min: 16 16;
2476 max: 16 16; 2372 max: 16 16;
2477 color: 160 160 160 255; 2373 color_class: "/fg/normal/slider/knob";
2478 } 2374 }
2479 description { state: "clicked" 0.0; 2375 description { state: "clicked" 0.0;
2480 inherit: "default" 0.0; 2376 inherit: "default" 0.0;
2481 color: 255 255 255 255; 2377 color_class: "/fg/pressed/slider/knob";
2482 } 2378 }
2483 description { state: "disabled" 0.0; 2379 description { state: "disabled" 0.0;
2484 inherit: "default" 0.0; 2380 inherit: "default" 0.0;
2485 color: 96 96 96 255; 2381 color_class: "/fg/disabled/slider/knob";
2486 } 2382 }
2487 } 2383 }
2488 part { name: "slideevent2"; type: RECT; repeat_events: 1; 2384 part { name: "slideevent2"; type: RECT; repeat_events: 1;
@@ -2492,17 +2388,15 @@ group { name: "elm/slider/range/vertical/default";
2492 dragable.events: "elm.dragable2.slider"; 2388 dragable.events: "elm.dragable2.slider";
2493 description { state: "default" 0.0; 2389 description { state: "default" 0.0;
2494 fixed: 1 1; 2390 fixed: 1 1;
2495 rel1.to: "elm.dragable2.slider"; 2391 rel.to: "elm.dragable2.slider";
2496 rel2.to: "elm.dragable2.slider"; 2392 color: 0 0 0 0; // no cc
2497 color: 0 0 0 0;
2498 } 2393 }
2499 } 2394 }
2500 part { name: "elm.track2.slider"; type: SWALLOW; mouse_events: 0; 2395 part { name: "elm.track2.slider"; type: SWALLOW; mouse_events: 0;
2501 clip_to: "enable2"; 2396 clip_to: "enable2";
2502 description { state: "default" 0.0; 2397 description { state: "default" 0.0;
2503 max: 0 0; 2398 max: 0 0;
2504 rel1.to: "elm.dragable2.slider"; 2399 rel.to: "elm.dragable2.slider";
2505 rel2.to: "elm.dragable2.slider";
2506 } 2400 }
2507 } 2401 }
2508 part { name: "enable2"; type: RECT; 2402 part { name: "enable2"; type: RECT;
@@ -2518,7 +2412,7 @@ group { name: "elm/slider/range/vertical/default";
2518 } 2412 }
2519 part { name: "event"; type: RECT; 2413 part { name: "event"; type: RECT;
2520 description { state: "default" 0.0; 2414 description { state: "default" 0.0;
2521 color: 0 0 0 0; 2415 color: 0 0 0 0; // no cc
2522 visible: 0; 2416 visible: 0;
2523 } 2417 }
2524 description { state: "disabled" 0.0; 2418 description { state: "disabled" 0.0;
@@ -2553,38 +2447,31 @@ group { name: "elm/slider/range/vertical/default";
2553 if (r) update_glow(m); 2447 if (r) update_glow(m);
2554 } 2448 }
2555 } 2449 }
2556 program { 2450 program { signal: "mouse,down,1"; source: "elm.dragable.slider";
2557 signal: "mouse,down,1"; source: "elm.dragable.slider";
2558 action: STATE_SET "clicked" 0.0; 2451 action: STATE_SET "clicked" 0.0;
2559 target: "knob"; 2452 target: "knob";
2560 } 2453 }
2561 program { 2454 program { signal: "mouse,up,1"; source: "elm.dragable.slider";
2562 signal: "mouse,up,1"; source: "elm.dragable.slider";
2563 action: STATE_SET "default" 0.0; 2455 action: STATE_SET "default" 0.0;
2564 target: "knob"; 2456 target: "knob";
2565 } 2457 }
2566 program { 2458 program { signal: "mouse,down,1"; source: "elm.dragable2.slider";
2567 signal: "mouse,down,1"; source: "elm.dragable2.slider";
2568 action: STATE_SET "clicked" 0.0; 2459 action: STATE_SET "clicked" 0.0;
2569 target: "knob2"; 2460 target: "knob2";
2570 } 2461 }
2571 program { 2462 program { signal: "mouse,up,1"; source: "elm.dragable2.slider";
2572 signal: "mouse,up,1"; source: "elm.dragable2.slider";
2573 action: STATE_SET "default" 0.0; 2463 action: STATE_SET "default" 0.0;
2574 target: "knob2"; 2464 target: "knob2";
2575 } 2465 }
2576 program { 2466 program { signal: "elm,state,indicator,show"; source: "elm";
2577 signal: "elm,state,indicator,show"; source: "elm";
2578 action: SIGNAL_EMIT "elm,popup,show" "elm"; 2467 action: SIGNAL_EMIT "elm,popup,show" "elm";
2579 after: "popup_show2"; 2468 after: "popup_show2";
2580 } 2469 }
2581 program { 2470 program { signal: "elm,state,indicator,hide"; source: "elm";
2582 signal: "elm,state,indicator,hide"; source: "elm";
2583 action: SIGNAL_EMIT "elm,popup,hide" "elm"; 2471 action: SIGNAL_EMIT "elm,popup,hide" "elm";
2584 after: "popup_hide2"; 2472 after: "popup_hide2";
2585 } 2473 }
2586 program { 2474 program { signal: "mouse,down,1"; source: "slideevent";
2587 signal: "mouse,down,1"; source: "slideevent";
2588 action: SIGNAL_EMIT "elm,popup,show" "elm"; 2475 action: SIGNAL_EMIT "elm,popup,show" "elm";
2589 after: "popup_show2"; 2476 after: "popup_show2";
2590 } 2477 }
@@ -2592,8 +2479,7 @@ group { name: "elm/slider/range/vertical/default";
2592 action: STATE_SET "hidden" 0.0; 2479 action: STATE_SET "hidden" 0.0;
2593 target: "button"; 2480 target: "button";
2594 } 2481 }
2595 program { 2482 program { signal: "mouse,up,1"; source: "slideevent";
2596 signal: "mouse,up,1"; source: "slideevent";
2597 action: SIGNAL_EMIT "elm,popup,hide" "elm"; 2483 action: SIGNAL_EMIT "elm,popup,hide" "elm";
2598 after: "popup_hide2"; 2484 after: "popup_hide2";
2599 } 2485 }
@@ -2601,18 +2487,15 @@ group { name: "elm/slider/range/vertical/default";
2601 action: STATE_SET "default" 0.0; 2487 action: STATE_SET "default" 0.0;
2602 target: "button"; 2488 target: "button";
2603 } 2489 }
2604 program { 2490 program { signal: "mouse,down,1"; source: "slideevent2";
2605 signal: "mouse,down,1"; source: "slideevent2";
2606 action: SIGNAL_EMIT "elm,popup,show" "elm"; 2491 action: SIGNAL_EMIT "elm,popup,show" "elm";
2607 after: "popup_show2"; 2492 after: "popup_show2";
2608 } 2493 }
2609 program { 2494 program { signal: "mouse,up,1"; source: "slideevent2";
2610 signal: "mouse,up,1"; source: "slideevent2";
2611 action: SIGNAL_EMIT "elm,popup,hide" "elm"; 2495 action: SIGNAL_EMIT "elm,popup,hide" "elm";
2612 after: "popup_hide2"; 2496 after: "popup_hide2";
2613 } 2497 }
2614 program { 2498 program { signal: "elm,state,text,visible"; source: "elm";
2615 signal: "elm,state,text,visible"; source: "elm";
2616 script { 2499 script {
2617 new m = get_int(slmode); 2500 new m = get_int(slmode);
2618 m |= LABEL; set_int(slmode, m); 2501 m |= LABEL; set_int(slmode, m);
@@ -2620,8 +2503,7 @@ group { name: "elm/slider/range/vertical/default";
2620 update_glow(m); 2503 update_glow(m);
2621 } 2504 }
2622 } 2505 }
2623 program { 2506 program { signal: "elm,state,text,hidden"; source: "elm";
2624 signal: "elm,state,text,hidden"; source: "elm";
2625 script { 2507 script {
2626 new m = get_int(slmode); 2508 new m = get_int(slmode);
2627 m &= ~LABEL; set_int(slmode, m); 2509 m &= ~LABEL; set_int(slmode, m);
@@ -2629,8 +2511,7 @@ group { name: "elm/slider/range/vertical/default";
2629 update_glow(m); 2511 update_glow(m);
2630 } 2512 }
2631 } 2513 }
2632 program { 2514 program { signal: "elm,state,icon,visible"; source: "elm";
2633 signal: "elm,state,icon,visible"; source: "elm";
2634 script { 2515 script {
2635 new m = get_int(slmode); 2516 new m = get_int(slmode);
2636 m |= ICON; set_int(slmode, m); 2517 m |= ICON; set_int(slmode, m);
@@ -2638,8 +2519,7 @@ group { name: "elm/slider/range/vertical/default";
2638 update_glow(m); 2519 update_glow(m);
2639 } 2520 }
2640 } 2521 }
2641 program { 2522 program { signal: "elm,state,icon,hidden"; source: "elm";
2642 signal: "elm,state,icon,hidden"; source: "elm";
2643 script { 2523 script {
2644 new m = get_int(slmode); 2524 new m = get_int(slmode);
2645 m &= ~ICON; set_int(slmode, m); 2525 m &= ~ICON; set_int(slmode, m);
@@ -2665,8 +2545,7 @@ group { name: "elm/slider/range/vertical/default";
2665 update_glow(m); 2545 update_glow(m);
2666 } 2546 }
2667 } 2547 }
2668 program { 2548 program { signal: "elm,state,units,visible"; source: "elm";
2669 signal: "elm,state,units,visible"; source: "elm";
2670 script { 2549 script {
2671 new m = get_int(slmode); 2550 new m = get_int(slmode);
2672 m |= UNITS; set_int(slmode, m); 2551 m |= UNITS; set_int(slmode, m);
@@ -2674,13 +2553,11 @@ group { name: "elm/slider/range/vertical/default";
2674 update_glow(m); 2553 update_glow(m);
2675 } 2554 }
2676 } 2555 }
2677 program { 2556 program { signal: "elm,state,units,visible"; source: "elm";
2678 signal: "elm,state,units,visible"; source: "elm";
2679 action: SIGNAL_EMIT "limits,visible" "elm"; 2557 action: SIGNAL_EMIT "limits,visible" "elm";
2680 target: "limits"; 2558 target: "limits";
2681 } 2559 }
2682 program { 2560 program { signal: "elm,state,units,hidden"; source: "elm";
2683 signal: "elm,state,units,hidden"; source: "elm";
2684 action: STATE_SET "default" 0.0; 2561 action: STATE_SET "default" 0.0;
2685 script { 2562 script {
2686 new m = get_int(slmode); 2563 new m = get_int(slmode);
@@ -2689,13 +2566,11 @@ group { name: "elm/slider/range/vertical/default";
2689 update_glow(m); 2566 update_glow(m);
2690 } 2567 }
2691 } 2568 }
2692 program { 2569 program { signal: "elm,state,units,hidden"; source: "elm";
2693 signal: "elm,state,units,hidden"; source: "elm";
2694 action: SIGNAL_EMIT "limits,hide" "elm"; 2570 action: SIGNAL_EMIT "limits,hide" "elm";
2695 target: "limits"; 2571 target: "limits";
2696 } 2572 }
2697 program { 2573 program { signal: "elm,state,inverted,on"; source: "elm";
2698 signal: "elm,state,inverted,on"; source: "elm";
2699 script { 2574 script {
2700 new m = get_int(slmode); 2575 new m = get_int(slmode);
2701 m |= INVERT; set_int(slmode, m); 2576 m |= INVERT; set_int(slmode, m);
@@ -2703,8 +2578,7 @@ group { name: "elm/slider/range/vertical/default";
2703 update_glow(m); 2578 update_glow(m);
2704 } 2579 }
2705 } 2580 }
2706 program { 2581 program { signal: "elm,state,inverted,off"; source: "elm";
2707 signal: "elm,state,inverted,off"; source: "elm";
2708 script { 2582 script {
2709 new m = get_int(slmode); 2583 new m = get_int(slmode);
2710 m &= ~INVERT; set_int(slmode, m); 2584 m &= ~INVERT; set_int(slmode, m);
@@ -2712,8 +2586,7 @@ group { name: "elm/slider/range/vertical/default";
2712 update_glow(m); 2586 update_glow(m);
2713 } 2587 }
2714 } 2588 }
2715 program { 2589 program { signal: "elm,state,disabled"; source: "elm";
2716 signal: "elm,state,disabled"; source: "elm";
2717 script { 2590 script {
2718 new m = get_int(slmode); 2591 new m = get_int(slmode);
2719 m |= DISABLE; set_int(slmode, m); 2592 m |= DISABLE; set_int(slmode, m);
@@ -2721,8 +2594,7 @@ group { name: "elm/slider/range/vertical/default";
2721 update_glow(m); 2594 update_glow(m);
2722 } 2595 }
2723 } 2596 }
2724 program { 2597 program { signal: "elm,state,enabled"; source: "elm";
2725 signal: "elm,state,enabled"; source: "elm";
2726 script { 2598 script {
2727 new m = get_int(slmode); 2599 new m = get_int(slmode);
2728 m &= ~DISABLE; set_int(slmode, m); 2600 m &= ~DISABLE; set_int(slmode, m);
diff --git a/data/elementary/themes/edc/elm/thumb.edc b/data/elementary/themes/edc/elm/thumb.edc
index f35865fd6d..0c2345b471 100644
--- a/data/elementary/themes/edc/elm/thumb.edc
+++ b/data/elementary/themes/edc/elm/thumb.edc
@@ -6,12 +6,13 @@ group { name: "elm/thumb/base/default";
6 description { state: "default" 0.0; 6 description { state: "default" 0.0;
7 rel.to: "bg"; 7 rel.to: "bg";
8 WIN_SHADOW_SMALL; 8 WIN_SHADOW_SMALL;
9 color_class: "/shadow/normal/thumb";
9 } 10 }
10 } 11 }
11 part { name: "bg"; type: RECT; 12 part { name: "bg"; type: RECT;
12 description { state: "default" 0.0; 13 description { state: "default" 0.0;
13 rel.to: "elm.swallow.content"; 14 rel.to: "elm.swallow.content";
14 color: 64 64 64 255; 15 color_class: "/bg/normal/thumb";
15 } 16 }
16 } 17 }
17 part { name: "clip"; type: RECT; 18 part { name: "clip"; type: RECT;
@@ -31,18 +32,18 @@ group { name: "elm/thumb/base/default";
31 part { name: "busy_clip"; type: RECT; 32 part { name: "busy_clip"; type: RECT;
32 description { state: "default" 0.0; 33 description { state: "default" 0.0;
33 visible: 0; 34 visible: 0;
34 color: 255 255 255 0; 35 color: 255 255 255 0; // no cc
35 } 36 }
36 description { state: "active" 0.0; 37 description { state: "active" 0.0;
37 visible: 1; 38 visible: 1;
38 color: 255 255 255 255; 39 color: 255 255 255 255; // no cc
39 } 40 }
40 } 41 }
41 part { name: "busy"; type: RECT; mouse_events: 0; 42 part { name: "busy"; type: RECT; mouse_events: 0;
42 clip_to: "busy_clip"; 43 clip_to: "busy_clip";
43 description { state: "default" 0.0; 44 description { state: "default" 0.0;
44 rel.to: "bg"; 45 rel.to: "bg";
45 color: 51 153 255 255; 46 color_class: "/fg/selected/thumb/bar";
46 fixed: 1 1; 47 fixed: 1 1;
47 min: 10 5; 48 min: 10 5;
48 max: 10 5; 49 max: 10 5;
diff --git a/data/elementary/themes/edc/elm/toolbar.edc b/data/elementary/themes/edc/elm/toolbar.edc
index 88907d4215..f74993501f 100644
--- a/data/elementary/themes/edc/elm/toolbar.edc
+++ b/data/elementary/themes/edc/elm/toolbar.edc
@@ -3,13 +3,12 @@ group { name: "elm/toolbar/base/default";
3 parts { 3 parts {
4 part { name: "base"; type: RECT; 4 part { name: "base"; type: RECT;
5 description { state: "default" 0.0; 5 description { state: "default" 0.0;
6 color: 64 64 64 255; 6 color_class: "/bg/normal/toolbar";
7 } 7 }
8 } 8 }
9 part { name: "clipper"; type: RECT; 9 part { name: "clipper"; type: RECT;
10 description { state: "default" 0.0; 10 description { state: "default" 0.0;
11 rel1.to: "base"; 11 rel.to: "base";
12 rel2.to: "base";
13 } 12 }
14 } 13 }
15 part { name: "elm.swallow.content"; type: SWALLOW; 14 part { name: "elm.swallow.content"; type: SWALLOW;
@@ -33,12 +32,12 @@ group { name: "elm/toolbar/base/default";
33 fixed: 1 1; 32 fixed: 1 1;
34 rel.to: "base"; 33 rel.to: "base";
35 align: 0.0 0.5; 34 align: 0.0 0.5;
36 color: 0 0 0 128; 35 color_class: "/dim/normal/toolbar/arrow";
37 FIXED_SIZE(23, 23) 36 FIXED_SIZE(23, 23)
38 } 37 }
39 description { state: "clicked" 0.0; 38 description { state: "clicked" 0.0;
40 inherit: "default" 0.0; 39 inherit: "default" 0.0;
41 color: 0 0 0 192; 40 color_class: "/dim/pressed/toolbar/arrow";
42 } 41 }
43 } 42 }
44 part { name: "arrow_l"; mouse_events: 0; 43 part { name: "arrow_l"; mouse_events: 0;
@@ -49,11 +48,11 @@ group { name: "elm/toolbar/base/default";
49 rel.to: "arrow_l_ev"; 48 rel.to: "arrow_l_ev";
50 image.normal: "i-arrow-l"; 49 image.normal: "i-arrow-l";
51 FIXED_SIZE(15, 15) 50 FIXED_SIZE(15, 15)
52 color: 160 160 160 255; 51 color_class: "/fg/normal/toolbar/arrow";
53 } 52 }
54 description { state: "clicked" 0.0; 53 description { state: "clicked" 0.0;
55 inherit: "default" 0.0; 54 inherit: "default" 0.0;
56 color: 255 255 255 255; 55 color_class: "/fg/pressed/toolbar/arrow";
57 } 56 }
58 } 57 }
59 58
@@ -73,12 +72,12 @@ group { name: "elm/toolbar/base/default";
73 fixed: 1 1; 72 fixed: 1 1;
74 rel.to: "base"; 73 rel.to: "base";
75 align: 1.0 0.5; 74 align: 1.0 0.5;
76 color: 0 0 0 128; 75 color_class: "/dim/normal/toolbar/arrow";
77 FIXED_SIZE(23, 23) 76 FIXED_SIZE(23, 23)
78 } 77 }
79 description { state: "clicked" 0.0; 78 description { state: "clicked" 0.0;
80 inherit: "default" 0.0; 79 inherit: "default" 0.0;
81 color: 0 0 0 192; 80 color_class: "/dim/pressed/toolbar/arrow";
82 } 81 }
83 } 82 }
84 part { name: "arrow_r"; mouse_events: 0; 83 part { name: "arrow_r"; mouse_events: 0;
@@ -89,11 +88,11 @@ group { name: "elm/toolbar/base/default";
89 rel.to: "arrow_r_ev"; 88 rel.to: "arrow_r_ev";
90 image.normal: "i-arrow-r"; 89 image.normal: "i-arrow-r";
91 FIXED_SIZE(15, 15) 90 FIXED_SIZE(15, 15)
92 color: 160 160 160 255; 91 color_class: "/fg/normal/toolbar/arrow";
93 } 92 }
94 description { state: "clicked" 0.0; 93 description { state: "clicked" 0.0;
95 inherit: "default" 0.0; 94 inherit: "default" 0.0;
96 color: 255 255 255 255; 95 color_class: "/fg/pressed/toolbar/arrow";
97 } 96 }
98 } 97 }
99 98
@@ -113,12 +112,12 @@ group { name: "elm/toolbar/base/default";
113 fixed: 1 1; 112 fixed: 1 1;
114 rel.to: "base"; 113 rel.to: "base";
115 align: 0.5 0.0; 114 align: 0.5 0.0;
116 color: 0 0 0 128; 115 color_class: "/dim/normal/toolbar/arrow";
117 FIXED_SIZE(23, 23) 116 FIXED_SIZE(23, 23)
118 } 117 }
119 description { state: "clicked" 0.0; 118 description { state: "clicked" 0.0;
120 inherit: "default" 0.0; 119 inherit: "default" 0.0;
121 color: 0 0 0 192; 120 color_class: "/dim/pressed/toolbar/arrow";
122 } 121 }
123 } 122 }
124 part { name: "arrow_u"; mouse_events: 0; 123 part { name: "arrow_u"; mouse_events: 0;
@@ -129,14 +128,14 @@ group { name: "elm/toolbar/base/default";
129 rel.to: "arrow_u_ev"; 128 rel.to: "arrow_u_ev";
130 image.normal: "i-arrow-u"; 129 image.normal: "i-arrow-u";
131 FIXED_SIZE(15, 15) 130 FIXED_SIZE(15, 15)
132 color: 160 160 160 255; 131 color_class: "/fg/normal/toolbar/arrow";
133 } 132 }
134 description { state: "clicked" 0.0; 133 description { state: "clicked" 0.0;
135 inherit: "default" 0.0; 134 inherit: "default" 0.0;
136 color: 255 255 255 255; 135 color_class: "/fg/pressed/toolbar/arrow";
137 } 136 }
138 } 137 }
139 138
140 part { name: "arrow_clipper_d"; type: RECT; 139 part { name: "arrow_clipper_d"; type: RECT;
141 description { state: "default" 0.0; 140 description { state: "default" 0.0;
142 visible: 0; 141 visible: 0;
@@ -153,12 +152,12 @@ group { name: "elm/toolbar/base/default";
153 fixed: 1 1; 152 fixed: 1 1;
154 rel.to: "base"; 153 rel.to: "base";
155 align: 0.5 1.0; 154 align: 0.5 1.0;
156 color: 0 0 0 128; 155 color_class: "/dim/normal/toolbar/arrow";
157 FIXED_SIZE(23, 23) 156 FIXED_SIZE(23, 23)
158 } 157 }
159 description { state: "clicked" 0.0; 158 description { state: "clicked" 0.0;
160 inherit: "default" 0.0; 159 inherit: "default" 0.0;
161 color: 0 0 0 192; 160 color_class: "/dim/pressed/toolbar/arrow";
162 } 161 }
163 } 162 }
164 part { name: "arrow_d"; mouse_events: 0; 163 part { name: "arrow_d"; mouse_events: 0;
@@ -169,11 +168,11 @@ group { name: "elm/toolbar/base/default";
169 rel.to: "arrow_d_ev"; 168 rel.to: "arrow_d_ev";
170 image.normal: "i-arrow-d"; 169 image.normal: "i-arrow-d";
171 FIXED_SIZE(15, 15) 170 FIXED_SIZE(15, 15)
172 color: 160 160 160 255; 171 color_class: "/fg/normal/toolbar/arrow";
173 } 172 }
174 description { state: "clicked" 0.0; 173 description { state: "clicked" 0.0;
175 inherit: "default" 0.0; 174 inherit: "default" 0.0;
176 color: 255 255 255 255; 175 color_class: "/fg/pressed/toolbar/arrow";
177 } 176 }
178 } 177 }
179 } 178 }
@@ -184,18 +183,15 @@ group { name: "elm/toolbar/base/default";
184// program { 183// program {
185// signal: "elm,orient,vertical"; source: "elm"; 184// signal: "elm,orient,vertical"; source: "elm";
186// } 185// }
187 program { 186 program { signal: "elm,action,show,left"; source: "elm";
188 signal: "elm,action,show,left"; source: "elm";
189 action: STATE_SET "visible" 0.0; 187 action: STATE_SET "visible" 0.0;
190 target: "arrow_clipper_l"; 188 target: "arrow_clipper_l";
191 } 189 }
192 program { 190 program { signal: "elm,action,hide,left"; source: "elm";
193 signal: "elm,action,hide,left"; source: "elm";
194 action: STATE_SET "default" 0.0; 191 action: STATE_SET "default" 0.0;
195 target: "arrow_clipper_l"; 192 target: "arrow_clipper_l";
196 } 193 }
197 program { 194 program { signal: "mouse,down,1*"; source: "arrow_l_ev";
198 signal: "mouse,down,1*"; source: "arrow_l_ev";
199 action: SIGNAL_EMIT "elm,action,left" "elm"; 195 action: SIGNAL_EMIT "elm,action,left" "elm";
200 after: "arrow_l_repeat"; 196 after: "arrow_l_repeat";
201 } 197 }
@@ -204,34 +200,28 @@ group { name: "elm/toolbar/base/default";
204 in: 0.3 0.0; 200 in: 0.3 0.0;
205 after: "arrow_l_repeat"; 201 after: "arrow_l_repeat";
206 } 202 }
207 program { 203 program { signal: "mouse,up,1"; source: "arrow_l_ev";
208 signal: "mouse,up,1"; source: "arrow_l_ev";
209 action: ACTION_STOP; 204 action: ACTION_STOP;
210 target: "arrow_l_repeat"; 205 target: "arrow_l_repeat";
211 } 206 }
212 program { 207 program { signal: "mouse,down,1*"; source: "arrow_l_ev";
213 signal: "mouse,down,1*"; source: "arrow_l_ev";
214 action: STATE_SET "clicked" 0.0; 208 action: STATE_SET "clicked" 0.0;
215 target: "arrow_l"; 209 target: "arrow_l";
216 } 210 }
217 program { 211 program { signal: "mouse,up,1"; source: "arrow_l_ev";
218 signal: "mouse,up,1"; source: "arrow_l_ev";
219 action: STATE_SET "default" 0.0; 212 action: STATE_SET "default" 0.0;
220 target: "arrow_l"; 213 target: "arrow_l";
221 } 214 }
222 215
223 program { 216 program { signal: "elm,action,show,right"; source: "elm";
224 signal: "elm,action,show,right"; source: "elm";
225 action: STATE_SET "visible" 0.0; 217 action: STATE_SET "visible" 0.0;
226 target: "arrow_clipper_r"; 218 target: "arrow_clipper_r";
227 } 219 }
228 program { 220 program { signal: "elm,action,hide,right"; source: "elm";
229 signal: "elm,action,hide,right"; source: "elm";
230 action: STATE_SET "default" 0.0; 221 action: STATE_SET "default" 0.0;
231 target: "arrow_clipper_r"; 222 target: "arrow_clipper_r";
232 } 223 }
233 program { 224 program { signal: "mouse,down,1*"; source: "arrow_r_ev";
234 signal: "mouse,down,1*"; source: "arrow_r_ev";
235 action: SIGNAL_EMIT "elm,action,right" "elm"; 225 action: SIGNAL_EMIT "elm,action,right" "elm";
236 after: "arrow_r_repeat"; 226 after: "arrow_r_repeat";
237 } 227 }
@@ -240,34 +230,28 @@ group { name: "elm/toolbar/base/default";
240 in: 0.3 0.0; 230 in: 0.3 0.0;
241 after: "arrow_r_repeat"; 231 after: "arrow_r_repeat";
242 } 232 }
243 program { 233 program { signal: "mouse,up,1"; source: "arrow_r_ev";
244 signal: "mouse,up,1"; source: "arrow_r_ev";
245 action: ACTION_STOP; 234 action: ACTION_STOP;
246 target: "arrow_r_repeat"; 235 target: "arrow_r_repeat";
247 } 236 }
248 program { 237 program { signal: "mouse,down,1*"; source: "arrow_r_ev";
249 signal: "mouse,down,1*"; source: "arrow_r_ev";
250 action: STATE_SET "clicked" 0.0; 238 action: STATE_SET "clicked" 0.0;
251 target: "arrow_r"; 239 target: "arrow_r";
252 } 240 }
253 program { 241 program { signal: "mouse,up,1"; source: "arrow_r_ev";
254 signal: "mouse,up,1"; source: "arrow_r_ev";
255 action: STATE_SET "default" 0.0; 242 action: STATE_SET "default" 0.0;
256 target: "arrow_r"; 243 target: "arrow_r";
257 } 244 }
258 245
259 program { 246 program { signal: "elm,action,show,up"; source: "elm";
260 signal: "elm,action,show,up"; source: "elm";
261 action: STATE_SET "visible" 0.0; 247 action: STATE_SET "visible" 0.0;
262 target: "arrow_clipper_u"; 248 target: "arrow_clipper_u";
263 } 249 }
264 program { 250 program { signal: "elm,action,hide,up"; source: "elm";
265 signal: "elm,action,hide,up"; source: "elm";
266 action: STATE_SET "default" 0.0; 251 action: STATE_SET "default" 0.0;
267 target: "arrow_clipper_u"; 252 target: "arrow_clipper_u";
268 } 253 }
269 program { 254 program { signal: "mouse,down,1*"; source: "arrow_u_ev";
270 signal: "mouse,down,1*"; source: "arrow_u_ev";
271 action: SIGNAL_EMIT "elm,action,up" "elm"; 255 action: SIGNAL_EMIT "elm,action,up" "elm";
272 after: "arrow_u_repeat"; 256 after: "arrow_u_repeat";
273 } 257 }
@@ -276,34 +260,28 @@ group { name: "elm/toolbar/base/default";
276 in: 0.3 0.0; 260 in: 0.3 0.0;
277 after: "arrow_u_repeat"; 261 after: "arrow_u_repeat";
278 } 262 }
279 program { 263 program { signal: "mouse,up,1"; source: "arrow_u_ev";
280 signal: "mouse,up,1"; source: "arrow_u_ev";
281 action: ACTION_STOP; 264 action: ACTION_STOP;
282 target: "arrow_u_repeat"; 265 target: "arrow_u_repeat";
283 } 266 }
284 program { 267 program { signal: "mouse,down,1*"; source: "arrow_u_ev";
285 signal: "mouse,down,1*"; source: "arrow_u_ev";
286 action: STATE_SET "clicked" 0.0; 268 action: STATE_SET "clicked" 0.0;
287 target: "arrow_u"; 269 target: "arrow_u";
288 } 270 }
289 program { 271 program { signal: "mouse,up,1"; source: "arrow_u_ev";
290 signal: "mouse,up,1"; source: "arrow_u_ev";
291 action: STATE_SET "default" 0.0; 272 action: STATE_SET "default" 0.0;
292 target: "arrow_u"; 273 target: "arrow_u";
293 } 274 }
294 275
295 program { 276 program { signal: "elm,action,show,down"; source: "elm";
296 signal: "elm,action,show,down"; source: "elm";
297 action: STATE_SET "visible" 0.0; 277 action: STATE_SET "visible" 0.0;
298 target: "arrow_clipper_d"; 278 target: "arrow_clipper_d";
299 } 279 }
300 program { 280 program { signal: "elm,action,hide,down"; source: "elm";
301 signal: "elm,action,hide,down"; source: "elm";
302 action: STATE_SET "default" 0.0; 281 action: STATE_SET "default" 0.0;
303 target: "arrow_clipper_d"; 282 target: "arrow_clipper_d";
304 } 283 }
305 program { 284 program { signal: "mouse,down,1*"; source: "arrow_d_ev";
306 signal: "mouse,down,1*"; source: "arrow_d_ev";
307 action: SIGNAL_EMIT "elm,action,down" "elm"; 285 action: SIGNAL_EMIT "elm,action,down" "elm";
308 after: "arrow_d_repeat"; 286 after: "arrow_d_repeat";
309 } 287 }
@@ -312,18 +290,15 @@ group { name: "elm/toolbar/base/default";
312 in: 0.3 0.0; 290 in: 0.3 0.0;
313 after: "arrow_d_repeat"; 291 after: "arrow_d_repeat";
314 } 292 }
315 program { 293 program { signal: "mouse,up,1"; source: "arrow_d_ev";
316 signal: "mouse,up,1"; source: "arrow_d_ev";
317 action: ACTION_STOP; 294 action: ACTION_STOP;
318 target: "arrow_d_repeat"; 295 target: "arrow_d_repeat";
319 } 296 }
320 program { 297 program { signal: "mouse,down,1*"; source: "arrow_d_ev";
321 signal: "mouse,down,1*"; source: "arrow_d_ev";
322 action: STATE_SET "clicked" 0.0; 298 action: STATE_SET "clicked" 0.0;
323 target: "arrow_d"; 299 target: "arrow_d";
324 } 300 }
325 program { 301 program { signal: "mouse,up,1"; source: "arrow_d_ev";
326 signal: "mouse,up,1"; source: "arrow_d_ev";
327 action: STATE_SET "default" 0.0; 302 action: STATE_SET "default" 0.0;
328 target: "arrow_d"; 303 target: "arrow_d";
329 } 304 }
@@ -346,11 +321,13 @@ group { name: "elm/toolbar/item/default";
346 set_state(PART:"elm.swallow.icon_new", "default", 0.0); 321 set_state(PART:"elm.swallow.icon_new", "default", 0.0);
347 set_state(PART:"icon_clip", "default", 0.0); 322 set_state(PART:"icon_clip", "default", 0.0);
348 set_state(PART:"elm.text", "default", 0.0); 323 set_state(PART:"elm.text", "default", 0.0);
324 set_state(PART:"event", "default", 0.0);
349 } else { 325 } else {
350 set_state(PART:"elm.swallow.icon", "default", 0.0); 326 set_state(PART:"elm.swallow.icon", "default", 0.0);
351 set_state(PART:"elm.swallow.icon_new", "default", 0.0); 327 set_state(PART:"elm.swallow.icon_new", "default", 0.0);
352 set_state(PART:"icon_clip", "disabled", 0.0); 328 set_state(PART:"icon_clip", "disabled", 0.0);
353 set_state(PART:"elm.text", "disabled", 0.0); 329 set_state(PART:"elm.text", "disabled", 0.0);
330 set_state(PART:"event", "disabled", 0.0);
354 } 331 }
355 } else if (m1 == (ICON)) { 332 } else if (m1 == (ICON)) {
356 if (!d) { 333 if (!d) {
@@ -358,11 +335,13 @@ group { name: "elm/toolbar/item/default";
358 set_state(PART:"elm.swallow.icon_new", "icononly", 0.0); 335 set_state(PART:"elm.swallow.icon_new", "icononly", 0.0);
359 set_state(PART:"icon_clip", "default", 0.0); 336 set_state(PART:"icon_clip", "default", 0.0);
360 set_state(PART:"elm.text", "icononly", 0.0); 337 set_state(PART:"elm.text", "icononly", 0.0);
338 set_state(PART:"event", "default", 0.0);
361 } else { 339 } else {
362 set_state(PART:"elm.swallow.icon", "icononly", 0.0); 340 set_state(PART:"elm.swallow.icon", "icononly", 0.0);
363 set_state(PART:"elm.swallow.icon_new", "icononly", 0.0); 341 set_state(PART:"elm.swallow.icon_new", "icononly", 0.0);
364 set_state(PART:"icon_clip", "disabled", 0.0); 342 set_state(PART:"icon_clip", "disabled", 0.0);
365 set_state(PART:"elm.text", "icononly", 0.0); 343 set_state(PART:"elm.text", "icononly", 0.0);
344 set_state(PART:"event", "disabled", 0.0);
366 } 345 }
367 } else if (m1 == (LABEL)) { 346 } else if (m1 == (LABEL)) {
368 if (!d) { 347 if (!d) {
@@ -370,11 +349,13 @@ group { name: "elm/toolbar/item/default";
370 set_state(PART:"elm.swallow.icon_new", "noicon", 0.0); 349 set_state(PART:"elm.swallow.icon_new", "noicon", 0.0);
371 set_state(PART:"icon_clip", "default", 0.0); 350 set_state(PART:"icon_clip", "default", 0.0);
372 set_state(PART:"elm.text", "noicon", 0.0); 351 set_state(PART:"elm.text", "noicon", 0.0);
352 set_state(PART:"event", "default", 0.0);
373 } else { 353 } else {
374 set_state(PART:"elm.swallow.icon", "noicon", 0.0); 354 set_state(PART:"elm.swallow.icon", "noicon", 0.0);
375 set_state(PART:"elm.swallow.icon_new", "noicon", 0.0); 355 set_state(PART:"elm.swallow.icon_new", "noicon", 0.0);
376 set_state(PART:"icon_clip", "disabled", 0.0); 356 set_state(PART:"icon_clip", "disabled", 0.0);
377 set_state(PART:"elm.text", "noicon_disabled", 0.0); 357 set_state(PART:"elm.text", "noicon_disabled", 0.0);
358 set_state(PART:"event", "disabled", 0.0);
378 } 359 }
379 } else { 360 } else {
380 if (!d) { 361 if (!d) {
@@ -382,11 +363,13 @@ group { name: "elm/toolbar/item/default";
382 set_state(PART:"elm.swallow.icon_new", "noicon", 0.0); 363 set_state(PART:"elm.swallow.icon_new", "noicon", 0.0);
383 set_state(PART:"icon_clip", "default", 0.0); 364 set_state(PART:"icon_clip", "default", 0.0);
384 set_state(PART:"elm.text", "noicon", 0.0); 365 set_state(PART:"elm.text", "noicon", 0.0);
366 set_state(PART:"event", "default", 0.0);
385 } else { 367 } else {
386 set_state(PART:"elm.swallow.icon", "noicon", 0.0); 368 set_state(PART:"elm.swallow.icon", "noicon", 0.0);
387 set_state(PART:"elm.swallow.icon_new", "noicon", 0.0); 369 set_state(PART:"elm.swallow.icon_new", "noicon", 0.0);
388 set_state(PART:"icon_clip", "disabled", 0.0); 370 set_state(PART:"icon_clip", "disabled", 0.0);
389 set_state(PART:"elm.text", "noicon_disabled", 0.0); 371 set_state(PART:"elm.text", "noicon_disabled", 0.0);
372 set_state(PART:"event", "disabled", 0.0);
390 } 373 }
391 } 374 }
392 } 375 }
@@ -394,33 +377,35 @@ group { name: "elm/toolbar/item/default";
394 parts { 377 parts {
395 part { name: "base"; type: RECT; 378 part { name: "base"; type: RECT;
396 description { state: "default" 0.0; 379 description { state: "default" 0.0;
397 color: 80 80 80 0; 380 color_class: "/bg/normal/toolbar/base";
381 color: 255 255 255 0; // no cc
398 visible: 0; 382 visible: 0;
399 } 383 }
400 description { state: "selected" 0.0; 384 description { state: "selected" 0.0;
401 inherit: "default" 0.0; 385 inherit: "default" 0.0;
402 color: 80 80 80 255; 386 color_class: "/bg/selected/toolbar/base";
387 color: 255 255 255 255; // no cc
403 visible: 1; 388 visible: 1;
404 } 389 }
405 } 390 }
406 391
407 part { name: "icon_clip"; type: RECT; 392 part { name: "icon_clip"; type: RECT;
408 description { state: "default" 0.0; 393 description { state: "default" 0.0;
409 } 394 }
410 description { state: "disabled" 0.0; 395 description { state: "disabled" 0.0;
411 inherit: "default" 0.0; 396 inherit: "default" 0.0;
412 color: 255 255 255 64; 397 color: 255 255 255 64; // no cc
413 } 398 }
414 } 399 }
415 part { name: "icon_clip1"; type: RECT; 400 part { name: "icon_clip1"; type: RECT;
416 clip_to: "icon_clip"; 401 clip_to: "icon_clip";
417 description { state: "default" 0.0; 402 description { state: "default" 0.0;
418 color: 255 255 255 255; 403 color: 255 255 255 255; // no cc
419 visible: 1; 404 visible: 1;
420 } 405 }
421 description { state: "animation" 0.0; 406 description { state: "animation" 0.0;
422 inherit: "default" 0.0; 407 inherit: "default" 0.0;
423 color: 255 255 255 0; 408 color: 255 255 255 0; // no cc
424 visible: 0; 409 visible: 0;
425 } 410 }
426 } 411 }
@@ -458,12 +443,12 @@ group { name: "elm/toolbar/item/default";
458 part { name: "icon_clip2"; type: RECT; 443 part { name: "icon_clip2"; type: RECT;
459 clip_to: "icon_clip"; 444 clip_to: "icon_clip";
460 description { state: "default" 0.0; 445 description { state: "default" 0.0;
461 color: 255 255 255 0; 446 color: 255 255 255 0; // no cc
462 visible: 0; 447 visible: 0;
463 } 448 }
464 description { state: "animation" 0.0; 449 description { state: "animation" 0.0;
465 inherit: "default" 0.0; 450 inherit: "default" 0.0;
466 color: 255 255 255 255; 451 color: 255 255 255 255; // no cc
467 visible: 1; 452 visible: 1;
468 } 453 }
469 } 454 }
@@ -497,15 +482,15 @@ group { name: "elm/toolbar/item/default";
497 min: ICMIN ICMIN; 482 min: ICMIN ICMIN;
498 } 483 }
499 } 484 }
500 485
501 part { name: "text_clip1"; type: RECT; 486 part { name: "text_clip1"; type: RECT;
502 description { state: "default" 0.0; 487 description { state: "default" 0.0;
503 color: 255 255 255 255; 488 color: 255 255 255 255; // no cc
504 visible: 1; 489 visible: 1;
505 } 490 }
506 description { state: "animation" 0.0; 491 description { state: "animation" 0.0;
507 inherit: "default" 0.0; 492 inherit: "default" 0.0;
508 color: 255 255 255 0; 493 color: 255 255 255 0; // no cc
509 visible: 0; 494 visible: 0;
510 } 495 }
511 } 496 }
@@ -517,7 +502,7 @@ group { name: "elm/toolbar/item/default";
517 rel1.relative: 0.0 1.0; 502 rel1.relative: 0.0 1.0;
518 rel2.offset: -5 -5; 503 rel2.offset: -5 -5;
519 align: 0.5 1.0; 504 align: 0.5 1.0;
520 color: 160 160 160 255; 505 color_class: "/fg/normal/toolbar/text";
521 offscale; 506 offscale;
522 text { font: FN; size: 10; 507 text { font: FN; size: 10;
523 min: 1 1; 508 min: 1 1;
@@ -529,12 +514,12 @@ group { name: "elm/toolbar/item/default";
529 } 514 }
530 description { state: "selected" 0.0; 515 description { state: "selected" 0.0;
531 inherit: "default" 0.0; 516 inherit: "default" 0.0;
532 color: 255 255 255 255; 517 color_class: "/fg/selected/toolbar/text";
533 } 518 }
534 description { state: "disabled" 0.0; 519 description { state: "disabled" 0.0;
535 inherit: "default" 0.0; 520 inherit: "default" 0.0;
536 color: 80 80 80 255; 521 color_class: "/fg/disabled/toolbar/text";
537 } 522 }
538 description { state: "noicon" 0.0; 523 description { state: "noicon" 0.0;
539 inherit: "default" 0.0; 524 inherit: "default" 0.0;
540 rel1.offset: 4 -5; 525 rel1.offset: 4 -5;
@@ -542,7 +527,7 @@ group { name: "elm/toolbar/item/default";
542 } 527 }
543 description { state: "noicon_disabled" 0.0; 528 description { state: "noicon_disabled" 0.0;
544 inherit: "noicon" 0.0; 529 inherit: "noicon" 0.0;
545 color: 80 80 80 255; 530 color_class: "/fg/disabled/toolbar/text";
546 } 531 }
547 description { state: "icononly" 0.0; 532 description { state: "icononly" 0.0;
548 inherit: "default" 0.0; 533 inherit: "default" 0.0;
@@ -553,12 +538,12 @@ group { name: "elm/toolbar/item/default";
553 } 538 }
554 part { name: "text_clip2"; type: RECT; 539 part { name: "text_clip2"; type: RECT;
555 description { state: "default" 0.0; 540 description { state: "default" 0.0;
556 color: 255 255 255 0; 541 color: 255 255 255 0; // no cc
557 visible: 0; 542 visible: 0;
558 } 543 }
559 description { state: "animation" 0.0; 544 description { state: "animation" 0.0;
560 inherit: "default" 0.0; 545 inherit: "default" 0.0;
561 color: 255 255 255 255; 546 color: 255 255 255 255; // no cc
562 visible: 1; 547 visible: 1;
563 } 548 }
564 } 549 }
@@ -570,7 +555,7 @@ group { name: "elm/toolbar/item/default";
570 rel1.relative: 0.0 1.0; 555 rel1.relative: 0.0 1.0;
571 rel2.offset: -5 -5; 556 rel2.offset: -5 -5;
572 align: 0.5 1.0; 557 align: 0.5 1.0;
573 color: 160 160 160 255; 558 color_class: "/fg/normal/toolbar/text";
574 offscale; 559 offscale;
575 text { font: FN; size: 10; 560 text { font: FN; size: 10;
576 min: 1 1; 561 min: 1 1;
@@ -582,11 +567,11 @@ group { name: "elm/toolbar/item/default";
582 } 567 }
583 description { state: "selected" 0.0; 568 description { state: "selected" 0.0;
584 inherit: "default" 0.0; 569 inherit: "default" 0.0;
585 color: 255 255 255 255; 570 color_class: "/fg/selected/toolbar/text";
586 } 571 }
587 description { state: "disabled" 0.0; 572 description { state: "disabled" 0.0;
588 inherit: "default" 0.0; 573 inherit: "default" 0.0;
589 color: 80 80 80 255; 574 color_class: "/fg/disabled/toolbar/text";
590 } 575 }
591 description { state: "noicon" 0.0; 576 description { state: "noicon" 0.0;
592 inherit: "default" 0.0; 577 inherit: "default" 0.0;
@@ -595,7 +580,7 @@ group { name: "elm/toolbar/item/default";
595 } 580 }
596 description { state: "noicon_disabled" 0.0; 581 description { state: "noicon_disabled" 0.0;
597 inherit: "noicon" 0.0; 582 inherit: "noicon" 0.0;
598 color: 80 80 80 255; 583 color_class: "/fg/disabled/toolbar/text";
599 } 584 }
600 description { state: "icononly" 0.0; 585 description { state: "icononly" 0.0;
601 inherit: "default" 0.0; 586 inherit: "default" 0.0;
@@ -609,13 +594,12 @@ group { name: "elm/toolbar/item/default";
609 scale: 1; 594 scale: 1;
610 description { state: "default" 0.0; 595 description { state: "default" 0.0;
611 fixed: 0 1; 596 fixed: 0 1;
597 rel.to: "base";
612 rel1.offset: 0 -1; 598 rel1.offset: 0 -1;
613 rel1.relative: 0.0 1.0; 599 rel1.relative: 0.0 1.0;
614 rel1.to: "base";
615 rel2.offset: -1 -1; 600 rel2.offset: -1 -1;
616 rel2.to: "base";
617 align: 0.5 1.0; 601 align: 0.5 1.0;
618 color: 51 153 255 255; 602 color_class: "/bg/selected/toolbar/bar";
619 visible: 0; 603 visible: 0;
620 min: 0 0; 604 min: 0 0;
621 max: 99999 0; 605 max: 99999 0;
@@ -631,7 +615,11 @@ group { name: "elm/toolbar/item/default";
631 part { name: "event"; type: RECT; 615 part { name: "event"; type: RECT;
632 ignore_flags: ON_HOLD; 616 ignore_flags: ON_HOLD;
633 description { state: "default" 0.0; 617 description { state: "default" 0.0;
634 color: 0 0 0 0; 618 color: 0 0 0 0; // no cc
619 }
620 description { state: "disabled" 0.0;
621 inherit: "default" 0.0;
622 visible: 0;
635 } 623 }
636 } 624 }
637 } 625 }
@@ -654,8 +642,19 @@ group { name: "elm/toolbar/item/default";
654 target: "base"; 642 target: "base";
655 target: "bar"; 643 target: "bar";
656 } 644 }
657 program { 645 program { signal: "elm,state,unselected"; source: "elm";
658 signal: "elm,state,unselected"; source: "elm"; 646 action: STATE_SET "default" 0.0;
647 target: "elm.text";
648 target: "base";
649 target: "bar";
650 }
651 program { signal: "mouse,down,1"; source: "event";
652 action: STATE_SET "selected" 0.0;
653 target: "elm.text";
654 target: "base";
655 target: "bar";
656 }
657 program { signal: "mouse,up,1"; source: "event";
659 action: STATE_SET "default" 0.0; 658 action: STATE_SET "default" 0.0;
660 target: "elm.text"; 659 target: "elm.text";
661 target: "base"; 660 target: "base";
@@ -797,40 +796,48 @@ group { name: "elm/toolbar/item/item_horizontal";
797 set_state(PART:"elm.swallow.icon", "default", 0.0); 796 set_state(PART:"elm.swallow.icon", "default", 0.0);
798 set_state(PART:"icon_clip", "default", 0.0); 797 set_state(PART:"icon_clip", "default", 0.0);
799 set_state(PART:"elm.text", "default", 0.0); 798 set_state(PART:"elm.text", "default", 0.0);
799 set_state(PART:"event", "default", 0.0);
800 } else { 800 } else {
801 set_state(PART:"elm.swallow.icon", "default", 0.0); 801 set_state(PART:"elm.swallow.icon", "default", 0.0);
802 set_state(PART:"icon_clip", "disabled", 0.0); 802 set_state(PART:"icon_clip", "disabled", 0.0);
803 set_state(PART:"elm.text", "disabled", 0.0); 803 set_state(PART:"elm.text", "disabled", 0.0);
804 set_state(PART:"event", "disabled", 0.0);
804 } 805 }
805 } else if (m1 == (ICON)) { 806 } else if (m1 == (ICON)) {
806 if (!d) { 807 if (!d) {
807 set_state(PART:"elm.swallow.icon", "icononly", 0.0); 808 set_state(PART:"elm.swallow.icon", "icononly", 0.0);
808 set_state(PART:"icon_clip", "default", 0.0); 809 set_state(PART:"icon_clip", "default", 0.0);
809 set_state(PART:"elm.text", "icononly", 0.0); 810 set_state(PART:"elm.text", "icononly", 0.0);
811 set_state(PART:"event", "default", 0.0);
810 } else { 812 } else {
811 set_state(PART:"elm.swallow.icon", "icononly", 0.0); 813 set_state(PART:"elm.swallow.icon", "icononly", 0.0);
812 set_state(PART:"icon_clip", "disabled", 0.0); 814 set_state(PART:"icon_clip", "disabled", 0.0);
813 set_state(PART:"elm.text", "icononly", 0.0); 815 set_state(PART:"elm.text", "icononly", 0.0);
816 set_state(PART:"event", "disabled", 0.0);
814 } 817 }
815 } else if (m1 == (LABEL)) { 818 } else if (m1 == (LABEL)) {
816 if (!d) { 819 if (!d) {
817 set_state(PART:"elm.swallow.icon", "noicon", 0.0); 820 set_state(PART:"elm.swallow.icon", "noicon", 0.0);
818 set_state(PART:"icon_clip", "default", 0.0); 821 set_state(PART:"icon_clip", "default", 0.0);
819 set_state(PART:"elm.text", "noicon", 0.0); 822 set_state(PART:"elm.text", "noicon", 0.0);
823 set_state(PART:"event", "default", 0.0);
820 } else { 824 } else {
821 set_state(PART:"elm.swallow.icon", "noicon", 0.0); 825 set_state(PART:"elm.swallow.icon", "noicon", 0.0);
822 set_state(PART:"icon_clip", "disabled", 0.0); 826 set_state(PART:"icon_clip", "disabled", 0.0);
823 set_state(PART:"elm.text", "noicon_disabled", 0.0); 827 set_state(PART:"elm.text", "noicon_disabled", 0.0);
828 set_state(PART:"event", "disabled", 0.0);
824 } 829 }
825 } else { 830 } else {
826 if (!d) { 831 if (!d) {
827 set_state(PART:"elm.swallow.icon", "noicon", 0.0); 832 set_state(PART:"elm.swallow.icon", "noicon", 0.0);
828 set_state(PART:"icon_clip", "default", 0.0); 833 set_state(PART:"icon_clip", "default", 0.0);
829 set_state(PART:"elm.text", "noicon", 0.0); 834 set_state(PART:"elm.text", "noicon", 0.0);
835 set_state(PART:"event", "default", 0.0);
830 } else { 836 } else {
831 set_state(PART:"elm.swallow.icon", "noicon", 0.0); 837 set_state(PART:"elm.swallow.icon", "noicon", 0.0);
832 set_state(PART:"icon_clip", "disabled", 0.0); 838 set_state(PART:"icon_clip", "disabled", 0.0);
833 set_state(PART:"elm.text", "noicon_disabled", 0.0); 839 set_state(PART:"elm.text", "noicon_disabled", 0.0);
840 set_state(PART:"event", "disabled", 0.0);
834 } 841 }
835 } 842 }
836 } 843 }
@@ -838,33 +845,35 @@ group { name: "elm/toolbar/item/item_horizontal";
838 parts { 845 parts {
839 part { name: "base"; type: RECT; 846 part { name: "base"; type: RECT;
840 description { state: "default" 0.0; 847 description { state: "default" 0.0;
841 color: 80 80 80 0; 848 color_class: "/bg/normal/toolbar/base";
849 color: 255 255 255 0; // no cc
842 visible: 0; 850 visible: 0;
843 } 851 }
844 description { state: "selected" 0.0; 852 description { state: "selected" 0.0;
845 inherit: "default" 0.0; 853 inherit: "default" 0.0;
846 color: 80 80 80 255; 854 color_class: "/bg/selected/toolbar/base";
855 color: 255 255 255 255; // no cc
847 visible: 1; 856 visible: 1;
848 } 857 }
849 } 858 }
850 859
851 part { name: "icon_clip"; type: RECT; 860 part { name: "icon_clip"; type: RECT;
852 description { state: "default" 0.0; 861 description { state: "default" 0.0;
853 } 862 }
854 description { state: "disabled" 0.0; 863 description { state: "disabled" 0.0;
855 inherit: "default" 0.0; 864 inherit: "default" 0.0;
856 color: 255 255 255 64; 865 color: 255 255 255 64; // no cc
857 } 866 }
858 } 867 }
859 part { name: "icon_clip1"; type: RECT; 868 part { name: "icon_clip1"; type: RECT;
860 clip_to: "icon_clip"; 869 clip_to: "icon_clip";
861 description { state: "default" 0.0; 870 description { state: "default" 0.0;
862 color: 255 255 255 255; 871 color: 255 255 255 255; // no cc
863 visible: 1; 872 visible: 1;
864 } 873 }
865 description { state: "animation" 0.0; 874 description { state: "animation" 0.0;
866 inherit: "default" 0.0; 875 inherit: "default" 0.0;
867 color: 255 255 255 0; 876 color: 255 255 255 0; // no cc
868 visible: 0; 877 visible: 0;
869 } 878 }
870 } 879 }
@@ -900,12 +909,12 @@ group { name: "elm/toolbar/item/item_horizontal";
900 part { name: "icon_clip2"; type: RECT; 909 part { name: "icon_clip2"; type: RECT;
901 clip_to: "icon_clip"; 910 clip_to: "icon_clip";
902 description { state: "default" 0.0; 911 description { state: "default" 0.0;
903 color: 255 255 255 0; 912 color: 255 255 255 0; // no cc
904 visible: 0; 913 visible: 0;
905 } 914 }
906 description { state: "animation" 0.0; 915 description { state: "animation" 0.0;
907 inherit: "default" 0.0; 916 inherit: "default" 0.0;
908 color: 255 255 255 255; 917 color: 255 255 255 255; // no cc
909 visible: 1; 918 visible: 1;
910 } 919 }
911 } 920 }
@@ -940,12 +949,12 @@ group { name: "elm/toolbar/item/item_horizontal";
940 949
941 part { name: "text_clip1"; type: RECT; 950 part { name: "text_clip1"; type: RECT;
942 description { state: "default" 0.0; 951 description { state: "default" 0.0;
943 color: 255 255 255 255; 952 color: 255 255 255 255; // no cc
944 visible: 1; 953 visible: 1;
945 } 954 }
946 description { state: "animation" 0.0; 955 description { state: "animation" 0.0;
947 inherit: "default" 0.0; 956 inherit: "default" 0.0;
948 color: 255 255 255 0; 957 color: 255 255 255 0; // no cc
949 visible: 0; 958 visible: 0;
950 } 959 }
951 } 960 }
@@ -958,7 +967,7 @@ group { name: "elm/toolbar/item/item_horizontal";
958 rel1.relative: 1.0 0.0; 967 rel1.relative: 1.0 0.0;
959 rel2.offset: -5 -5; 968 rel2.offset: -5 -5;
960 align: 0.0 0.5; 969 align: 0.0 0.5;
961 color: 160 160 160 255; 970 color_class: "/fg/normal/toolbar/text";
962 offscale; 971 offscale;
963 text { font: FN; size: 10; 972 text { font: FN; size: 10;
964 min: 1 1; 973 min: 1 1;
@@ -969,18 +978,18 @@ group { name: "elm/toolbar/item/item_horizontal";
969 } 978 }
970 description { state: "selected" 0.0; 979 description { state: "selected" 0.0;
971 inherit: "default" 0.0; 980 inherit: "default" 0.0;
972 color: 255 255 255 255; 981 color_class: "/fg/selected/toolbar/text";
973 } 982 }
974 description { state: "disabled" 0.0; 983 description { state: "disabled" 0.0;
975 inherit: "default" 0.0; 984 inherit: "default" 0.0;
976 color: 80 80 80 255; 985 color_class: "/fg/disabled/toolbar/text";
977 } 986 }
978 description { state: "noicon" 0.0; 987 description { state: "noicon" 0.0;
979 inherit: "default" 0.0; 988 inherit: "default" 0.0;
980 } 989 }
981 description { state: "noicon_disabled" 0.0; 990 description { state: "noicon_disabled" 0.0;
982 inherit: "noicon" 0.0; 991 inherit: "noicon" 0.0;
983 color: 80 80 80 255; 992 color_class: "/fg/disabled/toolbar/text";
984 } 993 }
985 description { state: "icononly" 0.0; 994 description { state: "icononly" 0.0;
986 inherit: "default" 0.0; 995 inherit: "default" 0.0;
@@ -994,12 +1003,12 @@ group { name: "elm/toolbar/item/item_horizontal";
994 } 1003 }
995 part { name: "text_clip2"; type: RECT; 1004 part { name: "text_clip2"; type: RECT;
996 description { state: "default" 0.0; 1005 description { state: "default" 0.0;
997 color: 255 255 255 0; 1006 color: 255 255 255 0; // no cc
998 visible: 0; 1007 visible: 0;
999 } 1008 }
1000 description { state: "animation" 0.0; 1009 description { state: "animation" 0.0;
1001 inherit: "default" 0.0; 1010 inherit: "default" 0.0;
1002 color: 255 255 255 255; 1011 color: 255 255 255 255; // no cc
1003 visible: 1; 1012 visible: 1;
1004 } 1013 }
1005 } 1014 }
@@ -1011,7 +1020,7 @@ group { name: "elm/toolbar/item/item_horizontal";
1011 rel1.relative: 1.0 0.0; 1020 rel1.relative: 1.0 0.0;
1012 rel2.offset: -5 -5; 1021 rel2.offset: -5 -5;
1013 align: 0.0 0.5; 1022 align: 0.0 0.5;
1014 color: 160 160 160 255; 1023 color_class: "/fg/normal/toolbar/text";
1015 offscale; 1024 offscale;
1016 text { font: FN; size: 10; 1025 text { font: FN; size: 10;
1017 min: 1 1; 1026 min: 1 1;
@@ -1023,11 +1032,11 @@ group { name: "elm/toolbar/item/item_horizontal";
1023 } 1032 }
1024 description { state: "selected" 0.0; 1033 description { state: "selected" 0.0;
1025 inherit: "default" 0.0; 1034 inherit: "default" 0.0;
1026 color: 255 255 255 255; 1035 color_class: "/fg/selected/toolbar/text";
1027 } 1036 }
1028 description { state: "disabled" 0.0; 1037 description { state: "disabled" 0.0;
1029 inherit: "default" 0.0; 1038 inherit: "default" 0.0;
1030 color: 80 80 80 255; 1039 color_class: "/fg/disabled/toolbar/text";
1031 } 1040 }
1032 description { state: "noicon" 0.0; 1041 description { state: "noicon" 0.0;
1033 inherit: "default" 0.0; 1042 inherit: "default" 0.0;
@@ -1039,7 +1048,7 @@ group { name: "elm/toolbar/item/item_horizontal";
1039 } 1048 }
1040 description { state: "noicon_disabled" 0.0; 1049 description { state: "noicon_disabled" 0.0;
1041 inherit: "noicon" 0.0; 1050 inherit: "noicon" 0.0;
1042 color: 80 80 80 255; 1051 color_class: "/fg/disabled/toolbar/text";
1043 } 1052 }
1044 description { state: "icononly" 0.0; 1053 description { state: "icononly" 0.0;
1045 inherit: "default" 0.0; 1054 inherit: "default" 0.0;
@@ -1061,7 +1070,7 @@ group { name: "elm/toolbar/item/item_horizontal";
1061 rel1.relative: 0.0 1.0; 1070 rel1.relative: 0.0 1.0;
1062 rel2.offset: -1 -1; 1071 rel2.offset: -1 -1;
1063 align: 0.5 1.0; 1072 align: 0.5 1.0;
1064 color: 51 153 255 255; 1073 color_class: "/bg/selected/toolbar/bar";
1065 visible: 0; 1074 visible: 0;
1066 min: 0 0; 1075 min: 0 0;
1067 max: 99999 0; 1076 max: 99999 0;
@@ -1077,7 +1086,11 @@ group { name: "elm/toolbar/item/item_horizontal";
1077 part { name: "event"; type: RECT; 1086 part { name: "event"; type: RECT;
1078 ignore_flags: ON_HOLD; 1087 ignore_flags: ON_HOLD;
1079 description { state: "default" 0.0; 1088 description { state: "default" 0.0;
1080 color: 0 0 0 0; 1089 color: 0 0 0 0; // no cc
1090 }
1091 description { state: "disabled" 0.0;
1092 inherit: "default" 0.0;
1093 visible: 0;
1081 } 1094 }
1082 } 1095 }
1083 } 1096 }
@@ -1107,6 +1120,18 @@ group { name: "elm/toolbar/item/item_horizontal";
1107 target: "base"; 1120 target: "base";
1108 target: "bar"; 1121 target: "bar";
1109 } 1122 }
1123 program { signal: "mouse,down,1"; source: "event";
1124 action: STATE_SET "selected" 0.0;
1125 target: "elm.text";
1126 target: "base";
1127 target: "bar";
1128 }
1129 program { signal: "mouse,up,1"; source: "event";
1130 action: STATE_SET "default" 0.0;
1131 target: "elm.text";
1132 target: "base";
1133 target: "bar";
1134 }
1110 program { signal: "mouse,up,1"; source: "event"; 1135 program { signal: "mouse,up,1"; source: "event";
1111 action: SIGNAL_EMIT "elm,action,click" "elm"; 1136 action: SIGNAL_EMIT "elm,action,click" "elm";
1112 } 1137 }
@@ -1180,8 +1205,7 @@ group { name: "elm/toolbar/item/item_horizontal";
1180 program { signal: "elm,state,icon_set,forward"; source: "elm"; 1205 program { signal: "elm,state,icon_set,forward"; source: "elm";
1181 after: "icon_set,animation"; 1206 after: "icon_set,animation";
1182 } 1207 }
1183 program { 1208 program { signal: "elm,state,icon_set,backward"; source: "elm";
1184 signal: "elm,state,icon_set,backward"; source: "elm";
1185 after: "icon_set,animation"; 1209 after: "icon_set,animation";
1186 } 1210 }
1187 program { name: "icon_set,animation"; 1211 program { name: "icon_set,animation";
@@ -1238,7 +1262,7 @@ group { name: "elm/toolbar/separator/default";
1238 max: 1 99999; 1262 max: 1 99999;
1239 rel1.offset: 4 4; 1263 rel1.offset: 4 4;
1240 rel2.offset: -5 -5; 1264 rel2.offset: -5 -5;
1241 color: 72 72 72 255; 1265 color_class: "/fg/selected/toolbar/separator";
1242 offscale; 1266 offscale;
1243 } 1267 }
1244 description { state: "vert" 0.0; 1268 description { state: "vert" 0.0;
@@ -1264,12 +1288,14 @@ group { name: "elm/toolbar/object/default";
1264 parts { 1288 parts {
1265 part { name: "base"; type: RECT; 1289 part { name: "base"; type: RECT;
1266 description { state: "default" 0.0; 1290 description { state: "default" 0.0;
1267 color: 80 80 80 0; 1291 color_class: "/bg/normal/toolbar/base";
1292 color: 255 255 255 0; // no cc
1268 visible: 0; 1293 visible: 0;
1269 } 1294 }
1270 description { state: "selected" 0.0; 1295 description { state: "selected" 0.0;
1271 inherit: "default" 0.0; 1296 inherit: "default" 0.0;
1272 color: 80 80 80 255; 1297 color_class: "/bg/selected/toolbar/base";
1298 color: 255 255 255 255; // no cc
1273 visible: 1; 1299 visible: 1;
1274 } 1300 }
1275 } 1301 }
@@ -1305,23 +1331,24 @@ group { name: "elm/toolbar/more/default";
1305 rel.to: "base"; 1331 rel.to: "base";
1306 rel1.offset: -1000 -1000; 1332 rel1.offset: -1000 -1000;
1307 rel2.offset: 1000 1000; 1333 rel2.offset: 1000 1000;
1308 color: 0 0 0 0; 1334 color: 255 255 255 0; // no cc
1335 color_class: "/shadow/normal/button";
1309 visible: 0; 1336 visible: 0;
1310 } 1337 }
1311 description { state: "open" 0.0; 1338 description { state: "open" 0.0;
1312 inherit: "default" 0.0; 1339 inherit: "default" 0.0;
1313 color: 0 0 0 255; 1340 color: 255 255 255 255; // no cc
1314 visible: 1; 1341 visible: 1;
1315 } 1342 }
1316 description { state: "open2" 0.0; 1343 description { state: "open2" 0.0;
1317 inherit: "default" 0.0; 1344 inherit: "default" 0.0;
1318 color: 0 0 0 255; 1345 color: 255 255 255 255; // no cc
1319 visible: 1; 1346 visible: 1;
1320 } 1347 }
1321 } 1348 }
1322 part { name: "base"; type: RECT; 1349 part { name: "base"; type: RECT;
1323 description { state: "default" 0.0; 1350 description { state: "default" 0.0;
1324 color: 64 64 64 255; 1351 color_class: "/bg/normal/toolbar/more";
1325 rel2.relative: 1.0 0.0; 1352 rel2.relative: 1.0 0.0;
1326 fixed: 1 1; 1353 fixed: 1 1;
1327 visible: 0; 1354 visible: 0;
@@ -1388,8 +1415,7 @@ group { name: "elm/toolbar/more/default";
1388 } 1415 }
1389 } 1416 }
1390 programs { 1417 programs {
1391 program { 1418 program { signal: "elm,state,open"; source: "elm";
1392 signal: "elm,state,open"; source: "elm";
1393 action: STATE_SET "open" 0.0; 1419 action: STATE_SET "open" 0.0;
1394 target: "shadow"; 1420 target: "shadow";
1395 target: "base"; 1421 target: "base";
@@ -1397,8 +1423,7 @@ group { name: "elm/toolbar/more/default";
1397 target: "clipper2"; 1423 target: "clipper2";
1398 transition: DECELERATE 0.2; 1424 transition: DECELERATE 0.2;
1399 } 1425 }
1400 program { 1426 program { signal: "elm,state,open2"; source: "elm";
1401 signal: "elm,state,open2"; source: "elm";
1402 action: STATE_SET "open2" 0.0; 1427 action: STATE_SET "open2" 0.0;
1403 target: "shadow"; 1428 target: "shadow";
1404 target: "base"; 1429 target: "base";
@@ -1406,8 +1431,7 @@ group { name: "elm/toolbar/more/default";
1406 target: "clipper2"; 1431 target: "clipper2";
1407 transition: DECELERATE 0.2; 1432 transition: DECELERATE 0.2;
1408 } 1433 }
1409 program { 1434 program { signal: "elm,state,close"; source: "elm";
1410 signal: "elm,state,close"; source: "elm";
1411 action: STATE_SET "default" 0.0; 1435 action: STATE_SET "default" 0.0;
1412 target: "shadow"; 1436 target: "shadow";
1413 target: "base"; 1437 target: "base";
diff --git a/data/elementary/themes/edc/slider.edc b/data/elementary/themes/edc/slider.edc
index c1ebe764ec..ca4bed2840 100644
--- a/data/elementary/themes/edc/slider.edc
+++ b/data/elementary/themes/edc/slider.edc
@@ -1,5 +1,4 @@
1group { name: "e/widgets/slider_horizontal"; 1group { name: "e/widgets/slider_horizontal";
2 images.image: "speaker_vol.png" COMP;
3 parts { 2 parts {
4 part { name: "bg"; type: RECT; 3 part { name: "bg"; type: RECT;
5 scale: 1; 4 scale: 1;
@@ -111,7 +110,7 @@ group { name: "e/widgets/slider_horizontal";
111 rel1.offset: -1 -1; 110 rel1.offset: -1 -1;
112 rel2.offset: 0 0; 111 rel2.offset: 0 0;
113 color_class: "/fg/normal/slider/knob"; 112 color_class: "/fg/normal/slider/knob";
114 image.normal: "speaker_vol.png"; 113 image.normal: "i-radio";
115 min: 16 16; 114 min: 16 16;
116 max: 16 16; 115 max: 16 16;
117 fixed: 1 1; 116 fixed: 1 1;
@@ -201,7 +200,6 @@ group { name: "e/widgets/slider_horizontal";
201} 200}
202 201
203group { name: "e/widgets/slider_vertical"; 202group { name: "e/widgets/slider_vertical";
204 images.image: "speaker_vol.png" COMP;
205 parts { 203 parts {
206 part { name: "bg"; type: RECT; 204 part { name: "bg"; type: RECT;
207 scale: 1; 205 scale: 1;
@@ -315,7 +313,7 @@ group { name: "e/widgets/slider_vertical";
315 rel2.offset: 0 0; 313 rel2.offset: 0 0;
316 rel2.to: "e.dragable.slider"; 314 rel2.to: "e.dragable.slider";
317 color_class: "/fg/normal/slider/knob"; 315 color_class: "/fg/normal/slider/knob";
318 image.normal: "speaker_vol.png"; 316 image.normal: "i-radio";
319 min: 16 16; 317 min: 16 16;
320 max: 16 16; 318 max: 16 16;
321 fixed: 1 1; 319 fixed: 1 1;