theme - shorten verbosity and rely on defaults

This commit is contained in:
Carsten Haitzler 2022-03-25 01:41:46 +00:00
parent 526225ec85
commit d76d85ba33
1 changed files with 302 additions and 525 deletions

View File

@ -1,8 +1,8 @@
#define ORIENT_TARGETS \
target: "day0"; \
target: "day1"; \
target: "icon"; \
target: "e.text.location"; \
target: "day0"; \
target: "day1"; \
target: "icon"; \
target: "e.text.location"; \
target: "e.text.temp"; \
target: "e.text.description"; \
target: "e.swallow.day0.icon"; \
@ -17,596 +17,373 @@
target: "e.text.day1.high"; \
#define FORECASTS_ICON(icon_code, minw, minh, maxw, maxh, a) \
images { \
image: icon_code".png" COMP; \
} \
group { \
name: "modules/forecasts/icons/"icon_code; \
min: minw minh; \
max: maxw maxh; \
parts { \
part { \
name: "icon"; \
description { \
state: "default" 0.0; \
aspect: a a; \
aspect_preference: BOTH; \
image { \
normal: icon_code".png"; \
} \
fill { \
smooth: 1; \
} \
} \
} \
} \
}
group { name: "modules/forecasts/icons/"icon_code; \
images.image: icon_code".png" COMP; \
min: minw minh; max: maxw maxh; \
parts { part { name: "icon"; \
description { state: "default" 0.0; \
aspect: a a; aspect_preference: BOTH; \
image.normal: icon_code".png"; \
fill.smooth: 1; \
} } } }
collections {
group {
name: "modules/forecasts/main";
group { name: "modules/forecasts/main";
script {
public is_float;
}
parts {
part {
name: "base";
type: RECT;
mouse_events: 1;
description {
state: "default" 0.0;
color: 0 0 0 0;
rel1 {
offset: 0 0;
}
rel2 {
offset: -1 -1;
}
}
}
part {
name: "icon";
type: SWALLOW;
mouse_events: 0;
description {
state: "default" 0.0;
aspect_preference: BOTH;
align: 0.0 0.0;
rel1 {
relative: 0.0 0.0;
offset: 0 0;
}
rel2 {
relative: 1.0 1.0;
offset: -1 -1;
}
//color: 0 0 0 0;
}
description {
state: "float" 0.0;
inherit: "default" 0.0;
part { name: "base"; type: RECT;
description { state: "default" 0.0;
color: 0 0 0 0;
}
}
part { name: "icon"; type: SWALLOW; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
aspect_preference: BOTH;
}
description { state: "float" 0.0;
inherit: "default" 0.0;
aspect: 1.0 1.0;
rel1 {
relative: 0.0 0.0;
}
rel2 {
relative: 0.6 1.0;
offset: 2 2;
}
}
}
part {
name: "e.text.temp";
type: TEXT;
mouse_events: 0;
scale: 1;
description {
state: "default" 0.0;
rel1 {
relative: 0.0 0.0;
offset: 0 0;
to: "icon";
}
rel2 {
relative: 1.0 1.0;
offset: -1 -1;
to: "icon";
}
color_class: "/fg/normal/gadgets/forecasts/temperature";
text {
font: "Sans:style=Bold";
size: 10;
min: 1 1;
align: 0.0 0.1;
offscale;
}
}
part { name: "e.text.temp"; type: TEXT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
rel1.to: "icon";
color_class: "/fg/normal/gadgets/forecasts/temperature";
text { font: "Sans:style=Bold"; size: 10;
min: 1 1;
align: 0.0 0.1;
ellipsis: -1.0;
text_class: "module_large";
}
}
description {
state: "float" 0.0;
inherit: "default" 0.0;
text_class: "module_large";
}
offscale;
}
description { state: "float" 0.0;
inherit: "default" 0.0;
rel1 {
relative: 0.0 1.0;
offset: 2 -20;
}
rel2 {
relative: 1.0 1.0;
offset: -2 -2;
}
rel2.offset: -2 -2;
text.align: 0.5 1.0;
}
}
part {
name: "e.text.description";
type: TEXT;
mouse_events: 0;
scale: 1;
description {
state: "default" 0.0;
rel1 {
relative: 0.0 1.0;
offset: -1 -1;
to_x: "icon";
}
rel2 {
relative: 1.0 1.0;
offset: -1 -10;
}
color_class: "/fg/normal/gadgets/forecasts/description";
text {
font: "Sans:style=Bold";
size: 10;
min: 1 1;
align: 0.5 0.5;
ellipsis: -1.0;
text_class: "module_normal";
}
}
description {
state: "hidden" 0.0;
inherit: "default" 0.0;
visible: 0;
}
description {
state: "float" 0.0;
inherit: "default" 0.0;
}
}
part { name: "e.text.description"; type: TEXT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
rel1 {
relative: 0.0 0.0;
offset: 1 -14;
to: "e.text.temp";
relative: 0.0 1.0;
offset: 2 2;
to_x: "icon";
}
rel2.offset: -3 -3;
color_class: "/fg/normal/gadgets/forecasts/description";
text { font: "Sans:style=Bold"; size: 10;
min: 1 1;
ellipsis: -1.0;
text_class: "module_normal";
}
offscale;
}
description { state: "hidden" 0.0;
inherit: "default" 0.0;
visible: 0;
}
description { state: "float" 0.0;
inherit: "default" 0.0;
rel.to: "e.text.temp";
rel1.relative: 0.0 0.0;
rel1.offset: 2 -14;
rel2.relative: 1.0 0.0;
}
}
part { name: "e.text.location"; type: TEXT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
visible: 0;
}
description { state: "float" 0.0;
visible: 1;
rel1.relative: 0.0 0.2;
rel1.offset: 2 2;
color_class: "/fg/normal/gadgets/forecasts/location";
text { font: "Sans:style=Bold"; size: 10;
text: "Location";
min: 1 1;
align: 0.0 0.0;
ellipsis: -1.0;
text_class: "module_normal";
}
offscale;
}
}
part { name: "day0"; type: RECT;
scale: 1;
description { state: "default" 0.0;
visible: 0;
}
description { state: "float" 0.0;
visible: 1;
color: 0 0 0 0;
rel1.relative: 0.6 0.0;
rel1.offset: 2 2;
rel2.relative: 1.0 0.5;
rel2.offset: -3 -3;
offscale;
}
}
part { name: "e.swallow.day0.icon"; type: SWALLOW; mouse_events: 0;
description { state: "default" 0.0;
visible: 0;
}
description { state: "float" 0.0;
visible: 1;
rel.to: "day0";
}
}
part { name: "e.text.day0.date"; type: TEXT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
visible: 0;
}
description { state: "float" 0.0;
visible: 1;
rel.to: "day0";
rel1.offset: 1 1;
rel2.offset: -2 -2;
color_class: "/fg/normal/gadgets/forecasts/day/date";
text { font: "Sans:style=Bold"; size: 9;
text: "Date0";
min: 1 1;
align: 0.5 0.0;
ellipsis: -1.0;
text_class: "module_normal";
}
offscale;
}
}
part { name: "e.text.day0.description"; type: TEXT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
visible: 0;
}
description { state: "float" 0.0;
visible: 1;
rel1 {
offset: 2 -14;
to_x: "day0";
to_y: "e.text.day0.low";
}
rel2 {
relative: 1.0 0.0;
offset: -2 -2;
to: "e.text.temp";
to_x: "day0";
to_y: "e.text.day0.low";
}
}
}
part {
name: "e.text.location";
type: TEXT;
mouse_events: 0;
scale: 1;
description {
state: "default" 0.0;
visible: 0;
}
description {
state: "float" 0.0;
visible: 1;
rel1 {
relative: 0.0 0.2;
offset: 1 1;
}
color_class: "/fg/normal/gadgets/forecasts/location";
text {
text: "Location";
font: "Sans:style=Bold";
size: 10;
min: 1 1;
align: 0.0 0.0;
color_class: "/fg/normal/gadgets/forecasts/day/description";
text { font: "Sans:style=Bold"; size: 10;
text: "Description0";
min: 1 1;
align: 0.5 0.0;
ellipsis: -1.0;
text_class: "module_normal";
}
}
}
part {
name: "day0";
type: RECT;
description {
state: "default" 0.0;
visible: 0;
}
description {
state: "float" 0.0;
visible: 1;
color: 0 0 0 0;
rel1 {
relative: 0.6 0.0;
offset: 1 1;
}
rel2 {
relative: 1.0 0.5;
offset: -5 -5;
text_class: "module_normal";
}
offscale;
}
}
part {
name: "e.swallow.day0.icon";
type: SWALLOW;
mouse_events: 0;
description {
state: "default" 0.0;
part { name: "e.text.day0.low"; type: TEXT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
visible: 0;
}
description {
state: "float" 0.0;
}
description { state: "float" 0.0;
visible: 1;
rel1 {
to: "day0";
}
rel2 {
to: "day0";
}
}
}
part {
name: "e.text.day0.date";
type: TEXT;
mouse_events: 0;
scale: 1;
description {
state: "default" 0.0;
visible: 0;
}
description {
state: "float" 0.0;
visible: 1;
rel1 {
relative: 0.0 0.0;
offset: 1 1;
to: "day0";
}
rel2 {
relative: 1.0 1.0;
offset: -1 -1;
to: "day0";
}
color_class: "/fg/normal/gadgets/forecasts/day/date";
text {
text: "Date0";
font: "Sans:style=Bold";
size: 9;
min: 1 1;
align: 0.5 0.0;
rel.to: "day0";
rel1.relative: 0.0 1.0;
rel1.offset: 2 -14;
color_class: "/fg/normal/gadgets/forecasts/day/low";
text { font: "Sans:style=Bold"; size: 9;
text: "Low0";
min: 1 1;
align: 0.0 0.0;
ellipsis: -1.0;
text_class: "module_normal";
}
}
}
part {
name: "e.text.day0.description";
type: TEXT;
mouse_events: 0;
scale: 1;
description {
state: "default" 0.0;
text_class: "module_normal";
}
offscale;
}
}
part { name: "e.text.day0.high"; type: TEXT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
visible: 0;
}
description {
state: "float" 0.0;
}
description { state: "float" 0.0;
visible: 1;
rel1 {
relative: 0.0 0.0;
offset: 1 -14;
to_x: "day0";
to_y: "e.text.day0.low";
}
rel2 {
relative: 1.0 0.0;
offset: -1 -1;
to_x: "day0";
to_y: "e.text.day0.low";
}
color_class: "/fg/normal/gadgets/forecasts/day/description";
text {
text: "Description0";
font: "Sans:style=Bold";
size: 10;
min: 1 1;
align: 0.5 0.0;
rel.to: "day0";
rel1.relative: 0.0 1.0;
rel1.offset: 2 -14;
color_class: "/fg/normal/gadgets/forecasts/day/high";
text { font: "Sans:style=Bold"; size: 9;
text: "High0";
min: 1 1;
align: 1.0 0.0;
ellipsis: -1.0;
text_class: "module_normal";
}
}
}
part {
name: "e.text.day0.low";
type: TEXT;
mouse_events: 0;
scale: 1;
description {
state: "default" 0.0;
visible: 0;
}
description {
state: "float" 0.0;
visible: 1;
rel1 {
relative: 0.0 1.0;
offset: 1 -14;
to: "day0";
}
rel2 {
relative: 1.0 1.0;
offset: -1 -1;
to: "day0";
}
color_class: "/fg/normal/gadgets/forecasts/day/low";
text {
text: "Low0";
font: "Sans:style=Bold";
size: 9;
min: 1 1;
align: 0.0 0.0;
ellipsis: -1.0;
text_class: "module_normal";
}
}
}
part {
name: "e.text.day0.high";
type: TEXT;
mouse_events: 0;
scale: 1;
description {
state: "default" 0.0;
visible: 0;
}
description {
state: "float" 0.0;
visible: 1;
rel1 {
relative: 0.0 1.0;
offset: 0 -14;
to: "day0";
}
rel2 {
relative: 1.0 1.0;
to: "day0";
}
color_class: "/fg/normal/gadgets/forecasts/day/high";
text {
text: "High0";
font: "Sans:style=Bold";
size: 9;
min: 1 1;
align: 1.0 0.0;
ellipsis: -1.0;
text_class: "module_normal";
}
}
}
text_class: "module_normal";
}
offscale;
}
}
part {
name: "day1";
type: RECT;
description {
state: "default" 0.0;
part { name: "day1"; type: RECT;
scale: 1;
description { state: "default" 0.0;
visible: 0;
}
description {
state: "float" 0.0;
}
description { state: "float" 0.0;
visible: 1;
color: 0 0 0 0;
rel1 {
relative: 0.6 0.5;
offset: 4 4;
}
rel2 {
relative: 1.0 1.0;
offset: -1 -1;
}
rel1.relative: 0.6 0.5;
rel1.offset: 4 4;
offscale;
}
}
part {
name: "e.swallow.day1.icon";
type: SWALLOW;
mouse_events: 0;
description {
state: "default" 0.0;
part { name: "e.swallow.day1.icon"; type: SWALLOW; mouse_events: 0;
description { state: "default" 0.0;
visible: 0;
}
description {
state: "float" 0.0;
}
description { state: "float" 0.0;
visible: 1;
rel1 {
to: "day1";
}
rel1 {
to: "day1";
}
}
}
part {
name: "e.text.day1.date";
type: TEXT;
mouse_events: 0;
scale: 1;
description {
state: "default" 0.0;
rel1.to: "day1";
}
}
part { name: "e.text.day1.date"; type: TEXT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
visible: 0;
}
description {
state: "float" 0.0;
}
description { state: "float" 0.0;
visible: 1;
rel1 {
relative: 0.0 0.0;
offset: 1 1;
to: "day1";
}
rel2 {
relative: 1.0 1.0;
offset: -1 -1;
to: "day1";
}
color_class: "/fg/normal/gadgets/forecasts/day/date";
text {
text: "Date1";
font: "Sans:style=Bold";
size: 9;
min: 1 1;
align: 0.5 0.0;
rel.to: "day1";
rel1.offset: 1 1;
rel2.offset: -2 -2;
color_class: "/fg/normal/gadgets/forecasts/day/date";
text { font: "Sans:style=Bold"; size: 9;
text: "Date1";
min: 1 1;
align: 0.5 0.0;
ellipsis: -1.0;
text_class: "module_normal";
}
}
}
part {
name: "e.text.day1.description";
type: TEXT;
mouse_events: 0;
scale: 1;
description {
state: "default" 0.0;
text_class: "module_normal";
}
offscale;
}
}
part { name: "e.text.day1.description"; type: TEXT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
visible: 0;
}
description {
state: "float" 0.0;
}
description { state: "float" 0.0;
visible: 1;
rel1 {
relative: 0.0 0.0;
offset: 1 -14;
rel1 {
offset: 2 -14;
to_x: "day1";
to_y: "e.text.day1.low";
}
rel2 {
relative: 1.0 0.0;
offset: -1 -1;
}
rel2 {
relative: 1.0 0.0;
offset: -2 -2;
to_x: "day1";
to_y: "e.text.day1.low";
}
color_class: "/fg/normal/gadgets/forecasts/day/description";
text {
text: "Description1";
font: "Sans:style=Bold";
size: 10;
min: 1 1;
align: 0.5 0.0;
}
color_class: "/fg/normal/gadgets/forecasts/day/description";
text { font: "Sans:style=Bold"; size: 10;
text: "Description1";
min: 1 1;
align: 0.5 0.0;
ellipsis: -1.0;
text_class: "module_normal";
}
}
}
part {
name: "e.text.day1.low";
type: TEXT;
mouse_events: 0;
scale: 1;
description {
state: "default" 0.0;
text_class: "module_normal";
}
offscale;
}
}
part { name: "e.text.day1.low"; type: TEXT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
visible: 0;
}
description {
state: "float" 0.0;
}
description { state: "float" 0.0;
visible: 1;
rel1 {
relative: 0.0 1.0;
offset: 1 -14;
to: "day1";
}
rel2 {
relative: 1.0 1.0;
offset: -1 -1;
to: "day1";
}
color_class: "/fg/normal/gadgets/forecasts/day/low";
text {
text: "Low1";
font: "Sans:style=Bold";
size: 9;
min: 1 1;
align: 0.0 0.0;
rel.to: "day1";
rel1.relative: 0.0 1.0;
rel1.offset: 2 -14;
color_class: "/fg/normal/gadgets/forecasts/day/low";
text { font: "Sans:style=Bold"; size: 9;
text: "Low1";
min: 1 1;
align: 0.0 0.0;
ellipsis: -1.0;
text_class: "module_normal";
}
}
}
part {
name: "e.text.day1.high";
type: TEXT;
mouse_events: 0;
scale: 1;
description {
state: "default" 0.0;
text_class: "module_normal";
}
offscale;
}
}
part { name: "e.text.day1.high"; type: TEXT; mouse_events: 0;
scale: 1;
description { state: "default" 0.0;
visible: 0;
}
description {
state: "float" 0.0;
}
description { state: "float" 0.0;
visible: 1;
rel1 {
relative: 0.0 1.0;
offset: 0 -14;
to: "day1";
}
rel2 {
relative: 1.0 1.0;
to: "day1";
}
color_class: "/fg/normal/gadgets/forecasts/day/high";
text {
text: "High1";
font: "Sans:style=Bold";
size: 9;
min: 1 1;
align: 1.0 0.0;
rel.to: "day1";
rel1.relative: 0.0 1.0;
rel1.offset: 2 -14;
color_class: "/fg/normal/gadgets/forecasts/day/high";
text { font: "Sans:style=Bold"; size: 9;
text: "High1";
min: 1 1;
align: 1.0 0.0;
ellipsis: -1.0;
text_class: "module_normal";
}
}
}
text_class: "module_normal";
}
offscale;
}
}
}
programs {
program {
name: "text_hide";
signal: "e,state,description,hide";
source: "e";
action: STATE_SET "hidden" 0.0;
target: "e.text.description";
}
program {
name: "text_show";
signal: "e,state,description,show";
source: "e";
action: STATE_SET "default" 0.0;
target: "e.text.description";
}
program {
name: "float";
signal: "e,state,orientation,float";
source: "e";
program { signal: "e,state,description,hide"; source: "e";
action: STATE_SET "hidden" 0.0;
target: "e.text.description";
}
program { signal: "e,state,description,show"; source: "e";
action: STATE_SET "default" 0.0;
target: "e.text.description";
}
program { signal: "e,state,orientation,float"; source: "e";
script {
set_int(is_float, 1);
run_program(PROGRAM:"float_complete");
}
}
program {
name: "float_complete";
action: STATE_SET "float" 0.0;
}
program { name: "float_complete";
action: STATE_SET "float" 0.0;
ORIENT_TARGETS
}
program {
name: "shelf";
signal: "e,state,orientation,default";
source: "e";
program { signal: "e,state,orientation,default"; source: "e";
script {
set_int(is_float, 0);
run_program(PROGRAM:"shelf_complete");
}
}
program {
name: "shelf_complete";
action: STATE_SET "default" 0.0;
}
program { name: "shelf_complete";
action: STATE_SET "default" 0.0;
ORIENT_TARGETS
}
}