diff --git a/data/elementary/themes/Makefile.am b/data/elementary/themes/Makefile.am index 529a3c78a4..308f602913 100644 --- a/data/elementary/themes/Makefile.am +++ b/data/elementary/themes/Makefile.am @@ -38,6 +38,7 @@ elementary/themes/edc/comp_effects.edc \ elementary/themes/edc/conf.edc \ elementary/themes/edc/connman.edc \ elementary/themes/edc/cpufreq.edc \ +elementary/themes/edc/cpumonitor.edc \ elementary/themes/edc/cslider.edc \ elementary/themes/edc/desklock.edc \ elementary/themes/edc/deskmirror.edc \ @@ -57,9 +58,11 @@ elementary/themes/edc/illume.edc \ elementary/themes/edc/init.edc \ elementary/themes/edc/label.edc \ elementary/themes/edc/luncher.edc \ +elementary/themes/edc/memusage.edc \ elementary/themes/edc/menu.edc \ elementary/themes/edc/mixer.edc \ elementary/themes/edc/music_control.edc \ +elementary/themes/edc/netstatus.edc \ elementary/themes/edc/notification.edc \ elementary/themes/edc/packagekit.edc \ elementary/themes/edc/pager.edc \ @@ -218,6 +221,7 @@ elementary/themes/img/col_sel_end_bottom.png \ elementary/themes/img/col_sel_end_left.png \ elementary/themes/img/col_sel_end_right.png \ elementary/themes/img/col_sel_end_top.png \ +elementary/themes/img/cpu_icon.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 \ @@ -478,6 +482,7 @@ elementary/themes/img/icon_wallpaper_within.png \ elementary/themes/img/icon_warning.png \ elementary/themes/img/ic_win_move.png \ elementary/themes/img/ic_win_resize.png \ +elementary/themes/img/idle.png \ elementary/themes/img/img_example_1.png \ elementary/themes/img/img_example_2.png \ elementary/themes/img/inset_bar_horiz_base.png \ @@ -551,6 +556,7 @@ 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/mini_blue_glow_arrow_0.png \ elementary/themes/img/mini_blue_glow_arrow_1.png \ elementary/themes/img/mini_blue_glow_arrow_2.png \ @@ -565,6 +571,17 @@ elementary/themes/img/pointer_glow.png \ elementary/themes/img/pointer_mono.png \ elementary/themes/img/pointer.png \ elementary/themes/img/pointer_hand1.png \ +elementary/themes/img/meter_00.png \ +elementary/themes/img/meter_01.png \ +elementary/themes/img/meter_02.png \ +elementary/themes/img/meter_03.png \ +elementary/themes/img/meter_04.png \ +elementary/themes/img/meter_05.png \ +elementary/themes/img/meter_06.png \ +elementary/themes/img/meter_07.png \ +elementary/themes/img/meter_08.png \ +elementary/themes/img/meter_09.png \ +elementary/themes/img/meter_10.png \ elementary/themes/img/ring_shadow.png \ elementary/themes/img/ring_white_blue_glow.png \ elementary/themes/img/ring_white_middle.png \ @@ -573,6 +590,7 @@ elementary/themes/img/runner_glow_horiz.png \ elementary/themes/img/runner_glow_vert.png \ elementary/themes/img/runner_horiz.png \ elementary/themes/img/runner_vert.png \ +elementary/themes/img/rx.png \ elementary/themes/img/screen_base.png \ elementary/themes/img/screen_bg.png \ elementary/themes/img/screen_circular_shadow.png \ @@ -662,6 +680,7 @@ elementary/themes/img/tooltip-edge-bottom-tip.png \ elementary/themes/img/tooltip-edge-left-tip.png \ elementary/themes/img/tooltip-edge-right-tip.png \ elementary/themes/img/tooltip-edge-top-tip.png \ +elementary/themes/img/tx.png \ elementary/themes/img/vert_bar_inset.png \ elementary/themes/img/vert_glow_run.png \ elementary/themes/img/vert_glow_range.png \ diff --git a/data/elementary/themes/default.edc b/data/elementary/themes/default.edc index f26f8b30b1..5e801b4dbd 100644 --- a/data/elementary/themes/default.edc +++ b/data/elementary/themes/default.edc @@ -149,6 +149,9 @@ collections { #include "edc/wireless.edc" #include "edc/time.edc" #include "edc/luncher.edc" +#include "edc/memusage.edc" +#include "edc/cpumonitor.edc" +#include "edc/netstatus.edc" // icons #include "edc/icons.edc" diff --git a/data/elementary/themes/edc/battery.edc b/data/elementary/themes/edc/battery.edc index 1886ec0704..57661f140d 100644 --- a/data/elementary/themes/edc/battery.edc +++ b/data/elementary/themes/edc/battery.edc @@ -223,9 +223,10 @@ group { name: "e/modules/battery/main"; rel2.offset: -1 2; color_class: "module_label_plain"; color3: 255 255 255 255; - text { font: "Sans"; size: 8; - min: 0 1; + text { font: "Sans"; fit: 1 1; + ellipsis: -1; + align: 0.5 0.5; text_class: "module_small"; } } @@ -243,9 +244,10 @@ group { name: "e/modules/battery/main"; rel2.to: "bg"; color_class: "module_label_plain"; color3: 255 255 255 255; - text { font: "Sans"; size: 8; - min: 0 1; + text { font: "Sans"; fit: 1 1; + ellipsis: -1; + align: 0.5 0.5; text_class: "module_small"; } } diff --git a/data/elementary/themes/edc/cpufreq.edc b/data/elementary/themes/edc/cpufreq.edc index c50f503331..6dcc2fe91c 100644 --- a/data/elementary/themes/edc/cpufreq.edc +++ b/data/elementary/themes/edc/cpufreq.edc @@ -222,8 +222,8 @@ group { name: "e/modules/cpufreq/main"; rel2.relative: 0.75 0.75; color_class: "module_label"; color3: 255 255 255 255; - text { font: FN; size: 6; - min: 1 1; + text { font: FNBOLD; size: 6; + align: 0.5 0.5; ellipsis: -1; text_class: "module_small"; } diff --git a/data/elementary/themes/edc/cpumonitor.edc b/data/elementary/themes/edc/cpumonitor.edc new file mode 100644 index 0000000000..36bee26afb --- /dev/null +++ b/data/elementary/themes/edc/cpumonitor.edc @@ -0,0 +1,129 @@ +group { name: "e/modules/cpumonitor/main"; + image: "cpu_icon.png" COMP; + 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; + script { + public message(Msg_Type:type, id, ...) { + if ((type == MSG_INT_SET) && (id == 1)) { + new status = getarg(2); + new text[16]; + if (status == 0) + set_state(PART:"meter", "default", 0.0); + else if (status > 0 && status < 10) + set_state(PART:"meter", "default", 0.1); + else if (status >= 10 && status < 20) + set_state(PART:"meter", "default", 0.2); + else if (status >= 20 && status < 30) + set_state(PART:"meter", "default", 0.3); + else if (status >= 30 && status < 40) + set_state(PART:"meter", "default", 0.4); + else if (status >= 40 && status < 50) + set_state(PART:"meter", "default", 0.5); + else if (status >= 50 && status < 60) + set_state(PART:"meter", "default", 0.6); + else if (status >= 60 && status < 70) + set_state(PART:"meter", "default", 0.7); + else if (status >= 70 && status < 80) + set_state(PART:"meter", "default", 0.8); + else if (status >= 80 && status < 90) + set_state(PART:"meter", "default", 0.9); + else if (status >= 90 && status <= 100) + set_state(PART:"meter", "default", 1.0); + snprintf(text, sizeof(text), "CPU: %i %%", status); + set_text(PART:"status", text); + } + } + } + parts { + part { name: "fade_clip"; type: RECT; + 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_preference: BOTH; + image.normal: "cpu_icon.png"; + } + } + part { name: "meter"; + clip_to: "fade_clip"; + description { state: "default" 0.0; + rel1.relative: 0.1 0.4; + rel2.relative: 0.9 0.6; + 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"; + } + } + part { name: "status"; type: TEXT; mouse_events: 0; + scale: 1; + effect: SHADOW BOTTOM; + clip_to: "fade_clip"; + description { state: "default" 0.0; + color_class: "module_label"; + color3: 255 255 255 255; + rel1.relative: 0.1 0.0; + rel2.relative: 0.9 1.0; + text { font: FNBOLD; + fit: 1 1; + elipsis: -1; + align: 0.5 0.5; + text_class: "module_small"; + } + } + } + } +} + diff --git a/data/elementary/themes/edc/memusage.edc b/data/elementary/themes/edc/memusage.edc new file mode 100644 index 0000000000..01f1691d7c --- /dev/null +++ b/data/elementary/themes/edc/memusage.edc @@ -0,0 +1,228 @@ +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; + 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); + } + 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); + } + } + } + parts { + part { name: "fade_clip"; type: RECT; + 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_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"; + } + } + 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"; + } + } + } + } +} + diff --git a/data/elementary/themes/edc/netstatus.edc b/data/elementary/themes/edc/netstatus.edc new file mode 100644 index 0000000000..5ad072d11e --- /dev/null +++ b/data/elementary/themes/edc/netstatus.edc @@ -0,0 +1,119 @@ +group { name: "e/modules/netstatus/main"; + image: "rx.png" COMP; + image: "tx.png" COMP; + image: "idle.png" COMP; + parts { + part { name: "fade_clip"; type: RECT; + description { state: "default" 0.0; + color: 255 255 255 255; + } + } + part { name: "rx"; type: IMAGE; + mouse_events: 0; + description { state: "default" 0.0; + aspect: 1.0 1.0; + aspect_preference: BOTH; + visible: 0; + rel1.to: "base"; + rel2.to: "base"; + image.normal: "rx.png"; + color: 255 255 255 0; + } + description { state: "active" 0.0; + inherit: "default" 0.0; + visible: 1; + color: 255 255 255 255; + } + } + part { name: "tx"; type: IMAGE; + mouse_events: 0; + description { state: "default" 0.0; + aspect: 1.0 1.0; + aspect_preference: BOTH; + visible: 0; + rel1.to: "base"; + rel2.to: "base"; + image.normal: "tx.png"; + color: 255 255 255 0; + } + description { state: "active" 0.0; + inherit: "default" 0.0; + visible: 1; + color: 255 255 255 255; + } + } + part { name: "base"; + clip_to: "fade_clip"; + description { state: "default" 0.0; + aspect: 1.0 1.0; + aspect_preference: BOTH; + image.normal: "idle.png"; + } + } + part { name: "e.text.received"; type: TEXT; mouse_events: 0; + scale: 1; + effect: SHADOW BOTTOM; + clip_to: "fade_clip"; + description { state: "default" 0.0; + color_class: "module_label"; + color3: 255 255 255 255; + rel1.relative: 0.1 0.0; + rel2.relative: 0.9 0.5; + text { font: FNBOLD; + fit: 1 1; + elipsis: -1; + align: 0.5 0.5; + text_class: "module_small"; + } + } + } + part { name: "e.text.transmitted"; type: TEXT; mouse_events: 0; + scale: 1; + effect: SHADOW BOTTOM; + clip_to: "fade_clip"; + description { state: "default" 0.0; + color_class: "module_label"; + color3: 255 255 255 255; + rel1.relative: 0.1 0.5; + rel2.relative: 0.9 1.0; + text { font: FNBOLD; + fit: 1 1; + elipsis: -1; + align: 0.5 0.5; + text_class: "module_small"; + } + } + } + } + programs { + program { name: "received"; + signal: "e,state,received,active"; + source: "e"; + action: STATE_SET "active" 0.0; + target: "rx"; + transition: SINUSOIDAL 0.25; + } + program { name: "received_idle"; + signal: "e,state,received,idle"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "rx"; + transition: SINUSOIDAL 0.25; + } + program { name: "transmitted"; + signal: "e,state,transmitted,active"; + source: "e"; + action: STATE_SET "active" 0.0; + target: "tx"; + transition: SINUSOIDAL 0.25; + } + program { name: "transmitted_idle"; + signal: "e,state,transmitted,idle"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "tx"; + transition: SINUSOIDAL 0.25; + } + } +} + diff --git a/data/elementary/themes/img/cpu_icon.png b/data/elementary/themes/img/cpu_icon.png new file mode 100644 index 0000000000..0a62663d94 Binary files /dev/null and b/data/elementary/themes/img/cpu_icon.png differ diff --git a/data/elementary/themes/img/idle.png b/data/elementary/themes/img/idle.png new file mode 100644 index 0000000000..7c988163af Binary files /dev/null and b/data/elementary/themes/img/idle.png differ diff --git a/data/elementary/themes/img/mem_icon.png b/data/elementary/themes/img/mem_icon.png new file mode 100644 index 0000000000..303a45ebaf Binary files /dev/null and b/data/elementary/themes/img/mem_icon.png differ diff --git a/data/elementary/themes/img/meter_00.png b/data/elementary/themes/img/meter_00.png new file mode 100644 index 0000000000..2b96666e94 Binary files /dev/null and b/data/elementary/themes/img/meter_00.png differ diff --git a/data/elementary/themes/img/meter_01.png b/data/elementary/themes/img/meter_01.png new file mode 100644 index 0000000000..0c590afc50 Binary files /dev/null and b/data/elementary/themes/img/meter_01.png differ diff --git a/data/elementary/themes/img/meter_02.png b/data/elementary/themes/img/meter_02.png new file mode 100644 index 0000000000..533fea6e09 Binary files /dev/null and b/data/elementary/themes/img/meter_02.png differ diff --git a/data/elementary/themes/img/meter_03.png b/data/elementary/themes/img/meter_03.png new file mode 100644 index 0000000000..a833a1927b Binary files /dev/null and b/data/elementary/themes/img/meter_03.png differ diff --git a/data/elementary/themes/img/meter_04.png b/data/elementary/themes/img/meter_04.png new file mode 100644 index 0000000000..591c9e7e4c Binary files /dev/null and b/data/elementary/themes/img/meter_04.png differ diff --git a/data/elementary/themes/img/meter_05.png b/data/elementary/themes/img/meter_05.png new file mode 100644 index 0000000000..27f3db93a7 Binary files /dev/null and b/data/elementary/themes/img/meter_05.png differ diff --git a/data/elementary/themes/img/meter_06.png b/data/elementary/themes/img/meter_06.png new file mode 100644 index 0000000000..f6827f9608 Binary files /dev/null and b/data/elementary/themes/img/meter_06.png differ diff --git a/data/elementary/themes/img/meter_07.png b/data/elementary/themes/img/meter_07.png new file mode 100644 index 0000000000..dcb5c1e237 Binary files /dev/null and b/data/elementary/themes/img/meter_07.png differ diff --git a/data/elementary/themes/img/meter_08.png b/data/elementary/themes/img/meter_08.png new file mode 100644 index 0000000000..e24c479527 Binary files /dev/null and b/data/elementary/themes/img/meter_08.png differ diff --git a/data/elementary/themes/img/meter_09.png b/data/elementary/themes/img/meter_09.png new file mode 100644 index 0000000000..2fc89801eb Binary files /dev/null and b/data/elementary/themes/img/meter_09.png differ diff --git a/data/elementary/themes/img/meter_10.png b/data/elementary/themes/img/meter_10.png new file mode 100644 index 0000000000..bec3df6b0f Binary files /dev/null and b/data/elementary/themes/img/meter_10.png differ diff --git a/data/elementary/themes/img/rx.png b/data/elementary/themes/img/rx.png new file mode 100644 index 0000000000..4807aaf599 Binary files /dev/null and b/data/elementary/themes/img/rx.png differ diff --git a/data/elementary/themes/img/tx.png b/data/elementary/themes/img/tx.png new file mode 100644 index 0000000000..46d355d0cf Binary files /dev/null and b/data/elementary/themes/img/tx.png differ