Merge branch 'feature/themes/flat' into devs/hermet/lottie

This commit is contained in:
Hermet Park 2020-01-07 16:36:36 +09:00
commit ddf1215ec4
7 changed files with 398 additions and 744 deletions

View File

@ -16,8 +16,7 @@ group { name: "e/modules/battery/main";
parts {
part { name: "pulse_clip"; type: RECT;
description { state: "default" 0.0;
rel1.to: "bg";
rel2.to: "bg";
rel.to: "bg";
}
description { state: "faded" 0.0;
inherit: "default" 0.0;
@ -27,25 +26,22 @@ group { name: "e/modules/battery/main";
part { name: "fill_clip_dim"; type: RECT;
clip_to: "pulse_clip";
description { state: "default" 0.0;
rel1.to: "bg";
rel2.to: "bg";
rel.to: "bg";
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
color: 128 128 128 255;
color: 160 160 160 255;
}
}
part { name: "fill_clip"; type: RECT;
clip_to: "fill_clip_dim";
description { state: "default" 0.0;
rel1.to: "bg";
rel2.to: "bg";
rel.to: "bg";
}
}
part { name: "info_clip"; type: RECT;
description { state: "default" 0.0;
rel1.to: "bg";
rel2.to: "bg";
rel.to: "bg";
color: 255 255 255 0;
}
description { state: "visible" 0.0;
@ -58,14 +54,13 @@ group { name: "e/modules/battery/main";
description { state: "default" 0.0;
aspect: 1.0 1.0; aspect_preference: BOTH;
image.normal: "bat_base.png";
color: 0 0 0 64;
color: 32 32 32 255;
}
}
part { name: "fill";
clip_to: "fill_clip";
description { state: "default" 0.0;
rel1.to: "bg";
rel2.to: "bg";
rel.to: "bg";
image.normal: "bat_base.png";
color: 160 160 160 255;
}
@ -79,10 +74,9 @@ group { name: "e/modules/battery/main";
clip_to: "info_clip";
description { state: "default" 0.0;
align: 0.5 0.0;
rel1.to: "bg";
rel2.to: "bg";
rel1.relative: 0.2 0.15;
rel2.relative: 0.8 0.53;
rel.to: "bg";
rel1.relative: 0.25 0.15;
rel2.relative: 0.75 0.53;
color: 255 255 255 255;
text { font: "Sans"; size: 8;
min: 0 1;
@ -98,10 +92,9 @@ group { name: "e/modules/battery/main";
clip_to: "info_clip";
description { state: "default" 0.0;
align: 0.5 1.0;
rel1.to: "bg";
rel2.to: "bg";
rel1.relative: 0.2 0.47;
rel2.relative: 0.8 0.85;
rel.to: "bg";
rel1.relative: 0.25 0.47;
rel2.relative: 0.75 0.85;
color: 255 255 255 255;
text { font: "Sans"; size: 8;
min: 0 1;
@ -119,13 +112,11 @@ group { name: "e/modules/battery/main";
}
}
programs {
program {
signal: "e,state,charging"; source: "e";
program { signal: "e,state,charging"; source: "e";
action: STATE_SET "charging" 0.0;
target: "fill";
}
program {
signal: "e,state,discharging"; source: "e";
program { signal: "e,state,discharging"; source: "e";
action: STATE_SET "default" 0.0;
target: "fill";
}
@ -142,8 +133,7 @@ group { name: "e/modules/battery/main";
target: "pulse_clip";
after: "pulse";
}
program {
signal: "e,action,pulse,stop"; source: "e";
program { signal: "e,action,pulse,stop"; source: "e";
action: ACTION_STOP;
target: "pulse";
target: "pulse2";
@ -154,15 +144,13 @@ group { name: "e/modules/battery/main";
action: STATE_SET "default" 0.0;
target: "pulse_clip";
}
program {
signal: "mouse,in"; source: "over";
program { signal: "mouse,in"; source: "over";
action: STATE_SET "visible" 0.0;
transition: SINUSOIDAL 0.3;
target: "info_clip";
target: "fill_clip_dim";
}
program {
signal: "mouse,out"; source: "over";
program { signal: "mouse,out"; source: "over";
action: STATE_SET "default" 0.0;
transition: SINUSOIDAL 0.3;
target: "info_clip";

View File

@ -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";
rect { "base";
desc { "default";
}
}
image { "shadow1"; nomouse;
clip_to: "clip";
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 {

View File

@ -1,124 +1,120 @@
group { name: "elm/colorselector/palette/default";
data.item: "horizontal_pad" 0;
data.item: "vertical_pad" 0;
images.image: "bevel_dark_in.png" COMP;
parts {
part { name: "elm.picker"; type: SWALLOW;
scale: 1;
description { state: "default" 0.0;
fixed: 0 1;
align: 0.5 0.0;
rel2.relative: 1.0 0.0;
offscale;
}
}
part { name: "sep1";
part { name: "sep1"; type: RECT;
scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
rel1.to_y: "elm.picker";
rel1.offset: 4 4;
rel1.offset: 5 2;
rel1.relative: 0.0 1.0;
rel2.to_y: "elm.picker";
rel2.offset: -5 5;
min: 2 2;
max: 99999 2;
image.normal: "bevel_dark_in.png";
image.border: 2 2 2 2;
fill.smooth: 0;
rel2.offset: -6 2;
min: 64 1;
max: 99999 1;
color: 72 72 72 255;
offscale;
}
description { state: "off" 0.0;
inherit: "default" 0.0;
rel1.offset: 4 -2;
rel2.offset: -5 -1;
rel1.offset: 5 -1;
rel2.offset: -6 -1;
min: 0 0;
visible: 0;
}
}
part { name: "elm.palette"; type: SWALLOW;
scale: 1;
description { state: "default" 0.0;
align: 0.5 0.0;
rel1.to_y: "sep1";
rel1.relative: 0.0 1.0;
rel1.offset: 0 4;
rel1.offset: 0 2;
rel2.to_y: "sep2";
rel2.relative: 1.0 0.0;
rel2.offset: -1 -5;
rel2.offset: -1 -3;
offscale;
}
description { state: "off" 0.0;
inherit: "default" 0.0;
rel1.offset: 0 0;
rel2.offset: -1 -1;
rel1.offset: 0 -1;
rel2.offset: -1 0;
}
}
part { name: "sep2";
part { name: "sep2"; type: RECT;
scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
rel1.to_y: "elm.selector";
rel1.offset: 4 -6;
rel1.offset: 5 -3;
rel2.to_y: "elm.selector";
rel2.offset: -5 -5;
rel2.offset: -6 -3;
rel2.relative: 1.0 0.0;
min: 2 2;
max: 99999 2;
image.normal: "bevel_dark_in.png";
image.border: 2 2 2 2;
fill.smooth: 0;
min: 64 1;
max: 99999 1;
color: 72 72 72 255;
offscale;
}
description { state: "off" 0.0;
inherit: "default" 0.0;
rel1.offset: 4 0;
rel2.offset: -5 1;
rel1.offset: 5 0;
rel2.offset: -6 0;
min: 0 0;
visible: 0;
}
}
part { name: "elm.selector"; type: SWALLOW;
scale: 1;
description { state: "default" 0.0;
fixed: 0 1;
align: 0.0 1.0;
rel1.relative: 0.0 1.0;
offscale;
}
}
}
programs {
program {
source: "elm"; signal: "elm,state,palette";
program { signal: "elm,state,palette"; source: "elm";
action: STATE_SET "off" 0.0;
target: "sep1";
target: "sep2";
}
program {
source: "elm"; signal: "elm,state,palette";
program { signal: "elm,state,palette"; source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.palette";
}
program {
source: "elm"; signal: "elm,state,components";
program { signal: "elm,state,components"; source: "elm";
action: STATE_SET "off" 0.0;
target: "sep1";
target: "sep2";
target: "elm.palette";
}
program {
source: "elm"; signal: "elm,state,both";
program { signal: "elm,state,both"; source: "elm";
action: STATE_SET "off" 0.0;
target: "sep1";
}
program {
source: "elm"; signal: "elm,state,both";
program { signal: "elm,state,both"; source: "elm";
action: STATE_SET "default" 0.0;
target: "elm.palette";
target: "sep2";
}
program {
source: "elm"; signal: "elm,state,picker";
program { signal: "elm,state,picker"; source: "elm";
action: STATE_SET "off" 0.0;
target: "sep1";
target: "sep2";
target: "elm.palette";
}
program {
source: "elm"; signal: "elm,state,all";
program { signal: "elm,state,all"; source: "elm";
action: STATE_SET "default" 0.0;
target: "sep1";
target: "sep2";
@ -131,14 +127,39 @@ group { name: "elm/colorselector/picker/base/default";
parts {
part { name: "elm.swallow.picker"; type: SWALLOW;
description { state: "default" 0.0;
min: 90 90;
min: 80 80;
rel2 {
relative: 0.0 1.0;
to_x: "elm.label.red";
to_x: "sp1";
}
}
}
part { name: "sp1"; type: SPACER;
description { state: "default" 0.0;
rel1.to: "elm.label.red";
rel2.to: "elm.label.green";
rel1.relative: 0.0 1.0;
align: 0.0 0.5;
}
}
part { name: "sp2"; type: SPACER;
description { state: "default" 0.0;
rel1.to: "elm.label.blue";
rel2.to: "elm.label.alpha";
rel1.relative: 0.0 1.0;
align: 0.0 0.5;
}
}
part { name: "sp3"; type: SPACER;
description { state: "default" 0.0;
rel1.to: "sp1";
rel2.to: "sp2";
rel1.relative: 0.0 1.0;
align: 0.0 0.5;
}
}
part { name: "elm.label.red"; type: TEXT;
scale: 1;
description { state: "default" 0.0;
align: 1.0 0.0;
min: 15 0;
@ -146,45 +167,52 @@ group { name: "elm/colorselector/picker/base/default";
rel2 {
relative: 0.0 1.0;
to: "elm.swallow.red";
offset: -3 -1;
}
text {
font: "Sans";
size: 10;
font: FN; size: 10;
ellipsis: -1;
}
color: 160 160 160 255;
offscale;
}
}
part { name: "elm.swallow.red"; type: SWALLOW;
scale: 1;
description { state: "default" 0.0;
align: 1.0 0.0;
min: 60 20;
max: 60 20;
min: 80 20;
max: 80 20;
}
}
part { name: "elm.label.green"; type: TEXT;
scale: 1;
description { state: "default" 0.0;
min: 15 0;
max: 15 -1;
rel1 {
relative: 0.0 1.0;
to: "elm.label.red";
offset: -3 -1;
}
rel2 {
relative: 0.0 1.0;
to: "elm.swallow.green";
}
text {
font: "Sans";
size: 10;
font: FN; size: 10;
ellipsis: -1;
}
color: 160 160 160 255;
offscale;
}
}
part { name: "elm.swallow.green"; type: SWALLOW;
scale: 1;
description { state: "default" 0.0;
align: 1.0 0.0;
min: 60 20;
max: 60 20;
min: 80 20;
max: 80 20;
rel1 {
relative: 0.0 1.0;
to: "elm.swallow.red";
@ -192,29 +220,33 @@ group { name: "elm/colorselector/picker/base/default";
}
}
part { name: "elm.label.blue"; type: TEXT;
scale: 1;
description { state: "default" 0.0;
min: 15 0;
max: 15 -1;
rel1 {
relative: 0.0 1.0;
to: "elm.label.green";
offset: -3 -1;
}
rel2 {
relative: 0.0 1.0;
to: "elm.swallow.blue";
}
text {
font: "Sans";
size: 10;
font: FN; size: 10;
ellipsis: -1;
}
color: 160 160 160 255;
offscale;
}
}
part { name: "elm.swallow.blue"; type: SWALLOW;
scale: 1;
description { state: "default" 0.0;
align: 1.0 0.0;
min: 60 20;
max: 60 20;
min: 80 20;
max: 80 20;
rel1 {
relative: 0.0 1.0;
to: "elm.swallow.green";
@ -222,29 +254,33 @@ group { name: "elm/colorselector/picker/base/default";
}
}
part { name: "elm.label.alpha"; type: TEXT;
scale: 1;
description { state: "default" 0.0;
min: 15 0;
max: 15 -1;
rel1 {
relative: 0.0 1.0;
to: "elm.label.blue";
offset: -3 -1;
}
rel2 {
relative: 0.0 1.0;
to: "elm.swallow.alpha";
}
text {
font: "Sans";
size: 10;
font: FN; size: 10;
ellipsis: -1;
}
color: 160 160 160 255;
offscale;
}
}
part { name: "elm.swallow.alpha"; type: SWALLOW;
scale: 1;
description { state: "default" 0.0;
align: 1.0 0.0;
min: 60 20;
max: 60 20;
min: 80 20;
max: 80 20;
rel1 {
relative: 0.0 1.0;
to: "elm.swallow.blue";
@ -255,61 +291,37 @@ group { name: "elm/colorselector/picker/base/default";
}
group { name: "elm/colorselector/picker/default";
images.image: "inset_shadow.png" COMP;
images.image: "bevel_in.png" COMP;
images.image: "dot_pattern.png" COMP;
images.image: "diagonal_stripes.png" COMP;
parts {
part { name: "bg"; type: RECT;
scale: 1;
description { state: "default" 0.0;
min: 20 20;
rel1.to: "elm.picker";
rel2.to: "elm.picker";
color: 48 48 48 255;
min: 16 16;
rel.to: "elm.picker";
color: 32 32 32 255;
}
}
part { name: "pat";
description { state: "default" 0.0;
rel1.to: "bg";
rel2.to: "bg";
image.normal: "dot_pattern.png";
TILED_PATTERN(256, 256)
rel.to: "bg";
image.normal: "diagonal_stripes.png";
color: 255 255 255 16;
TILED_PATTERN(240, 240)
}
}
part { name: "clipper"; type: RECT;
description { state: "default" 0.0;
rel1.to: "elm.picker";
rel2.to: "elm.picker";
rel.to: "elm.picker";
}
}
part { name: "elm.picker"; type: SWALLOW;
clip_to: "clipper";
scale: 1;
description { state: "default" 0.0;
rel1.offset: 3 3;
rel2.offset: -4 -4;
}
}
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;
min: 16 16;
rel1.offset: 5 5;
rel2.offset: -6 -6;
offscale;
}
}
}
@ -355,85 +367,49 @@ group { name: "elm/colorselector/bg/default";
}
group { name: "elm/colorselector/base/default";
images.image: "inset_shadow.png" COMP;
images.image: "bevel_in.png" COMP;
images.image: "ring_shadow.png" COMP;
images.image: "ring_white_blue_glow.png" COMP;
images.image: "col_sel_end_bottom.png" COMP;
images.image: "col_sel_end_top.png" COMP;
parts {
part { name: "elm.bar_bg"; type: SWALLOW; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
min: 32 15;
rel1.offset: 0 10;
min: 80 20;
rel1.offset: 5 25;
rel1.to_x: "elm.arrow_bg";
rel2.offset: -1 -11;
rel2.offset: -6 -6;
rel2.to_x: "elm.arrow_bg";
offscale;
}
}
part { name: "elm.bar"; type: SWALLOW; mouse_events: 0;
description { state: "default" 0.0;
rel1.to: "elm.bar_bg";
rel2.to: "elm.bar_bg";
}
}
part { name: "clipper"; type: RECT;
description { state: "default" 0.0;
rel1.to: "shadow";
rel2.to: "shadow";
}
}
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: "elm.bar_bg";
rel2.to: "elm.bar_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: "shadow";
rel1.offset: -1 -1;
rel2.to: "shadow";
rel2.offset: 0 0;
fill.smooth: 0;
rel.to: "elm.bar_bg";
}
}
part { name: "elm.arrow_bg"; type: SWALLOW;
description { state: "default" 0.0;
rel1 {
relative: 1.0 0.0;
offset: 3 0;
to_x: "elm.l_button";
}
rel2 {
relative: 0.0 1.0;
offset: -4 0;
to_x: "elm.r_button";
}
}
}
part { name: "elm.arrow"; type: RECT;
dragable {
confine: "elm.bar_bg";
x: 1 1 0;
y: 0 0 0;
}
description { state: "default" 0.0;
fixed: 1 1;
min: 1 1;
rel1.to_x: "elm.arrow_bg";
rel2.to_x: "elm.arrow_bg";
rel1.to_x: "elm.bar_bg";
rel2.to_x: "elm.bar_bg";
visible: 0;
}
dragable {
confine: "elm.arrow_bg";
x: 1 1 0;
y: 0 0 0;
}
}
part { name: "event"; type: RECT;
description { state: "default" 0.0;
@ -444,58 +420,18 @@ group { name: "elm/colorselector/base/default";
}
dragable.events: "elm.arrow";
}
part { name: "arrow_under"; mouse_events: 0;
description { state: "default" 0.0;
image.normal: "ring_shadow.png";
rel1.to: "elm.arrow_icon";
rel2.to: "elm.arrow_icon";
}
}
part { name: "elm.arrow_icon"; type: SWALLOW; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
min: 16 16;
max: 16 16;
align: 0.5 (28/32);
min: 24 24;
max: 24 24;
align: 0.5 1.0;
rel1.to_x: "elm.arrow";
rel1.to_y: "shadow";
rel1.to_y: "elm.bar";
rel2.relative: 1.0 0.0;
rel2.to_x: "elm.arrow";
rel2.to_y: "shadow";
}
}
part { name: "end1"; mouse_events: 0;
clip_to: "clipper";
scale: 1;
description { state: "default" 0.0;
image.normal: "col_sel_end_top.png";
FIXED_SIZE(11, 8)
align: 0.5 0.0;
rel1.to_x: "cursor";
rel2.to_x: "cursor";
rel1.to_y: "shadow";
rel2.to_y: "shadow";
}
}
part { name: "end2"; mouse_events: 0;
clip_to: "clipper";
scale: 1;
description { state: "default" 0.0;
image.normal: "col_sel_end_bottom.png";
FIXED_SIZE(11, 8)
align: 0.5 1.0;
rel1.to_x: "cursor";
rel2.to_x: "cursor";
rel1.to_y: "shadow";
rel2.to_y: "shadow";
}
}
part { name: "arrow_over"; mouse_events: 0;
description { state: "default" 0.0;
image.normal: "ring_white_blue_glow.png";
rel1.to: "elm.arrow_icon";
rel2.to: "elm.arrow_icon";
rel2.to_y: "elm.bar";
}
}
part { name: "cursor"; type: RECT;
@ -503,10 +439,10 @@ group { name: "elm/colorselector/base/default";
fixed: 1 1;
min: 1 1;
rel1.to_x: "elm.arrow_icon";
rel1.to_y: "shadow";
rel1.to_y: "elm.bar";
rel1.relative: 0.5 0.0;
rel2.to_x: "elm.arrow_icon";
rel2.to_y: "shadow";
rel2.to_y: "elm.bar";
rel2.relative: 0.5 1.0;
rel2.offset: 0 -1;
color: 255 255 255 255;
@ -516,8 +452,7 @@ group { name: "elm/colorselector/base/default";
part { name: "elm.arrow_bg_access"; type: RECT;
repeat_events: 1;
description { state: "default" 0.0;
rel1.to: "elm.arrow_bg";
rel2.to: "elm.arrow_bg";
rel.to: "elm.arrow_bg";
color: 0 0 0 0;
}
}
@ -525,7 +460,7 @@ group { name: "elm/colorselector/base/default";
scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
min: 17 17;
min: 24 24;
rel1.relative: 0.0 0.0;
rel1.to_y: "elm.bar_bg";
rel2.relative: 0.0 1.0;
@ -537,7 +472,7 @@ group { name: "elm/colorselector/base/default";
scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
min: 17 17;
min: 24 24;
rel1.relative: 1.0 0.0;
rel1.to_y: "elm.bar_bg";
rel2.relative: 1.0 1.0;
@ -549,26 +484,21 @@ group { name: "elm/colorselector/base/default";
}
group { name: "elm/colorselector/arrow/default";
images.image: "ring_white_middle.png" COMP;
parts {
part { name: "base";
part { name: "base"; type: RECT;
description { state: "default" 0.0;
aspect: 1.0 1.0; aspect_preference: BOTH;
image.normal: "ring_white_middle.png";
color: 255 255 255 255;
}
}
}
}
group{ name: "elm/colorselector/image/colorbar_0/default";
images {
image: "color_picker_color.png" COMP;
}
images.image: "color_picker_color.png" COMP;
parts {
part { name: "colorbar_0_image";
type: IMAGE;
description { state: "default" 0.0;
rel2.offset: -1 -1;
image.normal: "color_picker_color.png";
}
}
@ -609,50 +539,54 @@ group { name: "elm/colorselector/image/colorbar_3/default";
}
group { name: "elm/colorselector/bg_image/colorbar_3/default";
images.image: "dot_pattern.png" COMP;
images.image: "diagonal_stripes.png" COMP;
parts {
part { name: "bg"; type: RECT;
description { state: "default" 0.0;
color: 48 48 48 255;
color: 32 32 32 255;
}
}
part { name: "pat";
description { state: "default" 0.0;
rel1.to: "bg";
rel2.to: "bg";
image.normal: "dot_pattern.png";
TILED_PATTERN(256, 256)
rel.to: "bg";
image.normal: "diagonal_stripes.png";
color: 255 255 255 16;
TILED_PATTERN(240, 240)
}
}
}
}
group { name: "elm/colorselector/item/default";
images.image: "inset_shadow.png" COMP;
images.image: "bevel_in.png" COMP;
images.image: "dot_pattern.png" COMP;
images.image: "bg_glow_in.png" COMP;
images.image: "diagonal_stripes.png" COMP;
parts {
part { name: "sel"; type: RECT;
description { state: "default" 0.0;
color: 51 153 255 0;
}
description { state: "focused" 0.0;
inherit: "default" 0.0;
color: 51 153 255 255;
}
}
part { name: "bg"; type: RECT;
scale: 1;
description { state: "default" 0.0;
min: 20 20;
rel1.to: "color_obj";
rel2.to: "color_obj";
color: 48 48 48 255;
min: 16 16;
rel.to: "color_obj";
color: 32 32 32 255;
}
}
part { name: "pat";
description { state: "default" 0.0;
rel1.to: "bg";
rel2.to: "bg";
image.normal: "dot_pattern.png";
TILED_PATTERN(256, 256)
rel.to: "bg";
image.normal: "diagonal_stripes.png";
color: 255 255 255 16;
TILED_PATTERN(240, 240)
}
}
part { name: "clipper"; type: RECT;
description { state: "default" 0.0;
rel1.to: "color_obj";
rel2.to: "color_obj";
}
description { state: "disabled" 0.0;
@ -662,90 +596,35 @@ group { name: "elm/colorselector/item/default";
}
alias: "color_obj" "elm.swallow.color_obj";
part { name: "elm.swallow.color_obj"; type: SWALLOW;
scale: 1;
clip_to: "clipper";
description { state: "default" 0.0;
rel1.offset: 3 3;
rel2.offset: -4 -4;
}
}
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: "dim"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
rel1.to: "bg";
rel2.to: "bg";
color: 0 0 0 0;
}
description { state: "focused" 0.0;
inherit: "default" 0.0;
color: 0 0 0 128;
}
}
part { name: "glow"; mouse_events: 0;
description { state: "default" 0.0;
rel1.to: "bg";
rel2.to: "bg";
image.normal: "bg_glow_in.png";
image.border: 7 7 7 7;
image.middle: 0;
fill.smooth: 0;
color: 255 255 255 0;
}
description { state: "focused" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
}
}
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;
min: 16 16;
rel1.offset: 5 5;
rel2.offset: -6 -6;
offscale;
}
}
}
programs {
program {
source: "elm"; signal: "elm,state,selected";
program { signal: "elm,state,selected"; source: "elm";
action: STATE_SET "focused" 0.0;
transition: DECELERATE 0.1;
target: "glow";
target: "dim";
target: "sel";
}
program {
source: "elm"; signal: "elm,state,unselected";
program { signal: "elm,state,unselected"; source: "elm";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.5;
target: "glow";
target: "dim";
transition: DECELERATE 0.2;
target: "sel";
}
program {
signal: "elm,anim,activate"; source: "elm";
program { signal: "elm,anim,activate"; source: "elm";
action: STATE_SET "focused" 0.0;
transition: DECELERATE 0.1;
target: "glow";
target: "dim";
target: "sel";
after: "active2";
}
program { name: "active2";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.8;
target: "glow";
target: "dim";
transition: DECELERATE 0.2;
target: "sel";
}
}
}

View File

@ -2,14 +2,10 @@
#define FLIP_PICKER_MAX_LEN_STR "50"
group { name: "elm/flipselector/base/default";
images.image: "big_arrow_up.png" COMP;
images.image: "big_arrow_down.png" COMP;
images.image: "flip_shad.png" COMP;
images.image: "sym_up_light_normal.png" COMP;
images.image: "sym_down_light_normal.png" COMP;
images.image: "sym_up_dark_normal.png" COMP;
images.image: "sym_down_dark_normal.png" COMP;
images.image: "shine.png" COMP;
images.image: "win_shadow.png" COMP;
images.image: "bevel_out.png" COMP;
data.item: "max_len" FLIP_PICKER_MAX_LEN_STR;
@ -86,11 +82,9 @@ group { name: "elm/flipselector/base/default";
set_tween_state(PART:"elm.bottom", pos, "shrink", 0.0, "default", 0.0);
set_tween_state(PART:"bottom_cur", pos, "shrink", 0.0, "default", 0.0);
set_tween_state(PART:"bottom_shadow", pos, "half", 0.0, "full", 0.0);
set_state(PART:"bottom_shine_cur", "visible", 0.0);
if (pos >= 1.0) {
set_state(PART:"bottom_shadow", "default", 0.0);
set_state(PART:"bottom_shine_cur", "default", 0.0);
set_int(lock, 0);
fetch_str(next, 0, tmp, FLIP_PICKER_MAX_LEN);
if (strncmp(tmp, "", FLIP_PICKER_MAX_LEN) != 0) {
@ -106,7 +100,6 @@ group { name: "elm/flipselector/base/default";
0.0);
if (pos >= 1.0)
{
set_state(PART:"top_shine_cur", "default", 0.0);
anim(0.2, "animator_bottom_down", val);
}
}
@ -122,9 +115,7 @@ group { name: "elm/flipselector/base/default";
set_tween_state(PART:"elm.top", pos, "shrink", 0.0, "default", 0.0);
set_tween_state(PART:"top_cur", pos, "shrink", 0.0, "default", 0.0);
set_tween_state(PART:"bottom_shadow", pos, "half", 0.0, "default",
0.0);
set_state(PART:"top_shine_cur", "visible", 0.0);
set_tween_state(PART:"bottom_shadow", pos, "half", 0.0, "default", 0.0);
if (pos >= 1.0) {
set_state(PART:"bottom_shadow", "default", 0.0);
@ -153,17 +144,18 @@ group { name: "elm/flipselector/base/default";
}
parts {
part { name: "base_shadow"; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
rel1.to: "base";
rel2.to: "base";
WIN_SHADOW;
rel.to: "base";
WIN_SHADOW_SMALL;
}
}
part { name: "base"; type: RECT;
scale: 1;
description { state: "default" 0.0;
rel1.offset: 6 6;
rel2.offset: -7 -7;
rel1.offset: 2 2;
rel2.offset: -3 -3;
offscale;
}
}
part { name: "bottom"; type: RECT;
@ -187,38 +179,36 @@ group { name: "elm/flipselector/base/default";
visible: 0;
}
}
part { name: "bottom_prev";
type: RECT;
part { name: "bottom_prev"; type: RECT;
mouse_events: 0;
description { state: "default" 0.0;
rel1.to: "bottom";
rel2.to: "bottom";
color: 72 72 72 255;
rel.to: "bottom";
color: 96 96 96 255;
}
}
part { name: "bottom_text_prev"; type: TEXT; mouse_events: 0;
effect: SHADOW BOTTOM;
clip_to: "bottom_clipper";
scale: 1;
description { state: "default" 0.0;
rel1.to_x: "base";
rel1.to_y: "arrow_top";
rel1.relative: 0.0 0.7;
rel1.offset: 2 0;
rel1.offset: 2 2;
rel2.to: "base";
rel2.to_y: "arrow_bottom";
rel2.relative: 1.0 0.3;
rel2.offset: -3 -1;
rel2.offset: -3 -3;
text { font: FN; size: 10;
min: 1 1;
ellipsis: -1;
align: 0.5 0.5;
}
color: FN_COL_DEFAULT;
color: 160 160 160 255;
offscale;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
color: FN_COL_DISABLE;
color: 112 112 112 255;
}
}
part { name: "bottom_shadow"; mouse_events: 0;
@ -243,9 +233,8 @@ group { name: "elm/flipselector/base/default";
}
part { name: "bottom_cur"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
rel1.to: "bottom";
rel2.to: "bottom";
color: 72 72 72 255;
rel.to: "bottom";
color: 96 96 96 255;
}
description { state: "shrink" 0.0;
inherit: "default" 0.0;
@ -253,40 +242,25 @@ group { name: "elm/flipselector/base/default";
rel2.relative: 1.0 0.0;
}
}
part { name: "bottom_shine_cur"; mouse_events: 0;
description { state: "default" 0.0;
rel1 { to: "bottom_cur"; relative: 0 1; }
rel2.to: "bottom_cur";
image.normal: "shine.png";
min: 0 1;
fixed: 0 1;
align: 0.5 1;
visible: 0;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
}
}
part { name: "elm.bottom"; type: TEXT; mouse_events: 0;
effect: SHADOW BOTTOM;
clip_to: "bottom_clipper";
scale: 1;
description { state: "default" 0.0;
rel1.to_x: "base";
rel1.to_y: "arrow_top";
rel1.relative: 0.0 0.7;
rel1.offset: 2 0;
rel1.offset: 2 2;
rel2.to: "base";
rel2.to_y: "arrow_bottom";
rel2.relative: 1.0 0.3;
rel2.offset: -3 -1;
rel2.offset: -3 -3;
text { font: FN; size: 10;
min: 1 1;
ellipsis: -1;
align: 0.5 0.5;
}
color: FN_COL_DEFAULT;
color: 160 160 160 255;
offscale;
}
description { state: "shrink" 0.0;
inherit: "default" 0.0;
@ -296,126 +270,95 @@ group { name: "elm/flipselector/base/default";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
color: FN_COL_DISABLE;
color: 112 112 112 255;
}
}
part { name: "top_prev"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
rel1.to: "top";
rel2.to: "top";
color: 56 56 56 255;
rel.to: "top";
color: 72 72 72 255;
}
}
part { name: "top_text_prev"; type: TEXT; mouse_events: 0;
effect: SHADOW BOTTOM;
clip_to: "top_clipper";
scale: 1;
description { state: "default" 0.0;
rel1.to_x: "base";
rel1.to_y: "arrow_top";
rel1.relative: 0.0 0.7;
rel1.offset: 2 0;
rel1.offset: 2 2;
rel2.to: "base";
rel2.to_y: "arrow_bottom";
rel2.relative: 1.0 0.3;
rel2.offset: -3 -1;
rel2.offset: -3 -3;
text { font: FN; size: 10;
min: 1 1;
ellipsis: -1;
align: 0.5 0.5;
source: "elm.top";
}
color: FN_COL_GREY_192;
color: 144 144 144 255;
offscale;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
color: FN_COL_GREY_16;
}
}
part { name: "top_shine_prev"; mouse_events: 0;
description { state: "default" 0.0;
rel1.to: "top_prev";
rel2 { to: "top_prev"; relative: 1 0; }
image.normal: "shine.png";
min: 0 1;
fixed: 0 1;
align: 0.5 0;
color: 96 96 96 255;
}
}
part { name: "top_cur"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
rel1.to: "top";
rel2.to: "top";
color: 56 56 56 255;
rel.to: "top";
color: 72 72 72 255;
}
description { state: "shrink" 0.0;
inherit: "default" 0.0;
fixed: 0 1;
rel1.relative: 0.0 1.0;
color: 40 40 40 255;
color: 32 32 32 255;
}
}
part { name: "elm.top"; type: TEXT; mouse_events: 0;
effect: SHADOW BOTTOM;
clip_to: "top_clipper";
scale: 1;
description { state: "default" 0.0;
rel1.to: "base";
rel1.to_x: "base";
rel1.to_y: "arrow_top";
rel1.relative: 0.0 0.7;
rel1.offset: 2 2;
rel2.to: "base";
rel2.to_x: "base";
rel2.to_y: "arrow_bottom";
rel2.relative: 1.0 0.3;
rel2.offset: -3 -3;
text { font: FN; size: 10;
min: 1 1;
ellipsis: -1;
align: 0.5 0.5;
}
color: FN_COL_GREY_192;
color: 144 144 144 255;
offscale;
}
description { state: "shrink" 0.0;
inherit: "default" 0.0;
visible: 0;
rel1.relative: 0.0 0.5;
}
color: 48 48 48 255;
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
color: FN_COL_GREY_16;
}
}
part { name: "top_shine_cur"; mouse_events: 0;
description { state: "default" 0.0;
rel1.to: "top_cur";
rel2 { to: "top_cur"; relative: 1 0; }
image.normal: "shine.png";
min: 0 1;
fixed: 0 1;
align: 0.5 0;
visible: 0;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
}
}
part { name: "bevel"; mouse_events: 0;
description { state: "default" 0.0;
image.normal: "bevel_out.png";
image.border: 1 1 1 1;
image.middle: 0;
rel1.to: "base";
rel2.to: "base";
fill.smooth: 0;
color: 96 96 96 255;
}
}
part { name: "arrow_top"; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
min: 15 15;
max: 15 15;
min: 17 14;
max: 17 14;
align: 0.5 0.0;
rel1.to: "top";
rel2.to: "top";
image.normal: "sym_up_light_normal.png";
color: 192 192 192 255;
rel.to: "top";
rel1.offset: 0 2;
image.normal: "big_arrow_up.png";
color: 144 144 144 255;
offscale;
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
@ -423,18 +366,24 @@ group { name: "elm/flipselector/base/default";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
image.normal: "sym_up_dark_normal.png";
color: 96 96 96 255;
}
description { state: "pressed" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
}
}
part { name: "arrow_bottom"; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
min: 15 15;
max: 15 15;
min: 17 14;
max: 17 14;
align: 0.5 1.0;
rel1.to: "bottom";
rel2.to: "bottom";
image.normal: "sym_down_light_normal.png";
rel.to: "bottom";
rel2.offset: -1 -3;
image.normal: "big_arrow_down.png";
color: 160 160 160 255;
offscale;
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
@ -442,19 +391,21 @@ group { name: "elm/flipselector/base/default";
}
description { state: "disabled" 0.0;
inherit: "default" 0.0;
image.normal: "sym_down_dark_normal.png";
color: 112 112 112 255;
}
description { state: "pressed" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
}
}
part { name: "top_clipper"; type: RECT;
description { state: "default" 0.0;
rel1.to: "top";
rel2.to: "top";
rel.to: "top";
}
}
part { name: "bottom_clipper"; type: RECT;
description { state: "default" 0.0;
rel1.to: "bottom";
rel2.to: "bottom";
rel.to: "bottom";
}
}
part { name: "event_blocker"; type: RECT;
@ -469,8 +420,7 @@ group { name: "elm/flipselector/base/default";
}
}
programs {
program {
signal: "load"; source: "";
program { signal: "load"; source: "";
script {
append_str(cur, "");
append_str(prev, "");
@ -478,40 +428,49 @@ group { name: "elm/flipselector/base/default";
set_int(lock, 0);
}
}
program {
signal: "elm,state,button,hidden"; source: "elm";
program { signal: "elm,state,button,hidden"; source: "elm";
action: STATE_SET "hidden" 0.0;
target: "arrow_top";
target: "arrow_bottom";
target: "top";
target: "bottom";
}
program {
signal: "elm,state,button,visible"; source: "elm";
program { signal: "elm,state,button,visible"; source: "elm";
action: STATE_SET "default" 0.0;
target: "arrow_top";
target: "arrow_bottom";
target: "top";
target: "bottom";
}
program { name: "up";
signal: "mouse,down,1"; source: "top";
program { signal: "mouse,down,1"; source: "top";
action: SIGNAL_EMIT "elm,action,up,start" "elm";
}
program { name: "up,stop";
signal: "mouse,up,1"; source: "top";
program { signal: "mouse,down,1"; source: "top";
action: STATE_SET "pressed" 0.0;
target: "arrow_top";
}
program { signal: "mouse,up,1"; source: "top";
action: SIGNAL_EMIT "elm,action,up,stop" "elm";
}
program { name: "down";
signal: "mouse,down,1"; source: "bottom";
program { signal: "mouse,up,1"; source: "top";
action: STATE_SET "default" 0.0;
target: "arrow_top";
}
program { signal: "mouse,down,1"; source: "bottom";
action: SIGNAL_EMIT "elm,action,down,start" "elm";
}
program { name: "down,stop";
signal: "mouse,up,1"; source: "bottom";
program { signal: "mouse,down,1"; source: "bottom";
action: STATE_SET "pressed" 0.0;
target: "arrow_bottom";
}
program { signal: "mouse,up,1"; source: "bottom";
action: SIGNAL_EMIT "elm,action,down,stop" "elm";
}
program { name: "disable";
signal: "elm,state,disabled"; source: "elm";
program { signal: "mouse,up,1"; source: "bottom";
action: STATE_SET "default" 0.0;
target: "arrow_bottom";
}
program { signal: "elm,state,disabled"; source: "elm";
script {
new st[31];
new Float:vl;
@ -530,12 +489,9 @@ group { name: "elm/flipselector/base/default";
set_state(PART:"arrow_top", "disabled", 0.0);
get_state(PART:"top_cur", st, 30, vl);
if (strcmp(st, "shrink"))
set_state(PART:"top_shine_cur", "visible", 0.0);
}
}
program { name: "enable";
signal: "elm,state,enabled"; source: "elm";
program { signal: "elm,state,enabled"; source: "elm";
script {
new st[31];
new Float:vl;

View File

@ -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";
part { name: "bar"; type: RECT;
clip_to: "clipper";
scale: 1;
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";
clip_to: "clipper";
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)
color: 64 64 64 255;
}
}
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;
}
}
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;
rel1.offset: 0 0;
rel2.offset: -1 -1;
}
}
part { name: "barbevclip"; type: RECT;
description { state: "default" 0.0;
rel2.relative: 1.0 1.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;
}
}
}
}

View File

@ -803,7 +803,7 @@ group { name: "elm/slider/vertical/default";
scale: 1;
description { state: "default" 0.0;
min: 20 40;
max: 29 99999;
max: 20 99999;
align: 0.5 1.0;
rel1.to_y: "elm.text";
rel1.relative: 0.0 1.0;
@ -1403,11 +1403,7 @@ group { name: "elm/slider/vertical/indicator/default";
//Range
group { name: "elm/slider/range/horizontal/default";
alias: "elm/slider/horizontal/disabled";
alias: "elm/slider/horizontal/media_player/position/default";
alias: "elm/slider/horizontal/media_player/position/flush";
alias: "elm/slider/horizontal/media_player/volume/default";
alias: "elm/slider/horizontal/media_player/volume/flush";
alias: "elm/range/horizontal/disabled";
images.image: "speaker_vol.png" COMP;
#define ICON 1
#define LABEL 2
@ -2157,11 +2153,7 @@ group { name: "elm/slider/range/horizontal/default";
}
group { name: "elm/slider/range/vertical/default";
alias: "elm/slider/vertical/disabled";
alias: "elm/slider/vertical/media_player/position/default";
alias: "elm/slider/vertical/media_player/position/flush";
alias: "elm/slider/vertical/media_player/volume/default";
alias: "elm/slider/vertical/media_player/volume/flush";
alias: "elm/range/vertical/disabled";
images.image: "speaker_vol.png" COMP;
#define ICON 1
#define LABEL 2
@ -2283,7 +2275,7 @@ group { name: "elm/slider/range/vertical/default";
scale: 1;
description { state: "default" 0.0;
min: 20 40;
max: 29 99999;
max: 20 99999;
align: 0.5 1.0;
rel1.to_y: "elm.text";
rel1.relative: 0.0 1.0;

View File

@ -8,7 +8,7 @@ group { name: "elm/video/base/default";
color: 128 128 128 255;
}
}
part { name: "elm.swallow.video"; type: SWALLOW; mouse_events: 1;
part { name: "elm.swallow.video"; type: SWALLOW;
clip_to: "clipper";
description { state: "default" 0.0;
aspect: 1.0 1.0; aspect_preference: BOTH;
@ -16,27 +16,23 @@ group { name: "elm/video/base/default";
}
}
programs {
program {
signal: "elm,video,load"; source: "elm";
program { signal: "elm,video,load"; source: "elm";
action: STATE_SET "darker" 0.0;
target: "clipper";
}
program {
signal: "elm,video,play"; source: "elm";
program { signal: "elm,video,play"; source: "elm";
action: STATE_SET "default" 0.0;
transition: SINUSOIDAL 0.2 CURRENT;
transition: SINUSOIDAL 0.1 CURRENT;
target: "clipper";
}
program {
signal: "elm,video,end"; source: "elm";
program { signal: "elm,video,pause"; source: "elm";
action: STATE_SET "darker" 0.0;
transition: SINUSOIDAL 0.5 CURRENT;
target: "clipper";
}
program {
signal: "elm,video,pause"; source: "elm";
program { signal: "elm,video,end"; source: "elm";
action: STATE_SET "darker" 0.0;
transition: SINUSOIDAL 0.7 CURRENT;
transition: SINUSOIDAL 0.5 CURRENT;
target: "clipper";
}
}