Flat theme: Fix cpuclock theme.`

This commit is contained in:
Stephen 'Okra' Houston 2019-01-28 14:52:45 -06:00
parent aaf2eb1e52
commit 042888c0dd
2 changed files with 35 additions and 156 deletions

View File

@ -1,35 +1,14 @@
group { name: "e/gadgets/cpuclock/main";
alias: "e/gadgets/cpuclock/main_vert";
images.image: "tacho_base.png" COMP;
images.image: "inset_round_hilight.png" COMP;
images.image: "inset_round_shadow.png" COMP;
images.image: "inset_round_shading.png" COMP;
set { name: "tacho_hand_big";
image { image: "tacho_hand_big.png" COMP; size: 73 73 99999 99999; }
image { image: "tacho_hand_big2.png" COMP; size: 37 37 72 72; }
image { image: "tacho_hand_big3.png" COMP; size: 19 19 36 36; }
image { image: "tacho_hand_big4.png" COMP; size: 0 0 18 18; }
}
images.image: "tacho_hand_big_shadow.png" COMP;
set { name: "tacho_hand_small_min";
image { image: "tacho_hand_small_min.png" COMP; size: 73 73 99999 99999; }
image { image: "tacho_hand_small_min2.png" COMP; size: 37 37 72 72; }
image { image: "tacho_hand_small_min3.png" COMP; size: 19 19 36 36; }
image { image: "tacho_hand_small_min4.png" COMP; size: 0 0 18 18; }
}
images.image: "tacho_hand_small_shadow.png" COMP;
set { name: "knob";
image { image: "knob_sz_24.png" COMP; size: 31 31 32 32; }
image { image: "knob_sz_22.png" COMP; size: 29 29 30 30; }
image { image: "knob_sz_20.png" COMP; size: 27 27 28 28; }
image { image: "knob_sz_18.png" COMP; size: 25 25 26 26; }
image { image: "knob_sz_16.png" COMP; size: 23 23 24 24; }
image { image: "knob_sz_14.png" COMP; size: 21 21 22 22; }
image { image: "knob_sz_12.png" COMP; size: 19 19 20 20; }
image { image: "knob_sz_10.png" COMP; size: 17 17 18 18; }
image { image: "knob_sz_08.png" COMP; size: 15 15 16 16; }
image { image: "knob_sz_06.png" COMP; size: 13 13 14 14; }
image { image: "knob_sz_04.png" COMP; size: 0 0 12 12; }
group { name: "e/gadget/cpuclock/main";
alias: "e/gadget/cpuclock/main_vert";
images.image: "cpu_base.png" COMP;
images.image: "cpu_clip1.png" COMP;
images.image: "cpu_clip2.png" COMP;
images.image: "cpu_clip3.png" COMP;
set { name: "marker";
image { image: "cpu_marker.png" COMP; size: 72 72 99999 99999; }
image { image: "cpu_marker2.png" COMP; size: 36 36 72 72; }
image { image: "cpu_marker3.png" COMP; size: 18 18 36 36; }
image { image: "cpu_marker4.png" COMP; size: 0 0 4 18; }
}
script {
public available_frequencies;
@ -71,9 +50,6 @@ group { name: "e/gadgets/cpuclock/main";
custom_state(PART:"meter", "default", 0.0);
set_state_val(PART:"meter", STATE_MAP_ROT_Z, tf);
set_state(PART:"meter", "custom", 0.0);
custom_state(PART:"meter_sh", "default", 0.0);
set_state_val(PART:"meter_sh", STATE_MAP_ROT_Z, tf);
set_state(PART:"meter_sh", "custom", 0.0);
f0 = get_int(min_freq_old);
f1 = get_int(min_freq_new);
@ -88,9 +64,6 @@ group { name: "e/gadgets/cpuclock/main";
custom_state(PART:"meter_min", "default", 0.0);
set_state_val(PART:"meter_min", STATE_MAP_ROT_Z, tf);
set_state(PART:"meter_min", "custom", 0.0);
custom_state(PART:"meter_min_sh", "default", 0.0);
set_state_val(PART:"meter_min_sh", STATE_MAP_ROT_Z, tf);
set_state(PART:"meter_min_sh", "custom", 0.0);
f0 = get_int(max_freq_old);
f1 = get_int(max_freq_new);
@ -105,9 +78,6 @@ group { name: "e/gadgets/cpuclock/main";
custom_state(PART:"meter_max", "default", 0.0);
set_state_val(PART:"meter_max", STATE_MAP_ROT_Z, tf);
set_state(PART:"meter_max", "custom", 0.0);
custom_state(PART:"meter_max_sh", "default", 0.0);
set_state_val(PART:"meter_max_sh", STATE_MAP_ROT_Z, tf);
set_state(PART:"meter_max_sh", "custom", 0.0);
if (v >= 1.0) {
set_int(cur_freq_anim, 0);
@ -148,7 +118,6 @@ group { name: "e/gadgets/cpuclock/main";
snprintf(text, 100, "%i.%i", f / 1000000,
(f % 1000000) / 100000);
}
set_text(PART:"readout", text);
ani = get_int(cur_freq_anim);
if (ani > 0) cancel_anim(ani);
@ -184,22 +153,28 @@ group { name: "e/gadgets/cpuclock/main";
color: 255 255 255 128;
}
}
part { name: "base-sh";
part { name: "clip1";
clip_to: "fade_clip";
description { state: "default" 0.0;
rel1.to: "base";
rel1.offset: 0 -1;
rel2.to: "base";
rel2.offset: -1 -2;
image.normal: "inset_round_shadow.png";
image.normal: "cpu_clip1.png";
}
}
part { name: "base-hi";
part { name: "clip2";
clip_to: "fade_clip";
description { state: "default" 0.0;
rel1.to: "base";
rel1.offset: 0 1;
rel2.to: "base";
rel2.offset: -1 0;
image.normal: "inset_round_hilight.png";
image.normal: "cpu_clip2.png";
}
}
part { name: "clip3";
clip_to: "fade_clip";
description { state: "default" 0.0;
rel1.to: "base";
rel2.to: "base";
image.normal: "cpu_clip3.png";
}
}
part { name: "base";
@ -207,33 +182,13 @@ group { name: "e/gadgets/cpuclock/main";
rel1.relative: (25/380) (25/380);
rel2.relative: (365/380) (365/380);
aspect: 1.0 1.0; aspect_preference: BOTH;
image.normal: "tacho_base.png";
}
}
part { name: "readout"; type: TEXT; mouse_events: 0;
scale: 1;
effect: SHADOW BOTTOM;
clip_to: "fade_clip";
description { state: "default" 0.0;
visible: 0;
}
}
part { name: "meter_min_sh"; mouse_events: 0;
clip_to: "fade_clip";
description { state: "default" 0.0;
image.normal: "tacho_hand_small_shadow.png";
rel1.to: "meter_sh";
rel2.to: "meter_sh";
map {
on: 1;
rotation.center: "meter_min_sh";
}
image.normal: "cpu_base.png";
}
}
part { name: "meter_min"; mouse_events: 0;
clip_to: "fade_clip";
clip_to: "clip3";
description { state: "default" 0.0;
image.normal: "tacho_hand_small_min";
image.normal: "marker";
color: 51 153 255 255;
rel1.to: "base";
rel2.to: "base";
@ -243,23 +198,11 @@ group { name: "e/gadgets/cpuclock/main";
}
}
}
part { name: "meter_max_sh"; mouse_events: 0;
clip_to: "fade_clip";
description { state: "default" 0.0;
image.normal: "tacho_hand_small_shadow.png";
rel1.to: "meter_sh";
rel2.to: "meter_sh";
map {
on: 1;
rotation.center: "meter_max_sh";
}
}
}
part { name: "meter_max"; mouse_events: 0;
clip_to: "fade_clip";
clip_to: "clip1";
description { state: "default" 0.0;
image.normal: "tacho_hand_small_min";
color: 255 153 51 255;
image.normal: "marker";
color: 255 0 0 255;
rel1.to: "base";
rel2.to: "base";
map {
@ -268,27 +211,11 @@ group { name: "e/gadgets/cpuclock/main";
}
}
}
part { name: "meter_sh"; mouse_events: 0;
clip_to: "fade_clip";
description { state: "default" 0.0;
image.normal: "tacho_hand_big_shadow.png";
rel1.to: "meter";
rel1.relative: 0.0 (15/380);
rel1.offset: 0 1;
rel2.to: "meter";
rel2.relative: 1.0 (395/380);
rel2.offset: -1 0;
map {
on: 1;
rotation.center: "meter_sh";
}
}
}
part { name: "meter"; mouse_events: 0;
clip_to: "fade_clip";
clip_to: "clip2";
description { state: "default" 0.0000;
color: 255 0 0 255;
image.normal: "tacho_hand_big";
color: 255 153 51 255;
image.normal: "marker";
rel1.to: "base";
rel2.to: "base";
map {
@ -297,36 +224,6 @@ group { name: "e/gadgets/cpuclock/main";
}
}
}
part { name: "over"; mouse_events: 0;
description { state: "default" 0.0;
rel1.to: "base";
rel2.to: "base";
image.normal: "inset_round_shading.png";
image.normal: "inset_round_shading.png";
}
}
part { name: "knob"; type: SPACER;
description { state: "default" 0.0;
rel1.relative: (140/340) (140/340);
rel1.to: "base";
rel2.relative: (205/340) (205/340);
rel2.to: "base";
min: 4 4;
step: 2 2;
max: 24 24;
}
}
part { name: "knob2";
description { state: "default" 0.0;
rel1.offset: -4 -4;
rel1.to: "knob";
rel2.offset: 3 3;
rel2.to: "knob";
min: 12 12;
max: 32 32;
image.normal: "knob";
}
}
}
programs {
program {
@ -341,3 +238,4 @@ group { name: "e/gadgets/cpuclock/main";
}
}
}

View File

@ -1,8 +1,4 @@
group { name: "e/modules/cpufreq/main";
alias: "e/gadget/cpuclock/main";
alias: "e/gadget/cpuclock/main_vert";
alias: "e/modules/cpuclock/main";
alias: "e/modules/cpuclock/main_vert";
images.image: "cpu_base.png" COMP;
images.image: "cpu_clip1.png" COMP;
images.image: "cpu_clip2.png" COMP;
@ -257,18 +253,3 @@ group { name: "e/modules/cpufreq/main";
}
}
group { name: "e/gadget/cpuclock/main";
alias: "e/gadget/cpuclock/main_vert";
inherit: "e/modules/cpufreq/main";
parts {
part { name: "readout"; type: TEXT; mouse_events: 0;
scale: 1;
effect: SHADOW BOTTOM;
clip_to: "fade_clip";
description { state: "default" 0.0;
visible: 0;
}
}
}
}