diff --git a/data/elementary/themes/Makefile.am b/data/elementary/themes/Makefile.am index 81d7d5a938..42e0b286a5 100644 --- a/data/elementary/themes/Makefile.am +++ b/data/elementary/themes/Makefile.am @@ -489,7 +489,6 @@ 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 \ @@ -574,6 +573,10 @@ elementary/themes/img/mini_blue_glow_arrow_3.png \ elementary/themes/img/mini_box_bevel_shadow.png \ elementary/themes/img/mini_box_glow.png \ elementary/themes/img/music_control_icon.png \ +elementary/themes/img/netstatus_base.png \ +elementary/themes/img/netstatus_over.png \ +elementary/themes/img/netstatus_tx.png \ +elementary/themes/img/netstatus_rx.png \ elementary/themes/img/outline_glow.png \ elementary/themes/img/packagekit_base.png \ elementary/themes/img/pointer_entry_bar.png \ @@ -589,7 +592,6 @@ 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 \ @@ -679,7 +681,6 @@ 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/edc/netstatus.edc b/data/elementary/themes/edc/netstatus.edc index 5ad072d11e..cd3cc298d7 100644 --- a/data/elementary/themes/edc/netstatus.edc +++ b/data/elementary/themes/edc/netstatus.edc @@ -1,118 +1,84 @@ 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"; - } + image: "netstatus_rx.png" COMP; + image: "netstatus_tx.png" COMP; + image: "netstatus_base.png" COMP; + image: "netstatus_over.png" COMP; + script { + public message(Msg_Type:type, id, ...) { + if ((type == MSG_INT_SET) && (id == 1)) { + // new rxcur = getarg(2); + new rxper = getarg(3); + // new rxmax = getarg(4); + // new txcur = getarg(5); + new txper = getarg(6); + // new txmax = getarg(7); + + new Float:val = rxper / 100.0; + custom_state(PART:"rx_clip", "default", 0.0); + set_state_val(PART:"rx_clip", STATE_REL1, 0.0, 1.0 - val); + set_state(PART:"rx_clip", "custom", 0.0); + + val = txper / 100.0; + custom_state(PART:"tx_clip", "default", 0.0); + set_state_val(PART:"tx_clip", STATE_REL1, 0.0, 1.0 - val); + set_state(PART:"tx_clip", "custom", 0.0); } } } - programs { - program { name: "received"; - signal: "e,state,received,active"; - source: "e"; - action: STATE_SET "active" 0.0; - target: "rx"; - transition: SINUSOIDAL 0.25; + parts { + part { name: "base"; + description { state: "default" 0.0; + aspect: 1.0 1.0; + aspect_preference: BOTH; + image.normal: "netstatus_base.png"; + } } - program { name: "received_idle"; - signal: "e,state,received,idle"; - source: "e"; - action: STATE_SET "default" 0.0; - target: "rx"; - transition: SINUSOIDAL 0.25; + part { name: "rx_spacer"; type: SPACER; + description { state: "default" 0.0; + rel1.relative: 0.32 0.33; + rel2.relative: 0.98 0.78; + } } - program { name: "transmitted"; - signal: "e,state,transmitted,active"; - source: "e"; - action: STATE_SET "active" 0.0; - target: "tx"; - transition: SINUSOIDAL 0.25; + part { name: "rx_clip"; type: RECT; + description { state: "default" 0.0; + rel1.to: "rx_spacer"; + rel2.to: "rx_spacer"; + } } - program { name: "transmitted_idle"; - signal: "e,state,transmitted,idle"; - source: "e"; - action: STATE_SET "default" 0.0; - target: "tx"; - transition: SINUSOIDAL 0.25; + part { name: "rx"; type: IMAGE; + clip_to: "rx_clip"; + description { state: "default" 0.0; + rel1.to: "base"; + rel2.to: "base"; + image.normal: "netstatus_rx.png"; + } + } + part { name: "tx_spacer"; type: SPACER; + description { state: "default" 0.0; + rel1.relative: 0.04 0.08; + rel2.relative: 0.68 0.50; + } + } + part { name: "tx_clip"; type: RECT; + description { state: "default" 0.0; + rel1.to: "tx_spacer"; + rel2.to: "tx_spacer"; + } + } + part { name: "tx"; type: IMAGE; + clip_to: "tx_clip"; + description { state: "default" 0.0; + rel1.to: "base"; + rel2.to: "base"; + image.normal: "netstatus_tx.png"; + } + } + part { name: "over"; + description { state: "default" 0.0; + rel1.to: "base"; + rel2.to: "base"; + image.normal: "netstatus_over.png"; + } } } } diff --git a/data/elementary/themes/img/idle.png b/data/elementary/themes/img/idle.png deleted file mode 100644 index 7c988163af..0000000000 Binary files a/data/elementary/themes/img/idle.png and /dev/null differ diff --git a/data/elementary/themes/img/netstatus_base.png b/data/elementary/themes/img/netstatus_base.png new file mode 100644 index 0000000000..9c2c55f837 Binary files /dev/null and b/data/elementary/themes/img/netstatus_base.png differ diff --git a/data/elementary/themes/img/netstatus_over.png b/data/elementary/themes/img/netstatus_over.png new file mode 100644 index 0000000000..62d5dcf10c Binary files /dev/null and b/data/elementary/themes/img/netstatus_over.png differ diff --git a/data/elementary/themes/img/netstatus_rx.png b/data/elementary/themes/img/netstatus_rx.png new file mode 100644 index 0000000000..2877ff69af Binary files /dev/null and b/data/elementary/themes/img/netstatus_rx.png differ diff --git a/data/elementary/themes/img/netstatus_tx.png b/data/elementary/themes/img/netstatus_tx.png new file mode 100644 index 0000000000..1387226652 Binary files /dev/null and b/data/elementary/themes/img/netstatus_tx.png differ diff --git a/data/elementary/themes/img/rx.png b/data/elementary/themes/img/rx.png deleted file mode 100644 index 4807aaf599..0000000000 Binary files a/data/elementary/themes/img/rx.png and /dev/null differ diff --git a/data/elementary/themes/img/tx.png b/data/elementary/themes/img/tx.png deleted file mode 100644 index 46d355d0cf..0000000000 Binary files a/data/elementary/themes/img/tx.png and /dev/null differ