okra pushed a commit to branch master. http://git.enlightenment.org/enlightenment/gadgets/wireless.git/commit/?id=32aef1a37f8a19bd7a7b5b48dbcd4aa20dfbda12
commit 32aef1a37f8a19bd7a7b5b48dbcd4aa20dfbda12 Author: Stephen Houston <[email protected]> Date: Tue Feb 27 11:47:39 2018 -0600 Update theme to match flat theme. --- theme/cloud-conn.png | Bin 0 -> 2232 bytes theme/eth-base.png | Bin 0 -> 159 bytes theme/eth-top.png | Bin 0 -> 221 bytes theme/eth.png | Bin 3087 -> 0 bytes theme/exlclam.png | Bin 4328 -> 0 bytes theme/hole_tiny.png | Bin 128 -> 0 bytes theme/led_tiny_green.png | Bin 225 -> 0 bytes theme/led_tiny_orange.png | Bin 234 -> 0 bytes theme/lock_insecure.png | Bin 8014 -> 0 bytes theme/lock_locked.png | Bin 7054 -> 0 bytes theme/slot_horiz_bottom.png | Bin 199 -> 0 bytes theme/slot_horiz_top.png | Bin 269 -> 0 bytes theme/wifi-1.png | Bin 0 -> 2108 bytes theme/wifi-2.png | Bin 0 -> 2091 bytes theme/wifi-3.png | Bin 0 -> 2311 bytes theme/wifi-4.png | Bin 0 -> 2537 bytes theme/wifi-5.png | Bin 0 -> 2672 bytes theme/wifi_base.png | Bin 5017 -> 0 bytes theme/wifi_shadow.png | Bin 3932 -> 0 bytes theme/wifi_sig_1.png | Bin 1709 -> 0 bytes theme/wifi_sig_2.png | Bin 4510 -> 0 bytes theme/wifi_sig_3.png | Bin 8332 -> 0 bytes theme/wireless.edc | 632 ++++++++++++-------------------------------- 23 files changed, 163 insertions(+), 469 deletions(-) diff --git a/theme/cloud-conn.png b/theme/cloud-conn.png new file mode 100644 index 0000000..dcafa98 Binary files /dev/null and b/theme/cloud-conn.png differ diff --git a/theme/eth-base.png b/theme/eth-base.png new file mode 100644 index 0000000..91dbb8f Binary files /dev/null and b/theme/eth-base.png differ diff --git a/theme/eth-top.png b/theme/eth-top.png new file mode 100644 index 0000000..2e17815 Binary files /dev/null and b/theme/eth-top.png differ diff --git a/theme/eth.png b/theme/eth.png deleted file mode 100644 index 14cb9c1..0000000 Binary files a/theme/eth.png and /dev/null differ diff --git a/theme/exlclam.png b/theme/exlclam.png deleted file mode 100644 index d4958c2..0000000 Binary files a/theme/exlclam.png and /dev/null differ diff --git a/theme/hole_tiny.png b/theme/hole_tiny.png deleted file mode 100644 index 49f7648..0000000 Binary files a/theme/hole_tiny.png and /dev/null differ diff --git a/theme/led_tiny_green.png b/theme/led_tiny_green.png deleted file mode 100644 index a66ffd2..0000000 Binary files a/theme/led_tiny_green.png and /dev/null differ diff --git a/theme/led_tiny_orange.png b/theme/led_tiny_orange.png deleted file mode 100644 index 0bcb574..0000000 Binary files a/theme/led_tiny_orange.png and /dev/null differ diff --git a/theme/lock_insecure.png b/theme/lock_insecure.png deleted file mode 100644 index ddafaf7..0000000 Binary files a/theme/lock_insecure.png and /dev/null differ diff --git a/theme/lock_locked.png b/theme/lock_locked.png deleted file mode 100644 index 91d3ad8..0000000 Binary files a/theme/lock_locked.png and /dev/null differ diff --git a/theme/slot_horiz_bottom.png b/theme/slot_horiz_bottom.png deleted file mode 100644 index a8c6fdc..0000000 Binary files a/theme/slot_horiz_bottom.png and /dev/null differ diff --git a/theme/slot_horiz_top.png b/theme/slot_horiz_top.png deleted file mode 100644 index e0dba5c..0000000 Binary files a/theme/slot_horiz_top.png and /dev/null differ diff --git a/theme/wifi-1.png b/theme/wifi-1.png new file mode 100644 index 0000000..9583918 Binary files /dev/null and b/theme/wifi-1.png differ diff --git a/theme/wifi-2.png b/theme/wifi-2.png new file mode 100644 index 0000000..3ff6aed Binary files /dev/null and b/theme/wifi-2.png differ diff --git a/theme/wifi-3.png b/theme/wifi-3.png new file mode 100644 index 0000000..24318d0 Binary files /dev/null and b/theme/wifi-3.png differ diff --git a/theme/wifi-4.png b/theme/wifi-4.png new file mode 100644 index 0000000..064a3f8 Binary files /dev/null and b/theme/wifi-4.png differ diff --git a/theme/wifi-5.png b/theme/wifi-5.png new file mode 100644 index 0000000..0f85665 Binary files /dev/null and b/theme/wifi-5.png differ diff --git a/theme/wifi_base.png b/theme/wifi_base.png deleted file mode 100644 index 077b0a3..0000000 Binary files a/theme/wifi_base.png and /dev/null differ diff --git a/theme/wifi_shadow.png b/theme/wifi_shadow.png deleted file mode 100644 index b1dc20f..0000000 Binary files a/theme/wifi_shadow.png and /dev/null differ diff --git a/theme/wifi_sig_1.png b/theme/wifi_sig_1.png deleted file mode 100644 index f7aebf2..0000000 Binary files a/theme/wifi_sig_1.png and /dev/null differ diff --git a/theme/wifi_sig_2.png b/theme/wifi_sig_2.png deleted file mode 100644 index a723881..0000000 Binary files a/theme/wifi_sig_2.png and /dev/null differ diff --git a/theme/wifi_sig_3.png b/theme/wifi_sig_3.png deleted file mode 100644 index 1d40d81..0000000 Binary files a/theme/wifi_sig_3.png and /dev/null differ diff --git a/theme/wireless.edc b/theme/wireless.edc index 1d6f376..7ba7910 100644 --- a/theme/wireless.edc +++ b/theme/wireless.edc @@ -1,86 +1,86 @@ -collections { - -group { name: "wireless/ethernet"; nomouse; - images.image: "slot_horiz_top.png" COMP; - images.image: "slot_horiz_bottom.png" COMP; - images.image: "eth.png" COMP; - images.image: "exlclam.png" COMP; - images.image: "hole_tiny.png" COMP; - images.image: "led_tiny_orange.png" COMP; - images.image: "led_tiny_green.png" COMP; - images.image: "lock_locked.png" COMP; - images.image: "lock_insecure.png" COMP; +group { name: "e/gadget/wireless/ethernet"; nomouse; + images.image: "cloud-conn.png" COMP; + images.image: "eth-base.png" COMP; + images.image: "eth-top.png" COMP; script { public message(Msg_Type:type, id, ...) { if ((type == MSG_INT_SET) && (id == 1)) { new state = getarg(2); - if ((state == 1)) { - set_state(PART:"led", "default", 0.0); + if ((state <= 1)) { + set_state(PART:"eth-base", "default", 0.0); + set_state(PART:"eth", "default", 0.0); + } + else if ((state == 1)) { + set_state(PART:"eth-base", "default", 0.0); + set_state(PART:"eth", "default", 0.0); run_program(PROGRAM:"connecting"); return; } - else if ((state == 2)) { set_state(PART:"led", "connected", 0.0); } - else if ((state == 3)) { set_state(PART:"led", "online", 0.0); } - else { set_state(PART:"led", "default", 0.0); } + stop_programs_on(PART:"eth-base"); + stop_programs_on(PART:"eth"); + if ((state == 2)) { + set_state(PART:"eth-base", "connected", 0.0); + set_state(PART:"eth", "connected", 0.0); + } + else if ((state == 3)) { + set_state(PART:"eth-base", "online", 0.0); + set_state(PART:"eth", "online", 0.0); + } + else { + set_state(PART:"eth-base", "default", 0.0); + set_state(PART:"eth", "default", 0.0); + } } } } parts { - part { name: "slot_bottom"; - description { state: "default" 0.0; - rel1.to: "slot"; - rel2.relative: 1.0 0.5; - rel2.to: "slot"; - min: 0 3; - image.normal: "slot_horiz_bottom.png"; - fixed: 0 1; - } - } -/////////////////////// part { name: "exclam_base"; clip_to: "clip_exclam"; description { state: "default" 0.0; - aspect: (71/144) (71/144); aspect_preference: BOTH; - align: 0.5 1.0; - rel2.relative: 1.0 0.5; - rel2.to_y: "slot"; - image.normal: "exlclam.png"; + min: 11 10; + rel1.relative: (20/160) (50/160); + rel2.relative: (135/160) (150/160); + aspect: (115/105) (115/105); aspect_preference: BOTH; + image.normal: "cloud-conn.png"; } } /////////////////////// - part { name: "eth_base"; + part { name: "eth-base"; clip_to: "clip_eth"; description { state: "default" 0.0; - aspect: (60/144) (60/144); aspect_preference: BOTH; - align: 0.5 1.0; - rel2.relative: 1.0 0.5; - rel2.to_y: "slot"; - image.normal: "eth.png"; + min: 6 13; + aspect: (60/130) (60/130); aspect_preference: BOTH; + rel1.relative: (50/160) (15/160); + rel2.relative: (110/160) (145/160); + image.normal: "eth-base.png"; + color: 160 160 160 128; } - } - part { name: "slot"; - description { state: "default" 0.0; - rel1.offset: 0 -1; - rel1.relative: (21/160) 1.0; - rel2.offset: -1 -1; - rel2.relative: (140/160) 1.0; - align: 0.5 1.0; - min: 0 6; - image.normal: "slot_horiz_top.png"; - fixed: 0 1; + description { state: "connected" 0.0; + inherit: "default" 0.0; + color: 160 160 160 255; + } + description { state: "online" 0.0; + inherit: "default" 0.0; + color: 51 153 255 255; } } - part { name: "hole"; + part { name: "eth"; mouse_events: 0; + scale: 1; + clip_to: "clip_eth"; description { state: "default" 0.0; - rel1.offset: -4 -4; - rel1.relative: 1.0 1.0; - rel2.offset: -4 -4; - align: 1.0 1.0; - min: 4 4; - max: 4 4; - image.normal: "hole_tiny.png"; - fixed: 1 1; + rel1.to: "eth-base"; + rel2.to: "eth-base"; + image.normal: "eth-top.png"; + color: 160 160 160 128; + } + description { state: "connected" 0.0; + inherit: "default" 0.0; + color: 160 160 160 255; + } + description { state: "online" 0.0; + inherit: "default" 0.0; + color: 160 160 160 255; } } part { name: "clip_exclam"; type: RECT; @@ -99,27 +99,6 @@ group { name: "wireless/ethernet"; nomouse; visible: 1; } } - part { name: "led"; - description { state: "default" 0.0; - rel1.to: "hole"; - rel2.to: "hole"; - min: 10 10; - max: 10 10; - image.normal: "led_tiny_orange.png"; - fixed: 1 1; - visible: 0; - } - description { state: "connected" 0.0; - inherit: "default" 0.0; - image.normal: "led_tiny_orange.png"; - visible: 1; - } - description { state: "online" 0.0; - inherit: "default" 0.0; - image.normal: "led_tiny_green.png"; - visible: 1; - } - } part { name: "event"; type: RECT; mouse; description { state: "default" 0.0; color: 0 0 0 0; @@ -128,242 +107,150 @@ group { name: "wireless/ethernet"; nomouse; } programs { + target_group: "eths" "eth-base" "eth"; program { name: "connecting"; action: STATE_SET "connected" 0.0; - target: "led"; + groups: "eths"; in: 0.3 0.0; after: "connecting2"; } program { name: "connecting2"; action: STATE_SET "default" 0.0; - target: "led"; + groups: "eths"; in: 0.3 0.0; after: "connecting"; } target_group: "clips" "clip_exclam" "clip_eth"; program { - signal: "wireless,state,error"; source: "wireless"; + signal: "e,state,error"; source: "e"; action: STATE_SET "default" 0.0; groups: "clips"; } program { - signal: "wireless,state,default"; source: "wireless"; + signal: "e,state,default"; source: "e"; action: STATE_SET "eth" 0.0; groups: "clips"; } } } -group { name: "wireless/wifi"; nomouse; - images.image: "slot_horiz_top.png" COMP; - images.image: "slot_horiz_bottom.png" COMP; - images.image: "wifi_shadow.png" COMP; - images.image: "wifi_base.png" COMP; - images.image: "wifi_sig_1.png" COMP; - images.image: "wifi_sig_2.png" COMP; - images.image: "wifi_sig_3.png" COMP; - images.image: "exlclam.png" COMP; - images.image: "hole_tiny.png" COMP; - images.image: "led_tiny_orange.png" COMP; - images.image: "led_tiny_green.png" COMP; - images.image: "lock_locked.png" COMP; - images.image: "lock_insecure.png" COMP; +group { name: "e/gadget/wireless/wifi"; nomouse; + images.image: "cloud-conn.png" COMP; + images.image: "wifi-1.png" COMP; + images.image: "wifi-2.png" COMP; + images.image: "wifi-3.png" COMP; + images.image: "wifi-4.png" COMP; + images.image: "wifi-5.png" COMP; script { public message(Msg_Type:type, id, ...) { if ((type == MSG_INT_SET) && (id == 1)) { new state = getarg(2), signl = getarg(3); if (state <= 1) { - set_state(PART:"wifi_1", "default", 0.0); - set_state(PART:"wifi_2", "default", 0.0); - set_state(PART:"wifi_3", "default", 0.0); - set_state(PART:"led", "default", 0.0); + set_state(PART:"wifi-base", "default", 0.0); + set_state(PART:"wifi", "default", 0.0); } if (state == 1) { run_program(PROGRAM:"connecting"); run_program(PROGRAM:"connecting_wifi"); return; } - stop_programs_on(PART:"led"); + stop_programs_on(PART:"wifi-base"); + stop_programs_on(PART:"wifi"); if (signl <= 14) { - set_state(PART:"wifi_1", "default", 0.0); - set_state(PART:"wifi_2", "default", 0.0); - set_state(PART:"wifi_3", "default", 0.0); + set_state(PART:"wifi", "default", 0.0); } else if (signl <= 28) { - set_state(PART:"wifi_1", "partly", 0.0); - set_state(PART:"wifi_2", "default", 0.0); - set_state(PART:"wifi_3", "default", 0.0); + set_state(PART:"wifi", "default", 0.25); } else if (signl <= 42) { - set_state(PART:"wifi_1", "visible", 0.0); - set_state(PART:"wifi_2", "default", 0.0); - set_state(PART:"wifi_3", "default", 0.0); + set_state(PART:"wifi", "default", 0.25); } else if (signl <= 57) { - set_state(PART:"wifi_1", "visible", 0.0); - set_state(PART:"wifi_2", "partly", 0.0); - set_state(PART:"wifi_3", "default", 0.0); + set_state(PART:"wifi", "default", 0.50); } else if (signl <= 71) { - set_state(PART:"wifi_1", "visible", 0.0); - set_state(PART:"wifi_2", "visible", 0.0); - set_state(PART:"wifi_3", "default", 0.0); + set_state(PART:"wifi", "default", 0.50); } else if (signl <= 85) { - set_state(PART:"wifi_1", "visible", 0.0); - set_state(PART:"wifi_2", "visible", 0.0); - set_state(PART:"wifi_3", "partly", 0.0); + set_state(PART:"wifi", "default", 0.75); } else { - set_state(PART:"wifi_1", "visible", 0.0); - set_state(PART:"wifi_2", "visible", 0.0); - set_state(PART:"wifi_3", "visible", 0.0); + set_state(PART:"wifi", "default", 0.75); + } + if ((state == 2)) { + set_state(PART:"wifi-base", "connected", 0.0); + set_state(PART:"wifi", "default", 1.0); + } + else if ((state == 3)) { + set_state(PART:"wifi-base", "online", 0.0); + set_state(PART:"wifi", "default", 1.0); + } + else { + set_state(PART:"wifi-base", "default", 0.0); + set_state(PART:"wifi", "default", 0.0); } - if ((state == 2)) { set_state(PART:"led", "connected", 0.0); } - else if ((state == 3)) { set_state(PART:"led", "online", 0.0); } - else { set_state(PART:"led", "default", 0.0); } } } } parts { - part { name: "slot_bottom"; - description { state: "default" 0.0; - rel1.to: "slot"; - rel2.relative: 1.0 0.5; - rel2.to: "slot"; - min: 0 3; - image.normal: "slot_horiz_bottom.png"; - fixed: 0 1; - } - } -/////////////////////// part { name: "exclam_base"; clip_to: "clip_exclam"; description { state: "default" 0.0; - aspect: (71/144) (71/144); aspect_preference: BOTH; - align: 0.5 1.0; - rel2.relative: 1.0 0.5; - rel2.to_y: "slot"; - image.normal: "exlclam.png"; + min: 11 10; + rel1.relative: (20/160) (50/160); + rel2.relative: (135/160) (150/160); + aspect: (115/105) (115/105); aspect_preference: BOTH; + image.normal: "cloud-conn.png"; } } /////////////////////// - part { name: "wifi_shadow"; + part { name: "wifi-base"; clip_to: "clip_wifi"; description { state: "default" 0.0; - aspect: (160/144) (160/144); aspect_preference: BOTH; - align: 0.5 1.0; - rel2.relative: 1.0 0.5; - rel2.to_y: "slot"; - image.normal: "wifi_shadow.png"; + min: 14 10; + aspect: (140/100) (140/100); aspect_preference: BOTH; + rel1.relative: (10/160) (30/160); + rel2.relative: (150/160) (130/160); + image.normal: "wifi-1.png"; + color: 160 160 160 255; } - } - part { name: "wifi_base"; - clip_to: "clip_wifi"; - description { state: "default" 0.0; - aspect: (160/144) (160/144); aspect_preference: BOTH; - align: 0.5 1.0; - rel2.relative: 1.0 0.5; - rel2.to_y: "slot"; - image.normal: "wifi_base.png"; - } - } - part { name: "wifi_1"; - clip_to: "clip_wifi"; - description { state: "default" 0.0; - rel1.to: "wifi_base"; - rel2.to: "wifi_base"; - image.normal: "wifi_sig_1.png"; - visible: 0; - } - description { state: "partly" 0.0; + description { state: "connected" 0.0; inherit: "default" 0.0; - color: 255 255 255 128; - visible: 1; + color: 160 160 160 255; } - description { state: "visible" 0.0; + description { state: "online" 0.0; inherit: "default" 0.0; - visible: 1; + color: 51 153 255 255; } } - part { name: "wifi_2"; + part { name: "wifi"; mouse_events: 0; clip_to: "clip_wifi"; description { state: "default" 0.0; - rel1.to: "wifi_base"; - rel2.to: "wifi_base"; - image.normal: "wifi_sig_2.png"; - visible: 0; + rel1.to: "wifi-base"; + rel2.to: "wifi-base"; + image.normal: "wifi-1.png"; + color: 0 0 0 0; } - description { state: "partly" 0.0; + description { state: "default" 0.25; inherit: "default" 0.0; - color: 255 255 255 128; - visible: 1; + image.normal: "wifi-2.png"; + color: 160 160 160 255; } - description { state: "visible" 0.0; + description { state: "default" 0.5; inherit: "default" 0.0; - visible: 1; + image.normal: "wifi-3.png"; + color: 160 160 160 255; } - } - part { name: "wifi_3"; - clip_to: "clip_wifi"; - description { state: "default" 0.0; - rel1.to: "wifi_base"; - rel2.to: "wifi_base"; - image.normal: "wifi_sig_3.png"; - visible: 0; - } - description { state: "partly" 0.0; + description { state: "default" 0.75; inherit: "default" 0.0; - color: 255 255 255 128; - visible: 1; + image.normal: "wifi-4.png"; + color: 160 160 160 255; } - description { state: "visible" 0.0; + description { state: "default" 1.0; inherit: "default" 0.0; - visible: 1; - } - } - part { name: "lock"; - clip_to: "clip_wifi"; - description { state: "default" 0.0; hid; - aspect: (160/144) (160/144); aspect_preference: BOTH; - align: 0.5 1.0; - rel2.relative: 1.0 0.5; - rel2.to_y: "slot"; - image.normal: "lock_locked.png"; - link.base: "wireless,state,unsecured" "wireless"; - } - desc { "insecure"; inherit; vis; - image.normal: "lock_insecure.png"; - link.base: "wireless,state,insecure" "wireless"; - } - desc { "secure"; inherit; vis; - link.base: "wireless,state,secure" "wireless"; - } - } -////////////////////////// - part { name: "slot"; - description { state: "default" 0.0; - rel1.offset: 0 -1; - rel1.relative: (21/160) 1.0; - rel2.offset: -1 -1; - rel2.relative: (140/160) 1.0; - align: 0.5 1.0; - min: 0 6; - image.normal: "slot_horiz_top.png"; - fixed: 0 1; - } - } - part { name: "hole"; - description { state: "default" 0.0; - rel1.offset: -4 -4; - rel1.relative: 1.0 1.0; - rel2.offset: -4 -4; - align: 1.0 1.0; - min: 4 4; - max: 4 4; - image.normal: "hole_tiny.png"; - fixed: 1 1; + image.normal: "wifi-5.png"; + color: 160 160 160 255; } } part { name: "clip_exclam"; type: RECT; @@ -382,27 +269,6 @@ group { name: "wireless/wifi"; nomouse; visible: 1; } } - part { name: "led"; - description { state: "default" 0.0; - rel1.to: "hole"; - rel2.to: "hole"; - min: 10 10; - max: 10 10; - image.normal: "led_tiny_orange.png"; - fixed: 1 1; - visible: 0; - } - description { state: "connected" 0.0; - inherit: "default" 0.0; - image.normal: "led_tiny_orange.png"; - visible: 1; - } - description { state: "online" 0.0; - inherit: "default" 0.0; - image.normal: "led_tiny_green.png"; - visible: 1; - } - } part { name: "event"; type: RECT; mouse; description { state: "default" 0.0; color: 0 0 0 0; @@ -412,68 +278,60 @@ group { name: "wireless/wifi"; nomouse; programs { program { "connecting_wifi"; action: STATE_SET "default"; - targets: "wifi_1" "wifi_2" "wifi_3"; + targets: "wifi"; sequence { - action: STATE_SET "partly"; - target: "wifi_1"; - transition: LINEAR 0.085; - action: STATE_SET "visible"; - target: "wifi_1"; + action: STATE_SET "default" 0.0; + target: "wifi"; transition: LINEAR 0.085; - action: STATE_SET "partly"; - target: "wifi_2"; + action: STATE_SET "default" 0.25; + target: "wifi"; transition: LINEAR 0.085; - action: STATE_SET "visible"; - target: "wifi_2"; + action: STATE_SET "default" 0.50; + target: "wifi"; transition: LINEAR 0.085; - action: STATE_SET "partly"; - target: "wifi_3"; + action: STATE_SET "default" 0.75; + target: "wifi"; transition: LINEAR 0.085; - action: STATE_SET "visible"; - target: "wifi_3"; + action: STATE_SET "default" 1.0; + target: "wifi"; transition: LINEAR 0.085; after: "connecting_wifi"; } } program { "connecting"; action: STATE_SET "connected"; - target: "led"; + target: "wifi-base"; in: 0.3 0.0; sequence { action: STATE_SET "default"; - target: "led"; + target: "wifi-base"; in: 0.3 0.0; after: "connecting"; } } target_group: "clips" "clip_exclam" "clip_wifi"; program { - signal: "wireless,state,error"; source: "wireless"; + signal: "e,state,error"; source: "e"; action: STATE_SET "default" 0.0; groups: "clips"; } program { - signal: "wireless,state,default"; source: "wireless"; + signal: "e,state,default"; source: "e"; action: STATE_SET "wifi" 0.0; groups: "clips"; } } } -group { name: "wireless/bluetooth"; nomouse; - images.image: "slot_horiz_top.png" COMP; - images.image: "slot_horiz_bottom.png" COMP; - images.image: "exlclam.png" COMP; - images.image: "hole_tiny.png" COMP; - images.image: "led_tiny_orange.png" COMP; - images.image: "led_tiny_green.png" COMP; +group { name: "e/gadget/wireless/bluetooth"; nomouse; + images.image: "cloud-conn.png" COMP; images.image: "bt_base.png" COMP; images.image: "bt_sig_1.png" COMP; images.image: "bt_sig_2.png" COMP; script { public message(Msg_Type:type, id, ...) { if ((type == MSG_INT_SET) && (id == 1)) { - new state = getarg(2), signl = getarg(3); + new signl = getarg(3); if (signl <= 20) { set_state(PART:"bt_1", "default", 0.0); set_state(PART:"bt_2", "default", 0.0); @@ -494,38 +352,19 @@ group { name: "wireless/bluetooth"; nomouse; set_state(PART:"bt_1", "visible", 0.0); set_state(PART:"bt_2", "visible", 0.0); } - if ((state == 2)) { - set_state(PART:"led", "default", 0.0); - run_program(PROGRAM:"connecting"); - return; - } - else if ((state == 3)) { return; } - else if ((state == 4)) { set_state(PART:"led", "connected", 0.0); } - else if ((state == 5)) { set_state(PART:"led", "online", 0.0); } - else { set_state(PART:"led", "default", 0.0); } } } } parts { - part { name: "slot_bottom"; - description { state: "default" 0.0; - rel1.to: "slot"; - rel2.relative: 1.0 0.5; - rel2.to: "slot"; - min: 0 3; - image.normal: "slot_horiz_bottom.png"; - fixed: 0 1; - } - } /////////////////////// part { name: "exclam_base"; clip_to: "clip_exclam"; description { state: "default" 0.0; - aspect: (71/144) (71/144); aspect_preference: BOTH; - align: 0.5 1.0; - rel2.relative: 1.0 0.5; - rel2.to_y: "slot"; - image.normal: "exlclam.png"; + min: 11 10; + rel1.relative: (20/160) (50/160); + rel2.relative: (135/160) (150/160); + aspect: (115/105) (115/105); aspect_preference: BOTH; + image.normal: "cloud-conn.png"; } } /////////////////////// @@ -533,9 +372,6 @@ group { name: "wireless/bluetooth"; nomouse; clip_to: "clip_bt"; description { state: "default" 0.0; aspect: (160/144) (160/144); aspect_preference: BOTH; - align: 0.5 1.0; - rel2.relative: 1.0 0.5; - rel2.to_y: "slot"; image.normal: "bt_base.png"; } } @@ -576,30 +412,6 @@ group { name: "wireless/bluetooth"; nomouse; } } /////////////////////// - part { name: "slot"; - description { state: "default" 0.0; - rel1.offset: 0 -1; - rel1.relative: (21/160) 1.0; - rel2.offset: -1 -1; - rel2.relative: (140/160) 1.0; - align: 0.5 1.0; - min: 0 6; - image.normal: "slot_horiz_top.png"; - fixed: 0 1; - } - } - part { name: "hole"; - description { state: "default" 0.0; - rel1.offset: -4 -4; - rel1.relative: 1.0 1.0; - rel2.offset: -4 -4; - align: 1.0 1.0; - min: 4 4; - max: 4 4; - image.normal: "hole_tiny.png"; - fixed: 1 1; - } - } part { name: "clip_exclam"; type: RECT; description { state: "default" 0.0; visible: 1; @@ -616,27 +428,6 @@ group { name: "wireless/bluetooth"; nomouse; visible: 1; } } - part { name: "led"; - description { state: "default" 0.0; - rel1.to: "hole"; - rel2.to: "hole"; - min: 10 10; - max: 10 10; - image.normal: "led_tiny_orange.png"; - fixed: 1 1; - visible: 0; - } - description { state: "connected" 0.0; - inherit: "default" 0.0; - image.normal: "led_tiny_orange.png"; - visible: 1; - } - description { state: "online" 0.0; - inherit: "default" 0.0; - image.normal: "led_tiny_green.png"; - visible: 1; - } - } part { name: "event"; type: RECT; mouse; description { state: "default" 0.0; color: 0 0 0 0; @@ -644,26 +435,14 @@ group { name: "wireless/bluetooth"; nomouse; } } programs { - program { name: "connecting"; - action: STATE_SET "connected" 0.0; - target: "led"; - in: 0.3 0.0; - after: "connecting2"; - } - program { name: "connecting2"; - action: STATE_SET "default" 0.0; - target: "led"; - in: 0.3 0.0; - after: "connecting"; - } program { - signal: "wireless,state,error"; source: "wireless"; + signal: "e,state,error"; source: "e"; action: STATE_SET "default" 0.0; target: "clip_exclam"; target: "clip_bt"; } program { - signal: "wireless,state,default"; source: "wireless"; + signal: "e,state,default"; source: "e"; action: STATE_SET "bt" 0.0; target: "clip_exclam"; target: "clip_bt"; @@ -671,13 +450,8 @@ group { name: "wireless/bluetooth"; nomouse; } } -group { name: "wireless/cellular"; - images.image: "slot_horiz_top.png" COMP; - images.image: "slot_horiz_bottom.png" COMP; - images.image: "exlclam.png" COMP; - images.image: "hole_tiny.png" COMP; - images.image: "led_tiny_orange.png" COMP; - images.image: "led_tiny_green.png" COMP; +group { name: "e/gadget/wireless/cellular"; + images.image: "cloud-conn.png" COMP; images.image: "cell_base.png" COMP; images.image: "cell_sig_1.png" COMP; images.image: "cell_sig_2.png" COMP; @@ -687,7 +461,7 @@ group { name: "wireless/cellular"; script { public message(Msg_Type:type, id, ...) { if ((type == MSG_INT_SET) && (id == 1)) { - new state = getarg(2), signl = getarg(3); + new signl = getarg(3); if (signl <= 11) { set_state(PART:"cell_1", "default", 0.0); set_state(PART:"cell_2", "default", 0.0); @@ -742,37 +516,19 @@ group { name: "wireless/cellular"; set_state(PART:"cell_3", "visible", 0.0); set_state(PART:"cell_4", "visible", 0.0); } - if ((state == 1)) { - set_state(PART:"led", "default", 0.0); - run_program(PROGRAM:"connecting"); - return; - } - else if ((state == 2)) { set_state(PART:"led", "connected", 0.0); } - else if ((state == 3)) { set_state(PART:"led", "online", 0.0); } - else { set_state(PART:"led", "default", 0.0); } } } } parts { - part { name: "slot_bottom"; mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "slot"; - rel2.relative: 1.0 0.5; - rel2.to: "slot"; - min: 0 3; - image.normal: "slot_horiz_bottom.png"; - fixed: 0 1; - } - } /////////////////////// - part { name: "exclam_base"; mouse_events: 0; + part { name: "exclam_base"; clip_to: "clip_exclam"; description { state: "default" 0.0; - aspect: (71/144) (71/144); aspect_preference: BOTH; - align: 0.5 1.0; - rel2.relative: 1.0 0.5; - rel2.to_y: "slot"; - image.normal: "exlclam.png"; + min: 11 10; + rel1.relative: (20/160) (50/160); + rel2.relative: (135/160) (150/160); + aspect: (115/105) (115/105); aspect_preference: BOTH; + image.normal: "cloud-conn.png"; } } /////////////////////// @@ -780,9 +536,6 @@ group { name: "wireless/cellular"; clip_to: "clip_cell"; description { state: "default" 0.0; aspect: (160/144) (160/144); aspect_preference: BOTH; - align: 0.5 1.0; - rel2.relative: 1.0 0.5; - rel2.to_y: "slot"; image.normal: "cell_base.png"; } } @@ -859,30 +612,6 @@ group { name: "wireless/cellular"; } } /////////////////////// - part { name: "slot"; mouse_events: 0; - description { state: "default" 0.0; - rel1.offset: 0 -1; - rel1.relative: (21/160) 1.0; - rel2.offset: -1 -1; - rel2.relative: (140/160) 1.0; - align: 0.5 1.0; - min: 0 6; - image.normal: "slot_horiz_top.png"; - fixed: 0 1; - } - } - part { name: "hole"; mouse_events: 0; - description { state: "default" 0.0; - rel1.offset: -4 -4; - rel1.relative: 1.0 1.0; - rel2.offset: -4 -4; - align: 1.0 1.0; - min: 4 4; - max: 4 4; - image.normal: "hole_tiny.png"; - fixed: 1 1; - } - } part { name: "clip_exclam"; type: RECT; description { state: "default" 0.0; visible: 1; @@ -899,27 +628,6 @@ group { name: "wireless/cellular"; visible: 1; } } - part { name: "led"; mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "hole"; - rel2.to: "hole"; - min: 10 10; - max: 10 10; - image.normal: "led_tiny_orange.png"; - fixed: 1 1; - visible: 0; - } - description { state: "connected" 0.0; - inherit: "default" 0.0; - image.normal: "led_tiny_orange.png"; - visible: 1; - } - description { state: "online" 0.0; - inherit: "default" 0.0; - image.normal: "led_tiny_green.png"; - visible: 1; - } - } part { name: "event"; type: RECT; description { state: "default" 0.0; color: 0 0 0 0; @@ -928,31 +636,17 @@ group { name: "wireless/cellular"; } programs { - program { name: "connecting"; - action: STATE_SET "connected" 0.0; - target: "led"; - in: 0.3 0.0; - after: "connecting2"; - } - program { name: "connecting2"; - action: STATE_SET "default" 0.0; - target: "led"; - in: 0.3 0.0; - after: "connecting"; - } program { - signal: "wireless,state,error"; source: "wireless"; + signal: "e,state,error"; source: "e"; action: STATE_SET "default" 0.0; target: "clip_exclam"; target: "clip_cell"; } program { - signal: "wireless,state,default"; source: "wireless"; + signal: "e,state,default"; source: "e"; action: STATE_SET "cell" 0.0; target: "clip_exclam"; target: "clip_cell"; } } } - -} --
