diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc index 2f5b482897..de6788c216 100644 --- a/data/elementary/themes/colorclasses.edc +++ b/data/elementary/themes/colorclasses.edc @@ -365,6 +365,19 @@ color_classes { color: 255 255 255 255; } color_class { name: "/fg/normal/gadgets/clock/cal/daydate-sep"; color: 255 255 255 32; } +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/bg/normal/gadgets/cpufreq/base"; + color: 32 32 32 255; } + color_class { name: "/bg/normal/gadgets/cpufreq/detail"; + color: 56 56 56 255; } + color_class { name: "/fg/normal/gadgets/cpufreq/text"; + color: 255 255 255 255; } + color_class { name: "/fg/normal/gadgets/cpufreq/hands/min"; + color: 51 153 255 255; } + color_class { name: "/fg/normal/gadgets/cpufreq/hands/max"; + color: 255 51 153 255; } + color_class { name: "/fg/normal/gadgets/cpufreq/hands/average"; + color: 255 153 51 255; } diff --git a/data/elementary/themes/edc/clock.edc b/data/elementary/themes/edc/clock.edc index 27812d64aa..bfd77c642f 100644 --- a/data/elementary/themes/edc/clock.edc +++ b/data/elementary/themes/edc/clock.edc @@ -516,29 +516,29 @@ group { name: "e/modules/clock/digital"; group { name: "e/modules/clock/main"; set { name: "clock_base"; - image { image: "clock_base-040.png" COMP; size: 81 81 99999 99999; } + image { image: "clock_base-160.png" COMP; size: 81 81 99999 99999; } image { image: "clock_base-080.png" COMP; size: 41 41 80 80; } - image { image: "clock_base-160.png" COMP; size: 0 0 40 40; } + image { image: "clock_base-040.png" COMP; size: 0 0 40 40; } } set { name: "clock_base_digits"; - image { image: "clock_base_digits-040.png" COMP; size: 81 81 99999 99999; } + image { image: "clock_base_digits-160.png" COMP; size: 81 81 99999 99999; } image { image: "clock_base_digits-080.png" COMP; size: 41 41 80 80; } - image { image: "clock_base_digits-160.png" COMP; size: 0 0 40 40; } + image { image: "clock_base_digits-040.png" COMP; size: 0 0 40 40; } } set { name: "clock_hand_secs"; - image { image: "clock_hand_secs-040.png" COMP; size: 81 81 99999 99999; } + image { image: "clock_hand_secs-160.png" COMP; size: 81 81 99999 99999; } image { image: "clock_hand_secs-080.png" COMP; size: 41 41 80 80; } - image { image: "clock_hand_secs-160.png" COMP; size: 0 0 40 40; } + image { image: "clock_hand_secs-040.png" COMP; size: 0 0 40 40; } } set { name: "clock_hand_mins"; - image { image: "clock_hand_mins-040.png" COMP; size: 81 81 99999 99999; } + image { image: "clock_hand_mins-160.png" COMP; size: 81 81 99999 99999; } image { image: "clock_hand_mins-080.png" COMP; size: 41 41 80 80; } - image { image: "clock_hand_mins-160.png" COMP; size: 0 0 40 40; } + image { image: "clock_hand_mins-040.png" COMP; size: 0 0 40 40; } } set { name: "clock_hand_hours"; - image { image: "clock_hand_hours-040.png" COMP; size: 81 81 99999 99999; } + image { image: "clock_hand_hours-160.png" COMP; size: 81 81 99999 99999; } image { image: "clock_hand_hours-080.png" COMP; size: 41 41 80 80; } - image { image: "clock_hand_hours-160.png" COMP; size: 0 0 40 40; } + image { image: "clock_hand_hours-040.png" COMP; size: 0 0 40 40; } } min: 16 16; max: 160 160; diff --git a/data/elementary/themes/edc/cpufreq.edc b/data/elementary/themes/edc/cpufreq.edc index e65fc71626..f4bcab037f 100644 --- a/data/elementary/themes/edc/cpufreq.edc +++ b/data/elementary/themes/edc/cpufreq.edc @@ -1,9 +1,30 @@ group { name: "e/modules/cpufreq/main"; - 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"; + set { name: "cpu_markers"; + image { image: "cpu_markers-160.png" COMP; size: 81 81 99999 99999; } + image { image: "cpu_markers-080.png" COMP; size: 41 41 80 80 99999; } + image { image: "cpu_markers-040.png" COMP; size: 0 0 40 40; } + } + set { name: "cpu_detail"; + image { image: "cpu_detail-160.png" COMP; size: 81 81 99999 99999; } + image { image: "cpu_detail-080.png" COMP; size: 41 41 80 80 99999; } + image { image: "cpu_detail-040.png" COMP; size: 0 0 40 40; } + } + set { name: "cpu_clip_1"; + image { image: "cpu_clip_1-160.png" COMP; size: 81 81 99999 99999; } + image { image: "cpu_clip_1-080.png" COMP; size: 41 41 80 80 99999; } + image { image: "cpu_clip_1-040.png" COMP; size: 0 0 40 40; } + } + set { name: "cpu_clip_2"; + image { image: "cpu_clip_2-160.png" COMP; size: 81 81 99999 99999; } + image { image: "cpu_clip_2-080.png" COMP; size: 41 41 80 80 99999; } + image { image: "cpu_clip_2-040.png" COMP; size: 0 0 40 40; } + } + set { name: "cpu_clip_3"; + image { image: "cpu_clip_3-160.png" COMP; size: 81 81 99999 99999; } + image { image: "cpu_clip_3-080.png" COMP; size: 41 41 80 80 99999; } + image { image: "cpu_clip_3-040.png" COMP; size: 0 0 40 40; } + } + set { name: "cpu_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; } @@ -152,42 +173,53 @@ group { name: "e/modules/cpufreq/main"; parts { part { name: "fade_clip"; type: RECT; description { state: "default" 0.0; - color: 255 255 255 255; } description { state: "faded" 0.0; - color: 255 255 255 128; + color: 255 255 255 128; // no cc } } part { name: "clip1"; clip_to: "fade_clip"; description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - image.normal: "cpu_clip1.png"; + rel.to: "base"; + image.normal: "cpu_clip_1"; } } part { name: "clip2"; clip_to: "fade_clip"; description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - image.normal: "cpu_clip2.png"; + rel.to: "base"; + image.normal: "cpu_clip_2"; } } part { name: "clip3"; clip_to: "fade_clip"; description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - image.normal: "cpu_clip3.png"; + rel.to: "base"; + image.normal: "cpu_clip_3"; } } part { name: "base"; description { state: "default" 0.0; - rel1.relative: (25/380) (25/380); - rel2.relative: (365/380) (365/380); aspect: 1.0 1.0; aspect_preference: BOTH; - image.normal: "cpu_base.png"; + image.normal: "clock_base"; + color_class: "/bg/normal/gadgets/cpufreq/base"; + } + } + part { name: "base_detail"; + description { state: "default" 0.0; + rel.to: "base"; + aspect: 1.0 1.0; aspect_preference: BOTH; + image.normal: "cpu_detail"; + color_class: "/bg/normal/gadgets/cpufreq/detail"; + } + } + part { name: "base_markers"; + description { state: "default" 0.0; + rel.to: "base"; + aspect: 1.0 1.0; aspect_preference: BOTH; + image.normal: "cpu_markers"; + color_class: "/fg/normal/gadgets/cpufreq/digits"; } } part { name: "readout"; type: TEXT; mouse_events: 0; @@ -196,7 +228,7 @@ group { name: "e/modules/cpufreq/main"; description { state: "default" 0.0; rel1.relative: (56/144) (56/144); rel2.relative: (88/144) (88/144); - color: 255 255 255 255; + color_class: "/fg/normal/gadgets/cpufreq/text"; text { font: FN; size: 6; min: 1 1; ellipsis: -1; @@ -207,10 +239,9 @@ group { name: "e/modules/cpufreq/main"; part { name: "meter_min"; mouse_events: 0; clip_to: "clip3"; description { state: "default" 0.0; - image.normal: "marker"; - color: 51 153 255 255; - rel1.to: "base"; - rel2.to: "base"; + image.normal: "cpu_marker"; + color_class: "/fg/normal/gadgets/cpufreq/hands/min"; + rel.to: "base"; map { on: 1; rotation.center: "base"; @@ -220,10 +251,9 @@ group { name: "e/modules/cpufreq/main"; part { name: "meter_max"; mouse_events: 0; clip_to: "clip1"; description { state: "default" 0.0; - image.normal: "marker"; - color: 255 0 0 255; - rel1.to: "base"; - rel2.to: "base"; + image.normal: "cpu_marker"; + color_class: "/fg/normal/gadgets/cpufreq/hands/max"; + rel.to: "base"; map { on: 1; rotation.center: "base"; @@ -233,10 +263,9 @@ group { name: "e/modules/cpufreq/main"; part { name: "meter"; mouse_events: 0; clip_to: "clip2"; description { state: "default" 0.0000; - color: 255 153 51 255; - image.normal: "marker"; - rel1.to: "base"; - rel2.to: "base"; + image.normal: "cpu_marker"; + color_class: "/fg/normal/gadgets/cpufreq/hands/average"; + rel.to: "base"; map { on: 1; rotation.center: "base"; @@ -245,13 +274,11 @@ group { name: "e/modules/cpufreq/main"; } } programs { - program { - signal: "e,state,enabled"; source: "e"; + program { signal: "e,state,enabled"; source: "e"; action: STATE_SET "default" 0.0; target: "fade_clip"; } - program { - signal: "e,state,disabled"; source: "e"; + program { signal: "e,state,disabled"; source: "e"; action: STATE_SET "faded" 0.0; target: "fade_clip"; } diff --git a/data/elementary/themes/img/cpu_clip_1-040.png b/data/elementary/themes/img/cpu_clip_1-040.png new file mode 100644 index 0000000000..8b069ae40d Binary files /dev/null and b/data/elementary/themes/img/cpu_clip_1-040.png differ diff --git a/data/elementary/themes/img/cpu_clip_1-080.png b/data/elementary/themes/img/cpu_clip_1-080.png new file mode 100644 index 0000000000..9e58674dd5 Binary files /dev/null and b/data/elementary/themes/img/cpu_clip_1-080.png differ diff --git a/data/elementary/themes/img/cpu_clip_1-160.png b/data/elementary/themes/img/cpu_clip_1-160.png new file mode 100644 index 0000000000..7d01037729 Binary files /dev/null and b/data/elementary/themes/img/cpu_clip_1-160.png differ diff --git a/data/elementary/themes/img/cpu_clip_2-040.png b/data/elementary/themes/img/cpu_clip_2-040.png new file mode 100644 index 0000000000..c10ca9e8b8 Binary files /dev/null and b/data/elementary/themes/img/cpu_clip_2-040.png differ diff --git a/data/elementary/themes/img/cpu_clip_2-080.png b/data/elementary/themes/img/cpu_clip_2-080.png new file mode 100644 index 0000000000..a0da46e09a Binary files /dev/null and b/data/elementary/themes/img/cpu_clip_2-080.png differ diff --git a/data/elementary/themes/img/cpu_clip_2-160.png b/data/elementary/themes/img/cpu_clip_2-160.png new file mode 100644 index 0000000000..3cc6557ccb Binary files /dev/null and b/data/elementary/themes/img/cpu_clip_2-160.png differ diff --git a/data/elementary/themes/img/cpu_clip_3-040.png b/data/elementary/themes/img/cpu_clip_3-040.png new file mode 100644 index 0000000000..bc4c2efb48 Binary files /dev/null and b/data/elementary/themes/img/cpu_clip_3-040.png differ diff --git a/data/elementary/themes/img/cpu_clip_3-080.png b/data/elementary/themes/img/cpu_clip_3-080.png new file mode 100644 index 0000000000..81af1361af Binary files /dev/null and b/data/elementary/themes/img/cpu_clip_3-080.png differ diff --git a/data/elementary/themes/img/cpu_clip_3-160.png b/data/elementary/themes/img/cpu_clip_3-160.png new file mode 100644 index 0000000000..ec5a509a42 Binary files /dev/null and b/data/elementary/themes/img/cpu_clip_3-160.png differ diff --git a/data/elementary/themes/img/cpu_detail-040.png b/data/elementary/themes/img/cpu_detail-040.png new file mode 100644 index 0000000000..8c6797c2a4 Binary files /dev/null and b/data/elementary/themes/img/cpu_detail-040.png differ diff --git a/data/elementary/themes/img/cpu_detail-080.png b/data/elementary/themes/img/cpu_detail-080.png new file mode 100644 index 0000000000..e1166d4038 Binary files /dev/null and b/data/elementary/themes/img/cpu_detail-080.png differ diff --git a/data/elementary/themes/img/cpu_detail-160.png b/data/elementary/themes/img/cpu_detail-160.png new file mode 100644 index 0000000000..cc7e3c038f Binary files /dev/null and b/data/elementary/themes/img/cpu_detail-160.png differ diff --git a/data/elementary/themes/img/cpu_markers-040.png b/data/elementary/themes/img/cpu_markers-040.png new file mode 100644 index 0000000000..f2e3049875 Binary files /dev/null and b/data/elementary/themes/img/cpu_markers-040.png differ diff --git a/data/elementary/themes/img/cpu_markers-080.png b/data/elementary/themes/img/cpu_markers-080.png new file mode 100644 index 0000000000..003813bd41 Binary files /dev/null and b/data/elementary/themes/img/cpu_markers-080.png differ diff --git a/data/elementary/themes/img/cpu_markers-160.png b/data/elementary/themes/img/cpu_markers-160.png new file mode 100644 index 0000000000..e959a82c8a Binary files /dev/null and b/data/elementary/themes/img/cpu_markers-160.png differ diff --git a/data/elementary/themes/img/svg/cpufreq.svg b/data/elementary/themes/img/svg/cpufreq.svg new file mode 100644 index 0000000000..79d9643316 --- /dev/null +++ b/data/elementary/themes/img/svg/cpufreq.svg @@ -0,0 +1,165 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + +