Flat theme: Get Bryce up to speed with flat theme, as well as luncher and pager for bryce. Add alternate and translucent themes to shelf and bryce that actually fit and match theme.

This commit is contained in:
Stephen Houston 2018-02-26 17:10:13 -06:00
parent 775f1c373f
commit dc676fec0a
5 changed files with 368 additions and 583 deletions

View File

@ -4,86 +4,26 @@ group { name: "e/bryce/default/base"; nomouse;
* when auto-hiding the bryce */ * when auto-hiding the bryce */
item: "hidden_state_size" "2"; item: "hidden_state_size" "2";
} }
images.image: "vgrad_med.png" COMP;
images.image: "vgrad_tall.png" COMP;
images.image: "bevel_out.png" COMP;
images.image: "holes_vert.png" COMP;
images.image: "holes_horiz.png" COMP;
images.image: "shine.png" COMP;
parts { parts {
rect { "mouse"; mouse; rect { "mouse"; mouse;
desc { color: 0 0 0 0; } desc { color: 0 0 0 0; }
} }
part { name: "bg"; part { name: "bg"; type: RECT;
description { state: "default" 0.0; description { state: "default" 0.0;
image.normal: "vgrad_med.png"; color: 64 64 64 255;
fill.smooth: 0;
TILED_HORIZ(120)
color_class: "bryce_base";
} }
description { state: "vert" 0.0; description { state: "vert" 0.0;
image.normal: "vgrad_tall.png"; color: 64 64 64 255;
fill.smooth: 0;
TILED_HORIZ(40)
color_class: "bryce_base";
}
}
part { name: "bevel";
description { state: "default" 0.0;
image.normal: "bevel_out.png";
image.border: 1 1 1 1;
image.middle: 0;
fill.smooth: 0;
}
}
part { name: "dots_start";
description { state: "default" 0.0;
image.normal: "holes_vert.png";
rel1.offset: 2 2;
rel2.relative: 0.0 1.0;
rel2.offset: 5 -3;
FIXED_SIZE(4, 14)
}
description { state: "vert" 0.0;
image.normal: "holes_horiz.png";
rel1.offset: 2 2;
rel2.relative: 1.0 0.0;
rel2.offset: -3 5;
FIXED_SIZE(14, 4)
}
}
part { name: "dots_end";
description { state: "default" 0.0;
image.normal: "holes_vert.png";
rel1.relative: 1.0 0.0;
rel1.offset: -6 2;
rel2.offset: -3 -3;
FIXED_SIZE(4, 14)
}
description { state: "vert" 0.0;
image.normal: "holes_horiz.png";
rel1.relative: 0.0 1.0;
rel1.offset: 2 -6;
rel2.offset: -3 -3;
FIXED_SIZE(14, 4)
} }
} }
spacer { "sizer"; spacer { "sizer";
description { state: "default" 0.0; description { state: "default" 0.0;
rel1.offset: 1 0; rel1.offset: 4 0;
rel1.relative: 1.0 0.0; rel2.offset: -5 -1;
rel1.to_x: "dots_start";
rel2.offset: -2 -1;
rel2.to_x: "dots_end";
rel2.relative: 0.0 1.0;
} }
description { state: "vert" 0.0; description { state: "vert" 0.0;
rel1.offset: 0 1; rel1.offset: 0 4;
rel1.relative: 0.0 1.0; rel2.offset: -1 -5;
rel1.to_y: "dots_start";
rel2.offset: -1 -2;
rel2.to_y: "dots_end";
rel2.relative: 1.0 0.0;
} }
} }
part { name: "e.swallow.content"; type: SWALLOW; mouse; part { name: "e.swallow.content"; type: SWALLOW; mouse;
@ -96,15 +36,6 @@ group { name: "e/bryce/default/base"; nomouse;
link.base: "e,state,hidden" "e"; link.base: "e,state,hidden" "e";
} }
} }
part { name: "shine";
description { state: "default" 0.0;
image.normal: "shine.png";
rel1.offset: 0 -2;
rel2.relative: 1.0 0.0;
rel2.offset: -1 2;
FIXED_SIZE(69, 5)
}
}
rect { "text_fader"; mouse; rect { "text_fader"; mouse;
desc { hid; desc { hid;
color: 0 0 0 0; color: 0 0 0 0;
@ -146,8 +77,6 @@ group { name: "e/bryce/default/base"; nomouse;
action: STATE_SET _STATE 0.0; \ action: STATE_SET _STATE 0.0; \
target: "bg"; \ target: "bg"; \
target: "sizer"; \ target: "sizer"; \
target: "dots_start"; \
target: "dots_end"; \
} }
} }
ORIENT_SATE("horizontal", "default") ORIENT_SATE("horizontal", "default")
@ -156,6 +85,20 @@ group { name: "e/bryce/default/base"; nomouse;
} }
} }
group { name: "e/bryce/alternate/base"; nomouse;
inherit: "e/bryce/default/base";
parts {
part { name: "bg"; type: RECT;
description { state: "default" 0.0;
color: 32 32 32 255;
}
description { state: "vert" 0.0;
color: 32 32 32 255;
}
}
}
}
group { name: "e/bryce/invisible/base"; nomouse; group { name: "e/bryce/invisible/base"; nomouse;
inherit: "e/bryce/default/base"; inherit: "e/bryce/default/base";
data.item: "noshadow" "1"; data.item: "noshadow" "1";
@ -168,48 +111,6 @@ group { name: "e/bryce/invisible/base"; nomouse;
visible: 0; visible: 0;
} }
} }
part { name: "bevel";
description { state: "default" 0.0;
visible: 0;
}
}
part { name: "shine";
description { state: "default" 0.0;
visible: 0;
}
}
part { name: "dots_start";
description { state: "default" 0.0;
rel1.offset: 0 0;
rel2.offset: -1 -1;
min: 0 0;
max: 0 0;
visible: 0;
}
description { state: "vert" 0.0;
rel1.offset: 0 0;
rel2.offset: -1 -1;
min: 0 0;
max: 0 0;
visible: 0;
}
}
part { name: "dots_end";
description { state: "default" 0.0;
rel1.offset: 0 0;
rel2.offset: -1 -1;
min: 0 0;
max: 0 0;
visible: 0;
}
description { state: "vert" 0.0;
rel1.offset: 0 0;
rel2.offset: -1 -1;
min: 0 0;
max: 0 0;
visible: 0;
}
}
} }
} }
@ -219,20 +120,10 @@ group { name: "e/bryce/translucent/base"; nomouse;
parts { parts {
part { name: "bg"; part { name: "bg";
description { state: "default" 0.0; description { state: "default" 0.0;
color: 127 127 127 135; color: 32 32 32 128;
} }
description { state: "vert" 0.0; description { state: "vert" 0.0;
color: 127 127 127 135; color: 32 32 32 128;
}
}
part { name: "bevel";
description { state: "default" 0.0;
color: 127 127 127 135;
}
}
part { name: "shine";
description { state: "default" 0.0;
color: 127 127 127 135;
} }
} }
} }
@ -254,12 +145,12 @@ group { name: "e/bryce/default/inset"; nomouse;
} }
spacer { "sizer"; spacer { "sizer";
description { state: "default" 0.0; description { state: "default" 0.0;
rel1.offset: 4 1; rel1.offset: 3 0;
rel2.offset: -5 -2; rel2.offset: -4 -1;
} }
description { state: "vert" 0.0; description { state: "vert" 0.0;
rel1.offset: 1 4; rel1.offset: 0 3;
rel2.offset: -2 -5; rel2.offset: -1 -4;
} }
} }
part { name: "e.swallow.content"; type: SWALLOW; mouse; part { name: "e.swallow.content"; type: SWALLOW; mouse;
@ -322,8 +213,8 @@ group { name: "e/bryce/default/plain"; nomouse;
} }
spacer { "sizer"; spacer { "sizer";
desc { desc {
rel1.offset: 1 1; rel1.offset: 0 0;
rel2.offset: -2 -2; rel2.offset: -1 -1;
} }
} }
part { name: "e.swallow.content"; type: SWALLOW; mouse; part { name: "e.swallow.content"; type: SWALLOW; mouse;
@ -356,6 +247,6 @@ group { "elm/scroller/base/bryce";
link.base: "e,state,orient,vertical" "e"; link.base: "e,state,orient,vertical" "e";
} }
} }
swallow { "elm.swallow.content" clip: "clip"; } swallow { "elm.swallow.content" clip: "clip"; description {rel1.offset: -1 -1; rel2.offset: 0 0; }}
} }
} }

