From 979416fc3c53d077520e807ae0a24362b6781367 Mon Sep 17 00:00:00 2001 From: Dave Andreoli Date: Sun, 8 Jan 2017 17:56:37 +0100 Subject: [PATCH] A new theme for the new E memory gadget hope you will like the new design --- data/elementary/themes/Makefile.am | 3 +- data/elementary/themes/edc/memusage.edc | 293 +++++++----------------- data/elementary/themes/img/mem_bar.png | Bin 0 -> 274 bytes data/elementary/themes/img/mem_icon.png | Bin 3618 -> 0 bytes data/elementary/themes/img/mem_on.png | Bin 0 -> 286 bytes 5 files changed, 87 insertions(+), 209 deletions(-) create mode 100644 data/elementary/themes/img/mem_bar.png delete mode 100644 data/elementary/themes/img/mem_icon.png create mode 100644 data/elementary/themes/img/mem_on.png diff --git a/data/elementary/themes/Makefile.am b/data/elementary/themes/Makefile.am index 308f602913..656e7f0835 100644 --- a/data/elementary/themes/Makefile.am +++ b/data/elementary/themes/Makefile.am @@ -556,7 +556,8 @@ elementary/themes/img/map_circle.png \ elementary/themes/img/map_marker.png \ elementary/themes/img/map_scale.png \ elementary/themes/img/media_busy_progress.png \ -elementary/themes/img/mem_icon.png \ +elementary/themes/img/mem_bar.png \ +elementary/themes/img/mem_on.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/memusage.edc b/data/elementary/themes/edc/memusage.edc index 01f1691d7c..347281698d 100644 --- a/data/elementary/themes/edc/memusage.edc +++ b/data/elementary/themes/edc/memusage.edc @@ -1,228 +1,105 @@ group { name: "e/modules/memusage/main"; - image: "mem_icon.png" COMP; - image: "meter_00.png" COMP; - image: "meter_01.png" COMP; - image: "meter_02.png" COMP; - image: "meter_03.png" COMP; - image: "meter_04.png" COMP; - image: "meter_05.png" COMP; - image: "meter_06.png" COMP; - image: "meter_07.png" COMP; - image: "meter_08.png" COMP; - image: "meter_09.png" COMP; - image: "meter_10.png" COMP; + image: "mem_bar.png" COMP; + image: "mem_on.png" COMP; script { - public slide_status(val) { - if (val == 0) - set_state(PART:"meter", "default", 0.0); - else if (val > 0 && val < 10) - set_state(PART:"meter", "default", 0.1); - else if (val >= 10 && val < 20) - set_state(PART:"meter", "default", 0.2); - else if (val >= 20 && val < 30) - set_state(PART:"meter", "default", 0.3); - else if (val >= 30 && val < 40) - set_state(PART:"meter", "default", 0.4); - else if (val >= 40 && val < 50) - set_state(PART:"meter", "default", 0.5); - else if (val >= 50 && val < 60) - set_state(PART:"meter", "default", 0.6); - else if (val >= 60 && val < 70) - set_state(PART:"meter", "default", 0.7); - else if (val >= 70 && val < 80) - set_state(PART:"meter", "default", 0.8); - else if (val >= 80 && val < 90) - set_state(PART:"meter", "default", 0.9); - else if (val >= 90 && val <= 100) - set_state(PART:"meter", "default", 1.0); - } - public slide_status_two(val) { - if (val == 0) - set_state(PART:"swap_meter", "default", 0.0); - else if (val > 0 && val < 10) - set_state(PART:"swap_meter", "default", 0.1); - else if (val >= 10 && val < 20) - set_state(PART:"swap_meter", "default", 0.2); - else if (val >= 20 && val < 30) - set_state(PART:"swap_meter", "default", 0.3); - else if (val >= 30 && val < 40) - set_state(PART:"swap_meter", "default", 0.4); - else if (val >= 40 && val < 50) - set_state(PART:"swap_meter", "default", 0.5); - else if (val >= 50 && val < 60) - set_state(PART:"swap_meter", "default", 0.6); - else if (val >= 60 && val < 70) - set_state(PART:"swap_meter", "default", 0.7); - else if (val >= 70 && val < 80) - set_state(PART:"swap_meter", "default", 0.8); - else if (val >= 80 && val < 90) - set_state(PART:"swap_meter", "default", 0.9); - else if (val >= 90 && val <= 100) - set_state(PART:"swap_meter", "default", 1.0); - } public message(Msg_Type:type, id, ...) { if ((type == MSG_INT_SET) && (id == 1)) { - new status = getarg(2); - new text[16]; - - slide_status(status); - snprintf(text, sizeof(text), "Mem: %i %%", status); - set_text(PART:"status", text); + 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); } if ((type == MSG_INT_SET) && (id == 2)) { - new status = getarg(2); - new text[16]; - - slide_status_two(status); - snprintf(text, sizeof(text), "Swap: %i %%", status); - set_text(PART:"swap_status", text); + new val = getarg(2); + 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: "fade_clip"; type: RECT; + part { name: "base"; type: SPACER; description { state: "default" 0.0; - color: 255 255 255 255; - } - } - part { name: "base"; - clip_to: "fade_clip"; - description { state: "default" 0.0; - aspect: 1.0 1.0; + aspect: 0.5 1; aspect_preference: BOTH; - image.normal: "mem_icon.png"; } } - part { name: "meter"; - clip_to: "fade_clip"; - description { state: "default" 0.0; - rel1.relative: 0.1 0.2; - rel2.relative: 0.9 0.4; - image.normal: "meter_00.png"; - color: 255 255 255 190; - } - description { state: "default" 0.1; - inherit: "default" 0.0; - image.normal: "meter_01.png"; - } - description { state: "default" 0.2; - inherit: "default" 0.0; - image.normal: "meter_02.png"; - } - description { state: "default" 0.3; - inherit: "default" 0.0; - image.normal: "meter_03.png"; - } - description { state: "default" 0.4; - inherit: "default" 0.0; - image.normal: "meter_04.png"; - } - description { state: "default" 0.5; - inherit: "default" 0.0; - image.normal: "meter_05.png"; - } - description { state: "default" 0.6; - inherit: "default" 0.0; - image.normal: "meter_06.png"; - } - description { state: "default" 0.7; - inherit: "default" 0.0; - image.normal: "meter_07.png"; - } - description { state: "default" 0.8; - inherit: "default" 0.0; - image.normal: "meter_08.png"; - } - description { state: "default" 0.9; - inherit: "default" 0.0; - image.normal: "meter_09.png"; - } - description { state: "default" 1.0; - inherit: "default" 0.0; - image.normal: "meter_10.png"; + + #define LED(_name_, _pos_) \ + part { name: _name_; \ + desc { "default"; hid; \ + rel1.relative: 0.0 (1.0 / 8 * (_pos_ - 1)); \ + rel2.relative: 1.0 (1.0 / 8 * _pos_); \ + image.normal: "mem_on.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: 0.5 1.0; + image.normal: "mem_bar.png"; + aspect_preference: SOURCE; } + LED("mem_led1", 8) + LED("mem_led2", 7) + LED("mem_led3", 6) + LED("mem_led4", 5) + LED("mem_led5", 4) + LED("mem_led6", 3) + LED("mem_led7", 2) + LED("mem_led8", 1) } - part { name: "status"; type: TEXT; - effect: SHADOW BOTTOM; - scale: 1; - description { state: "default" 0.0; - rel1.relative: 0.1 0.2; - rel2.relative: 0.9 0.4; - color_class: "module_label"; - color3: 255 255 255 255; - text { font: FNBOLD; - fit: 1 1; - ellipsis: -1; - align: 0.5 0.5; - text_class: "module_small"; - } - } - } - part { name: "swap_meter"; - clip_to: "fade_clip"; - description { state: "default" 0.0; - rel1.relative: 0.1 0.5; - rel2.relative: 0.9 0.7; - image.normal: "meter_00.png"; - color: 255 255 255 192; - } - description { state: "default" 0.1; - inherit: "default" 0.0; - image.normal: "meter_01.png"; - } - description { state: "default" 0.2; - inherit: "default" 0.0; - image.normal: "meter_02.png"; - } - description { state: "default" 0.3; - inherit: "default" 0.0; - image.normal: "meter_03.png"; - } - description { state: "default" 0.4; - inherit: "default" 0.0; - image.normal: "meter_04.png"; - } - description { state: "default" 0.5; - inherit: "default" 0.0; - image.normal: "meter_05.png"; - } - description { state: "default" 0.6; - inherit: "default" 0.0; - image.normal: "meter_06.png"; - } - description { state: "default" 0.7; - inherit: "default" 0.0; - image.normal: "meter_07.png"; - } - description { state: "default" 0.8; - inherit: "default" 0.0; - image.normal: "meter_08.png"; - } - description { state: "default" 0.9; - inherit: "default" 0.0; - image.normal: "meter_09.png"; - } - description { state: "default" 1.0; - inherit: "default" 0.0; - image.normal: "meter_10.png"; - } - } - part { name: "swap_status"; type: TEXT; - effect: SHADOW BOTTOM; - scale: 1; - description { state: "default" 0.0; - rel1.relative: 0.1 0.5; - rel2.relative: 0.9 0.7; - color_class: "module_label"; - color3: 255 255 255 255; - text { font: FNBOLD; - fit: 1 1; - ellipsis: -1; - align: 0.5 0.5; - text_class: "module_small"; - } + + part { name: "swp"; + desc { "default"; + rel1.to: "base"; + rel2.to: "base"; + 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) + LED("swp_led3", 6) + LED("swp_led4", 5) + LED("swp_led5", 4) + LED("swp_led6", 3) + LED("swp_led7", 2) + LED("swp_led8", 1) } + + #undef LED } } - diff --git a/data/elementary/themes/img/mem_bar.png b/data/elementary/themes/img/mem_bar.png new file mode 100644 index 0000000000000000000000000000000000000000..1d2686d90297720f3164783d184a9c7a109b442d GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^d_Zi$!3HGHW}i$1Qfx`y?k)`fL2$v|<&%LToCO|{ z#S9GG!XV7ZFl&wkP>{XE)7O>#J}0*bi@_Rmc|D+zWQl7;iF1B#Zfaf$gL6@8Vo7R> zLV0FMhJw4NZ$Nk>pEyuam8Xkih{y4_lTULt7znuBS81}1X!tulnOSUM$HxckqJm!+ z9eR_xX~NyPZsuP`upy85}S Ib4q9e0K1f8rvLx| literal 0 HcmV?d00001 diff --git a/data/elementary/themes/img/mem_icon.png b/data/elementary/themes/img/mem_icon.png deleted file mode 100644 index 303a45ebaf1d5d36d79c3429dca973efe95f06bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3618 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 diff --git a/data/elementary/themes/img/mem_on.png b/data/elementary/themes/img/mem_on.png new file mode 100644 index 0000000000000000000000000000000000000000..48d3f04596b61181004068013f22050abed87fcc GIT binary patch literal 286 zcmeAS@N?(olHy`uVBq!ia0vp^d_c_3!3HEP+-oF(6kC$Fy9>jA5L~c#`DCC7XMsm# zF#`j)FbFd;%$g$s(o^E;>&kwglUsyOCWT?PJ5Wfn#5JPCIX^cyHLrxhxhOTUBsE2$ zJhLQ2!QIn0AiR-J9H^+x)5S4F;&O6|19O{bu*%H}*1#imwRPtU_9;KN+$5pglNe+E z+JHv4M!@Bo31fn%O$C7W@j;T|b}!$WT!GoCztlpydp?fB}6{oTyL zkC*4$OWdpZ-5CyI8JO19{+sad$9?+>)4J-fBE|(1oTpBm&F}i=`*nYbg; T4fz7}76XH)tDnm{r-UW|av5Mx literal 0 HcmV?d00001