raster pushed a commit to branch feature/themes/flat.
http://git.enlightenment.org/core/efl.git/commit/?id=a3d13013e4200d2b2e1f89ae33310b3ea160c015
commit a3d13013e4200d2b2e1f89ae33310b3ea160c015
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Mon Jan 6 19:39:49 2020 +0000
TH - video player
---
data/elementary/themes/edc/elm/button.edc | 109 ++++++-------
data/elementary/themes/edc/elm/player.edc | 246 ++++++------------------------
2 files changed, 99 insertions(+), 256 deletions(-)
diff --git a/data/elementary/themes/edc/elm/button.edc
b/data/elementary/themes/edc/elm/button.edc
index f10694f914..f27681c018 100644
--- a/data/elementary/themes/edc/elm/button.edc
+++ b/data/elementary/themes/edc/elm/button.edc
@@ -620,14 +620,15 @@ group { name: "elm/button/base/anchor";
group { name: "elm/button/base/colorselector/left/default";
inherit: "elm/button/base/default";
- images.image: "sym_left_light_normal.png" COMP;
parts {
image { "ic"; nomouse;
+ scale: 1;
desc { "default";
+ fixed: 1 1;
min: 15 15;
max: 15 15;
- fixed: 1 1;
- image.normal: "sym_left_light_normal.png";
+ image.normal: "ic-arrow-l";
+ color: 160 160 160 255;
}
}
}
@@ -635,56 +636,27 @@ group { name:
"elm/button/base/colorselector/left/default";
group { name: "elm/button/base/colorselector/right/default";
inherit: "elm/button/base/default";
- images.image: "sym_right_light_normal.png" COMP;
parts {
image { "ic"; nomouse;
+ scale: 1;
desc { "default";
+ fixed: 1 1;
min: 15 15;
max: 15 15;
- fixed: 1 1;
- image.normal: "sym_right_light_normal.png";
+ image.normal: "ic-arrow-r";
+ color: 160 160 160 255;
}
}
}
}
group { name: "elm/button/base/media_player/prev/default";
- alias: "elm/button/base/media_player/rewind/default";
- alias: "elm/button/base/media_player/play/default";
- alias: "elm/button/base/media_player/pause/default";
- alias: "elm/button/base/media_player/stop/default";
- alias: "elm/button/base/media_player/forward/default";
- alias: "elm/button/base/media_player/next/default";
- alias: "elm/button/base/media_player/info/default";
- alias: "elm/button/base/media_player/eject/default";
- alias: "elm/button/base/media_player/volume/default";
- alias: "elm/button/base/media_player/mute/default";
-
alias: "elm/button/base/media_player/prev/flush";
- alias: "elm/button/base/media_player/rewind/flush";
- alias: "elm/button/base/media_player/play/flush";
- alias: "elm/button/base/media_player/pause/flush";
- alias: "elm/button/base/media_player/stop/flush";
- alias: "elm/button/base/media_player/forward/flush";
- alias: "elm/button/base/media_player/next/flush";
- alias: "elm/button/base/media_player/info/flush";
- alias: "elm/button/base/media_player/eject/flush";
- alias: "elm/button/base/media_player/volume/flush";
- alias: "elm/button/base/media_player/mute/flush";
-
- images.image: "shadow_inset_bevels.png" COMP;
- images.image: "shadow_angled_in_sides.png" COMP;
+ images.image: "icon_prev_mono.png" COMP;
parts {
- rect { "clip";
- desc { "default";
- }
- }
- image { "shadow1"; nomouse;
- clip_to: "clip";
+ rect { "base";
desc { "default";
- rel2.offset: -1 0;
- image.normal: "shadow_inset_bevels.png";
- image.border: 2 2 0 1;
+ color: 96 96 96 255;
visible: 0;
}
desc { "selected";
@@ -692,25 +664,17 @@ group { name: "elm/button/base/media_player/prev/default";
visible: 1;
}
}
- image { "shadow2"; nomouse;
- clip_to: "clip";
+ image { "ic"; nomouse;
+ scale: 1;
desc { "default";
- rel1.offset: 1 0;
- rel2.offset: -2 -1;
- image.normal: "shadow_angled_in_sides.png";
- image.border: 8 8 0 1;
- image.middle: 0;
- visible: 0;
+ min: 24 24;
+ max: 24 24;
+ image.normal: "icon_prev_mono.png";
+ color: 160 160 160 255;
}
desc { "selected";
inherit: "default";
- visible: 1;
- }
- }
- swallow { "elm.swallow.content"; nomouse;
- desc { "default";
- rel1.offset: 3 1;
- rel2.offset: -4 -2;
+ color: 255 255 255 255;
}
}
rect { "event";
@@ -721,23 +685,48 @@ group { name: "elm/button/base/media_player/prev/default";
}
}
programs {
- program {
- signal: "mouse,down,1"; source: "event";
+ program { signal: "mouse,down,1"; source: "event";
action: SIGNAL_EMIT "elm,action,press" "elm";
after: "button_click_anim";
}
program { name: "button_click_anim";
action: STATE_SET "selected" 0.0;
- target: "shadow1";
- target: "shadow2";
+ target: "base";
+ target: "ic";
}
- program {
- signal: "mouse,clicked,1"; source: "event";
+ program { signal: "mouse,up,1"; source: "event";
+ action: STATE_SET "default" 0.0;
+ target: "base";
+ target: "ic";
+ }
+ program { signal: "mouse,clicked,1"; source: "event";
action: SIGNAL_EMIT "elm,action,click" "elm";
}
}
}
+#define MEDIABUTTON(_name, _icon) \
+group { name: "elm/button/base/media_player/"_name"/default"; \
+ alias: "elm/button/base/media_player/"_name"/flush"; \
+ inherit: "elm/button/base/media_player/prev/default"; \
+ images.image: _icon COMP; \
+ parts { image { "ic"; \
+ desc { "default"; image.normal: _icon; } \
+ desc { "selected"; image.normal: _icon; } \
+ } } \
+}
+
+MEDIABUTTON("rewind", "icon_rewind_mono.png")
+MEDIABUTTON("play", "icon_play_mono.png")
+MEDIABUTTON("pause", "icon_pause_mono.png")
+MEDIABUTTON("forward", "icon_forward_mono.png")
+MEDIABUTTON("next", "icon_next_mono.png")
+MEDIABUTTON("info", "icon_info_mono.png")
+MEDIABUTTON("stop", "icon_stop_mono.png")
+MEDIABUTTON("eject", "icon_eject_mono.png")
+MEDIABUTTON("volume", "icon_volume_mono.png")
+MEDIABUTTON("mute", "icon_mute_mono.png")
+
group { name: "elm/button/base/hoversel_vertical_entry/default";
alias: "elm/button/base/hoversel_vertical_entry/entry";
script {
diff --git a/data/elementary/themes/edc/elm/player.edc
b/data/elementary/themes/edc/elm/player.edc
index c69119486e..91419f399e 100644
--- a/data/elementary/themes/edc/elm/player.edc
+++ b/data/elementary/themes/edc/elm/player.edc
@@ -1,11 +1,6 @@
-#define BSZ 20
+#define BSZ 24
group { name: "elm/player/base/default";
- images.image: "inset_shadow.png" COMP;
- images.image: "shine.png" COMP;
images.image: "bevel_out.png" COMP;
- images.image: "vgrad_med_lighter.png" COMP;
- images.image: "bevel_out.png" COMP;
- images.image: "shine.png" COMP;
images.image: "vgrad_shadow_bi.png" COMP;
images.image: "shadow_square_tiny.png" COMP;
script {
@@ -34,107 +29,37 @@ group { name: "elm/player/base/default";
parts {
part { name: "bg"; type: RECT;
description { state: "default" 0.0;
- rel1.offset: 1 1;
- rel2.offset: -2 -2;
color: 0 0 0 255;
}
}
part { name: "clipper"; type: RECT;
description { state: "default" 0.0;
- rel1.to: "bg";
- rel2.to: "bg";
+ rel.to: "bg";
}
}
// video (elm_video) content here
part { name: "elm.swallow.content"; type: SWALLOW;
clip_to: "clipper";
description { state: "default" 0.0;
- rel1.offset: 1 1;
- rel2.offset: -2 -2;
}
}
- part { name: "barshad";
- clip_to: "clipper";
- description { state: "default" 0.0;
- image.normal: "vgrad_shadow_bi.png";
- rel1.to: "bar";
- rel1.relative: 0.0 -0.5;
- rel2.to: "bar";
- rel2.relative: 1.0 0.5;
- color: 255 255 255 0;
- visible: 0;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- color: 255 255 255 128;
- visible: 1;
- }
- }
- part { name: "volpop_shadow"; mouse_events: 0;
- clip_to: "volclip";
- description { state: "default" 0.0;
- rel1.offset: -3 -2;
- rel1.to: "volpop";
- rel2.offset: 3 4;
- rel2.to: "volpop";
- image.normal: "shadow_square_tiny.png";
- image.border: 6 6 6 6;
- fill.smooth: 0;
- }
- }
-
- part { name: "bar";
+ part { name: "bar"; type: RECT;
clip_to: "clipper";
+ scale: 1;
description { state: "default" 0.0;
- color_class: "player_bar";
- image.normal: "vgrad_med_lighter.png";
+ rel1.offset: 0 -6;
rel1.to_y: "elm.swallow.media_player.prev";
- rel1.offset: 1 -1;
rel2.to_y: "elm.swallow.media_player.positionslider";
- rel2.offset: -2 -1;
- fill.smooth: 0;
- TILED_HORIZ(120)
- }
- }
- part { name: "barbevclip"; type: RECT;
- clip_to: "clipper";
- description { state: "default" 0.0;
- fixed: 0 1;
- rel1.to: "bar";
- rel2.to: "bar";
- rel2.relative: 1.0 0.0;
- rel2.offset: -1 0;
- color: 255 255 255 255;
- }
- }
- part { name: "barbev";
- clip_to: "barbevclip";
- description { state: "default" 0.0;
- rel1.to: "bar";
- rel2.to: "bar";
- image.normal: "bevel_out.png";
- image.border: 2 2 2 2;
- fill.smooth: 0;
- }
- }
- part { name: "shine"; mouse_events: 0;
- clip_to: "clipper";
- description { state: "default" 0.0;
- image.normal: "shine.png";
- rel1.offset: 0 -2;
- rel1.to: "bar";
- rel2.relative: 1.0 0.0;
- rel2.offset: -1 2;
- rel2.to: "bar";
- FIXED_SIZE(69, 5)
+ rel2.offset: -1 4;
+ color: 64 64 64 255;
+ offscale;
}
}
part { name: "volclip"; type: RECT;
description { state: "default" 0.0;
rel1.to: "bg";
- rel2.to: "bg";
color: 255 255 255 0;
visible: 0;
}
@@ -144,51 +69,17 @@ group { name: "elm/player/base/default";
visible: 1;
}
}
- part { name: "volpop";
+ part { name: "volpop"; type: RECT;
clip_to: "volclip";
description { state: "default" 0.0;
- color_class: "player_volume";
- image.normal: "vgrad_med_lighter.png";
rel1.to: "elm.swallow.media_player.volumeslider";
rel1.offset: -1 -1;
rel2.to: "elm.swallow.media_player.volumeslider";
rel2.offset: 0 0;
- fill.smooth: 0;
- TILED_HORIZ(120)
- }
- }
- part { name: "volpopclip"; type: RECT;
- clip_to: "volclip";
- description { state: "default" 0.0;
- rel1.to: "volpop";
- rel1.offset: 0 -5;
- rel2.to: "volpop";
- color: 255 255 255 255;
+ color: 64 64 64 255;
}
}
- part { name: "volpopbev";
- clip_to: "volpopclip";
- description { state: "default" 0.0;
- rel1.to: "volpop";
- rel2.to: "volpop";
- image.normal: "bevel_out.png";
- image.border: 2 2 2 2;
- fill.smooth: 0;
- }
- }
- part { name: "volshine"; mouse_events: 0;
- clip_to: "volpopclip";
- description { state: "default" 0.0;
- image.normal: "shine.png";
- rel1.offset: 0 -2;
- rel1.to: "volpop";
- rel2.relative: 1.0 0.0;
- rel2.offset: -1 2;
- rel2.to: "volpop";
- FIXED_SIZE(69, 5)
- }
- }
-
+
part { name: "elm.swallow.media_player.prev"; type: SWALLOW;
clip_to: "clipper";
scale: 1;
@@ -197,14 +88,15 @@ group { name: "elm/player/base/default";
min: BSZ BSZ;
align: 0.0 0.0;
rel1.relative: 0.0 1.0;
- rel1.offset: 1 7;
+ rel1.offset: 5 5;
rel2.relative: 0.0 1.0;
- rel2.offset: 1 7;
+ rel2.offset: 5 5;
+ offscale;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
- rel1.offset: 1 -2;
- rel2.offset: 1 -2;
+ rel1.offset: 5 -6;
+ rel2.offset: 5 -6;
align: 0.0 1.0;
}
}
@@ -217,10 +109,11 @@ group { name: "elm/player/base/default";
align: 0.0 1.0;
rel1.to: "elm.swallow.media_player.prev";
rel1.relative: 1.0 0.0;
- rel1.offset: 0 0;
+ rel1.offset: 5 0;
rel2.to: "elm.swallow.media_player.prev";
rel2.relative: 1.0 1.0;
- rel2.offset: 0 -1;
+ rel2.offset: 5 -1;
+ offscale;
}
}
part { name: "elm.swallow.media_player.play"; type: SWALLOW;
@@ -232,10 +125,11 @@ group { name: "elm/player/base/default";
align: 0.0 1.0;
rel1.to: "elm.swallow.media_player.rewind";
rel1.relative: 1.0 0.0;
- rel1.offset: 0 0;
+ rel1.offset: 5 0;
rel2.to: "elm.swallow.media_player.rewind";
rel2.relative: 1.0 1.0;
- rel2.offset: 0 -1;
+ rel2.offset: 5 -1;
+ offscale;
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
@@ -265,10 +159,11 @@ group { name: "elm/player/base/default";
align: 0.0 1.0;
rel1.to: "elm.swallow.media_player.play";
rel1.relative: 1.0 0.0;
- rel1.offset: 0 0;
+ rel1.offset: 5 0;
rel2.to: "elm.swallow.media_player.play";
rel2.relative: 1.0 1.0;
- rel2.offset: 0 -1;
+ rel2.offset: 5 -1;
+ offscale;
}
}
part { name: "elm.swallow.media_player.next"; type: SWALLOW;
@@ -280,10 +175,11 @@ group { name: "elm/player/base/default";
align: 0.0 1.0;
rel1.to: "elm.swallow.media_player.forward";
rel1.relative: 1.0 0.0;
- rel1.offset: 0 0;
+ rel1.offset: 5 0;
rel2.to: "elm.swallow.media_player.forward";
rel2.relative: 1.0 1.0;
- rel2.offset: 0 -1;
+ rel2.offset: 5 -1;
+ offscale;
}
}
part { name: "elm.swallow.media_player.stop"; type: SWALLOW;
@@ -295,10 +191,11 @@ group { name: "elm/player/base/default";
align: 0.0 1.0;
rel1.to: "elm.swallow.media_player.next";
rel1.relative: 1.0 0.0;
- rel1.offset: 0 0;
+ rel1.offset: 5 0;
rel2.to: "elm.swallow.media_player.next";
rel2.relative: 1.0 1.0;
- rel2.offset: 0 -1;
+ rel2.offset: 5 -1;
+ offscale;
}
}
part { name: "elm.swallow.media_player.eject"; type: SWALLOW;
@@ -310,10 +207,11 @@ group { name: "elm/player/base/default";
align: 0.0 1.0;
rel1.to: "elm.swallow.media_player.stop";
rel1.relative: 1.0 0.0;
- rel1.offset: 0 0;
+ rel1.offset: 5 0;
rel2.to: "elm.swallow.media_player.stop";
rel2.relative: 1.0 1.0;
- rel2.offset: 0 -1;
+ rel2.offset: 5 -1;
+ offscale;
}
}
part { name: "elm.swallow.media_player.volume"; type: SWALLOW;
@@ -325,10 +223,11 @@ group { name: "elm/player/base/default";
align: 0.0 1.0;
rel1.to: "elm.swallow.media_player.eject";
rel1.relative: 1.0 0.0;
- rel1.offset: 0 0;
+ rel1.offset: 5 0;
rel2.to: "elm.swallow.media_player.eject";
rel2.relative: 1.0 1.0;
- rel2.offset: 0 -1;
+ rel2.offset: 5 -1;
+ offscale;
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
@@ -358,20 +257,24 @@ group { name: "elm/player/base/default";
align: 0.0 1.0;
rel1.to: "elm.swallow.media_player.volume";
rel1.relative: 1.0 0.0;
- rel1.offset: 0 0;
+ rel1.offset: 5 0;
rel2.to: "elm.swallow.media_player.volume";
rel2.relative: 1.0 1.0;
- rel2.offset: 0 -1;
+ rel2.offset: 5 -1;
+ offscale;
}
}
part { name: "elm.swallow.media_player.positionslider"; type: SWALLOW;
clip_to: "clipper";
+ scale: 1;
description { state: "default" 0.0;
fixed: 0 1;
rel1.relative: 1.0 0.0;
+ rel1.offset: 5 0;
rel1.to: "elm.swallow.media_player.info";
rel2.to_y: "elm.swallow.media_player.info";
- rel2.offset: -2 -1;
+ rel2.offset: -6 -1;
+ offscale;
}
}
part { name: "elm.swallow.media_player.volumeslider"; type: SWALLOW;
@@ -388,31 +291,7 @@ group { name: "elm/player/base/default";
max: 99999 100;
}
}
-
- part { name: "shadow"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "inset_shadow.png";
- image.border: 5 5 7 3;
- image.middle: 0;
- rel1.to: "bg";
- rel2.to: "bg";
- fill.smooth: 0;
- color: 255 255 255 128;
- }
- }
- part { name: "inset"; mouse_events: 0;
- description { state: "default" 0.0;
- image.normal: "bevel_in.png";
- image.border: 1 1 1 1;
- image.middle: 0;
- rel1.to: "bg";
- rel1.offset: -1 -1;
- rel2.to: "bg";
- rel2.offset: 0 0;
- fill.smooth: 0;
- }
- }
-
+
part { name: "controls"; type: RECT; repeat_events: 1;
clip_to: "clipper";
scale: 1;
@@ -423,7 +302,7 @@ group { name: "elm/player/base/default";
color: 0 0 0 0;
}
}
-
+
part { name: "volumetop"; type: SPACER;
description { state: "default" 0.0;
fixed: 1 1;
@@ -488,15 +367,13 @@ group { name: "elm/player/base/default";
action: STATE_SET "visible" 0.0;
transition: DECELERATE 0.2;
target: "elm.swallow.media_player.prev";
- target: "barshad";
target: "volume";
}
program {
signal: "conhide"; source: "";
action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.5;
+ transition: ACCELERATE 0.5;
target: "elm.swallow.media_player.prev";
- target: "barshad";
target: "volume";
}
program {
@@ -508,10 +385,10 @@ group { name: "elm/player/base/default";
program {
signal: "mouse,out"; source: "volume";
action: STATE_SET "default" 0.0;
- transition: DECELERATE 0.5;
+ transition: ACCELERATE 0.5;
target: "volclip";
}
-
+
program {
signal: "load"; source: "";
after: "pause/0";
@@ -594,22 +471,10 @@ group { name: "elm/player/base/flush";
}
part { name: "bar";
description { state: "default" 0.0;
- rel1.offset: 0 -1;
- rel2.offset: -1 -1;
- }
- }
- part { name: "barbevclip"; type: RECT;
- description { state: "default" 0.0;
- rel2.relative: 1.0 1.0;
+ rel1.offset: 0 0;
rel2.offset: -1 -1;
}
}
- part { name: "barbev";
- description { state: "default" 0.0;
- rel1.offset: -1 0;
- rel2.offset: 0 -1;
- }
- }
part { name: "elm.swallow.media_player.prev";
description { state: "default" 0.0;
rel1.offset: 0 7;
@@ -625,16 +490,5 @@ group { name: "elm/player/base/flush";
rel2.offset: -1 -1;
}
}
-
- part { name: "shadow"; mouse_events: 0;
- description { state: "default" 0.0;
- visible: 0;
- }
- }
- part { name: "inset"; mouse_events: 0;
- description { state: "default" 0.0;
- visible: 0;
- }
- }
}
}
--
