seoz pushed a commit to branch master.
http://git.enlightenment.org/themes/dark.git/commit/?id=9df616d085b8bcbb8aa63bd899fec6416e52121f
commit 9df616d085b8bcbb8aa63bd899fec6416e52121f
Author: Niraj Kumar <jiraj...@samsung.com>
Date: Wed Oct 16 21:03:40 2013 +0900
progress: Added theme for the vertical and horizontal multiple progress
status
reviewer: seoz
reviewer comment: this needs some fixes but I and raster will fix them up
after this commit due to phab D232 corruption.
Differential Revision: https://phab.enlightenment.org/D232
---
edje/edc/elm/progress.edc | 299 ++++++++++++++++++---
edje/img/inset_bar_horiz_glow_base_recording.png | Bin 0 -> 13825 bytes
.../inset_bar_horiz_glow_inv_base_recording.png | Bin 0 -> 15274 bytes
edje/img/inset_bar_vert_glow_base_recording.png | Bin 0 -> 17543 bytes
.../img/inset_bar_vert_glow_inv_base_recording.png | Bin 0 -> 17747 bytes
5 files changed, 267 insertions(+), 32 deletions(-)
diff --git a/edje/edc/elm/progress.edc b/edje/edc/elm/progress.edc
index 89dcc2d..1e70908 100644
--- a/edje/edc/elm/progress.edc
+++ b/edje/edc/elm/progress.edc
@@ -398,25 +398,25 @@ group { name: "elm/progressbar/horizontal/default";
}
}
programs {
- program {
+ program { name: "inverted-on";
signal: "elm,state,inverted,on"; source: "elm";
action: STATE_SET "inv" 0.0;
target: "bar";
target: "barend";
target: "light";
}
- program {
+ program { name: "inverted-off";
signal: "elm,state,inverted,off"; source: "elm";
action: STATE_SET "default" 0.0;
target: "bar";
target: "barend";
target: "light";
}
- program {
+ program { name: "drag-set";
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")) {
@@ -475,13 +475,13 @@ group { name: "elm/progressbar/horizontal/default";
after: "pulse0";
after: "pulse0.1";
}
- program {
+ program { name: "fraction";
signal: "elm,state,fraction"; source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.text.status";
after: "pulse-stop";
}
- program {
+ program { name: "elmpulse-stop";
signal: "elm,state,pulse,stop"; source: "elm";
action: ACTION_STOP;
target: "pulse0";
@@ -492,17 +492,17 @@ group { name: "elm/progressbar/horizontal/default";
action: STATE_SET "default" 0.0;
target: "pulse_clip";
}
- program {
+ program { name: "units-visible";
signal: "elm,state,units,visible"; source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.text.status";
}
- program {
+ program { name: "units-hidden";
signal: "elm,state,units,hidden"; source: "elm";
action: STATE_SET "hidden" 0.0;
target: "elm.text.status";
}
- program {
+ program { name: "text-visible";
signal: "elm,state,text,visible"; source: "elm";
script {
new m = get_int(slmode);
@@ -510,15 +510,15 @@ group { name: "elm/progressbar/horizontal/default";
eval_mode(m);
}
}
- program {
+ program { name: "text-hidden";
signal: "elm,state,text,hidden"; source: "elm";
- script {
+ script {
new m = get_int(slmode);
m &= ~LABEL; set_int(slmode, m);
eval_mode(m);
}
}
- program {
+ program { name: "icon-visible";
signal: "elm,state,icon,visible"; source: "elm";
script {
new m = get_int(slmode);
@@ -526,25 +526,25 @@ group { name: "elm/progressbar/horizontal/default";
eval_mode(m);
}
}
- program {
+ program { name: "icon-hidden";
signal: "elm,state,icon,hidden"; source: "elm";
- script {
+ script {
new m = get_int(slmode);
m &= ~ICON; set_int(slmode, m);
eval_mode(m);
}
}
- program {
+ program { name: "state-disabled";
signal: "elm,state,disabled"; source: "elm";
- script {
+ script {
new m = get_int(slmode);
m |= DISABLE; set_int(slmode, m);
eval_mode(m);
}
}
- program {
+ program { name: "state-enabled";
signal: "elm,state,enabled"; source: "elm";
- script {
+ script {
new m = get_int(slmode);
m &= ~DISABLE; set_int(slmode, m);
eval_mode(m);
@@ -970,25 +970,25 @@ group { name: "elm/progressbar/vertical/default";
}
}
programs {
- program {
+ program { name: "inverted-on";
signal: "elm,state,inverted,on"; source: "elm";
action: STATE_SET "inv" 0.0;
target: "bar";
target: "barend";
target: "light";
}
- program {
+ program { name: "inverted-off";
signal: "elm,state,inverted,off"; source: "elm";
action: STATE_SET "default" 0.0;
target: "bar";
target: "barend";
target: "light";
}
- program {
+ program { name: "drag-set";
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")) {
@@ -1047,13 +1047,13 @@ group { name: "elm/progressbar/vertical/default";
after: "pulse0";
after: "pulse0.1";
}
- program {
+ program { name: "fraction";
signal: "elm,state,fraction"; source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.text.status";
after: "pulse-stop";
}
- program {
+ program { name: "elmpulsestop";
signal: "elm,state,pulse,stop"; source: "elm";
action: ACTION_STOP;
target: "pulse0";
@@ -1064,17 +1064,17 @@ group { name: "elm/progressbar/vertical/default";
action: STATE_SET "default" 0.0;
target: "pulse_clip";
}
- program {
+ program { name: "unit-visible";
signal: "elm,state,units,visible"; source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.text.status";
}
- program {
+ program { name: "unit-hidden";
signal: "elm,state,units,hidden"; source: "elm";
action: STATE_SET "hidden" 0.0;
target: "elm.text.status";
}
- program {
+ program { name: "text-visible";
signal: "elm,state,text,visible"; source: "elm";
script {
new m = get_int(slmode);
@@ -1082,7 +1082,7 @@ group { name: "elm/progressbar/vertical/default";
eval_mode(m);
}
}
- program {
+ program { name: "text-hidden";
signal: "elm,state,text,hidden"; source: "elm";
script {
new m = get_int(slmode);
@@ -1090,7 +1090,7 @@ group { name: "elm/progressbar/vertical/default";
eval_mode(m);
}
}
- program {
+ program { name: "icon-visible";
signal: "elm,state,icon,visible"; source: "elm";
script {
new m = get_int(slmode);
@@ -1098,7 +1098,7 @@ group { name: "elm/progressbar/vertical/default";
eval_mode(m);
}
}
- program {
+ program { name: "icon-hidden";
signal: "elm,state,icon,hidden"; source: "elm";
script {
new m = get_int(slmode);
@@ -1106,7 +1106,7 @@ group { name: "elm/progressbar/vertical/default";
eval_mode(m);
}
}
- program {
+ program { name: "elmdisabled";
signal: "elm,state,disabled"; source: "elm";
script {
new m = get_int(slmode);
@@ -1114,7 +1114,7 @@ group { name: "elm/progressbar/vertical/default";
eval_mode(m);
}
}
- program {
+ program { name: "elmenabled";
signal: "elm,state,enabled"; source: "elm";
script {
new m = get_int(slmode);
@@ -1221,3 +1221,238 @@ group { name: "elm/progressbar/horizontal/wheel";
}
}
}
+
+group { name: "elm/progressbar/horizontal/double";
+ inherit: "elm/progressbar/horizontal/default";
+ images {
+ image: "inset_bar_horiz_glow_base_recording.png" COMP;
+ image: "inset_bar_horiz_glow_inv_base_recording.png" COMP;
+ }
+ parts {
+ part { name: "elm.cur.progressbar1"; 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;
+ min: 8 4;
+ max: 8 4;
+ rel1.to: "inside";
+ rel2.to: "inside";
+ }
+ }
+ part { name: "barend1"; type: SPACER;
+ scale: 1;
+ description { state: "default" 0.0;
+ fixed: 1 0;
+ min: 14 16;
+ rel1.to_x: "elm.cur.progressbar1";
+ rel1.relative: 1.0 0.0;
+ rel2.to_x: "elm.cur.progressbar1";
+ rel2.relative: 1.0 1.0;
+ align: 0.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;
+ }
+ }
+ part { name: "bar1";
+ 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: "barend1";
+ rel2.to_y: "bg";
+ rel2.relative: 1.0 1.25;
+ image.normal: "inset_bar_horiz_glow_base_recording.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_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_recording.png";
+ image.border: 72 0 0 0;
+ }
+ }
+ part { name: "light1";
+ clip_to: "fract_clip";
+ scale: 1;
+ description { state: "default" 0.0;
+ max: 36 11;
+ rel1.to_x: "bar1";
+ rel1.to_y: "bar1";
+ rel1.relative: 0.0 (26/96);
+ rel2.to_x: "barend1";
+ rel2.to_y: "bar1";
+ 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: "barend1";
+ rel1.to_y: "bar1";
+ rel1.relative: 0.8 (26/96);
+ rel2.to_x: "bar1";
+ rel2.to_y: "bar1";
+ 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";
+ signal: "elm,state,inverted,on"; source: "elm";
+ action: STATE_SET "inv" 0.0;
+ target: "bar";
+ target: "bar1";
+ target: "barend";
+ target: "barend1";
+ target: "light";
+ target: "light1";
+ }
+ program
+ { name: "inverted-off";
+ signal: "elm,state,inverted,off"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "bar";
+ target: "bar1";
+ target: "barend";
+ target: "barend1";
+ target: "light";
+ target: "light1";
+ }
+ }
+}
+
+group { name: "elm/progressbar/vertical/double";
+ inherit: "elm/progressbar/vertical/default";
+ images {
+ image: "inset_bar_vert_glow_base_recording.png" COMP;
+ image: "inset_bar_vert_glow_inv_base_recording.png" COMP;
+ }
+ parts {
+ part { name: "elm.cur.progressbar1"; mouse_events: 0; type: SPACER;
+ scale: 1;
+ dragable.confine: "inside";
+ 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";
+ }
+ }
+ part { name: "barend1"; type: SPACER;
+ scale: 1;
+ description { state: "default" 0.0;
+ fixed: 0 1;
+ min: 16 14;
+ rel1.to_y: "elm.cur.progressbar1";
+ rel1.relative: 0.0 1.0;
+ rel2.to_y: "elm.cur.progressbar1";
+ rel2.relative: 1.0 1.0;
+ align: 0.5 0.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;
+ }
+ }
+ part { name: "bar1";
+ 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);
+ rel2.to_y: "barend1";
+ rel2.to_x: "bg";
+ rel2.relative: 1.25 1.0;
+ image.normal: "inset_bar_vert_glow_base_recording.png";
+ image.border: 0 0 0 72;
+ image.border_scale_by: 0.25; image.border_scale: 1;
+ }
+ 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_recording.png";
+ image.border: 0 0 72 0;
+ }
+ }
+ part { name: "light1";
+ clip_to: "fract_clip";
+ scale: 1;
+ description { state: "default" 0.0;
+ max: 11 36;
+ rel1.to_y: "bar1";
+ rel1.to_x: "bar1";
+ rel1.relative: (26/96) 0.0;
+ rel2.to_y: "barend1";
+ rel2.to_x: "bar1";
+ 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: "barend1";
+ rel1.to_x: "bar1";
+ rel1.relative: (26/96) 0.8;
+ rel2.to_y: "bar1";
+ rel2.to_x: "bar1";
+ 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";
+ signal: "elm,state,inverted,on"; source: "elm";
+ action: STATE_SET "inv" 0.0;
+ target: "bar";
+ target: "barend";
+ target: "light";
+ target: "bar1";
+ target: "barend1";
+ target: "light1";
+ }
+ program { name: "inverted-off";
+ signal: "elm,state,inverted,off"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "bar";
+ target: "barend";
+ target: "light";
+ target: "bar1";
+ target: "barend1";
+ target: "light1";
+ }
+ }
+}
diff --git a/edje/img/inset_bar_horiz_glow_base_recording.png
b/edje/img/inset_bar_horiz_glow_base_recording.png
new file mode 100644
index 0000000..7963de5
Binary files /dev/null and b/edje/img/inset_bar_horiz_glow_base_recording.png
differ
diff --git a/edje/img/inset_bar_horiz_glow_inv_base_recording.png
b/edje/img/inset_bar_horiz_glow_inv_base_recording.png
new file mode 100644
index 0000000..2beff29
Binary files /dev/null and
b/edje/img/inset_bar_horiz_glow_inv_base_recording.png differ
diff --git a/edje/img/inset_bar_vert_glow_base_recording.png
b/edje/img/inset_bar_vert_glow_base_recording.png
new file mode 100644
index 0000000..7443c21
Binary files /dev/null and b/edje/img/inset_bar_vert_glow_base_recording.png
differ
diff --git a/edje/img/inset_bar_vert_glow_inv_base_recording.png
b/edje/img/inset_bar_vert_glow_inv_base_recording.png
new file mode 100644
index 0000000..9e01ed0
Binary files /dev/null and
b/edje/img/inset_bar_vert_glow_inv_base_recording.png differ
--
