davemds pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=2cee30b0bc1ac04c724a070ce85154224e92608a
commit 2cee30b0bc1ac04c724a070ce85154224e92608a Author: Dave Andreoli <[email protected]> Date: Mon Jan 9 20:59:55 2017 +0100 cpu + mem gadget: implemented vertical layouts --- data/elementary/themes/Makefile.am | 6 ++ data/elementary/themes/edc/cpumonitor.edc | 89 +++++++++++++++++ data/elementary/themes/edc/memusage.edc | 110 +++++++++++++++++++++- data/elementary/themes/img/cpu_bar_vert.png | Bin 0 -> 582 bytes data/elementary/themes/img/cpu_green_on_vert.png | Bin 0 -> 259 bytes data/elementary/themes/img/cpu_red_on_vert.png | Bin 0 -> 248 bytes data/elementary/themes/img/cpu_yellow_on_vert.png | Bin 0 -> 257 bytes data/elementary/themes/img/mem_bar_vert.png | Bin 0 -> 274 bytes data/elementary/themes/img/mem_on_vert.png | Bin 0 -> 293 bytes 9 files changed, 202 insertions(+), 3 deletions(-) diff --git a/data/elementary/themes/Makefile.am b/data/elementary/themes/Makefile.am index 6a06b29..81d7d5a 100644 --- a/data/elementary/themes/Makefile.am +++ b/data/elementary/themes/Makefile.am @@ -225,6 +225,10 @@ elementary/themes/img/cpu_bar.png \ elementary/themes/img/cpu_green_on.png \ elementary/themes/img/cpu_red_on.png \ elementary/themes/img/cpu_yellow_on.png \ +elementary/themes/img/cpu_bar_vert.png \ +elementary/themes/img/cpu_green_on_vert.png \ +elementary/themes/img/cpu_red_on_vert.png \ +elementary/themes/img/cpu_yellow_on_vert.png \ elementary/themes/img/darken_rounded_square_half_h.png \ elementary/themes/img/darken_rounded_square_half.png \ elementary/themes/img/darken_rounded_square.png \ @@ -561,6 +565,8 @@ elementary/themes/img/map_scale.png \ elementary/themes/img/media_busy_progress.png \ elementary/themes/img/mem_bar.png \ elementary/themes/img/mem_on.png \ +elementary/themes/img/mem_bar_vert.png \ +elementary/themes/img/mem_on_vert.png \ elementary/themes/img/mini_blue_glow_arrow_0.png \ elementary/themes/img/mini_blue_glow_arrow_1.png \ elementary/themes/img/mini_blue_glow_arrow_2.png \ diff --git a/data/elementary/themes/edc/cpumonitor.edc b/data/elementary/themes/edc/cpumonitor.edc index ebe42bb..09be6d2 100644 --- a/data/elementary/themes/edc/cpumonitor.edc +++ b/data/elementary/themes/edc/cpumonitor.edc @@ -86,3 +86,92 @@ group { name: "e/modules/cpumonitor/main"; } } } + +group { name: "e/modules/cpumonitor/main_vert"; + image: "cpu_bar_vert.png" COMP; + image: "cpu_green_on_vert.png" COMP; + image: "cpu_yellow_on_vert.png" COMP; + image: "cpu_red_on_vert.png" COMP; + script { + public message(Msg_Type:type, id, ...) { + if ((type == MSG_INT_SET) && (id == 1)) { + new val = getarg(2); + if (val > (100 / 7 * 1)) set_state(PART:"led1", "on", 0.0); + else set_state(PART:"led1", "off", 0.0); + if (val > (100 / 7 * 2)) set_state(PART:"led2", "on", 0.0); + else set_state(PART:"led2", "off", 0.0); + if (val > (100 / 7 * 3)) set_state(PART:"led3", "on", 0.0); + else set_state(PART:"led3", "off", 0.0); + if (val > (100 / 7 * 4)) set_state(PART:"led4", "on", 0.0); + else set_state(PART:"led4", "off", 0.0); + if (val > (100 / 7 * 5)) set_state(PART:"led5", "on", 0.0); + else set_state(PART:"led5", "off", 0.0); + if (val > (100 / 7 * 6)) set_state(PART:"led6", "on", 0.0); + else set_state(PART:"led6", "off", 0.0); + } + } + } + parts { + part { name: "bg"; + desc { "default"; + aspect: (54 / 10) (54 / 10); + aspect_preference: BOTH; + image.normal: "cpu_bar_vert.png"; + } + part { name: "led1"; + desc { "default"; hid; + rel1.relative: (1.0 / 6 * 0) 0.0; + rel2.relative: (1.0 / 6 * 1) 1.0; + image.normal: "cpu_green_on_vert.png"; + } + desc { "on"; inherit: "default"; vis; } + desc { "off"; inherit: "default"; hid; } + } + part { name: "led2"; + desc { "default"; hid; + rel1.relative: (1.0 / 6 * 1) 0.0; + rel2.relative: (1.0 / 6 * 2) 1.0; + image.normal: "cpu_green_on_vert.png"; + } + desc { "on"; inherit: "default"; vis; } + desc { "off"; inherit: "default"; hid; } + } + part { name: "led3"; + desc { "default"; hid; + rel1.relative: (1.0 / 6 * 2) 0.0; + rel2.relative: (1.0 / 6 * 3) 1.0; + image.normal: "cpu_green_on_vert.png"; + } + desc { "on"; inherit: "default"; vis; } + desc { "off"; inherit: "default"; hid; } + } + part { name: "led4"; + desc { "default"; hid; + rel1.relative: (1.0 / 6 * 3) 0.0; + rel2.relative: (1.0 / 6 * 4) 1.0; + image.normal: "cpu_yellow_on_vert.png"; + } + desc { "on"; inherit: "default"; vis; } + desc { "off"; inherit: "default"; hid; } + } + part { name: "led5"; + desc { "default"; hid; + rel1.relative: (1.0 / 6 * 4) 0.0; + rel2.relative: (1.0 / 6 * 5) 1.0; + image.normal: "cpu_yellow_on_vert.png"; + } + desc { "on"; inherit: "default"; vis; } + desc { "off"; inherit: "default"; hid; } + } + part { name: "led6"; + desc { "default"; hid; + rel1.relative: (1.0 / 6 * 5) 0.0; + rel2.relative: (1.0 / 6 * 6) 1.0; + image.normal: "cpu_red_on_vert.png"; + } + desc { "on"; inherit: "default"; vis; } + desc { "off"; inherit: "default"; hid; } + } + } + } +} diff --git a/data/elementary/themes/edc/memusage.edc b/data/elementary/themes/edc/memusage.edc index 256beef..14642ba 100644 --- a/data/elementary/themes/edc/memusage.edc +++ b/data/elementary/themes/edc/memusage.edc @@ -47,7 +47,7 @@ group { name: "e/modules/memusage/main"; parts { part { name: "base"; type: SPACER; description { state: "default" 0.0; - aspect: 0.5 1; + aspect: (28 / 56) (28 / 56); aspect_preference: BOTH; } } @@ -70,7 +70,6 @@ group { name: "e/modules/memusage/main"; rel1.relative: 0.0 0.0; rel2.relative: 0.5 1.0; image.normal: "mem_bar.png"; - aspect_preference: SOURCE; } LED("mem_led1", 8) LED("mem_led2", 7) @@ -89,7 +88,6 @@ group { name: "e/modules/memusage/main"; rel1.relative: 0.5 0.0; rel2.relative: 1.0 1.0; image.normal: "mem_bar.png"; - aspect_preference: SOURCE; } LED("swp_led1", 8) LED("swp_led2", 7) @@ -104,3 +102,109 @@ group { name: "e/modules/memusage/main"; #undef LED } } + +group { name: "e/modules/memusage/main_vert"; + image: "mem_bar_vert.png" COMP; + image: "mem_on_vert.png" COMP; + script { + public message(Msg_Type:type, id, ...) { + if ((type == MSG_INT_SET) && (id == 1)) { + // mem + new val = getarg(2); + if (val > (100 / 9 * 1)) set_state(PART:"mem_led1", "on", 0.0); + else set_state(PART:"mem_led1", "off", 0.0); + if (val > (100 / 9 * 2)) set_state(PART:"mem_led2", "on", 0.0); + else set_state(PART:"mem_led2", "off", 0.0); + if (val > (100 / 9 * 3)) set_state(PART:"mem_led3", "on", 0.0); + else set_state(PART:"mem_led3", "off", 0.0); + if (val > (100 / 9 * 4)) set_state(PART:"mem_led4", "on", 0.0); + else set_state(PART:"mem_led4", "off", 0.0); + if (val > (100 / 9 * 5)) set_state(PART:"mem_led5", "on", 0.0); + else set_state(PART:"mem_led5", "off", 0.0); + if (val > (100 / 9 * 6)) set_state(PART:"mem_led6", "on", 0.0); + else set_state(PART:"mem_led6", "off", 0.0); + if (val > (100 / 9 * 7)) set_state(PART:"mem_led7", "on", 0.0); + else set_state(PART:"mem_led7", "off", 0.0); + if (val > (100 / 9 * 8)) set_state(PART:"mem_led8", "on", 0.0); + else set_state(PART:"mem_led8", "off", 0.0); + + // swap + val = getarg(3); + if (val > (100 / 9 * 1)) set_state(PART:"swp_led1", "on", 0.0); + else set_state(PART:"swp_led1", "off", 0.0); + if (val > (100 / 9 * 2)) set_state(PART:"swp_led2", "on", 0.0); + else set_state(PART:"swp_led2", "off", 0.0); + if (val > (100 / 9 * 3)) set_state(PART:"swp_led3", "on", 0.0); + else set_state(PART:"swp_led3", "off", 0.0); + if (val > (100 / 9 * 4)) set_state(PART:"swp_led4", "on", 0.0); + else set_state(PART:"swp_led4", "off", 0.0); + if (val > (100 / 9 * 5)) set_state(PART:"swp_led5", "on", 0.0); + else set_state(PART:"swp_led5", "off", 0.0); + if (val > (100 / 9 * 6)) set_state(PART:"swp_led6", "on", 0.0); + else set_state(PART:"swp_led6", "off", 0.0); + if (val > (100 / 9 * 7)) set_state(PART:"swp_led7", "on", 0.0); + else set_state(PART:"swp_led7", "off", 0.0); + if (val > (100 / 9 * 8)) set_state(PART:"swp_led8", "on", 0.0); + else set_state(PART:"swp_led8", "off", 0.0); + } + } + } + parts { + part { name: "base"; type: SPACER; + description { state: "default" 0.0; + aspect: (56 / 28) (56 / 28); + aspect_preference: BOTH; + } + } + + #define LED(_name_, _pos_) \ + part { name: _name_; \ + desc { "default"; hid; \ + rel1.relative: (1.0 / 8 * (_pos_ - 1)) 0.0; \ + rel2.relative: (1.0 / 8 * _pos_) 1.0; \ + image.normal: "mem_on_vert.png"; \ + } \ + desc { "on"; inherit: "default"; vis; } \ + desc { "off"; inherit: "default"; hid; } \ + } \ + + part { name: "mem"; + desc { "default"; + rel1.to: "base"; + rel2.to: "base"; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 0.5; + image.normal: "mem_bar_vert.png"; + } + LED("mem_led1", 1) + LED("mem_led2", 2) + LED("mem_led3", 3) + LED("mem_led4", 4) + LED("mem_led5", 5) + LED("mem_led6", 6) + LED("mem_led7", 7) + LED("mem_led8", 8) + } + + part { name: "swp"; + desc { "default"; + rel1.to: "base"; + rel2.to: "base"; + rel1.relative: 0.0 0.5; + rel2.relative: 1.0 1.0; + rel2.offset: -1 -2; + image.normal: "mem_bar_vert.png"; + } + LED("swp_led1", 1) + LED("swp_led2", 2) + LED("swp_led3", 3) + LED("swp_led4", 4) + LED("swp_led5", 5) + LED("swp_led6", 6) + LED("swp_led7", 7) + LED("swp_led8", 8) + } + + #undef LED + } +} diff --git a/data/elementary/themes/img/cpu_bar_vert.png b/data/elementary/themes/img/cpu_bar_vert.png new file mode 100644 index 0000000..a12ac0d Binary files /dev/null and b/data/elementary/themes/img/cpu_bar_vert.png differ diff --git a/data/elementary/themes/img/cpu_green_on_vert.png b/data/elementary/themes/img/cpu_green_on_vert.png new file mode 100644 index 0000000..421f1a1 Binary files /dev/null and b/data/elementary/themes/img/cpu_green_on_vert.png differ diff --git a/data/elementary/themes/img/cpu_red_on_vert.png b/data/elementary/themes/img/cpu_red_on_vert.png new file mode 100644 index 0000000..611549d Binary files /dev/null and b/data/elementary/themes/img/cpu_red_on_vert.png differ diff --git a/data/elementary/themes/img/cpu_yellow_on_vert.png b/data/elementary/themes/img/cpu_yellow_on_vert.png new file mode 100644 index 0000000..de57ac4 Binary files /dev/null and b/data/elementary/themes/img/cpu_yellow_on_vert.png differ diff --git a/data/elementary/themes/img/mem_bar_vert.png b/data/elementary/themes/img/mem_bar_vert.png new file mode 100644 index 0000000..c810c89 Binary files /dev/null and b/data/elementary/themes/img/mem_bar_vert.png differ diff --git a/data/elementary/themes/img/mem_on_vert.png b/data/elementary/themes/img/mem_on_vert.png new file mode 100644 index 0000000..ea4f91a Binary files /dev/null and b/data/elementary/themes/img/mem_on_vert.png differ --
