raster pushed a commit to branch feature/themes/flat.
http://git.enlightenment.org/core/efl.git/commit/?id=d5dd331c4a3ad9b9f90c0c0bf1db2a67edbdaa37
commit d5dd331c4a3ad9b9f90c0c0bf1db2a67edbdaa37
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Thu Jul 4 18:36:06 2019 +0100
TH wizard
---
data/elementary/themes/edc/wizard.edc | 299 +++++++++++-----------------------
1 file changed, 92 insertions(+), 207 deletions(-)
diff --git a/data/elementary/themes/edc/wizard.edc
b/data/elementary/themes/edc/wizard.edc
index dec68160e4..324b1da616 100644
--- a/data/elementary/themes/edc/wizard.edc
+++ b/data/elementary/themes/edc/wizard.edc
@@ -1,162 +1,125 @@
group { name: "e/wizard/main";
- BACKGROUND_IMG
- images.image: "screen_circular_shadow.png" COMP;
- images.image: "button_normal.png" COMP;
- images.image: "button_clicked.png" COMP;
- images.image: "knob_round_busy.png" COMP;
- images.image: "glow_round_corners.png" COMP;
+ inherit: "e/desktop/background";
+ IMAGE_RING("ringa", 160)
+ IMAGE_RING("ringb", 160)
+ IMAGE_RING("ringc", 160)
+ images.image: "win_shadow.png" COMP;
parts {
- part { name: "clip"; type: RECT; mouse_events: 0;
- description { state: "default" 0.0;
- }
- }
- part { name: "bg";
- clip_to: "clip";
- description { state: "default" 0.0;
- image.normal: "background";
- image.scale_hint: STATIC;
- ASPECT_FILL((7680/4320))
- }
- }
- part { name: "busy_clip"; type: RECT;
+ part { name: "e.swallow.content"; type: SWALLOW;
+ scale: 1;
description { state: "default" 0.0;
- visible: 0;
- color: 255 255 255 0;
- }
- description { state: "active" 0.0;
- visible: 1;
- color: 255 255 255 255;
+ rel1.relative: 0.2 1.0;
+ rel1.offset: 16 16;
+ rel1.to_y: "e.text.title";
+ rel2.relative: 0.8 0.0;
+ rel2.offset: -17 -21;
+ rel2.to_y: "e.text.label";
+ max: 400 99999;
+ offscale;
}
}
- part { name: "knob"; mouse_events: 0;
- clip_to: "busy_clip";
+
+ part { name: "busy_area"; type: SPACER;
+ scale: 1;
description { state: "default" 0.0;
- fixed: 1 1;
- image.normal: "knob_round_busy.png";
min: 40 40;
max: 40 40;
- rel1.relative: 0.0 1.0;
- rel1.offset: 4 -5;
- rel2.relative: 0.0 1.0;
- rel2.offset: 4 -5;
- align: 0.0 1.0;
+ rel1.relative: 1.0 1.0;
+ rel1.offset: -17 -17;
+ rel2.relative: 1.0 1.0;
+ rel2.offset: -17 -17;
+ align: 1.0 1.0;
fixed: 1 1;
+ offscale;
}
}
- part { name: "e.swallow.content"; type: SWALLOW;
+ BUSY("busy_area", "e,state,next,disable", "e", "e,state,next,enable",
"e")
+
+ part { name: "shadow"; mouse_events: 0;
+ scale: 1;
description { state: "default" 0.0;
- rel1.relative: 0.2 1.0;
- rel1.offset: 4 4;
- rel1.to_y: "e.text.title";
- rel2.relative: 0.8 0.0;
- rel2.offset: -5 -11;
- rel2.to_y: "e.text.label";
+ rel.to: "base";
+ WIN_SHADOW_SMALL;
+ }
+ description { state: "clicked" 0.0;
+ inherit;
+ image.border_scale_by: 0.25;
+ rel1.offset: -5 -3;
+ rel2.offset: 4 6;
}
}
- part { name: "base";
+ part { name: "base"; type: RECT;
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "button_normal.png";
- image.border: 4 4 3 5;
- image.middle: SOLID;
- rel1.offset: -1 0;
- rel1.to: "e.text.label";
- rel2.offset: 0 1;
- rel2.to: "e.text.label";
- fill.smooth: 0;
+ rel.to: "e.text.label";
+ rel1.offset: -4 -4;
+ rel2.offset: 3 3;
+ color: 80 80 80 255;
+ offscale;
}
description { state: "clicked" 0.0;
inherit: "default" 0.0;
- image.normal: "button_clicked.png";
- image.border: 5 5 4 6;
+ color: 40 40 40 255;
}
}
part { name: "block"; type: RECT;
description { state: "default" 0.0;
- rel1.to: "base";
- rel2.to: "base";
+ rel.to: "base";
color: 0 0 0 0;
visible: 0;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
- visible: 0;
+ visible: 1;
}
}
part { name: "e.text.label"; type: TEXT; mouse_events: 0;
- effect: SHADOW BOTTOM;
scale: 1;
description { state: "default" 0.0;
min: 96 32;
align: 0.5 1.0;
rel1.relative: 0.5 0.99;
- rel1.offset: 4 -5;
+ rel1.offset: 16 -17;
rel2.relative: 0.5 0.99;
- rel2.offset: -5 -5;
- color: FN_COL_DEFAULT;
+ rel2.offset: -17 -17;
+ color: 160 160 160 255;
text { font: FN; size: 10;
- text: "Next";
min: 1 1;
ellipsis: -1;
}
+ offscale;
}
- description { state: "disabled" 0.0;
+ description { state: "clicked" 0.0;
inherit: "default" 0.0;
- color: FN_COL_DISABLE;
- }
- }
- part { name: "shadow"; mouse_events: 0;
- clip_to: "clip";
- description { state: "default" 0.0;
- rel1.relative: 0.0 0.0;
- rel2.relative: 1.0 1.0;
color: 255 255 255 255;
- image.normal: "screen_circular_shadow.png";
- fill.smooth: 0;
}
- description { state: "visible" 0.0;
+ description { state: "disabled" 0.0;
inherit: "default" 0.0;
- rel1.relative: -1.0 -1.0;
- rel2.relative: 2.0 2.0;
- color: 255 255 255 255;
+ color: 96 96 96 255;
}
}
+
part { name: "e.text.title"; type: TEXT;
- effect: GLOW;
scale: 1;
description { state: "default" 0.0;
rel1.relative: 0.05 0.01;
- rel1.offset: 4 4;
+ rel1.offset: 16 16;
rel2.relative: 0.95 0.01;
- rel2.offset: -5 4;
+ rel2.offset: -17 16;
align: 0.5 0.0;
- color: FN_COL_HIGHLIGHT;
- text { font: FNBD; size: 10;
+ color: 255 255 255 255;
+ text { font: FNBD; size: 20;
min: 0 1;
text_class: "init_title";
}
fixed: 0 1;
+ offscale;
}
}
- part { name: "knob_spinner"; mouse_events: 0;
- clip_to: "busy_clip";
- 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;
- }
- }
+
part { name: "blanker"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
color: 0 0 0 255;
- visible: 1;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
@@ -166,35 +129,36 @@ group { name: "e/wizard/main";
}
}
programs {
- program {
- signal: "show"; source: "";
+ program { signal: "show"; source: "";
action: STATE_SET "visible" 0.0;
transition: DECELERATE 1.0;
- target: "shadow";
target: "blanker";
}
- program {
- signal: "mouse,down,1"; source: "base";
+ program { signal: "mouse,down,1"; source: "base";
script {
new st[31];
new Float:vl;
get_state(PART:"block", st, 30, vl);
- if (!strcmp(st, "default"))
+ if (!strcmp(st, "default")) {
set_state(PART:"base", "clicked", 0.0);
+ set_state(PART:"shadow", "clicked", 0.0);
+ set_state(PART:"e.text.label", "clicked", 0.0);
+ }
}
}
- program {
- signal: "mouse,up,1"; source: "base";
+ program { signal: "mouse,up,1"; source: "base";
script {
new st[31];
new Float:vl;
get_state(PART:"block", st, 30, vl);
- if (!strcmp(st, "default"))
+ if (!strcmp(st, "default")) {
set_state(PART:"base", "default", 0.0);
+ set_state(PART:"shadow", "default", 0.0);
+ set_state(PART:"e.text.label", "default", 0.0);
+ }
}
}
- program {
- signal: "mouse,clicked,1"; source: "base";
+ program { signal: "mouse,clicked,1"; source: "base";
script {
new st[31];
new Float:vl;
@@ -203,85 +167,38 @@ group { name: "e/wizard/main";
emit("e,action,next", "");
}
}
- program {
- signal: "e,state,next,enable"; source: "e";
+ program { signal: "e,state,next,enable"; source: "e";
action: STATE_SET "default" 0.0;
target: "block";
target: "e.text.label";
}
- program {
- signal: "e,state,next,disable"; source: "e";
+ program { signal: "e,state,next,disable"; source: "e";
action: STATE_SET "disabled" 0.0;
target: "block";
target: "e.text.label";
}
-
- program {
- signal: "e,state,next,disable"; source: "e";
- action: ACTION_STOP;
- target: "spin";
- target: "spin2";
- target: "spin3";
- target: "spin4";
- after: "spin";
- }
- program { name: "spin";
- action: STATE_SET "spin" 0.0;
- transition: LINEAR 1.0;
- target: "knob_spinner";
- after: "spin2";
- }
- program { name: "spin2";
- action: STATE_SET "default" 0.0;
- target: "knob_spinner";
- after: "spin";
- }
- program {
- signal: "e,state,next,disable"; source: "e";
- action: STATE_SET "active" 0.0;
- transition: SINUSOIDAL 0.25;
- target: "busy_clip";
- }
- program {
- signal: "e,state,next,enable"; source: "e";
- action: STATE_SET "default" 0.0;
- transition: SINUSOIDAL 1.0;
- target: "busy_clip";
- after: "spin3";
- }
- program { name: "spin3";
- action: ACTION_STOP;
- target: "spin";
- target: "spin2";
- after: "spin4";
- }
- program { name: "spin4";
- action: STATE_SET "default" 0.0;
- target: "knob_spinner";
- }
}
}
group { name: "e/wizard/firstpage";
- images.image: "logo_blue_small.png" COMP;
- images.image: "logo_blue_small_glow.png" COMP;
+ set { name: "logo_mono";
+ image { image: "logo.png" COMP; size: 601 601 99999 99999; }
+ image { image: "logo2.png" COMP; size: 301 301 600 600; }
+ image { image: "logo3.png" COMP; size: 151 151 300 300; }
+ image { image: "logo4.png" COMP; size: 76 76 150 150; }
+ image { image: "logo5.png" COMP; size: 0 0 75 75; }
+ }
parts {
part { name: "logo";
+ scale: 1;
description { state: "default" 0.0;
- image.normal: "logo_blue_small.png";
+ image.normal: "logo_mono";
rel1.relative: 0.5 0.5;
rel2.relative: 0.5 0.5;
- FIXED_SIZE(100, 127)
- }
- }
- part { name: "logo_glow";
- description { state: "default" 0.0;
- image.normal: "logo_blue_small_glow.png";
- rel1.to: "logo";
- rel2.to: "logo";
- color: 255 255 255 128;
+ FIXED_SIZE(150, 150)
+ color: 220 220 220 255;
}
- description { state: "active" 0.0;
+ description { state: "active";
inherit: "default" 0.0;
color: 255 255 255 255;
}
@@ -291,55 +208,25 @@ group { name: "e/wizard/firstpage";
program { name: "logo_pulse";
signal: "show"; source: "";
action: STATE_SET "active" 0.0;
- target: "logo_glow";
- transition: BOUNCE 0.8 0.5 6;
+ target: "logo";
+ transition: SINUSOIDAL 1.0;
after: "logo_pulse2";
}
program { name: "logo_pulse2";
action: STATE_SET "default" 0.0;
- target: "logo_glow";
- transition: SINUSOIDAL 0.8;
+ target: "logo";
+ transition: SINUSOIDAL 1.0;
after: "logo_pulse";
}
}
}
group { name: "e/wizard/extra";
- BACKGROUND_IMG
- images.image: "screen_circular_shadow.png" COMP;
+ inherit: "e/desktop/background";
parts {
- part { name: "clip"; type: RECT; mouse_events: 0;
- description { state: "default" 0.0;
- }
- }
- part { name: "bg";
- clip_to: "clip";
- description { state: "default" 0.0;
- image.normal: "background";
- image.scale_hint: STATIC;
- ASPECT_FILL((7680/4320))
- }
- }
- part { name: "shadow"; mouse_events: 0;
- clip_to: "clip";
- description { state: "default" 0.0;
- rel1.relative: 0.0 0.0;
- rel2.relative: 1.0 1.0;
- color: 255 255 255 255;
- image.normal: "screen_circular_shadow.png";
- fill.smooth: 0;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- rel1.relative: -1.0 -1.0;
- rel2.relative: 2.0 2.0;
- color: 255 255 255 255;
- }
- }
part { name: "blanker"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
color: 0 0 0 255;
- visible: 1;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
@@ -349,11 +236,9 @@ group { name: "e/wizard/extra";
}
}
programs {
- program {
- signal: "show"; source: "";
+ program { signal: "show"; source: "";
action: STATE_SET "visible" 0.0;
transition: DECELERATE 1.0;
- target: "shadow";
target: "blanker";
}
}
--
