raster pushed a commit to branch master.
commit 78260662833cb69b58e26138da994764544fd70d
Author: Carsten Haitzler (Rasterman) <[email protected]>
Date: Sat Aug 10 01:20:45 2013 +0900
progressbar done for horizontal progress. vertical to go.
---
edje/edc/elm/progress.edc | 771 +++++++++++++++++-----------
edje/img/inset_bar_horiz_base.png | Bin 0 -> 2581 bytes
edje/img/inset_bar_horiz_glow_base.png | Bin 0 -> 15312 bytes
edje/img/inset_bar_horiz_glow_inv_base.png | Bin 0 -> 14932 bytes
edje/img/inset_bar_horiz_glow_inv_light.png | Bin 0 -> 1929 bytes
edje/img/inset_bar_horiz_glow_light.png | Bin 0 -> 1883 bytes
edje/img/inset_bar_horiz_glow_mid_base.png | Bin 0 -> 8887 bytes
edje/img/inset_bar_horiz_glow_mid_light.png | Bin 0 -> 1488 bytes
edje/img/inset_bar_horiz_inside_base.png | Bin 0 -> 285 bytes
edje/img/inset_bar_horiz_inside_light.png | Bin 0 -> 249 bytes
edje/img/inset_bar_horiz_light.png | Bin 0 -> 950 bytes
mock-18.xcf.gz | Bin 612340 -> 612340 bytes
12 files changed, 474 insertions(+), 297 deletions(-)
diff --git a/edje/edc/elm/progress.edc b/edje/edc/elm/progress.edc
index 41719e5..a8c7444 100644
--- a/edje/edc/elm/progress.edc
+++ b/edje/edc/elm/progress.edc
@@ -1,387 +1,564 @@
-/*
group { name: "elm/progressbar/horizontal/default";
- images {
- image: "shelf_inset.png" COMP;
- image: "bt_sm_base2.png" COMP;
- image: "bt_sm_hilight.png" COMP;
- image: "bt_sm_shine.png" COMP;
+ 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;
+#define ICON 1
+#define LABEL 2
+#define DISABLE 4
+ script {
+ public slmode;
+ public eval_mode(m) {
+ new ic = m & ICON;
+ new l = m & LABEL;
+ new d = m & DISABLE;
+ if (l) {
+ if (!d) {
+ set_state(PART:"elm.text", "visible", 0.0);
+ } else {
+ set_state(PART:"elm.text", "disabled_visible", 0.0);
+ }
+ } else {
+ set_state(PART:"elm.text", "default", 0.0);
+ }
+ if (ic) {
+ set_state(PART:"elm.swallow.content", "visible", 0.0);
+ set_state(PART:"sizer.content", "visible", 0.0);
+ } else {
+ set_state(PART:"elm.swallow.content", "default", 0.0);
+ set_state(PART:"sizer.content", "default", 0.0);
+ }
+ if (!d) {
+ set_state(PART:"dis_clip", "default", 0.0);
+ } else {
+ set_state(PART:"dis_clip", "disabled", 0.0);
+ }
+ }
}
parts {
- part { name: "elm.background.progressbar";
- type: RECT;
- mouse_events: 0;
- description {
- state: "default" 0.0;
- rel1 {
- relative: 0.0 0.0;
- offset: 0 0;
- }
- rel2 {
- relative: 1.0 1.0;
- }
+ part { name: "dis_clip"; type: RECT;
+ description { state: "default" 0.0;
+ rel1.to: "elm.swallow.content";
+ rel2.to: "elm.swallow.content";
+ }
+ description { state: "disabled" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 64;
}
}
- part { name: "elm.swallow.bar";
- mouse_events: 0;
- type: SWALLOW;
- description {
- min: 48 28;
- max: 99999 28;
- state: "default" 0.0;
- rel1 {
- to_x: "elm.text";
- to_y: "elm.background.progressbar";
- relative: 1.0 0.0;
- }
- rel2 {
- to: "elm.background.progressbar";
- relative: 1.0 1.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: "elm.swallow.content";
- type: SWALLOW;
+ 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: "elm.swallow.content"; type: SWALLOW;
+ clip_to: "dis_clip";
description { state: "default" 0.0;
visible: 0;
align: 0.0 0.5;
- rel1 {
- offset: 4 0;
- to_y: "elm.background.progressbar";
- }
- rel2 {
- offset: 3 -1;
- relative: 0.0 1.0;
- to_y: "elm.background.progressbar";
- }
+ rel1.offset: 0 2;
+ rel2.offset: -1 -3;
+ rel2.relative: 0.0 1.0;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
- aspect: 1.0 1.0;
- aspect_preference: VERTICAL;
- rel2.offset: 4 -1;
+ aspect: 1.0 1.0; aspect_preference: VERTICAL;
+ rel1.offset: 2 2;
+ rel2.offset: 2 -3;
}
}
- part { name: "elm.text";
- type: TEXT;
- mouse_events: 0;
+ part { name: "sizer.content"; type: TEXT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
+ fixed: 1 1;
visible: 0;
+ text { font: FN; size: 10;
+ min: 0 0;
+ text_class: "slider_text";
+ }
+ }
+ description { state: "visible" 0.0;
+ inherit: "default" 0.0;
+ rel1.to: "elm.swallow.content";
+ rel2.to: "elm.swallow.content";
+ text {
+ min: 1 1;
+ text: "M";
+ }
+ }
+ }
+ part { name: "elm.text"; type: TEXT; mouse_events: 0;
+ effect: SHADOW BOTTOM;
+ scale: 1;
+ description { state: "default" 0.0;
fixed: 1 1;
align: 0.0 0.5;
rel1.to_x: "elm.swallow.content";
rel1.relative: 1.0 0.0;
- rel1.offset: -1 4;
+ rel1.offset: -1 2;
rel2.to_x: "elm.swallow.content";
rel2.relative: 1.0 1.0;
- rel2.offset: -1 -5;
- color: 0 0 0 255;
- text {
- font: "Sans,Edje-Vera";
- size: 10;
+ rel2.offset: -1 -3;
+ color: 255 255 255 255;
+ color3: 0 0 0 128;
+ color_class: "slider_text";
+ text { font: FN; size: 10;
+ text_class: "slider";
min: 0 0;
align: 0.0 0.5;
}
+ visible: 0;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
+ fixed: 1 0;
visible: 1;
+ rel1.offset: 2 2;
+ rel2.offset: 2 -3;
text.min: 1 1;
- rel1.offset: 0 4;
- rel2.offset: 0 -5;
+ }
+ description { state: "disabled_visible" 0.0;
+ inherit: "visible" 0.0;
+ color_class: "slider_text_disabled";
+ color: 21 21 21 255;
+ color3: 255 255 255 15;
}
}
-
- part { name: "background";
- mouse_events: 0;
- clip_to: "elm.background.progressbar";
- description {
- state: "default" 0.0;
- rel1 {
- to: "elm.swallow.bar";
- relative: 0.0 0.0;
- }
- rel2 {
- to: "elm.swallow.bar";
- relative: 1.0 1.0;
- offset: -1 -1;
- }
- image {
- normal: "shelf_inset.png";
- border: 7 7 7 7;
- }
+ part { name: "bg-hi";
+ description { state: "default" 0.0;
+ min: 16 16;
+ 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;
}
}
-
- part { name: "elm.text.status";
- type: TEXT;
- mouse_events: 0;
+ part { name: "bg";
+ scale: 1;
description { state: "default" 0.0;
- fixed: 1 1;
- visible: 1;
- rel1 {
- to: "background";
- relative: 0.5 0.5;
- }
- rel2 {
- to: "background";
- relative: 0.5 0.5;
- }
- text {
- font: "Sans:style=Bold,Edje-Vera-Bold";
- size: 10;
- min: 1 1;
- align: 0.5 0.0;
- }
- color: 0 0 0 255;
+ min: 16 16;
+ rel1.to_x: "elm.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;
}
- description { state: "hidden" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- text.min: 0 0;
+ }
+ 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;
}
}
-
- part { name: "elm.progress.progressbar";
- mouse_events: 0;
- clip_to: "elm.background.progressbar";
- description {
- state: "default" 0.0;
- min: 14 28;
+ part { name: "ins1"; type: SPACER;
+ scale: 1;
+ description { state: "default" 0.0;
+ fixed: 1 0;
+ rel1.to: "bg";
+ 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;
+ min: 4 4;
+ 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: "elm.swallow.bar"; type: SWALLOW; mouse_events: 0;
+ description { state: "default" 0.0;
+ rel1.to: "inside";
+ rel2.to: "inside";
+ }
+ }
+ part { name: "elm.cur.progressbar"; mouse_events: 0; type: SPACER;
+ scale: 1;
+ dragable.confine: "inside";
+ dragable.x: 1 1 1;
+ dragable.y: 0 0 0;
+ description { state: "default" 0.0;
fixed: 1 1;
- rel1 {
- to: "elm.swallow.bar";
- relative: 0.0 0.0;
- }
- rel2 {
- to_y: "elm.swallow.bar";
- to_x: "elm.cur.progressbar";
- offset: -1 -1;
- }
- image {
- normal: "bt_sm_base2.png";
- border: 6 6 6 6;
- }
+ min: 8 4;
+ max: 8 4;
+ rel1.to: "inside";
+ rel2.to: "inside";
}
- description {
- state: "invert" 0.0;
+ }
+ part { name: "barend"; type: SPACER;
+ scale: 1;
+ description { state: "default" 0.0;
+ fixed: 1 0;
+ min: 14 16;
+ rel1.to_x: "elm.cur.progressbar";
+ rel1.relative: 1.0 0.0;
+ rel2.to_x: "elm.cur.progressbar";
+ rel2.relative: 1.0 1.0;
+ align: 0.0 0.5;
+ }
+ description { state: "inv" 0.0;
inherit: "default" 0.0;
- rel1 {
- to_y: "elm.swallow.bar";
- to_x: "elm.cur.progressbar";
- }
- rel2 {
- to: "elm.swallow.bar";
- relative: 1.0 1.0;
- }
+ rel1.relative: 0.0 0.0;
+ rel2.relative: 0.0 1.0;
+ align: 1.0 0.5;
}
- description {
- state: "state_begin" 0.0;
+ }
+ part { name: "bar";
+ clip_to: "fract_clip";
+ scale: 1;
+ description { state: "default" 0.0;
+ rel1.to_x: "ins0";
+ rel1.to_y: "bg";
+ rel1.relative: (12/16) -0.25;
+ 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;
+ }
+ description { state: "inv" 0.0;
inherit: "default" 0.0;
- rel1 {
- to: "elm.swallow.bar";
- relative: 0.0 0.0;
- }
- rel2 {
- to: "elm.swallow.bar";
- relative: 0.1 1.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;
}
- description {
- state: "state_end" 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.5;
+ }
+ }
+ part { name: "pulse";
+ 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";
+ align: 0.0 0.5;
+ }
+ description { state: "end" 0.0;
inherit: "default" 0.0;
- rel1 {
- to: "elm.swallow.bar";
- relative: 0.9 0.0;
- }
- rel2 {
- to: "elm.swallow.bar";
- relative: 1.0 1.0;
- }
+ align: 1.0 0.5;
}
}
- part { name: "text-bar";
- type: TEXT;
- mouse_events: 0;
- clip_to: "progress-rect";
- effect: SOFT_SHADOW;
+ part { name: "elm.text.status"; type: TEXT; mouse_events: 0;
scale: 1;
+ effect: GLOW;
description { state: "default" 0.0;
- align: 0.0 0.0;
fixed: 1 1;
- visible: 1;
- rel1.to: "elm.text.status";
- rel1.offset: -1 -1;
- rel2.to: "elm.text.status";
- text {
- text_source: "elm.text.status";
- font: "Sans:style=Bold,Edje-Vera-Bold";
- size: 10;
- min: 1 1;
- align: 0.0 0.0;
+ rel1.to: "inside";
+ rel2.to: "inside";
+ color_class: "progress_status";
+ align: 1.0 0.5;
+ text { font: FN; size: 10;
+ min: 0 1;
+ text_class: "progress_status";
+ align: 1.0 0.5;
}
- color: 224 224 224 255;
- color3: 0 0 0 64;
+ color: 255 255 255 255;
+ color2: 51 153 255 64;
+ color3: 51 153 255 32;
+ visible: 1;
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
visible: 0;
- text.min: 0 0;
}
}
-
- part { name: "over1";
- mouse_events: 0;
+ part { name: "pulse2";
+ clip_to: "pulse_clip";
+ scale: 1;
description { state: "default" 0.0;
- rel1.to: "elm.progress.progressbar";
- rel2.to: "elm.progress.progressbar";
- rel2.relative: 1.0 0.5;
- image {
- normal: "bt_sm_hilight.png";
- border: 6 6 6 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;
}
- }
-
- part { name: "over2";
- mouse_events: 1;
- repeat_events: 1;
- description { state: "default" 0.0;
- rel1.to: "elm.progress.progressbar";
- rel2.to: "elm.progress.progressbar";
- image {
- normal: "bt_sm_shine.png";
- border: 6 6 6 0;
- }
+ description { state: "glow" 0.0;
+ inherit: "default" 0.0;
+ color: 255 255 255 255;
}
}
-
- part { name: "elm.cur.progressbar";
- mouse_events: 0;
- dragable {
- confine: "background";
- x: 1 1 1;
- y: 0 0 0;
- }
+ part { name: "light";
+ clip_to: "fract_clip";
+ scale: 1;
description { state: "default" 0.0;
- min: 14 28;
- fixed: 1 1;
- visible: 0;
- rel1 {
- to: "background";
- relative: 0 0;
- }
- rel2.to: "background";
+ 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;
}
- }
- part { name: "progress-rect";
- type: RECT;
- mouse_events: 0;
- description {
- state: "default" 0.0;
- rel1.to: "elm.progress.progressbar";
- rel2.to: "elm.progress.progressbar";
+ 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: "label_show";
- signal: "elm,state,text,visible";
- source: "elm";
- action: STATE_SET "visible" 0.0;
- target: "elm.text";
+ program {
+ signal: "elm,state,inverted,on"; source: "elm";
+ action: STATE_SET "inv" 0.0;
+ target: "bar";
+ target: "barend";
+ target: "light";
}
- program { name: "label_hide";
- signal: "elm,state,text,hidden";
- source: "elm";
+ program {
+ signal: "elm,state,inverted,off"; source: "elm";
action: STATE_SET "default" 0.0;
- target: "elm.text";
+ target: "bar";
+ target: "barend";
+ target: "light";
}
- program { name: "icon_show";
- signal: "elm,state,icon,visible";
- source: "elm";
- action: STATE_SET "visible" 0.0;
- target: "elm.swallow.content";
+ program {
+ signal: "drag,set"; source: "elm.cur.progressbar";
+ script {
+ new a, Float:dx, Float:dy, Float:vl, st[20];
+
+ get_drag(PART:"elm.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: "icon_hide";
- signal: "elm,state,icon,hidden";
- source: "elm";
+ program { name: "pulse-mode0";
+ signal: "elm,state,pulse"; source: "elm";
+ action: STATE_SET "hidden" 0.0;
+ target: "elm.text.status";
+ after: "pulse-mode1";
+ }
+ program { name: "pulse-mode1";
+ signal: "elm,state,pulse,start"; source: "elm";
+ action: STATE_SET "pulse" 0.0;
+ target: "fract_clip";
+ }
+ program { name: "pulse-start";
+ signal: "elm,state,pulse,start"; source: "elm";
+ action: STATE_SET "pulse" 0.0;
+ 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;
- target: "elm.swallow.content";
+ transition: DECELERATE 0.4;
+ target: "pulse2";
}
- program { name: "units_show";
- signal: "elm,state,units,visible";
- source: "elm";
+ 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;
- target: "text-bar";
- target: "elm.text.status";
+ transition: SINUSOIDAL 0.8;
+ target: "pulse";
+ after: "pulse0";
+ after: "pulse0.1";
}
- program { name: "units_hide";
- signal: "elm,state,units,hidden";
- source: "elm";
- action: STATE_SET "hidden" 0.0;
- target: "text-bar";
+ program {
+ signal: "elm,state,fraction"; source: "elm";
+ action: STATE_SET "default" 0.0;
target: "elm.text.status";
+ after: "pulse-stop";
}
- program { name: "slide_to_end";
- action: STATE_SET "state_end" 0.0;
- transition: LINEAR 0.5;
- target: "elm.progress.progressbar";
- after: "slide_to_begin";
+ program {
+ signal: "elm,state,pulse,stop"; source: "elm";
+ action: ACTION_STOP;
+ target: "pulse0";
+ target: "pulse1";
+ after: "pulse-stop";
}
- program { name: "slide_to_begin";
- signal: "elm,state,slide,begin";
- action: STATE_SET "state_begin" 0.0;
- target: "elm.progress.progressbar";
- transition: LINEAR 0.5;
- after: "slide_to_end";
+ program { name: "pulse-stop";
+ action: STATE_SET "default" 0.0;
+ target: "pulse_clip";
}
- program { name: "start_pulse";
- signal: "elm,state,pulse,start";
- source: "elm";
- after: "slide_to_end";
+ program {
+ signal: "elm,state,units,visible"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "elm.text.status";
}
- program { name: "stop_pulse";
- signal: "elm,state,pulse,stop";
- source: "elm";
- action: ACTION_STOP;
- target: "slide_to_begin";
- target: "slide_to_end";
- target: "start_pulse";
- after: "state_pulse";
+ program {
+ signal: "elm,state,units,hidden"; source: "elm";
+ action: STATE_SET "hidden" 0.0;
+ target: "elm.text.status";
}
- program { name: "state_pulse";
- signal: "elm,state,pulse";
- source: "elm";
- action: STATE_SET "state_begin" 0.0;
- target: "elm.progress.progressbar";
- after: "units_hide";
+ program {
+ signal: "elm,state,text,visible"; source: "elm";
+ script {
+ new m = get_int(slmode);
+ m |= LABEL; set_int(slmode, m);
+ eval_mode(m);
+ }
}
- program { name: "state_fraction";
- signal: "elm,state,fraction";
- source: "elm";
- action: ACTION_STOP;
- target: "slide_to_begin";
- target: "slide_to_end";
- target: "start_pulse";
- action: STATE_SET "default" 0.0;
- target: "elm.progress.progressbar";
+ program {
+ signal: "elm,state,text,hidden"; source: "elm";
+ script {
+ new m = get_int(slmode);
+ m &= ~LABEL; set_int(slmode, m);
+ eval_mode(m);
+ }
}
- program { name: "set_invert_on";
- signal: "elm,state,inverted,on";
- source: "elm";
- action: STATE_SET "invert" 0.0;
- target: "elm.progress.progressbar";
+ program {
+ signal: "elm,state,icon,visible"; source: "elm";
+ script {
+ new m = get_int(slmode);
+ m |= ICON; set_int(slmode, m);
+ eval_mode(m);
+ }
}
- program { name: "set_invert_off";
- signal: "elm,state,inverted,off";
- source: "elm";
- action: STATE_SET "default" 0.0;
- target: "elm.progress.progressbar";
+ program {
+ signal: "elm,state,icon,hidden"; source: "elm";
+ script {
+ new m = get_int(slmode);
+ m &= ~ICON; set_int(slmode, m);
+ eval_mode(m);
+ }
+ }
+ program {
+ signal: "elm,state,disabled"; source: "elm";
+ script {
+ new m = get_int(slmode);
+ m |= DISABLE; set_int(slmode, m);
+ eval_mode(m);
+ }
+ }
+ program {
+ signal: "elm,state,enabled"; source: "elm";
+ script {
+ new m = get_int(slmode);
+ m &= ~DISABLE; set_int(slmode, m);
+ eval_mode(m);
+ }
}
}
+#undef ICON
+#undef LABEL
+#undef UNITS
+#undef DISABLE
}
+/*
+XXX: do vertical
///////////////////////////////////////////////////////////////////////////////
group { name: "elm/progressbar/vertical/default";
@@ -392,7 +569,7 @@ group { name: "elm/progressbar/vertical/default";
image: "bt_sm_shine.png" COMP;
}
parts {
- part { name: "elm.background.progressbar";
+ part { name: "bg";
type: RECT;
mouse_events: 0;
description {
@@ -482,7 +659,7 @@ group { name: "elm/progressbar/vertical/default";
part { name: "background";
mouse_events: 0;
- clip_to: "elm.background.progressbar";
+ clip_to: "bg";
description {
state: "default" 0.0;
rel1 {
@@ -503,7 +680,7 @@ group { name: "elm/progressbar/vertical/default";
part { name: "elm.progress.progressbar";
mouse_events: 0;
- clip_to: "elm.background.progressbar";
+ clip_to: "bg";
description {
state: "default" 0.0;
min: 28 14;
diff --git a/edje/img/inset_bar_horiz_base.png
b/edje/img/inset_bar_horiz_base.png
new file mode 100644
index 0000000..e2c16a4
Binary files /dev/null and b/edje/img/inset_bar_horiz_base.png differ
diff --git a/edje/img/inset_bar_horiz_glow_base.png
b/edje/img/inset_bar_horiz_glow_base.png
new file mode 100644
index 0000000..3527887
Binary files /dev/null and b/edje/img/inset_bar_horiz_glow_base.png differ
diff --git a/edje/img/inset_bar_horiz_glow_inv_base.png
b/edje/img/inset_bar_horiz_glow_inv_base.png
new file mode 100644
index 0000000..d41612f
Binary files /dev/null and b/edje/img/inset_bar_horiz_glow_inv_base.png differ
diff --git a/edje/img/inset_bar_horiz_glow_inv_light.png
b/edje/img/inset_bar_horiz_glow_inv_light.png
new file mode 100644
index 0000000..c421580
Binary files /dev/null and b/edje/img/inset_bar_horiz_glow_inv_light.png differ
diff --git a/edje/img/inset_bar_horiz_glow_light.png
b/edje/img/inset_bar_horiz_glow_light.png
new file mode 100644
index 0000000..48723b8
Binary files /dev/null and b/edje/img/inset_bar_horiz_glow_light.png differ
diff --git a/edje/img/inset_bar_horiz_glow_mid_base.png
b/edje/img/inset_bar_horiz_glow_mid_base.png
new file mode 100644
index 0000000..bf1ea5d
Binary files /dev/null and b/edje/img/inset_bar_horiz_glow_mid_base.png differ
diff --git a/edje/img/inset_bar_horiz_glow_mid_light.png
b/edje/img/inset_bar_horiz_glow_mid_light.png
new file mode 100644
index 0000000..5b51ce1
Binary files /dev/null and b/edje/img/inset_bar_horiz_glow_mid_light.png differ
diff --git a/edje/img/inset_bar_horiz_inside_base.png
b/edje/img/inset_bar_horiz_inside_base.png
new file mode 100644
index 0000000..d69711a
Binary files /dev/null and b/edje/img/inset_bar_horiz_inside_base.png differ
diff --git a/edje/img/inset_bar_horiz_inside_light.png
b/edje/img/inset_bar_horiz_inside_light.png
new file mode 100644
index 0000000..17a90d2
Binary files /dev/null and b/edje/img/inset_bar_horiz_inside_light.png differ
diff --git a/edje/img/inset_bar_horiz_light.png
b/edje/img/inset_bar_horiz_light.png
new file mode 100644
index 0000000..2fb7601
Binary files /dev/null and b/edje/img/inset_bar_horiz_light.png differ
diff --git a/mock-18.xcf.gz b/mock-18.xcf.gz
index 91b7536..8c2ef6c 100644
Binary files a/mock-18.xcf.gz and b/mock-18.xcf.gz differ
--
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