View File

@ -12,9 +12,9 @@ group { name: "e/gadget/luncher/bar";
part { name: "e.swallow.bar"; type: SWALLOW; part { name: "e.swallow.bar"; type: SWALLOW;
description { state: "default" 0.0; description { state: "default" 0.0;
rel1.relative: 0.0 0.0; rel1.relative: 0.0 0.0;
rel1.offset: 0 0; rel1.offset: 1 1;
rel2.relative: 1.0 1.0; rel2.relative: 1.0 1.0;
rel2.offset: -1 -1; rel2.offset: -2 -2;
} }
} }
} }
@ -31,9 +31,9 @@ group { name: "e/gadget/luncher/grid";
part { name: "e.swallow.grid"; type: SWALLOW; part { name: "e.swallow.grid"; type: SWALLOW;
description { state: "default" 0.0; description { state: "default" 0.0;
rel1.relative: 0.0 0.0; rel1.relative: 0.0 0.0;
rel1.offset: 0 0; rel1.offset: 1 1;
rel2.relative: 1.0 1.0; rel2.relative: 1.0 1.0;
rel2.offset: -1 -1; rel2.offset: -2 -2;
} }
} }
} }
@ -61,7 +61,6 @@ group { name: "e/gadget/luncher/icon";
clip_to: "item_clip"; clip_to: "item_clip";
mouse_events: 0; mouse_events: 0;
description { description {
align: 0.5 0.5;
state: "default" 0.0; state: "default" 0.0;
rel1.relative: 0.0 0.0; rel1.relative: 0.0 0.0;
rel2.relative: 1.0 1.0; rel2.relative: 1.0 1.0;
@ -83,82 +82,64 @@ group { name: "e/gadget/luncher/icon";
color: 255 255 255 50; color: 255 255 255 50;
} }
} }
part { name: "indicator"; type: RECT;
clip_to: "item_clip";
mouse_events: 0;
description { state: "default" 0.0;
visible: 0;
color: 255 255 255 0;
}
description { state: "on_left" 0.0;
inherit: "default" 0.0;
visible: 1;
rel1.relative: 0.0 0.025;
rel1.offset: 0 1;
rel2.relative: 0.05 0.975;
color: 51 153 255 255;
}
description { state: "on_top" 0.0;
inherit: "default" 0.0;
visible: 1;
rel1.relative: 0.025 0.0;
rel1.offset: 1 0;
rel2.relative: 0.975 0.05;
color: 51 153 255 255;
}
description { state: "on_right" 0.0;
inherit: "default" 0.0;
visible: 1;
rel1.relative: 0.95 0.025;
rel1.offset: 0 1;
rel2.relative: 1.0 0.975;
color: 51 153 255 255;
}
description { state: "on_bottom" 0.0;
inherit: "default" 0.0;
visible: 1;
rel1.relative: 0.025 0.95;
rel1.offset: 1 0;
rel2.relative: 0.975 1.0;
color: 51 153 255 255;
}
}
part { name: "e.swallow.icon"; type: SWALLOW; part { name: "e.swallow.icon"; type: SWALLOW;
clip_to: "item_clip"; clip_to: "item_clip";
mouse_events: 1; mouse_events: 1;
repeat_events: 1; repeat_events: 1;
description { state: "default" 0.0; description { state: "default" 0.0;
align: 0.5 0.5;
rel1.to: "sizer"; rel1.to: "sizer";
rel1.offset: 3 3;
rel2.to: "sizer"; rel2.to: "sizer";
rel2.offset: -4 -4;
} }
description { state: "on_left" 0.0;
inherit: "default" 0.0;
align: 1.0 0.5;
rel1.relative: 0.065 0.0;
rel1.offset: 1 1;
rel2.offset: -2 -1;
} }
description { state: "on_top" 0.0; part { name: "indicator"; type: RECT;
inherit: "default" 0.0; clip_to: "item_clip";
mouse_events: 0;
description { state: "default" 0.0;
visible: 0;
color: 51 153 255 255;
align: 0.5 1.0; align: 0.5 1.0;
rel1.relative: 0.0 0.065; max: 99999 6;
rel1.offset: 1 1;
rel2.offset: -1 -2;
} }
description { state: "on_right" 0.0; description { state: "left" 0.0;
inherit: "default" 0.0; inherit: "default" 0.0;
align: 0.0 0.5; align: 0.0 0.5;
rel2.relative: 0.945 1.0; max: 6 99999;
rel1.offset: 2 1; rel2.relative: 0.5 1.0;
rel2.offset: -1 -1;
} }
description { state: "on_bottom" 0.0; description { state: "top" 0.0;
inherit: "default" 0.0; inherit: "default" 0.0;
align: 0.5 0.0; align: 0.5 0.0;
rel2.relative: 1.0 0.945; rel2.relative: 1.0 0.5;
rel1.offset: 1 2; }
rel2.offset: -1 -1; description { state: "right" 0.0;
inherit: "default" 0.0;
align: 1.0 0.5;
max: 6 99999;
rel1.relative: 0.5 0.0;
}
description { state: "bottom" 0.0;
inherit: "default" 0.0;
align: 0.5 1.0;
rel1.relative: 0.0 0.5;
}
description { state: "on_left" 0.0;
inherit: "left" 0.0;
visible: 1;
}
description { state: "on_top" 0.0;
inherit: "top" 0.0;
visible: 1;
}
description { state: "on_right" 0.0;
inherit: "right" 0.0;
visible: 1;
}
description { state: "on_bottom" 0.0;
inherit: "bottom" 0.0;
visible: 1;
} }
} }
part { name: "obackground"; type: RECT; part { name: "obackground"; type: RECT;
@ -236,63 +217,62 @@ group { name: "e/gadget/luncher/icon";
target: "item_clip"; target: "item_clip";
transition: DECELERATE 0.1; transition: DECELERATE 0.1;
} }
program { name: "icon_on_left"; program { name: "sel_left";
signal: "e,state,on,left"; source: "e"; signal: "e,state,on,left"; source: "e";
action: STATE_SET "on_left" 0.0; action: STATE_SET "left" 0.0;
target: "indicator"; target: "indicator";
target: "e.swallow.icon"; after: "on_left";
transition: ACCELERATE 0.1;
} }
program { name: "icon_on_top"; program { name: "sel_top";
signal: "e,state,on,top"; source: "e"; signal: "e,state,on,top"; source: "e";
action: STATE_SET "on_top" 0.0; action: STATE_SET "top" 0.0;
target: "indicator"; target: "indicator";
target: "e.swallow.icon"; after: "on_top";
transition: ACCELERATE 0.1;
} }
program { name: "icon_on_right"; program { name: "sel_right";
signal: "e,state,on,right"; source: "e"; signal: "e,state,on,right"; source: "e";
action: STATE_SET "on_right" 0.0; action: STATE_SET "right" 0.0;
target: "indicator"; target: "indicator";
target: "e.swallow.icon"; after: "on_right";
transition: ACCELERATE 0.1;
} }
program { name: "icon_on_bottom"; program { name: "sel_bottom";
signal: "e,state,on,bottom"; source: "e"; signal: "e,state,on,bottom"; source: "e";
action: STATE_SET "on_bottom" 0.0; action: STATE_SET "bottom" 0.0;
target: "indicator"; target: "indicator";
target: "e.swallow.icon"; after: "on_bottom";
transition: ACCELERATE 0.1;
} }
program { name: "icon_off_left"; program { name: "on_left";
signal: "e,state,off,left"; source: "e";
action: STATE_SET "on_left" 0.0; action: STATE_SET "on_left" 0.0;
target: "e.swallow.icon"; transition: DECELERATE 0.2;
transition: ACCELERATE 0.1; target: "indicator";
} }
program { name: "icon_off_top"; program { name: "on_top";
signal: "e,state,off,top"; source: "e";
action: STATE_SET "on_top" 0.0; action: STATE_SET "on_top" 0.0;
target: "e.swallow.icon"; transition: DECELERATE 0.2;
transition: ACCELERATE 0.1; target: "indicator";
} }
program { name: "icon_off_right"; program { name: "on_right";
signal: "e,state,off,right"; source: "e";
action: STATE_SET "on_right" 0.0; action: STATE_SET "on_right" 0.0;
target: "e.swallow.icon"; transition: DECELERATE 0.2;
transition: ACCELERATE 0.1; target: "indicator";
} }
program { name: "icon_off_bottom"; program { name: "on_bottom";
signal: "e,state,off,bottom"; source: "e";
action: STATE_SET "on_bottom" 0.0; action: STATE_SET "on_bottom" 0.0;
target: "e.swallow.icon"; transition: DECELERATE 0.2;
transition: DECELERATE 0.1; target: "indicator";
} }
program { name: "icon_off"; program {
signal: "e,state,off,*"; source: "e";
action: ACTION_STOP;
target: "sel_left";
target: "sel_top";
target: "sel_right";
target: "sel_bottom";
}
program {
signal: "e,state,off,*"; source: "e"; signal: "e,state,off,*"; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
target: "indicator"; target: "indicator";
transition: DECELERATE 0.1;
} }
program { name: "urgent"; program { name: "urgent";
signal: "e,state,urgent"; source: "e"; signal: "e,state,urgent"; source: "e";

View File

@ -1,45 +1,30 @@
group { name: "e/modules/pager/popup"; group { name: "e/modules/pager/popup";
alias: "e/gadget/pager/popup"; alias: "e/gadget/pager/popup";
images.image: "vgrad_tall.png" COMP;
images.image: "bevel_out.png" COMP;
images.image: "shine.png" COMP;
parts { parts {
part { name: "base"; mouse_events: 0; part { name: "base"; type: RECT; mouse_events: 0;
description { state: "default" 0.0; description { state: "default" 0.0;
image.normal: "vgrad_tall.png"; color: 64 64 64 255;
fill.smooth: 0;
TILED_HORIZ(40)
}
}
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;
fill.smooth: 0;
} }
} }
part { name: "e.swallow.content"; type: SWALLOW; part { name: "e.swallow.content"; type: SWALLOW;
description { state: "default" 0.0; description { state: "default" 0.0;
rel1.to_y: "e.text.label"; rel1.to_y: "e.text.label";
rel1.relative: 0.0 1.0; rel1.relative: 0.0 1.0;
rel1.offset: 2 0; rel1.offset: 0 8;
rel2.relative: 1.0 1.0; rel2.relative: 1.0 1.0;
rel2.offset: -3 -2; rel2.offset: -1 -9;
} }
} }
part { name: "e.text.label"; type: TEXT; mouse_events: 0; part { name: "e.text.label"; type: TEXT; mouse_events: 0;
scale: 1; scale: 1;
effect: SHADOW BOTTOM;
description { state: "default" 0.0; description { state: "default" 0.0;
color_class: "border_title";
rel1.to: "base"; rel1.to: "base";
rel1.offset: 0 1; rel1.offset: 0 1;
rel2.to: "base"; rel2.to: "base";
rel2.relative: 1.0 0.0; rel2.relative: 1.0 0.0;
rel2.offset: -1 1; rel2.offset: -1 1;
align: 0.5 0.0; align: 0.5 0.0;
color: FN_COL_DISABLE; color: 160 160 160 255;
text { font: FNBD; size: 10; text { font: FNBD; size: 10;
text_class: "title_bar"; text_class: "title_bar";
align: 0.5 0.0; align: 0.5 0.0;
@ -48,24 +33,11 @@ group { name: "e/modules/pager/popup";
fixed: 0 1; fixed: 0 1;
} }
} }
part { name: "shine"; mouse_events: 0;
description { state: "default" 0.0;
image.normal: "shine.png";
rel1.offset: 0 -2;
rel2.relative: 1.0 0.0;
rel2.offset: -1 2;
FIXED_SIZE(69, 5)
}
}
} }
} }
group { name: "e/modules/pager/desk"; group { name: "e/modules/pager/desk";
images.image: "vgrad_med_darker.png" COMP; BACKGROUND_IMG
images.image: "bevel_out.png" COMP;
images.image: "bevel_in.png" COMP;
images.image: "inset_shadow.png" COMP;
images.image: "downlight_glow.png" COMP;
images.image: "mini_blue_glow_arrow_0.png" COMP; images.image: "mini_blue_glow_arrow_0.png" COMP;
images.image: "mini_blue_glow_arrow_1.png" COMP; images.image: "mini_blue_glow_arrow_1.png" COMP;
images.image: "mini_blue_glow_arrow_2.png" COMP; images.image: "mini_blue_glow_arrow_2.png" COMP;
@ -73,21 +45,9 @@ group { name: "e/modules/pager/desk";
parts { parts {
part { name: "base"; part { name: "base";
description { state: "default" 0.0; description { state: "default" 0.0;
image.normal: "vgrad_med_darker.png"; image.normal: "background";
rel1.to: "inset"; image.scale_hint: STATIC;
rel1.offset: 1 1; ASPECT_FILL((7680/4320))
rel2.to: "inset";
rel2.offset: -2 -2;
fill.smooth: 0;
TILED_HORIZ(32)
}
}
part { name: "pat"; mouse_events: 0;
description { state: "default" 0.0;
image.normal: "dot_pattern.png";
rel1.to: "base";
rel2.to: "base";
TILED_PATTERN(256, 256)
} }
} }
part { name: "e.background"; type: SWALLOW; part { name: "e.background"; type: SWALLOW;
@ -101,16 +61,6 @@ group { name: "e/modules/pager/desk";
visible: 0; visible: 0;
} }
} }
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;
}
}
part { name: "clip"; type: RECT; mouse_events: 0; part { name: "clip"; type: RECT; mouse_events: 0;
description { state: "default" 0.0; description { state: "default" 0.0;
rel1.to: "base"; rel1.to: "base";
@ -124,58 +74,39 @@ group { name: "e/modules/pager/desk";
rel2.to: "base"; rel2.to: "base";
} }
} }
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: "base";
rel2.to: "base";
fill.smooth: 0;
}
}
part { name: "glow"; mouse_events: 0;
description { state: "default" 0.0;
image.normal: "downlight_glow.png";
image.border: 0 0 3 0;
rel1.to: "base";
rel2.to: "base";
color: 255 255 255 0;
}
description { state: "active" 0.0;
inherit: "default" 0.0;
color: 255 255 255 255;
}
}
part { name: "e.text.label"; type: TEXT; mouse_events: 0; part { name: "e.text.label"; type: TEXT; mouse_events: 0;
scale: 1; desc { "default";
effect: SHADOW BOTTOM; rel1.to: "e.swallow.content";
description { state: "default" 0.0; rel2.to: "e.swallow.content";
rel1.to: "base";
rel2.to: "base";
color_class: "module_label_invisible";
color3: 255 255 255 255; color3: 255 255 255 255;
text { font: FN; size: 10; text { font: "Sans"; size: 10;
text_class: "module_small"; text_class: "module_small";
align: 0.5 0.5; align: 0.5 0.5;
} }
visible: 0; visible: 0;
} }
description { state: "active" 0.0; desc { "active"; inherit;
inherit: "default" 0.0;
color_class: "module_label"; color_class: "module_label";
color3: 255 255 255 255;
visible: 1; visible: 1;
} }
} }
part { name: "inset"; mouse_events: 0; part { name: "sel"; type: RECT; mouse_events: 0;
description { state: "default" 0.0; scale: 1;
image.normal: "bevel_in.png"; clip_to: "clip";
image.border: 1 1 1 1; desc { "default";
image.middle: 0; color: 51 153 255 255;
rel1.offset: 1 2; visible: 0;
rel2.offset: -2 -3; rel1.to: "e.swallow.content";
fill.smooth: 0; rel2.to: "e.swallow.content";
rel2.offset: -1 0;
rel1.relative: 0.0 1.0;
align: 0.5 1.0;
max: 99999 6;
}
desc { "active"; inherit;
inherit: "default" 0.0;
rel1.relative: 0.0 0.5;
visible: 1;
} }
} }
part { name: "drop0"; mouse_events: 0; part { name: "drop0"; mouse_events: 0;
@ -293,8 +224,8 @@ group { name: "e/modules/pager/desk";
program { name: "sel"; program { name: "sel";
signal: "e,state,selected"; source: "e"; signal: "e,state,selected"; source: "e";
action: STATE_SET "active" 0.0; action: STATE_SET "active" 0.0;
transition: BOUNCE 0.4 0.5 4; transition: DECELERATE 0.2;
target: "glow"; target: "sel";
} }
program { program {
signal: "e,state,unselected"; source: "e"; signal: "e,state,unselected"; source: "e";
@ -305,7 +236,7 @@ group { name: "e/modules/pager/desk";
signal: "e,state,unselected"; source: "e"; signal: "e,state,unselected"; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
transition: DECELERATE 0.2; transition: DECELERATE 0.2;
target: "glow"; target: "sel";
} }
program { program {
signal: "e,preview,on"; source: "e"; signal: "e,preview,on"; source: "e";
@ -357,10 +288,7 @@ group { name: "e/modules/pager/desk";
} }
group { name: "e/gadget/pager/plain/desk"; group { name: "e/gadget/pager/plain/desk";
images.image: "vgrad_med_darker.png" COMP; BACKGROUND_IMG
images.image: "bevel_out.png" COMP;
images.image: "bevel_in.png" COMP;
images.image: "inset_shadow.png" COMP;
images.image: "mini_blue_glow_arrow_0.png" COMP; images.image: "mini_blue_glow_arrow_0.png" COMP;
images.image: "mini_blue_glow_arrow_1.png" COMP; images.image: "mini_blue_glow_arrow_1.png" COMP;
images.image: "mini_blue_glow_arrow_2.png" COMP; images.image: "mini_blue_glow_arrow_2.png" COMP;
@ -368,21 +296,9 @@ group { name: "e/gadget/pager/plain/desk";
parts { parts {
part { name: "base"; part { name: "base";
description { state: "default" 0.0; description { state: "default" 0.0;
image.normal: "vgrad_med_darker.png"; image.normal: "background";
rel1.to: "inset"; image.scale_hint: STATIC;
rel1.offset: 1 1; ASPECT_FILL((7680/4320))
rel2.to: "inset";
rel2.offset: -2 -2;
fill.smooth: 0;
TILED_HORIZ(32)
}
}
part { name: "pat"; mouse_events: 0;
description { state: "default" 0.0;
image.normal: "dot_pattern.png";
rel1.to: "base";
rel2.to: "base";
TILED_PATTERN(256, 256)
} }
} }
part { name: "e.background"; type: SWALLOW; part { name: "e.background"; type: SWALLOW;
@ -396,16 +312,6 @@ group { name: "e/gadget/pager/plain/desk";
visible: 0; visible: 0;
} }
} }
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;
}
}
part { name: "clip"; type: RECT; mouse_events: 0; part { name: "clip"; type: RECT; mouse_events: 0;
description { state: "default" 0.0; description { state: "default" 0.0;
rel1.to: "base"; rel1.to: "base";
@ -431,87 +337,70 @@ group { name: "e/gadget/pager/plain/desk";
rel2.to: "base"; rel2.to: "base";
} }
} }
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: "base";
rel2.to: "base";
fill.smooth: 0;
}
}
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.offset: 1 2;
rel2.offset: -2 -3;
fill.smooth: 0;
}
}
part { name: "glow"; mouse_events: 0;
type: RECT;
description { state: "default" 0.0;
visible: 0;
color: 255 255 255 0;
}
description { state: "on_left" 0.0;
inherit: "default" 0.0;
visible: 1;
rel1.relative: 0.0 0.025;
rel1.offset: 0 1;
rel2.relative: 0.05 0.975;
rel2.offset: -1 -1;
color: 51 153 255 255;
}
description { state: "on_top" 0.0;
inherit: "default" 0.0;
visible: 1;
rel1.relative: 0.025 0.0;
rel1.offset: 1 0;
rel2.relative: 0.975 0.05;
rel2.offset: -1 -1;
color: 51 153 255 255;
}
description { state: "on_right" 0.0;
inherit: "default" 0.0;
visible: 1;
rel1.relative: 0.95 0.025;
rel1.offset: 1 1;
rel2.relative: 1.0 0.975;
rel2.offset: 0 -1;
color: 51 153 255 255;
}
description { state: "on_bottom" 0.0;
inherit: "default" 0.0;
visible: 1;
rel1.relative: 0.025 0.95;
rel1.offset: 0 1;
rel2.relative: 0.975 1.0;
rel2.offset: -1 0;
color: 51 153 255 255;
}
}
part { name: "e.text.label"; type: TEXT; mouse_events: 0; part { name: "e.text.label"; type: TEXT; mouse_events: 0;
scale: 1; desc { "default";
effect: SHADOW BOTTOM; rel1.to: "e.swallow.content";
description { state: "default" 0.0; rel2.to: "e.swallow.content";
rel1.to: "base";
rel2.to: "base";
color_class: "module_label_invisible";
color3: 255 255 255 255; color3: 255 255 255 255;
text { font: FN; size: 10; text { font: "Sans"; size: 10;
text_class: "module_small"; text_class: "module_small";
align: 0.5 0.5; align: 0.5 0.5;
} }
visible: 0; visible: 0;
} }
description { state: "active" 0.0; desc { "active"; inherit;
inherit: "default" 0.0;
color_class: "module_label"; color_class: "module_label";
color3: 255 255 255 255; visible: 1;
}
}
part { name: "sel"; type: RECT; mouse_events: 0;
scale: 1;
clip_to: "clip";
desc { "default";
color: 51 153 255 255;
visible: 0;
rel1.to: "e.swallow.content";
rel2.to: "e.swallow.content";
align: 0.5 1.0;
max: 99999 6;
}
description { state: "left" 0.0;
inherit: "default" 0.0;
align: 0.0 0.5;
max: 6 99999;
rel2.relative: 0.5 1.0;
}
description { state: "top" 0.0;
inherit: "default" 0.0;
align: 0.5 0.0;
rel2.relative: 1.0 0.5;
}
description { state: "right" 0.0;
inherit: "default" 0.0;
align: 1.0 0.5;
max: 6 99999;
rel1.relative: 0.5 0.0;
}
description { state: "bottom" 0.0;
inherit: "default" 0.0;
align: 0.5 1.0;
rel1.relative: 0.0 0.5;
}
description { state: "on_left" 0.0;
inherit: "left" 0.0;
visible: 1;
}
description { state: "on_top" 0.0;
inherit: "top" 0.0;
visible: 1;
}
description { state: "on_right" 0.0;
inherit: "right" 0.0;
visible: 1;
}
description { state: "on_bottom" 0.0;
inherit: "bottom" 0.0;
visible: 1; visible: 1;
} }
} }
@ -629,33 +518,60 @@ group { name: "e/gadget/pager/plain/desk";
programs { programs {
program { name: "sel_left"; program { name: "sel_left";
signal: "e,state,selected,left"; source: "e"; signal: "e,state,selected,left"; source: "e";
action: STATE_SET "on_left" 0.0; action: STATE_SET "left" 0.0;
transition: ACCELERATE 0.2; target: "sel";
target: "glow"; after: "on_left";
} }
program { name: "sel_top"; program { name: "sel_top";
signal: "e,state,selected,top"; source: "e"; signal: "e,state,selected,top"; source: "e";
action: STATE_SET "on_top" 0.0; action: STATE_SET "top" 0.0;
transition: ACCELERATE 0.2; target: "sel";
target: "glow"; after: "on_top";
} }
program { name: "sel_right"; program { name: "sel_right";
signal: "e,state,selected,right"; source: "e"; signal: "e,state,selected,right"; source: "e";
action: STATE_SET "on_right" 0.0; action: STATE_SET "right" 0.0;
transition: ACCELERATE 0.2; target: "sel";
target: "glow"; after: "on_right";
} }
program { name: "sel_bottom"; program { name: "sel_bottom";
signal: "e,state,selected,bottom"; source: "e"; signal: "e,state,selected,bottom"; source: "e";
action: STATE_SET "bottom" 0.0;
target: "sel";
after: "on_bottom";
}
program { name: "on_left";
action: STATE_SET "on_left" 0.0;
transition: DECELERATE 0.2;
target: "sel";
}
program { name: "on_top";
action: STATE_SET "on_top" 0.0;
transition: DECELERATE 0.2;
target: "sel";
}
program { name: "on_right";
action: STATE_SET "on_right" 0.0;
transition: DECELERATE 0.2;
target: "sel";
}
program { name: "on_bottom";
action: STATE_SET "on_bottom" 0.0; action: STATE_SET "on_bottom" 0.0;
transition: ACCELERATE 0.2; transition: DECELERATE 0.2;
target: "glow"; target: "sel";
}
program {
signal: "e,state,unselected"; source: "e";
action: ACTION_STOP;
target: "sel_left";
target: "sel_top";
target: "sel_right";
target: "sel_bottom";
} }
program { program {
signal: "e,state,unselected"; source: "e"; signal: "e,state,unselected"; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
transition: DECELERATE 0.2; target: "sel";
target: "glow";
} }
program { program {
signal: "e,preview,on"; source: "e"; signal: "e,preview,on"; source: "e";
@ -707,37 +623,20 @@ group { name: "e/gadget/pager/plain/desk";
} }
group { name: "e/gadget/pager/default/desk"; group { name: "e/gadget/pager/default/desk";
images.image: "vgrad_med_darker.png" COMP;
images.image: "bevel_out.png" COMP;
images.image: "bevel_in.png" COMP;
images.image: "inset_shadow.png" COMP;
images.image: "mini_blue_glow_arrow_0.png" COMP; images.image: "mini_blue_glow_arrow_0.png" COMP;
images.image: "mini_blue_glow_arrow_1.png" COMP; images.image: "mini_blue_glow_arrow_1.png" COMP;
images.image: "mini_blue_glow_arrow_2.png" COMP; images.image: "mini_blue_glow_arrow_2.png" COMP;
images.image: "mini_blue_glow_arrow_3.png" COMP; images.image: "mini_blue_glow_arrow_3.png" COMP;
parts { parts {
part { name: "base"; type: SPACER; part { name: "base"; type: RECT;
description { state: "default" 0.0; description { state: "default" 0.0;
rel1.to: "inset"; color: 0 0 0 0;
rel1.offset: 1 1;
rel2.to: "inset";
rel2.offset: -2 -2;
}
}
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;
} }
} }
part { name: "clip"; type: RECT; mouse_events: 0; part { name: "clip"; type: RECT; mouse_events: 0;
description { state: "default" 0.0; desc { "default";
rel1.to: "base"; rel1.to: "e.swallow.content";
rel2.to: "base"; rel2.to: "e.swallow.content";
} }
} }
part { name: "e.swallow.drop"; type: SWALLOW; part { name: "e.swallow.drop"; type: SWALLOW;
@ -754,86 +653,18 @@ group { name: "e/gadget/pager/default/desk";
} }
part { name: "e.swallow.content"; type: SWALLOW; part { name: "e.swallow.content"; type: SWALLOW;
clip_to: "clip"; clip_to: "clip";
description { state: "default" 0.0; desc { "default";
rel1.to: "base";
rel2.to: "base";
rel2.offset: -2 -1;
link.base: "e,state,visible" "e"; link.base: "e,state,visible" "e";
} }
desc { "hid"; inherit; hid; desc { "hid"; inherit; hid;
link.base: "e,state,hidden" "e"; link.base: "e,state,hidden" "e";
} }
} }
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: "base";
rel2.to: "base";
fill.smooth: 0;
}
}
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.offset: 1 2;
rel2.offset: -2 -3;
fill.smooth: 0;
}
}
part { name: "glow"; mouse_events: 0;
type: RECT;
description { state: "default" 0.0;
visible: 0;
color: 255 255 255 0;
}
description { state: "on_left" 0.0;
inherit: "default" 0.0;
visible: 1;
rel1.relative: 0.0 0.025;
rel1.offset: 0 1;
rel2.relative: 0.05 0.975;
rel2.offset: -1 -1;
color: 51 153 255 255;
}
description { state: "on_top" 0.0;
inherit: "default" 0.0;
visible: 1;
rel1.relative: 0.025 0.0;
rel1.offset: 1 0;
rel2.relative: 0.975 0.05;
rel2.offset: -1 -1;
color: 51 153 255 255;
}
description { state: "on_right" 0.0;
inherit: "default" 0.0;
visible: 1;
rel1.relative: 0.95 0.025;
rel1.offset: 1 1;
rel2.relative: 1.0 0.975;
rel2.offset: 0 -1;
color: 51 153 255 255;
}
description { state: "on_bottom" 0.0;
inherit: "default" 0.0;
visible: 1;
rel1.relative: 0.025 0.95;
rel1.offset: 0 1;
rel2.relative: 0.975 1.0;
rel2.offset: -1 0;
color: 51 153 255 255;
}
}
part { name: "e.text.label"; type: TEXT; mouse_events: 0; part { name: "e.text.label"; type: TEXT; mouse_events: 0;
scale: 1; scale: 1;
effect: SHADOW BOTTOM; desc { "default";
description { state: "default" 0.0; rel1.to: "e.swallow.content";
rel1.to: "base"; rel2.to: "e.swallow.content";
rel2.to: "base";
color_class: "module_label_invisible";
color3: 255 255 255 255; color3: 255 255 255 255;
text { font: "Sans"; size: 10; text { font: "Sans"; size: 10;
text_class: "module_small"; text_class: "module_small";
@ -841,10 +672,59 @@ group { name: "e/gadget/pager/default/desk";
} }
visible: 0; visible: 0;
} }
description { state: "active" 0.0; desc { "active"; inherit;
inherit: "default" 0.0;
color_class: "module_label"; color_class: "module_label";
color3: 255 255 255 255; visible: 1;
}
}
part { name: "sel"; type: RECT; mouse_events: 0;
scale: 1;
clip_to: "clip";
desc { "default";
color: 51 153 255 255;
visible: 0;
rel1.to: "e.swallow.content";
rel2.to: "e.swallow.content";
align: 0.5 1.0;
max: 99999 6;
}
description { state: "left" 0.0;
inherit: "default" 0.0;
align: 0.0 0.5;
max: 6 99999;
rel2.relative: 0.5 1.0;
}
description { state: "top" 0.0;
inherit: "default" 0.0;
align: 0.5 0.0;
rel2.relative: 1.0 0.5;
}
description { state: "right" 0.0;
inherit: "default" 0.0;
align: 1.0 0.5;
max: 6 99999;
rel1.relative: 0.5 0.0;
}
description { state: "bottom" 0.0;
inherit: "default" 0.0;
align: 0.5 1.0;
rel1.relative: 0.0 0.5;
}
description { state: "on_left" 0.0;
inherit: "left" 0.0;
visible: 1;
}
description { state: "on_top" 0.0;
inherit: "top" 0.0;
visible: 1;
}
description { state: "on_right" 0.0;
inherit: "right" 0.0;
visible: 1;
}
description { state: "on_bottom" 0.0;
inherit: "bottom" 0.0;
visible: 1; visible: 1;
} }
} }
@ -962,33 +842,60 @@ group { name: "e/gadget/pager/default/desk";
programs { programs {
program { name: "sel_left"; program { name: "sel_left";
signal: "e,state,selected,left"; source: "e"; signal: "e,state,selected,left"; source: "e";
action: STATE_SET "on_left" 0.0; action: STATE_SET "left" 0.0;
transition: ACCELERATE 0.2; target: "sel";
target: "glow"; after: "on_left";
} }
program { name: "sel_top"; program { name: "sel_top";
signal: "e,state,selected,top"; source: "e"; signal: "e,state,selected,top"; source: "e";
action: STATE_SET "on_top" 0.0; action: STATE_SET "top" 0.0;
transition: ACCELERATE 0.2; target: "sel";
target: "glow"; after: "on_top";
} }
program { name: "sel_right"; program { name: "sel_right";
signal: "e,state,selected,right"; source: "e"; signal: "e,state,selected,right"; source: "e";
action: STATE_SET "on_right" 0.0; action: STATE_SET "right" 0.0;
transition: ACCELERATE 0.2; target: "sel";
target: "glow"; after: "on_right";
} }
program { name: "sel_bottom"; program { name: "sel_bottom";
signal: "e,state,selected,bottom"; source: "e"; signal: "e,state,selected,bottom"; source: "e";
action: STATE_SET "bottom" 0.0;
target: "sel";
after: "on_bottom";
}
program { name: "on_left";
action: STATE_SET "on_left" 0.0;
transition: DECELERATE 0.2;
target: "sel";
}
program { name: "on_top";
action: STATE_SET "on_top" 0.0;
transition: DECELERATE 0.2;
target: "sel";
}
program { name: "on_right";
action: STATE_SET "on_right" 0.0;
transition: DECELERATE 0.2;
target: "sel";
}
program { name: "on_bottom";
action: STATE_SET "on_bottom" 0.0; action: STATE_SET "on_bottom" 0.0;
transition: ACCELERATE 0.2; transition: DECELERATE 0.2;
target: "glow"; target: "sel";
}
program {
signal: "e,state,unselected"; source: "e";
action: ACTION_STOP;
target: "sel_left";
target: "sel_top";
target: "sel_right";
target: "sel_bottom";
} }
program { program {
signal: "e,state,unselected"; source: "e"; signal: "e,state,unselected"; source: "e";
action: STATE_SET "default" 0.0; action: STATE_SET "default" 0.0;
transition: DECELERATE 0.2; target: "sel";
target: "glow";
} }
program { name: "drop1"; program { name: "drop1";
signal: "e,action,drag,in"; source: "e"; signal: "e,action,drag,in"; source: "e";
@ -1031,8 +938,6 @@ group { name: "e/gadget/pager/default/desk";
group { name: "e/modules/pager/window"; group { name: "e/modules/pager/window";
alias: "e/gadget/pager/plain/window"; alias: "e/gadget/pager/plain/window";
images.image: "mini_box_bevel_shadow.png" COMP;
images.image: "mini_box_glow.png" COMP;
parts { parts {
part { name: "base"; type: SPACER; part { name: "base"; type: SPACER;
description { state: "default" 0.0; description { state: "default" 0.0;
@ -1042,18 +947,13 @@ group { name: "e/modules/pager/window";
rel2.offset: -1 -6; rel2.offset: -1 -6;
} }
} }
part { name: "win"; mouse_events: 0; part { name: "win"; type: RECT; mouse_events: 0;
description { state: "default" 0.0; description { state: "default" 0.0;
image.normal: "mini_box_bevel_shadow.png"; color: 64 64 64 255;
image.border: 7 7 7 7;
rel1.offset: -5 -5;
rel1.to: "base";
rel2.offset: 4 4;
rel2.to: "base";
} }
description { state: "active" 0.0; description { state: "active" 0.0;
inherit: "default" 0.0; inherit: "default" 0.0;
image.normal: "mini_box_glow.png"; color: 32 32 32 255;
} }
} }
part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0; part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0;

View File

@ -1,5 +1,4 @@
group { name: "e/modules/pager16/popup"; group { name: "e/modules/pager16/popup";
alias: "e/gadget/pager16/popup";
parts { parts {
part { name: "base"; type: RECT; mouse_events: 0; part { name: "base"; type: RECT; mouse_events: 0;
description { state: "default" 0.0; description { state: "default" 0.0;
@ -37,7 +36,6 @@ group { name: "e/modules/pager16/popup";
} }
group { name: "e/modules/pager16/desk"; group { name: "e/modules/pager16/desk";
alias: "e/gadget/pager16/desk";
images.image: "mini_blue_glow_arrow_0.png" COMP; images.image: "mini_blue_glow_arrow_0.png" COMP;
images.image: "mini_blue_glow_arrow_1.png" COMP; images.image: "mini_blue_glow_arrow_1.png" COMP;
images.image: "mini_blue_glow_arrow_2.png" COMP; images.image: "mini_blue_glow_arrow_2.png" COMP;

View File

@ -1,5 +1,4 @@
group { name: "e/shelf/default/base"; nomouse; group { name: "e/shelf/default/base"; nomouse;
alias: "e/shelf/alternate/base";
data { data {
/* this tells e the shelf is shaped, not rectangular */ /* this tells e the shelf is shaped, not rectangular */
// item: "shaped" "1"; // item: "shaped" "1";
@ -20,6 +19,9 @@ group { name: "e/shelf/default/base"; nomouse;
description { state: "default" 0.0; description { state: "default" 0.0;
color: 64 64 64 255; color: 64 64 64 255;
} }
description { state: "vert" 0.0;
color: 64 64 64 255;
}
} }
spacer { "sizer"; spacer { "sizer";
description { state: "default" 0.0; description { state: "default" 0.0;
@ -288,6 +290,20 @@ target: "sh_vert_clip"; \
} }
} }
group { name: "e/shelf/alternate/base"; nomouse;
inherit: "e/shelf/default/base";
parts {
part { name: "bg"; type: RECT;
description { state: "default" 0.0;
color: 32 32 32 255;
}
description { state: "vert" 0.0;
color: 32 32 32 255;
}
}
}
}
group { name: "e/shelf/invisible/base"; nomouse; group { name: "e/shelf/invisible/base"; nomouse;
inherit: "e/shelf/default/base"; inherit: "e/shelf/default/base";
data { data {
@ -352,10 +368,10 @@ group { name: "e/shelf/translucent/base"; nomouse;
parts { parts {
part { name: "bg"; part { name: "bg";
description { state: "default" 0.0; description { state: "default" 0.0;
color: 255 255 255 128; color: 32 32 32 128;
} }
description { state: "vert" 0.0; description { state: "vert" 0.0;
color: 255 255 255 128; color: 32 32 32 128;
} }
} }
} }