okra pushed a commit to branch master.
http://git.enlightenment.org/enlightenment/gadgets/wireless.git/commit/?id=55bc571fbda6528cb063a776bda03dc314aea43e
commit 55bc571fbda6528cb063a776bda03dc314aea43e
Author: Stephen Houston <stephen@localhost.localdomain>
Date: Tue Feb 27 13:35:29 2018 -0600
Make theme work.
---
theme/wireless.edc | 62 ++++++++++++++++--------------------------------------
1 file changed, 18 insertions(+), 44 deletions(-)
diff --git a/theme/wireless.edc b/theme/wireless.edc
index 7ba7910..58f21f0 100644
--- a/theme/wireless.edc
+++ b/theme/wireless.edc
@@ -1,4 +1,5 @@
-group { name: "e/gadget/wireless/ethernet"; nomouse;
+collections {
+group { name: "wireless/ethernet"; nomouse;
images.image: "cloud-conn.png" COMP;
images.image: "eth-base.png" COMP;
images.image: "eth-top.png" COMP;
@@ -17,8 +18,6 @@ group { name: "e/gadget/wireless/ethernet"; nomouse;
run_program(PROGRAM:"connecting");
return;
}
- 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);
@@ -122,19 +121,19 @@ group { name: "e/gadget/wireless/ethernet"; nomouse;
}
target_group: "clips" "clip_exclam" "clip_eth";
program {
- signal: "e,state,error"; source: "e";
+ signal: "wireless,state,error"; source: "wireless";
action: STATE_SET "default" 0.0;
groups: "clips";
}
program {
- signal: "e,state,default"; source: "e";
+ signal: "wireless,state,default"; source: "wireless";
action: STATE_SET "eth" 0.0;
groups: "clips";
}
}
}
-group { name: "e/gadget/wireless/wifi"; nomouse;
+group { name: "wireless/wifi"; nomouse;
images.image: "cloud-conn.png" COMP;
images.image: "wifi-1.png" COMP;
images.image: "wifi-2.png" COMP;
@@ -155,40 +154,16 @@ group { name: "e/gadget/wireless/wifi"; nomouse;
run_program(PROGRAM:"connecting_wifi");
return;
}
- stop_programs_on(PART:"wifi-base");
- stop_programs_on(PART:"wifi");
- if (signl <= 14) {
- set_state(PART:"wifi", "default", 0.0);
- }
- else if (signl <= 28) {
- set_state(PART:"wifi", "default", 0.25);
- }
- else if (signl <= 42) {
- set_state(PART:"wifi", "default", 0.25);
- }
- else if (signl <= 57) {
- set_state(PART:"wifi", "default", 0.50);
- }
- else if (signl <= 71) {
- set_state(PART:"wifi", "default", 0.50);
- }
- else if (signl <= 85) {
- set_state(PART:"wifi", "default", 0.75);
- }
- else {
- set_state(PART:"wifi", "default", 0.75);
- }
+ set_state(PART:"wifi", "default", float(signl) / 100.0);
+
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);
}
}
}
@@ -277,8 +252,6 @@ group { name: "e/gadget/wireless/wifi"; nomouse;
}
programs {
program { "connecting_wifi";
- action: STATE_SET "default";
- targets: "wifi";
sequence {
action: STATE_SET "default" 0.0;
target: "wifi";
@@ -299,11 +272,11 @@ group { name: "e/gadget/wireless/wifi"; nomouse;
}
}
program { "connecting";
- action: STATE_SET "connected";
+ action: STATE_SET "connected" 0.0;
target: "wifi-base";
in: 0.3 0.0;
sequence {
- action: STATE_SET "default";
+ action: STATE_SET "default" 0.0;
target: "wifi-base";
in: 0.3 0.0;
after: "connecting";
@@ -311,19 +284,19 @@ group { name: "e/gadget/wireless/wifi"; nomouse;
}
target_group: "clips" "clip_exclam" "clip_wifi";
program {
- signal: "e,state,error"; source: "e";
+ signal: "wireless,state,error"; source: "wireless";
action: STATE_SET "default" 0.0;
groups: "clips";
}
program {
- signal: "e,state,default"; source: "e";
+ signal: "wireless,state,default"; source: "wireless";
action: STATE_SET "wifi" 0.0;
groups: "clips";
}
}
}
-group { name: "e/gadget/wireless/bluetooth"; nomouse;
+group { name: "wireless/bluetooth"; nomouse;
images.image: "cloud-conn.png" COMP;
images.image: "bt_base.png" COMP;
images.image: "bt_sig_1.png" COMP;
@@ -436,13 +409,13 @@ group { name: "e/gadget/wireless/bluetooth"; nomouse;
}
programs {
program {
- signal: "e,state,error"; source: "e";
+ signal: "wireless,state,error"; source: "wireless";
action: STATE_SET "default" 0.0;
target: "clip_exclam";
target: "clip_bt";
}
program {
- signal: "e,state,default"; source: "e";
+ signal: "wireless,state,default"; source: "wireless";
action: STATE_SET "bt" 0.0;
target: "clip_exclam";
target: "clip_bt";
@@ -450,7 +423,7 @@ group { name: "e/gadget/wireless/bluetooth"; nomouse;
}
}
-group { name: "e/gadget/wireless/cellular";
+group { name: "wireless/cellular";
images.image: "cloud-conn.png" COMP;
images.image: "cell_base.png" COMP;
images.image: "cell_sig_1.png" COMP;
@@ -637,16 +610,17 @@ group { name: "e/gadget/wireless/cellular";
programs {
program {
- signal: "e,state,error"; source: "e";
+ signal: "wireless,state,error"; source: "wireless";
action: STATE_SET "default" 0.0;
target: "clip_exclam";
target: "clip_cell";
}
program {
- signal: "e,state,default"; source: "e";
+ signal: "wireless,state,default"; source: "wireless";
action: STATE_SET "cell" 0.0;
target: "clip_exclam";
target: "clip_cell";
}
}
}
+}
--
