raster pushed a commit to branch feature/themes/flat.
http://git.enlightenment.org/core/efl.git/commit/?id=4ed5ad6e35e2714739e8b0f941bb3998e6b07d45
commit 4ed5ad6e35e2714739e8b0f941bb3998e6b07d45
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Fri Mar 19 17:18:38 2021 +0000
TH - efl ui progress
---
data/elementary/themes/edc/efl/button.edc | 2 +-
data/elementary/themes/edc/efl/progress.edc | 1490 +++++++++++++++------------
2 files changed, 849 insertions(+), 643 deletions(-)
diff --git a/data/elementary/themes/edc/efl/button.edc
b/data/elementary/themes/edc/efl/button.edc
index eb28be4135..52193a8c16 100644
--- a/data/elementary/themes/edc/efl/button.edc
+++ b/data/elementary/themes/edc/efl/button.edc
@@ -154,7 +154,7 @@ group { name: "efl/button";
text { "efl.text"; nomouse; required;
scale: 1;
desc { "default";
- fixed: 1 1;
+// fixed: 1 1;
color: 192 192 192 255;
rel1.offset: 0 6;
rel1.relative: 1.0 0.0;
diff --git a/data/elementary/themes/edc/efl/progress.edc
b/data/elementary/themes/edc/efl/progress.edc
index d319097727..fcd333622f 100644
--- a/data/elementary/themes/edc/efl/progress.edc
+++ b/data/elementary/themes/edc/efl/progress.edc
@@ -1,18 +1,8 @@
-group { "efl/progressbar/horizontal";
- data.item: "version" "123";
- images.image: "inset_bar_horiz_base.png" COMP;
- images.image: "inset_bar_horiz_light.png" COMP;
- images.image: "inset_bar_horiz_inside_base.png" COMP;
- images.image: "inset_bar_horiz_inside_light.png" COMP;
- images.image: "inset_bar_horiz_glow_base.png" COMP;
- images.image: "inset_bar_horiz_glow_light.png" COMP;
- images.image: "inset_bar_horiz_glow_inv_base.png" COMP;
- images.image: "inset_bar_horiz_glow_inv_light.png" COMP;
- images.image: "inset_bar_horiz_glow_mid_base.png" COMP;
- images.image: "inset_bar_horiz_glow_mid_light.png" COMP;
+group { name: "efl/progressbar/horizontal";
#define ICON 1
#define LABEL 2
#define DISABLE 4
+ data.item: "version" "123";
script {
public slmode;
public eval_mode(m) {
@@ -31,9 +21,16 @@ group { "efl/progressbar/horizontal";
if (ic) {
set_state(PART:"efl.content", "visible", 0.0);
set_state(PART:"sizer_content", "visible", 0.0);
+ set_state(PART:"bg", "iclabel", 0.0);
} else {
set_state(PART:"efl.content", "default", 0.0);
set_state(PART:"sizer_content", "default", 0.0);
+ if (l) {
+ set_state(PART:"bg", "iclabel", 0.0);
+ }
+ else {
+ set_state(PART:"bg", "default", 0.0);
+ }
}
if (!d) {
set_state(PART:"dis_clip", "default", 0.0);
@@ -45,8 +42,7 @@ group { "efl/progressbar/horizontal";
parts {
part { name: "dis_clip"; type: RECT;
description { state: "default" 0.0;
- rel1.to: "efl.content";
- rel2.to: "efl.content";
+ rel.to: "efl.content";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
@@ -75,22 +71,23 @@ group { "efl/progressbar/horizontal";
}
}
part { name: "efl.content"; type: SWALLOW;
+ scale: 1;
clip_to: "dis_clip";
- required;
description { state: "default" 0.0;
visible: 0;
align: 0.0 0.5;
fixed: 1 0;
- rel1.offset: 0 2;
- rel2.offset: -1 -3;
+ rel1.offset: -1 4;
+ rel2.offset: -1 -5;
rel2.relative: 0.0 1.0;
+ offscale;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
- aspect: 1.0 1.0; aspect_preference: VERTICAL;
- rel1.offset: 2 2;
- rel2.offset: 2 -3;
+// aspect: 1.0 1.0; aspect_preference: VERTICAL;
+ rel1.offset: 4 4;
+ rel2.offset: 4 -5;
}
}
part { name: "sizer_content"; type: TEXT; mouse_events: 0;
@@ -105,224 +102,119 @@ group { "efl/progressbar/horizontal";
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
- rel1.to: "efl.content";
- rel2.to: "efl.content";
+ rel.to: "efl.content";
text {
min: 1 1;
ellipsis: -1;
- text: "M";
+ text: SPACER_TEXT;
}
}
}
part { name: "efl.text"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
scale: 1;
- required;
description { state: "default" 0.0;
fixed: 1 1;
align: 0.0 0.5;
rel1.to_x: "efl.content";
rel1.relative: 1.0 0.0;
- rel1.offset: -1 2;
+ rel1.offset: -1 4;
rel2.to_x: "efl.content";
rel2.relative: 1.0 1.0;
- rel2.offset: -1 -3;
- color: FN_COL_DEFAULT;
- color_class: "progressbar_text";
+ rel2.offset: -1 -5;
+ color: 160 160 160 255;
text { font: FN; size: 10;
text_class: "progressbar";
min: 0 0;
align: 0.0 0.5;
}
visible: 0;
+ offscale;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
fixed: 1 0;
visible: 1;
- rel1.offset: 2 2;
- rel2.offset: 2 -3;
+ rel1.offset: 4 4;
+ rel2.offset: 4 -5;
text.min: 1 1;
text.ellipsis: -1;
}
description { state: "disabled_visible" 0.0;
inherit: "visible" 0.0;
- color_class: "progressbar_text_disabled";
- color: FN_COL_DISABLE_LIGHTER_SHADOW;
- }
- }
- part { name: "bg-hi";
- description { state: "default" 0.0;
- rel1.to: "bg";
- rel1.offset: 0 1;
- rel2.to: "bg";
- rel2.offset: -1 0;
- image.normal: "inset_bar_horiz_light.png";
- image.border: 32 32 0 0;
- image.border_scale_by: 0.25; image.border_scale: 1;
+ color: 80 80 80 255;
}
}
- part { name: "bg";
+ part { name: "bg"; type: RECT;
scale: 1;
description { state: "default" 0.0;
min: 16 16;
max: -1 16;
- rel1.to_x: "efl.text";
- rel1.relative: 1.0 0.0;
- rel1.offset: 3 3;
- rel2.offset: -4 -4;
- image.normal: "inset_bar_horiz_base.png";
- image.border: 32 32 0 0;
- image.border_scale_by: 0.25; image.border_scale: 1;
- }
- }
- part { name: "ins0"; type: SPACER;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 0;
- rel1.to: "bg";
- rel2.to: "bg";
- rel2.relative: 0.0 1.0;
- min: 5 16;
- align: 0.0 0.5;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ color: DARK_GREY_BG_COLOR;
+ offscale;
}
- }
- part { name: "ins1"; type: SPACER;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 0;
- rel1.to: "bg";
+ description { state: "iclabel" 0.0;
+ inherit: "default" 0.0;
+ rel1.to_x: "efl.text";
rel1.relative: 1.0 0.0;
- rel2.to: "bg";
- min: 5 16;
- align: 1.0 0.5;
- }
- }
- part { name: "inside-hi";
- scale: 1;
- description { state: "default" 0.0;
- rel1.to: "inside";
- rel1.offset: 0 1;
- rel2.to: "inside";
- rel2.offset: -1 0;
- image.normal: "inset_bar_horiz_inside_light.png";
- image.border: 8 8 0 0;
- image.border_scale_by: 0.25; image.border_scale: 1;
- }
- }
- part { name: "inside";
- scale: 1;
- description { state: "default" 0.0;
- min: 4 4;
- rel1.to: "ins0";
- rel1.relative: 1.0 (6/16);
- rel2.to: "ins1";
- rel2.relative: 0.0 (10/16);
- image.normal: "inset_bar_horiz_inside_base.png";
- image.border: 8 8 0 0;
- image.border_scale_by: 0.25; image.border_scale: 1;
}
}
part { name: "efl.bar"; type: SWALLOW; mouse_events: 0;
description { state: "default" 0.0;
- rel1.to: "inside";
- rel2.to: "inside";
+ rel.to: "bg";
}
}
part { name: "efl.cur.progressbar"; mouse_events: 0; type: SPACER;
- scale: 1;
- dragable.confine: "inside";
+ dragable.confine: "efl.bar";
dragable.x: 1 1 1;
dragable.y: 0 0 0;
description { state: "default" 0.0;
fixed: 1 1;
- min: 8 4;
- max: 8 4;
- rel1.to: "inside";
- rel2.to: "inside";
+ min: 1 1;
+ max: 1 9999;
+ rel.to: "efl.bar";
}
}
part { name: "barend"; type: SPACER;
- scale: 1;
description { state: "default" 0.0;
fixed: 1 0;
- min: 14 16;
+ max: 1 9999;
rel1.to_x: "efl.cur.progressbar";
- rel1.relative: 1.0 0.0;
rel2.to_x: "efl.cur.progressbar";
- rel2.relative: 1.0 1.0;
- align: 0.0 0.5;
+ align: 1.0 0.5;
}
description { state: "inv" 0.0;
inherit: "default" 0.0;
- rel1.relative: 0.0 0.0;
- rel2.relative: 0.0 1.0;
- align: 1.0 0.5;
+ align: 0.0 0.5;
}
}
- part { name: "bar";
- clip_to: "fract_clip";
+ part { name: "bar"; type: RECT;
scale: 1;
+ clip_to: "fract_clip";
description { state: "default" 0.0;
- rel1.to_x: "ins0";
- rel1.to_y: "bg";
- rel1.relative: (12/16) -0.25;
+ rel1.to: "bg";
rel2.to_x: "barend";
rel2.to_y: "bg";
- rel2.relative: 1.0 1.25;
- image.normal: "inset_bar_horiz_glow_base.png";
- image.border: 0 72 0 0;
- image.border_scale_by: 0.25; image.border_scale: 1;
+ color: 51 153 255 255;
+ offscale;
}
description { state: "inv" 0.0;
inherit: "default" 0.0;
rel1.to_x: "barend";
- rel1.relative: 0.0 -0.25;
- rel2.to_x: "ins1";
- rel2.relative: (4/16) 1.25;
- image.normal: "inset_bar_horiz_glow_inv_base.png";
- image.border: 72 0 0 0;
- }
- }
- part { name: "insidep0"; type: SPACER;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 0;
- min: 20 16;
- rel1.to_x: "inside";
- rel1.relative: 0.0 0.0;
- rel2.to_x: "inside";
- rel2.relative: 0.0 1.0;
- align: 1.0 0.5;
- }
- }
- part { name: "insidep1"; type: SPACER;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 0;
- min: 20 16;
- rel1.to_x: "inside";
- rel1.relative: 1.0 0.0;
- rel2.to_x: "inside";
- rel2.relative: 1.0 1.0;
- align: 0.0 0.5;
+ rel2.to_x: "bg";
}
}
- part { name: "pulse";
+ part { name: "pulse"; type: RECT;
clip_to: "pulse_clip";
scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
- min: 64 24;
- max: 64 24;
- rel1.to_x: "insidep0";
- rel1.to_y: "bar";
- rel1.relative: 0.0 0.0;
- rel2.to_x: "insidep1";
- rel2.to_y: "bar";
- rel2.relative: 1.0 1.0;
- image.normal: "inset_bar_horiz_glow_mid_base.png";
+ min: 16 8;
+ max: 16 9999;
+ rel.to: "efl.bar";
align: 0.0 0.5;
+ color: 51 153 255 255;
}
description { state: "end" 0.0;
inherit: "default" 0.0;
@@ -331,73 +223,25 @@ group { "efl/progressbar/horizontal";
}
part { name: "efl.text.status"; type: TEXT; mouse_events: 0;
scale: 1;
- effect: GLOW;
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "inside";
- rel2.to: "inside";
- color_class: "progress_status";
+ rel.to: "efl.bar";
+ rel1.offset: 4 0;
+ rel2.offset: -5 -1;
align: 1.0 0.5;
text { font: FN; size: 10;
min: 0 1;
text_class: "progress_status";
align: 1.0 0.5;
}
- color: FN_COL_HIGHLIGHT_CLICKED;
- visible: 1;
+ color: 255 255 255 255;
+ offscale;
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
visible: 0;
}
}
- part { name: "pulse2";
- clip_to: "pulse_clip";
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 1;
- min: 36 14;
- max: 36 14;
- rel1.to: "pulse";
- rel2.to: "pulse";
- image.normal: "inset_bar_horiz_glow_mid_light.png";
- color: 255 255 255 0;
- }
- description { state: "glow" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- }
- }
- part { name: "light";
- clip_to: "fract_clip";
- scale: 1;
- description { state: "default" 0.0;
- max: 36 11;
- rel1.to_x: "bar";
- rel1.to_y: "bar";
- rel1.relative: 0.0 (26/96);
- rel2.to_x: "barend";
- rel2.to_y: "bar";
- rel2.relative: 0.2 ((26+44)/96);
- align: 1.0 0.0;
- image.normal: "inset_bar_horiz_glow_light.png";
- image.border: 0 20 0 0;
- image.border_scale_by: 0.25; image.border_scale: 1;
- color: 255 255 255 0;
- }
- description { state: "inv" 0.0;
- inherit: "default" 0.0;
- rel1.to_x: "barend";
- rel1.to_y: "bar";
- rel1.relative: 0.8 (26/96);
- rel2.to_x: "bar";
- rel2.to_y: "bar";
- rel2.relative: 1.0 ((26+44)/96);
- align: 0.0 0.0;
- image.normal: "inset_bar_horiz_glow_inv_light.png";
- image.border: 20 0 0 0;
- }
- }
}
programs {
program { name: "inverted-on";
@@ -405,33 +249,12 @@ group { "efl/progressbar/horizontal";
action: STATE_SET "inv" 0.0;
target: "bar";
target: "barend";
- target: "light";
}
program { name: "inverted-off";
signal: "efl,state,inverted,off"; source: "efl";
action: STATE_SET "default" 0.0;
target: "bar";
target: "barend";
- target: "light";
- }
- program { name: "drag-set";
- signal: "drag,set"; source: "efl.cur.progressbar";
- script {
- new a, Float:dx, Float:dy, Float:vl, st[20];
-
- get_drag(PART:"efl.cur.progressbar", dx, dy);
- get_state(PART:"bar", st, 19, vl);
- if (!strcmp(st, "inv")) {
- a = round(((1.0 - dx) * 255) / 0.2);
- custom_state(PART:"light", "inv", 0.0);
- } else {
- a = round((dx * 255) / 0.2);
- custom_state(PART:"light", "default", 0.0);
- }
- if (a > 255) { a = 255; }
- set_state_val(PART:"light", STATE_COLOR, 255, 255, 255, a);
- set_state(PART:"light", "custom", 0.0);
- }
}
program { name: "pulse-mode0";
signal: "efl,state,pulse"; source: "efl";
@@ -450,32 +273,18 @@ group { "efl/progressbar/horizontal";
target: "pulse_clip";
target: "fract_clip";
after: "pulse0";
- after: "pulse0.1";
- }
- program { name: "pulse0.1";
- action: STATE_SET "glow" 0.0;
- transition: ACCELERATE 0.4;
- target: "pulse2";
- after: "pulse0.2";
- }
- program { name: "pulse0.2";
- action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.4;
- target: "pulse2";
}
program { name: "pulse0";
action: STATE_SET "end" 0.0;
transition: SINUSOIDAL 0.8;
target: "pulse";
after: "pulse1";
- after: "pulse0.1";
}
program { name: "pulse1";
action: STATE_SET "default" 0.0;
transition: SINUSOIDAL 0.8;
target: "pulse";
after: "pulse0";
- after: "pulse0.1";
}
program { name: "fraction";
signal: "efl,state,fraction"; source: "efl";
@@ -483,7 +292,7 @@ group { "efl/progressbar/horizontal";
target: "efl.text.status";
after: "pulse-stop";
}
- program { name: "elmpulse-stop";
+ program { name: "eflpulse-stop";
signal: "efl,state,pulse,stop"; source: "efl";
action: ACTION_STOP;
target: "pulse0";
@@ -505,7 +314,7 @@ group { "efl/progressbar/horizontal";
target: "efl.text.status";
}
program { name: "text-visible";
- signal: "efl,text,set"; source: "efl";
+ signal: "efl,state,text,visible"; source: "efl";
script {
new m = get_int(slmode);
m |= LABEL; set_int(slmode, m);
@@ -513,7 +322,7 @@ group { "efl/progressbar/horizontal";
}
}
program { name: "text-hidden";
- signal: "efl,text,unset"; source: "efl";
+ signal: "efl,state,text,hidden"; source: "efl";
script {
new m = get_int(slmode);
m &= ~LABEL; set_int(slmode, m);
@@ -521,7 +330,7 @@ group { "efl/progressbar/horizontal";
}
}
program { name: "icon-visible";
- signal: "efl,content,set"; source: "efl";
+ signal: "efl,state,icon,visible"; source: "efl";
script {
new m = get_int(slmode);
m |= ICON; set_int(slmode, m);
@@ -529,7 +338,7 @@ group { "efl/progressbar/horizontal";
}
}
program { name: "icon-hidden";
- signal: "efl,content,unset"; source: "efl";
+ signal: "efl,state,icon,hidden"; source: "efl";
script {
new m = get_int(slmode);
m &= ~ICON; set_int(slmode, m);
@@ -555,25 +364,14 @@ group { "efl/progressbar/horizontal";
}
#undef ICON
#undef LABEL
-#undef UNITS
#undef DISABLE
}
-group { "efl/progressbar/vertical";
- data.item: "version" "123";
- images.image: "inset_bar_vert_base.png" COMP;
- images.image: "inset_bar_vert_light.png" COMP;
- images.image: "inset_bar_vert_inside_base.png" COMP;
- images.image: "inset_bar_vert_inside_light.png" COMP;
- images.image: "inset_bar_vert_glow_base.png" COMP;
- images.image: "inset_bar_vert_glow_light.png" COMP;
- images.image: "inset_bar_vert_glow_inv_base.png" COMP;
- images.image: "inset_bar_vert_glow_inv_light.png" COMP;
- images.image: "inset_bar_vert_glow_mid_base.png" COMP;
- images.image: "inset_bar_vert_glow_mid_light.png" COMP;
+group { name: "efl/progressbar/vertical";
#define ICON 1
#define LABEL 2
#define DISABLE 4
+ data.item: "version" "123";
script {
public slmode;
public eval_mode(m) {
@@ -592,9 +390,16 @@ group { "efl/progressbar/vertical";
if (ic) {
set_state(PART:"efl.content", "visible", 0.0);
set_state(PART:"sizer_content", "visible", 0.0);
+ set_state(PART:"bg", "iclabel", 0.0);
} else {
set_state(PART:"efl.content", "default", 0.0);
set_state(PART:"sizer_content", "default", 0.0);
+ if (l) {
+ set_state(PART:"bg", "iclabel", 0.0);
+ }
+ else {
+ set_state(PART:"bg", "default", 0.0);
+ }
}
if (!d) {
set_state(PART:"dis_clip", "default", 0.0);
@@ -636,28 +441,29 @@ group { "efl/progressbar/vertical";
}
}
part { name: "efl.content"; type: SWALLOW;
+ scale: 1;
clip_to: "dis_clip";
- required;
description { state: "default" 0.0;
visible: 0;
align: 0.5 0.0;
- fixed: 0 1;
- rel1.offset: 2 0;
- rel2.offset: -3 -1;
+ fixed: 1 1;
+ rel1.offset: 4 0;
+ rel2.offset: -5 -1;
rel2.relative: 1.0 0.0;
+ offscale;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
- aspect: 1.0 1.0; aspect_preference: HORIZONTAL;
- rel1.offset: 2 2;
- rel2.offset: -3 2;
+// aspect: 1.0 1.0; aspect_preference: HORIZONTAL;
+ rel1.offset: 4 4;
+ rel2.offset: -5 4;
}
}
part { name: "sizer_content"; type: TEXT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
- fixed: 1 1;
+ fixed: 0 0;
visible: 0;
text { font: FN; size: 10;
min: 0 0;
@@ -666,224 +472,123 @@ group { "efl/progressbar/vertical";
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
+ fixed: 1 1;
rel1.to: "efl.content";
rel2.to: "efl.content";
text {
min: 1 1;
ellipsis: -1;
- text: "M";
+ text: SPACER_TEXT;
}
}
}
part { name: "efl.text"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
scale: 1;
- required;
description { state: "default" 0.0;
fixed: 1 1;
align: 0.5 0.0;
rel1.to_y: "efl.content";
rel1.relative: 0.0 1.0;
- rel1.offset: 2 -1;
+ rel1.offset: 4 -1;
rel2.to_y: "efl.content";
rel2.relative: 1.0 1.0;
- rel2.offset: -3 -1;
- color: FN_COL_DEFAULT;
- color_class: "progressbar_text";
+ rel2.offset: -5 -1;
+ color: 160 160 160 255;
text { font: FN; size: 10;
text_class: "progressbar";
min: 0 0;
align: 0.5 0.0;
}
visible: 0;
+ offscale;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
- fixed: 0 1;
visible: 1;
- rel1.offset: 2 2;
- rel2.offset: -3 2;
+ rel1.offset: 4 4;
+ rel2.offset: -5 4;
text.min: 1 1;
text.ellipsis: -1;
}
description { state: "disabled_visible" 0.0;
inherit: "visible" 0.0;
- color_class: "progressbar_text_disabled";
- color: FN_COL_DISABLE_LIGHTER_SHADOW;
- }
- }
- part { name: "bg-hi";
- description { state: "default" 0.0;
- rel1.to: "bg";
- rel1.offset: 0 1;
- rel2.to: "bg";
- rel2.offset: -1 0;
- image.normal: "inset_bar_vert_light.png";
- image.border: 0 0 32 32;
- image.border_scale_by: 0.25; image.border_scale: 1;
+ color: 80 80 80 255;
}
}
- part { name: "bg";
+ part { name: "bg"; type: RECT;
scale: 1;
description { state: "default" 0.0;
min: 16 16;
max: 16 -1;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ color: DARK_GREY_BG_COLOR;
+ offscale;
+ }
+ description { state: "iclabel" 0.0;
+ inherit: "default" 0.0;
rel1.to_y: "efl.text";
rel1.relative: 0.0 1.0;
- rel1.offset: 3 3;
- rel2.offset: -4 -4;
- image.normal: "inset_bar_vert_base.png";
- image.border: 0 0 32 32;
- image.border_scale_by: 0.25; image.border_scale: 1;
- }
- }
- part { name: "ins0"; type: SPACER;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 0 1;
- rel1.to: "bg";
- rel2.to: "bg";
- rel2.relative: 1.0 0.0;
- min: 16 5;
- align: 0.5 0.0;
}
}
- part { name: "ins1"; type: SPACER;
- scale: 1;
+ part { name: "efl.bar"; type: SWALLOW; mouse_events: 0;
description { state: "default" 0.0;
- fixed: 0 1;
rel1.to: "bg";
- rel1.relative: 0.0 1.0;
rel2.to: "bg";
- min: 16 5;
- align: 0.5 1.0;
- }
- }
- part { name: "inside-hi";
- scale: 1;
- description { state: "default" 0.0;
- rel1.to: "inside";
- rel1.offset: 0 1;
- rel2.to: "inside";
- rel2.offset: -1 0;
- image.normal: "inset_bar_vert_inside_light.png";
- image.border: 0 0 8 8;
- image.border_scale_by: 0.25; image.border_scale: 1;
- }
- }
- part { name: "inside";
- scale: 1;
- description { state: "default" 0.0;
- min: 4 4;
- rel1.to: "ins0";
- rel1.relative: (6/16) 1.0;
- rel2.to: "ins1";
- rel2.relative: (10/16) 0.0;
- image.normal: "inset_bar_vert_inside_base.png";
- image.border: 0 0 8 8;
- image.border_scale_by: 0.25; image.border_scale: 1;
- }
- }
- part { name: "efl.bar"; type: SWALLOW; mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "inside";
- rel2.to: "inside";
}
}
part { name: "efl.cur.progressbar"; mouse_events: 0; type: SPACER;
- scale: 1;
- dragable.confine: "inside";
+ dragable.confine: "efl.bar";
dragable.x: 0 0 0;
dragable.y: 1 1 1;
description { state: "default" 0.0;
fixed: 1 1;
- min: 4 8;
- max: 4 8;
- rel1.to: "inside";
- rel2.to: "inside";
+ min: 1 1;
+ max: 9999 1;
+ rel1.to: "efl.bar";
+ rel2.to: "efl.bar";
}
}
part { name: "barend"; type: SPACER;
- scale: 1;
description { state: "default" 0.0;
fixed: 0 1;
- min: 16 14;
+ max: 9999 1;
rel1.to_y: "efl.cur.progressbar";
- rel1.relative: 0.0 1.0;
rel2.to_y: "efl.cur.progressbar";
- rel2.relative: 1.0 1.0;
- align: 0.5 0.0;
+ align: 0.5 1.0;
}
description { state: "inv" 0.0;
inherit: "default" 0.0;
- rel1.relative: 0.0 0.0;
- rel2.relative: 1.0 0.0;
- align: 0.5 1.0;
+ align: 0.5 0.0;
}
}
- part { name: "bar";
- clip_to: "fract_clip";
+ part { name: "bar"; type: RECT;
scale: 1;
+ clip_to: "fract_clip";
description { state: "default" 0.0;
- rel1.to_y: "ins0";
- rel1.to_x: "bg";
- rel1.relative: -0.25 (12/16);
+ rel1.to: "bg";
rel2.to_y: "barend";
rel2.to_x: "bg";
- rel2.relative: 1.25 1.0;
- image.normal: "inset_bar_vert_glow_base.png";
- image.border: 0 0 0 72;
- image.border_scale_by: 0.25; image.border_scale: 1;
+ color: 51 153 255 255;
+ offscale;
}
description { state: "inv" 0.0;
inherit: "default" 0.0;
rel1.to_y: "barend";
- rel1.relative: -0.25 0.0;
- rel2.to_y: "ins1";
- rel2.relative: 1.25 (4/16);
- image.normal: "inset_bar_vert_glow_inv_base.png";
- image.border: 0 0 72 0;
- }
- }
- part { name: "insidep0"; type: SPACER;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 0 1;
- min: 16 20;
- rel1.to_y: "inside";
- rel1.relative: 0.0 0.0;
- rel2.to_y: "inside";
- rel2.relative: 1.0 0.0;
- align: 0.5 1.0;
- }
- }
- part { name: "insidep1"; type: SPACER;
- scale: 1;
- description { state: "default" 0.0;
- fixed: 0 1;
- min: 16 20;
- rel1.to_y: "inside";
- rel1.relative: 0.0 1.0;
- rel2.to_y: "inside";
- rel2.relative: 1.0 1.0;
- align: 0.5 0.0;
+ rel2.to_y: "bg";
}
}
- part { name: "pulse";
+ part { name: "pulse"; type: RECT;
clip_to: "pulse_clip";
scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
- min: 24 64;
- max: 24 64;
- rel1.to_y: "insidep0";
- rel1.to_x: "bar";
- rel1.relative: 0.0 0.0;
- rel2.to_y: "insidep1";
- rel2.to_x: "bar";
- rel2.relative: 1.0 1.0;
- image.normal: "inset_bar_vert_glow_mid_base.png";
+ min: 8 16;
+ max: 9999 16;
+ rel1.to: "efl.bar";
+ rel2.to: "efl.bar";
align: 0.5 0.0;
+ color: 51 153 255 255;
}
description { state: "end" 0.0;
inherit: "default" 0.0;
@@ -894,30 +599,28 @@ group { "efl/progressbar/vertical";
scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "inside";
- rel2.to: "inside";
+ rel1.to: "bg";
+ rel2.to: "bg";
aspect: 1.0 1.0; aspect_preference: NONE;
}
}
part { name: "efl.text.status"; type: TEXT; mouse_events: 0;
scale: 1;
- effect: GLOW;
description { state: "default" 0.0;
fixed: 1 1;
rel1.to: "statbox";
rel2.to: "statbox";
- color_class: "progress_status";
+ rel1.offset: 4 0;
+ rel2.offset: -5 -1;
align: 1.0 0.5;
text { font: FN; size: 10;
min: 0 1;
text_class: "progress_status";
align: 1.0 0.5;
}
- color: FN_COL_HIGHLIGHT_CLICKED;
- visible: 1;
map.on: 1;
map.smooth: 0;
- map.rotation.center: "statbox";
+ map.rotation.center: "efl.bar";
map.rotation.z: 90;
}
description { state: "hidden" 0.0;
@@ -925,53 +628,6 @@ group { "efl/progressbar/vertical";
visible: 0;
}
}
- part { name: "pulse2";
- clip_to: "pulse_clip";
- scale: 1;
- description { state: "default" 0.0;
- fixed: 1 1;
- min: 14 36;
- max: 14 36;
- rel1.to: "pulse";
- rel2.to: "pulse";
- image.normal: "inset_bar_vert_glow_mid_light.png";
- color: 255 255 255 0;
- }
- description { state: "glow" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 255;
- }
- }
- part { name: "light";
- clip_to: "fract_clip";
- scale: 1;
- description { state: "default" 0.0;
- max: 11 36;
- rel1.to_y: "bar";
- rel1.to_x: "bar";
- rel1.relative: (26/96) 0.0;
- rel2.to_y: "barend";
- rel2.to_x: "bar";
- rel2.relative: ((26+44)/96) 0.2;
- align: 0.0 1.0;
- image.normal: "inset_bar_vert_glow_light.png";
- image.border: 0 0 0 20;
- image.border_scale_by: 0.25; image.border_scale: 1;
- color: 255 255 255 0;
- }
- description { state: "inv" 0.0;
- inherit: "default" 0.0;
- rel1.to_y: "barend";
- rel1.to_x: "bar";
- rel1.relative: (26/96) 0.8;
- rel2.to_y: "bar";
- rel2.to_x: "bar";
- rel2.relative: ((26+44)/96) 1.0;
- align: 0.0 0.0;
- image.normal: "inset_bar_vert_glow_inv_light.png";
- image.border: 0 0 20 0;
- }
- }
}
programs {
program { name: "inverted-on";
@@ -979,33 +635,12 @@ group { "efl/progressbar/vertical";
action: STATE_SET "inv" 0.0;
target: "bar";
target: "barend";
- target: "light";
}
program { name: "inverted-off";
signal: "efl,state,inverted,off"; source: "efl";
action: STATE_SET "default" 0.0;
target: "bar";
target: "barend";
- target: "light";
- }
- program { name: "drag-set";
- signal: "drag,set"; source: "efl.cur.progressbar";
- script {
- new a, Float:dx, Float:dy, Float:vl, st[20];
-
- get_drag(PART:"efl.cur.progressbar", dx, dy);
- get_state(PART:"bar", st, 19, vl);
- if (!strcmp(st, "inv")) {
- a = round(((1.0 - dy) * 255) / 0.2);
- custom_state(PART:"light", "inv", 0.0);
- } else {
- a = round((dy * 255) / 0.2);
- custom_state(PART:"light", "default", 0.0);
- }
- if (a > 255) { a = 255; }
- set_state_val(PART:"light", STATE_COLOR, 255, 255, 255, a);
- set_state(PART:"light", "custom", 0.0);
- }
}
program { name: "pulse-mode0";
signal: "efl,state,pulse"; source: "efl";
@@ -1024,32 +659,18 @@ group { "efl/progressbar/vertical";
target: "pulse_clip";
target: "fract_clip";
after: "pulse0";
- after: "pulse0.1";
- }
- program { name: "pulse0.1";
- action: STATE_SET "glow" 0.0;
- transition: ACCELERATE 0.4;
- target: "pulse2";
- after: "pulse0.2";
- }
- program { name: "pulse0.2";
- action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.4;
- target: "pulse2";
}
program { name: "pulse0";
action: STATE_SET "end" 0.0;
transition: SINUSOIDAL 0.8;
target: "pulse";
after: "pulse1";
- after: "pulse0.1";
}
program { name: "pulse1";
action: STATE_SET "default" 0.0;
transition: SINUSOIDAL 0.8;
target: "pulse";
after: "pulse0";
- after: "pulse0.1";
}
program { name: "fraction";
signal: "efl,state,fraction"; source: "efl";
@@ -1057,7 +678,7 @@ group { "efl/progressbar/vertical";
target: "efl.text.status";
after: "pulse-stop";
}
- program { name: "elmpulsestop";
+ program { name: "eflpulse-stop";
signal: "efl,state,pulse,stop"; source: "efl";
action: ACTION_STOP;
target: "pulse0";
@@ -1068,18 +689,18 @@ group { "efl/progressbar/vertical";
action: STATE_SET "default" 0.0;
target: "pulse_clip";
}
- program { name: "unit-visible";
+ program { name: "units-visible";
signal: "efl,state,units,visible"; source: "efl";
action: STATE_SET "default" 0.0;
target: "efl.text.status";
}
- program { name: "unit-hidden";
+ program { name: "units-hidden";
signal: "efl,state,units,hidden"; source: "efl";
action: STATE_SET "hidden" 0.0;
target: "efl.text.status";
}
program { name: "text-visible";
- signal: "efl,text,set"; source: "efl";
+ signal: "efl,state,text,visible"; source: "efl";
script {
new m = get_int(slmode);
m |= LABEL; set_int(slmode, m);
@@ -1087,7 +708,7 @@ group { "efl/progressbar/vertical";
}
}
program { name: "text-hidden";
- signal: "efl,text,unset"; source: "efl";
+ signal: "efl,state,text,hidden"; source: "efl";
script {
new m = get_int(slmode);
m &= ~LABEL; set_int(slmode, m);
@@ -1095,7 +716,7 @@ group { "efl/progressbar/vertical";
}
}
program { name: "icon-visible";
- signal: "efl,content,set"; source: "efl";
+ signal: "efl,state,icon,visible"; source: "efl";
script {
new m = get_int(slmode);
m |= ICON; set_int(slmode, m);
@@ -1103,14 +724,14 @@ group { "efl/progressbar/vertical";
}
}
program { name: "icon-hidden";
- signal: "efl,content,unset"; source: "efl";
+ signal: "efl,state,icon,hidden"; source: "efl";
script {
new m = get_int(slmode);
m &= ~ICON; set_int(slmode, m);
eval_mode(m);
}
}
- program { name: "elmdisabled";
+ program { name: "state-disabled";
signal: "efl,state,disabled"; source: "efl";
script {
new m = get_int(slmode);
@@ -1118,7 +739,7 @@ group { "efl/progressbar/vertical";
eval_mode(m);
}
}
- program { name: "elmenabled";
+ program { name: "state-enabled";
signal: "efl,state,enabled"; source: "efl";
script {
new m = get_int(slmode);
@@ -1129,168 +750,775 @@ group { "efl/progressbar/vertical";
}
#undef ICON
#undef LABEL
-#undef UNITS
#undef DISABLE
}
-group { "efl/progressbar/horizontal:wheel";
+group { name: "efl/progressbar/horizontal:bare";
data.item: "version" "123";
- alias: "efl/progressbar/vertical:wheel";
- images.image: "knob_round_busy.png" COMP;
- images.image: "glow_round_corners.png" COMP;
parts {
- part { name: "efl.bar" ; type: SWALLOW; mouse_events: 0;
+ part { name: "efl.content"; type: SWALLOW;
description { state: "default" 0.0;
+ fixed: 1 1;
min: 0 0;
max: 0 0;
visible: 0;
}
}
- part { name: "efl.content"; type: SWALLOW;
+ part { name: "pulse_clip"; type: RECT;
description { state: "default" 0.0;
- min: 0 0;
- max: 0 0;
+ rel1.relative: -2.0 -2.0;
+ rel2.relative: 3.0 3.0;
visible: 0;
}
+ description { state: "pulse" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ }
}
- part { name: "busy_clip"; type: RECT;
+ part { name: "fract_clip"; type: RECT;
description { state: "default" 0.0;
- visible: 0;
- color: 255 255 255 0;
+ rel1.relative: -2.0 -2.0;
+ rel2.relative: 3.0 3.0;
}
- description { state: "active" 0.0;
- visible: 1;
- color: 255 255 255 255;
+ description { state: "pulse" 0.0;
+ inherit: "default" 0.0;
+ visible: 0;
}
}
- part { name: "knob"; mouse_events: 0;
+ part { name: "bg"; type: RECT;
scale: 1;
description { state: "default" 0.0;
- image.normal: "knob_round_busy.png";
- min: 40 40;
- max: 40 40;
+ min: 10 5;
+ max: -1 5;
+ color: DARK_GREY_BG_COLOR;
+ }
+ }
+ part { name: "efl.bar"; type: SWALLOW; mouse_events: 0;
+ description { state: "default" 0.0;
+ rel1.to: "bg";
+ rel2.to: "bg";
}
}
- part { name: "knob_spinner"; mouse_events: 0;
- clip_to: "busy_clip";
+ part { name: "efl.cur.progressbar"; mouse_events: 0; type: SPACER;
+ dragable.confine: "efl.bar";
+ dragable.x: 1 1 1;
+ dragable.y: 0 0 0;
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "knob";
- rel2.to: "knob";
- image.normal: "glow_round_corners.png";
- map.on: 1;
- map.smooth: 1;
- map.rotation.center: "knob";
- }
- description { state: "spin" 0.0;
- inherit: "default" 0.0;
- map.rotation.z: 360;
+ min: 1 1;
+ max: 1 9999;
+ rel1.to: "efl.bar";
+ rel2.to: "efl.bar";
}
}
- }
- programs {
- program { name: "spin";
- signal: "efl,state,pulse,start"; source: "efl";
- action: STATE_SET "spin" 0.0;
- transition: LINEAR 1.0;
- target: "knob_spinner";
- after: "spin2";
+ part { name: "barend"; type: SPACER;
+ description { state: "default" 0.0;
+ fixed: 1 0;
+ max: 1 9999;
+ rel1.to_x: "efl.cur.progressbar";
+ rel2.to_x: "efl.cur.progressbar";
+ align: 1.0 0.5;
+ }
+ description { state: "inv" 0.0;
+ inherit: "default" 0.0;
+ align: 0.0 0.5;
+ }
}
- program { name: "spin2";
- action: STATE_SET "default" 0.0;
- target: "knob_spinner";
- after: "spin";
+ part { name: "bar"; type: RECT;
+ clip_to: "fract_clip";
+ description { state: "default" 0.0;
+ rel1.to: "bg";
+ rel2.to_x: "barend";
+ rel2.to_y: "bg";
+ color: 51 153 255 255;
+ }
+ description { state: "inv" 0.0;
+ inherit: "default" 0.0;
+ rel1.to_x: "barend";
+ rel2.to_x: "bg";
+ }
+ }
+ part { name: "pulse"; type: RECT;
+ clip_to: "pulse_clip";
+ scale: 1;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ min: 5 5;
+ max: 5 9999;
+ rel1.to: "efl.bar";
+ rel2.to: "efl.bar";
+ align: 0.0 0.5;
+ color: 51 153 255 255;
+ }
+ description { state: "end" 0.0;
+ inherit: "default" 0.0;
+ align: 1.0 0.5;
+ }
+ }
+ }
+ programs {
+ program { name: "inverted-on";
+ signal: "efl,state,inverted,on"; source: "efl";
+ action: STATE_SET "inv" 0.0;
+ target: "bar";
+ target: "barend";
+ }
+ program { name: "inverted-off";
+ signal: "efl,state,inverted,off"; source: "efl";
+ action: STATE_SET "default" 0.0;
+ target: "bar";
+ target: "barend";
+ }
+ program { name: "pulse-mode1";
+ signal: "efl,state,pulse,start"; source: "efl";
+ action: STATE_SET "pulse" 0.0;
+ target: "fract_clip";
+ }
+ program { name: "pulse-start";
+ signal: "efl,state,pulse,start"; source: "efl";
+ action: STATE_SET "pulse" 0.0;
+ target: "pulse_clip";
+ target: "fract_clip";
+ after: "pulse0";
+ }
+ program { name: "pulse0";
+ action: STATE_SET "end" 0.0;
+ transition: SINUSOIDAL 0.8;
+ target: "pulse";
+ after: "pulse1";
+ }
+ program { name: "pulse1";
+ action: STATE_SET "default" 0.0;
+ transition: SINUSOIDAL 0.8;
+ target: "pulse";
+ after: "pulse0";
+ }
+ program { name: "eflpulse-stop";
+ signal: "efl,state,pulse,stop"; source: "efl";
+ action: ACTION_STOP;
+ target: "pulse0";
+ target: "pulse1";
+ after: "pulse-stop";
+ }
+ program { name: "pulse-stop";
+ action: STATE_SET "default" 0.0;
+ target: "pulse_clip";
+ }
+ }
+}
+
+group { name: "efl/progressbar/horizontal:hidden_bare";
+ inherit: "efl/progressbar/horizontal:bare";
+ data.item: "version" "123";
+ parts {
+ part { name: "bg";
+ description { state: "default" 0.0;
+ color: 0 0 0 0;
+ }
+ }
+ }
+}
+
+group { name: "efl/progressbar/vertical:bare";
+ data.item: "version" "123";
+ parts {
+ part { name: "efl.content"; type: SWALLOW;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ min: 0 0;
+ max: 0 0;
+ visible: 0;
+ }
+ }
+ part { name: "pulse_clip"; type: RECT;
+ description { state: "default" 0.0;
+ rel1.relative: -2.0 -2.0;
+ rel2.relative: 3.0 3.0;
+ visible: 0;
+ }
+ description { state: "pulse" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ }
+ }
+ part { name: "fract_clip"; type: RECT;
+ description { state: "default" 0.0;
+ rel1.relative: -2.0 -2.0;
+ rel2.relative: 3.0 3.0;
+ }
+ description { state: "pulse" 0.0;
+ inherit: "default" 0.0;
+ visible: 0;
+ }
+ }
+ part { name: "bg"; type: RECT;
+ scale: 1;
+ description { state: "default" 0.0;
+ min: 5 10;
+ max: 5 -1;
+ color: DARK_GREY_BG_COLOR;
+ }
+ }
+ part { name: "efl.bar"; type: SWALLOW; mouse_events: 0;
+ description { state: "default" 0.0;
+ rel1.to: "bg";
+ rel2.to: "bg";
+ }
+ }
+ part { name: "efl.cur.progressbar"; mouse_events: 0; type: SPACER;
+ dragable.confine: "efl.bar";
+ dragable.x: 0 0 0;
+ dragable.y: 1 1 1;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ min: 1 1;
+ max: 9999 1;
+ rel1.to: "efl.bar";
+ rel2.to: "efl.bar";
+ }
+ }
+ part { name: "barend"; type: SPACER;
+ description { state: "default" 0.0;
+ fixed: 0 1;
+ max: 9999 1;
+ rel1.to_y: "efl.cur.progressbar";
+ rel2.to_y: "efl.cur.progressbar";
+ align: 0.5 1.0;
+ }
+ description { state: "inv" 0.0;
+ inherit: "default" 0.0;
+ align: 0.5 0.0;
+ }
+ }
+ part { name: "bar"; type: RECT;
+ scale: 1;
+ clip_to: "fract_clip";
+ description { state: "default" 0.0;
+ rel1.to: "bg";
+ rel2.to_y: "barend";
+ rel2.to_x: "bg";
+ color: 51 153 255 255;
+ offscale;
+ }
+ description { state: "inv" 0.0;
+ inherit: "default" 0.0;
+ rel1.to_y: "barend";
+ rel2.to_y: "bg";
+ }
+ }
+ part { name: "pulse"; type: RECT;
+ clip_to: "pulse_clip";
+ scale: 1;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ min: 5 10;
+ max: 9999 10;
+ rel1.to: "efl.bar";
+ rel2.to: "efl.bar";
+ align: 0.5 0.0;
+ color: 51 153 255 255;
+ }
+ description { state: "end" 0.0;
+ inherit: "default" 0.0;
+ align: 0.5 1.0;
+ }
+ }
+ }
+ programs {
+ program { name: "inverted-on";
+ signal: "efl,state,inverted,on"; source: "efl";
+ action: STATE_SET "inv" 0.0;
+ target: "bar";
+ target: "barend";
+ }
+ program { name: "inverted-off";
+ signal: "efl,state,inverted,off"; source: "efl";
+ action: STATE_SET "default" 0.0;
+ target: "bar";
+ target: "barend";
+ }
+ program { name: "pulse-mode1";
+ signal: "efl,state,pulse,start"; source: "efl";
+ action: STATE_SET "pulse" 0.0;
+ target: "fract_clip";
+ }
+ program { name: "pulse-start";
+ signal: "efl,state,pulse,start"; source: "efl";
+ action: STATE_SET "pulse" 0.0;
+ target: "pulse_clip";
+ target: "fract_clip";
+ after: "pulse0";
+ }
+ program { name: "pulse0";
+ action: STATE_SET "end" 0.0;
+ transition: SINUSOIDAL 0.8;
+ target: "pulse";
+ after: "pulse1";
+ }
+ program { name: "pulse1";
+ action: STATE_SET "default" 0.0;
+ transition: SINUSOIDAL 0.8;
+ target: "pulse";
+ after: "pulse0";
+ }
+ program { name: "eflpulse-stop";
+ signal: "efl,state,pulse,stop"; source: "efl";
+ action: ACTION_STOP;
+ target: "pulse0";
+ target: "pulse1";
+ after: "pulse-stop";
+ }
+ program { name: "pulse-stop";
+ action: STATE_SET "default" 0.0;
+ target: "pulse_clip";
+ }
+ }
+}
+
+group { name: "efl/progressbar/vertical:hidden_bare";
+ inherit: "efl/progressbar/vertical:bare";
+ data.item: "version" "123";
+ parts {
+ part { name: "bg";
+ description { state: "default" 0.0;
+ color: 0 0 0 0;
+ }
+ }
+ }
+}
+
+group { name: "efl/progressbar/horizontal:hidden_wheel";
+ alias: "efl/progressbar/vertical:hidden_wheel";
+ data.item: "version" "123";
+ IMAGE_RING("ringa", 160)
+ IMAGE_RING("ringb", 160)
+ IMAGE_RING("ringc", 160)
+ parts {
+ part { name: "efl.bar" ; type: SWALLOW; mouse_events: 0;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ min: 0 0;
+ max: 0 0;
+ visible: 0;
+ }
+ }
+ part { name: "efl.content"; type: SWALLOW;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ min: 0 0;
+ max: 0 0;
+ visible: 0;
+ }
+ }
+ BUSY("base", "efl,state,pulse,start", "efl", "efl,state,pulse,stop",
"efl")
+ part { name: "base"; type: RECT;
+ scale: 1;
+ description { state: "default" 0.0;
+ color: 0 0 0 0;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ min: 40 40;
+ max: 40 40;
+ offscale;
+ }
+ }
+ }
+}
+
+group { name: "efl/progressbar/horizontal:wheel";
+ inherit: "efl/progressbar/horizontal:hidden_wheel";
+ alias: "efl/progressbar/vertical:wheel";
+ data.item: "version" "123";
+ images.image: "speaker_vol.png" COMP;
+ parts {
+ part { name: "bg"; nomouse;
+ insert_before: "base";
+ description { state: "default" 0.0;
+ image.normal: "speaker_vol.png";
+ rel.to:"base";
+ color: 48 48 48 255;
+ }
+ description { state: "hidden" 0.0;
+ inherit;
+ color: 48 48 48 0;
+ visible: 0;
+ }
}
program {
signal: "efl,state,pulse,start"; source: "efl";
- action: STATE_SET "active" 0.0;
- transition: SINUSOIDAL 0.25;
- target: "busy_clip";
+ action: STATE_SET "hidden" 0.0;
+ transition: SINUSOIDAL 1.0;
+ target: "bg";
}
program {
signal: "efl,state,pulse,stop"; source: "efl";
action: STATE_SET "default" 0.0;
transition: SINUSOIDAL 1.0;
- target: "busy_clip";
- after: "spin3";
+ target: "bg";
}
- program { name: "spin3";
- action: ACTION_STOP;
- target: "spin";
+ }
+}
+
+group { name: "efl/progressbar/horizontal:bar";
+ alias: "efl/progressbar/horizontal:fileselector";
+ data.item: "version" "123";
+ set { name: "spinner";
+ image { image: "spinner-32.png" COMP; size: 17 45 9999 9999; }
+ image { image: "spinner-16.png" COMP; size: 9 23 16 44; }
+ image { image: "spinner-8.png" COMP; size: 0 0 8 22; }
+ }
+ parts {
+ part { name: "efl.bar" ; type: SWALLOW; mouse_events: 0;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ min: 0 0;
+ max: 0 0;
+ visible: 0;
+ }
+ }
+ part { name: "efl.content"; type: SWALLOW;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ min: 0 0;
+ max: 0 0;
+ visible: 0;
+ }
+ }
+ part { name: "spin1"; mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+ image.normal: "spinner";
+ color: 160 160 160 255;
+ rel1.relative: 0.0 0.0;
+ rel2.relative: 0.2 1.0;
+ rel1.to: "base";
+ rel2.to: "base";
+ min: 8 22;
+ max: 8 22;
+ map.on: 1;
+ map.smooth: 1;
+ map.rotation.center: "spin1";
+ }
+ description { state: "end" 0.0;
+ inherit;
+ map.rotation.z: 360;
+ }
+ }
+ part { name: "spin2"; mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+ image.normal: "spinner";
+ color: 160 160 160 255;
+ rel1.relative: 0.2 0.0;
+ rel2.relative: 0.4 1.0;
+ rel1.to: "base";
+ rel2.to: "base";
+ min: 8 22;
+ max: 8 22;
+ map.on: 1;
+ map.smooth: 1;
+ map.rotation.center: "spin2";
+ }
+ description { state: "end" 0.0;
+ inherit;
+ map.rotation.z: 360;
+ }
+ }
+ part { name: "spin3"; mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+ image.normal: "spinner";
+ color: 160 160 160 255;
+ rel1.relative: 0.4 0.0;
+ rel2.relative: 0.6 1.0;
+ rel1.to: "base";
+ rel2.to: "base";
+ min: 8 22;
+ max: 8 22;
+ map.on: 1;
+ map.smooth: 1;
+ map.rotation.center: "spin3";
+ }
+ description { state: "end" 0.0;
+ inherit;
+ map.rotation.z: 360;
+ }
+ }
+ part { name: "spin4"; mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+ image.normal: "spinner";
+ color: 160 160 160 255;
+ rel1.relative: 0.6 0.0;
+ rel2.relative: 0.8 1.0;
+ rel1.to: "base";
+ rel2.to: "base";
+ min: 8 22;
+ max: 8 22;
+ map.on: 1;
+ map.smooth: 1;
+ map.rotation.center: "spin4";
+ }
+ description { state: "end" 0.0;
+ inherit;
+ map.rotation.z: 360;
+ }
+ }
+ part { name: "spin5"; mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+ image.normal: "spinner";
+ color: 160 160 160 255;
+ rel1.relative: 0.8 0.0;
+ rel2.relative: 1.0 1.0;
+ rel1.to: "base";
+ rel2.to: "base";
+ min: 8 22;
+ max: 8 22;
+ map.on: 1;
+ map.smooth: 1;
+ map.rotation.center: "spin5";
+ }
+ description { state: "end" 0.0;
+ inherit;
+ map.rotation.z: 360;
+ }
+ }
+ part { name: "base"; type: RECT;
+ scale: 1;
+ description { state: "default" 0.0;
+ color: 0 0 0 0;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ min: 100 20;
+ max: 100 20;
+ offscale;
+ }
+ }
+ }
+ programs {
+ program { name: "spin-1";
+ in: 0.0 0.0;
+ signal: "efl,state,pulse,start"; source: "efl";
+ action: SIGNAL_EMIT "spin1" "";
+ after: "spin-2";
+ }
+ program { name: "spin-2";
+ in: 0.2 0.0;
+ action: SIGNAL_EMIT "spin2" "";
+ after: "spin-3";
+ }
+ program { name: "spin-3";
+ in: 0.2 0.0;
+ action: SIGNAL_EMIT "spin3" "";
+ after: "spin-4";
+ }
+ program { name: "spin-4";
+ in: 0.2 0.0;
+ action: SIGNAL_EMIT "spin4" "";
+ after: "spin-5";
+ }
+ program { name: "spin-5";
+ in: 0.2 0.0;
+ action: SIGNAL_EMIT "spin5" "";
+ }
+ program { name: "spin1.1";
+ signal: "spin1"; source: "";
+ action: STATE_SET "end" 0.0;
+ transition: SINUSOIDAL 1.0;
+ target: "spin1";
+ after: "spin1.2";
+ }
+ program { name: "spin1.2";
+ action: STATE_SET "default" 0.0;
+ target: "spin1";
+ after: "spin1.1";
+ }
+ program { name: "spin2.1";
+ signal: "spin2"; source: "";
+ action: STATE_SET "end" 0.0;
+ transition: SINUSOIDAL 1.0;
target: "spin2";
- after: "spin4";
+ after: "spin2.2";
+ }
+ program { name: "spin2.2";
+ action: STATE_SET "default" 0.0;
+ target: "spin2";
+ after: "spin2.1";
+ }
+ program { name: "spin3.1";
+ signal: "spin3"; source: "";
+ action: STATE_SET "end" 0.0;
+ transition: SINUSOIDAL 1.0;
+ target: "spin3";
+ after: "spin3.2";
}
- program { name: "spin4";
+ program { name: "spin3.2";
action: STATE_SET "default" 0.0;
- target: "knob_spinner";
+ target: "spin3";
+ after: "spin3.1";
+ }
+ program { name: "spin4.1";
+ signal: "spin4"; source: "";
+ action: STATE_SET "end" 0.0;
+ transition: SINUSOIDAL 1.0;
+ target: "spin4";
+ after: "spin4.2";
+ }
+ program { name: "spin4.2";
+ action: STATE_SET "default" 0.0;
+ target: "spin4";
+ after: "spin4.1";
+ }
+ program { name: "spin5.1";
+ signal: "spin5"; source: "";
+ action: STATE_SET "end" 0.0;
+ transition: SINUSOIDAL 1.0;
+ target: "spin5";
+ after: "spin5.2";
+ }
+ program { name: "spin5.2";
+ action: STATE_SET "default" 0.0;
+ target: "spin5";
+ after: "spin5.1";
+ }
+ program {
+ signal: "efl,state,pulse,stop"; source: "efl";
+ action: ACTION_STOP;
+ target: "spin-1";
+ target: "spin-2";
+ target: "spin-3";
+ target: "spin-4";
+ target: "spin-5";
+ after: "stop2";
+ }
+ program { name: "stop2";
+ action: STATE_SET "default" 0.0;
+ transition: SINUSOIDAL 1.0 CURRENT;
+ target: "spin1";
+ target: "spin2";
+ target: "spin3";
+ target: "spin4";
+ target: "spin5";
}
}
}
-group { "efl/progressbar/horizontal:double";
- inherit: "efl/progressbar/horizontal";
+group { name: "efl/progressbar/vertical:bar";
+ inherit: "efl/progressbar/horizontal:bar";
data.item: "version" "123";
- images {
- image: "inset_bar_horiz_glow_base_double.png" COMP;
- image: "inset_bar_horiz_glow_inv_base_double.png" COMP;
+ parts {
+ part { name: "spin1";
+ description { state: "default" 0.0;
+ rel1.relative: 0.0 0.0;
+ rel2.relative: 1.0 0.2;
+ map.rotation.z: 90;
+ }
+ description { state: "end" 0.0;
+ inherit;
+ map.rotation.z: 450;
+ }
+ }
+ part { name: "spin2";
+ description { state: "default" 0.0;
+ rel1.relative: 0.0 0.2;
+ rel2.relative: 1.0 0.4;
+ map.rotation.z: 90;
+ }
+ description { state: "end" 0.0;
+ inherit;
+ map.rotation.z: 450;
+ }
+ }
+ part { name: "spin3";
+ description { state: "default" 0.0;
+ rel1.relative: 0.0 0.4;
+ rel2.relative: 1.0 0.6;
+ map.rotation.z: 90;
+ }
+ description { state: "end" 0.0;
+ inherit;
+ map.rotation.z: 450;
+ }
+ }
+ part { name: "spin4";
+ description { state: "default" 0.0;
+ rel1.relative: 0.0 0.6;
+ rel2.relative: 1.0 0.8;
+ map.rotation.z: 90;
+ }
+ description { state: "end" 0.0;
+ inherit;
+ map.rotation.z: 450;
+ }
+ }
+ part { name: "spin5";
+ description { state: "default" 0.0;
+ rel1.relative: 0.0 0.8;
+ rel2.relative: 1.0 1.0;
+ map.rotation.z: 90;
+ }
+ description { state: "end" 0.0;
+ inherit;
+ map.rotation.z: 450;
+ }
+ }
+ part { name: "base";
+ description { state: "default" 0.0;
+ min: 20 100;
+ max: 20 100;
+ }
+ }
}
+}
+
+group { name: "efl/progressbar/horizontal:double";
+ inherit: "efl/progressbar/horizontal";
+ data.item: "version" "123";
parts {
part { name: "efl.cur.progressbar1"; mouse_events: 0; type: SPACER;
- insert_after: "inside";
+ insert_after: "bg";
scale: 1;
- dragable.confine: "inside";
+ dragable.confine: "efl.bar";
dragable.x: 1 1 1;
dragable.y: 0 0 0;
description { state: "default" 0.0;
- fixed: 1 1;
- min: 8 4;
- max: 8 4;
- rel1.to: "inside";
- rel2.to: "inside";
+ fixed: 1 0;
+ min: 1 1;
+ max: 1 9999;
+ rel1.to: "efl.bar";
+ rel2.to: "efl.bar";
}
}
part { name: "barend1"; type: SPACER;
scale: 1;
description { state: "default" 0.0;
fixed: 1 0;
- min: 14 16;
+ max: 1 9999;
rel1.to_x: "efl.cur.progressbar1";
- rel1.relative: 1.0 0.0;
rel2.to_x: "efl.cur.progressbar1";
- rel2.relative: 1.0 1.0;
- align: 0.0 0.5;
+ align: 1.0 0.5;
}
description { state: "inv" 0.0;
inherit: "default" 0.0;
- rel1.relative: 0.0 0.0;
- rel2.relative: 0.0 1.0;
- align: 1.0 0.5;
+ align: 0.0 0.5;
}
}
- part { name: "bar1";
- insert_after: "barend";
- clip_to: "fract_clip";
+ part { name: "bar1"; type: RECT;
scale: 1;
+ insert_before: "bar";
+ clip_to: "fract_clip";
description { state: "default" 0.0;
- rel1.to_x: "ins0";
- rel1.to_y: "bg";
- rel1.relative: (12/16) -0.25;
+ rel1.to: "bg";
rel2.to_x: "barend1";
rel2.to_y: "bg";
- rel2.relative: 1.0 1.25;
- image.normal: "inset_bar_horiz_glow_base_double.png";
- image.border: 0 72 0 0;
- image.border_scale_by: 0.25; image.border_scale: 1;
- color: 51 153 255 128;
+ color: 80 80 80 255;
+ offscale;
}
description { state: "inv" 0.0;
inherit: "default" 0.0;
- rel1.to_x: "barend";
- rel1.relative: 0.0 -0.25;
- rel2.to_x: "ins1";
- rel2.relative: (4/16) 1.25;
- image.normal: "inset_bar_horiz_glow_inv_base_double.png";
- image.border: 72 0 0 0;
+ rel1.to_x: "barend1";
+ rel2.to_x: "bg";
}
}
}
@@ -1302,7 +1530,6 @@ group { "efl/progressbar/horizontal:double";
target: "bar1";
target: "barend";
target: "barend1";
- target: "light";
}
program
{ name: "inverted-off";
@@ -1312,75 +1539,56 @@ group { "efl/progressbar/horizontal:double";
target: "bar1";
target: "barend";
target: "barend1";
- target: "light";
}
}
}
-group { "efl/progressbar/vertical:double";
+group { name: "efl/progressbar/vertical:double";
inherit: "efl/progressbar/vertical";
data.item: "version" "123";
- images {
- image: "inset_bar_vert_glow_base_double.png" COMP;
- image: "inset_bar_vert_glow_inv_base_double.png" COMP;
- }
parts {
part { name: "efl.cur.progressbar1"; mouse_events: 0; type: SPACER;
- insert_after: "inside";
+ insert_after: "bg";
scale: 1;
- dragable.confine: "inside";
+ dragable.confine: "efl.bar";
dragable.x: 0 0 0;
dragable.y: 1 1 1;
description { state: "default" 0.0;
- fixed: 1 1;
- min: 4 8;
- max: 4 8;
- rel1.to: "inside";
- rel2.to: "inside";
+ fixed: 0 1;
+ max: 1 9999;
+ rel1.to: "efl.bar";
+ rel2.to: "efl.bar";
}
}
part { name: "barend1"; type: SPACER;
scale: 1;
description { state: "default" 0.0;
fixed: 0 1;
- min: 16 14;
+ max: 1 9999;
rel1.to_y: "efl.cur.progressbar1";
- rel1.relative: 0.0 1.0;
rel2.to_y: "efl.cur.progressbar1";
- rel2.relative: 1.0 1.0;
- align: 0.5 0.0;
+ align: 0.5 1.0;
}
description { state: "inv" 0.0;
inherit: "default" 0.0;
- rel1.relative: 0.0 0.0;
- rel2.relative: 1.0 0.0;
- align: 0.5 1.0;
+ align: 0.5 0.0;
}
}
- part { name: "bar1";
+ part { name: "bar1"; type: RECT;
+ scale: 1;
insert_after: "barend";
clip_to: "fract_clip";
- scale: 1;
description { state: "default" 0.0;
- rel1.to_y: "ins0";
- rel1.to_x: "bg";
- rel1.relative: -0.25 (12/16);
+ rel1.to: "bg";
rel2.to_y: "barend1";
rel2.to_x: "bg";
- rel2.relative: 1.25 1.0;
- image.normal: "inset_bar_vert_glow_base_double.png";
- image.border: 0 0 0 72;
- image.border_scale_by: 0.25; image.border_scale: 1;
- color: 51 153 255 128;
+ color: 80 80 80 255;
+ offscale;
}
description { state: "inv" 0.0;
inherit: "default" 0.0;
rel1.to_y: "barend1";
- rel1.relative: -0.25 0.0;
- rel2.to_y: "ins1";
- rel2.relative: 1.25 (4/16);
- image.normal: "inset_bar_vert_glow_inv_base_double.png";
- image.border: 0 0 72 0;
+ rel2.to_y: "bg";
}
}
}
@@ -1389,18 +1597,16 @@ group { "efl/progressbar/vertical:double";
signal: "efl,state,inverted,on"; source: "efl";
action: STATE_SET "inv" 0.0;
target: "bar";
- target: "barend";
- target: "light";
target: "bar1";
+ target: "barend";
target: "barend1";
}
program { name: "inverted-off";
signal: "efl,state,inverted,off"; source: "efl";
action: STATE_SET "default" 0.0;
target: "bar";
- target: "barend";
- target: "light";
target: "bar1";
+ target: "barend";
target: "barend1";
}
}
--
