From 3c2641d17a69709602510af43c8173fef66678a5 Mon Sep 17 00:00:00 2001 From: Bruno Dilly Date: Mon, 3 Sep 2012 22:06:48 +0000 Subject: [PATCH] e/connman: Better online / ready status Show it on wired / 3g / ... as well SVN revision: 76074 --- data/themes/default.edc | 146 ++++++++++++------ data/themes/images/Makefile.am | 6 +- data/themes/images/connman_online.png | Bin 318 -> 0 bytes data/themes/images/connman_ready.png | Bin 310 -> 0 bytes .../images/connman_status_online_128.png | Bin 0 -> 1615 bytes .../images/connman_status_online_32.png | Bin 0 -> 1053 bytes .../images/connman_status_ready_128.png | Bin 0 -> 1657 bytes .../themes/images/connman_status_ready_32.png | Bin 0 -> 1054 bytes src/modules/connman/e_mod_main.c | 7 - 9 files changed, 99 insertions(+), 60 deletions(-) delete mode 100644 data/themes/images/connman_online.png delete mode 100644 data/themes/images/connman_ready.png create mode 100644 data/themes/images/connman_status_online_128.png create mode 100644 data/themes/images/connman_status_online_32.png create mode 100644 data/themes/images/connman_status_ready_128.png create mode 100644 data/themes/images/connman_status_ready_32.png diff --git a/data/themes/default.edc b/data/themes/default.edc index 4f2d082ff..6f04d133b 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -7871,12 +7871,65 @@ collections { ///////////////////////////////////////////////////////////////////////////// /*** MOD: CONNMAN ***/ +#define MSG_ID_STRENGTH 1 + +#define CONNMAN_STATE_PART_ADD() \ + part { \ + name: "state"; \ + type: IMAGE; \ + mouse_events: 0; \ + description { \ + state: "default" 0.0; \ + aspect: 1 1; \ + aspect_preference: BOTH; \ + color: 255 255 255 0; \ + image.normal: "connman_status_ready"; \ + rel1.relative: 1 0; \ + align: 1 1; \ + min: 8 8; \ + } \ + description { \ + state: "ready" 0.0; \ + inherit: "default" 0.0; \ + color: 255 255 255 255; \ + } \ + description { \ + state: "online" 0.0; \ + inherit: "default" 0.0; \ + color: 255 255 255 255; \ + image.normal: "connman_status_online"; \ + } \ + } + #define CONNMAN_ICON(_icon) \ group { \ name: "e/modules/connman/icon/"##_icon; \ + script { \ + public message(Msg_Type:type, id, ...) { \ + if ((type == MSG_INT_SET) && (id == MSG_ID_STRENGTH)) { \ + new state = getarg(2); \ + /* Connecting if in association or configuration */ \ + if ((state == 2)) \ + { \ + set_state(PART:"state", "default", 0.0); \ + run_program(PROGRAM:"connecting"); \ + return; \ + } \ + if ((state == 3)) \ + return; \ + if ((state == 4)) \ + set_state(PART:"state", "ready", 0.0); \ + else if ((state == 5)) \ + set_state(PART:"state", "online", 0.0); \ + else \ + set_state(PART:"state", "default", 0.0); \ + set_state(PART:"icon", "default", 0.0); \ + } \ + } \ + } \ parts { \ part { \ - name: #_icon; \ + name: "icon"; \ type: IMAGE; \ mouse_events: 0; \ description { \ @@ -7886,6 +7939,28 @@ collections { image.image: "connman_"##_icon##".png" COMP; \ image.normal: "connman_"##_icon##".png"; \ } \ + description { \ + state: "hidden" 0.0; \ + inherit: "default" 0.0; \ + color: 255 255 255 0; \ + } \ + } \ + CONNMAN_STATE_PART_ADD() \ + } \ + programs { \ + program { \ + name: "connecting"; \ + action: STATE_SET "hidden" 0.0; \ + transition: ACCEL 0.3; \ + target: "icon"; \ + after: "connecting,2"; \ + } \ + program { \ + name: "connecting,2"; \ + action: STATE_SET "default" 0.0; \ + transition: DECEL 0.3; \ + target: "icon"; \ + after: "connecting"; \ } \ } \ } @@ -7914,8 +7989,6 @@ CONNMAN_ICON(ethernet) group { name: "e/modules/connman/icon/wifi"; -#define MSG_ID_STRENGTH 1 - #define CONNMAN_BAR_IMAGES_SET(_name) \ images { \ set { \ @@ -7984,12 +8057,20 @@ CONNMAN_ICON(ethernet) /* Connecting if in association or configuration */ if ((state == 2)) { + set_state(PART:"state", "default", 0.0); run_program(PROGRAM:"connecting"); return; } if ((state == 3)) return; + if ((state == 4)) + set_state(PART:"state", "ready", 0.0); + else if ((state == 5)) + set_state(PART:"state", "online", 0.0); + else + set_state(PART:"state", "default", 0.0); + set_state(PART:"bar_0_on", "visible", 0.0); set_tween_state(PART:"bar_1_on", (str - (100/3) * 0) / (100/3), "default", 0.0, "visible", 0.0); @@ -8066,6 +8147,9 @@ CONNMAN_ICON(ethernet) color: 255 255 255 255; } } + CONNMAN_IMAGES_SET(status_ready) + CONNMAN_IMAGES_SET(status_online) + CONNMAN_STATE_PART_ADD() } programs { program { @@ -8081,6 +8165,7 @@ CONNMAN_ICON(ethernet) signal: "e,unavailable"; source: "e"; action: STATE_SET "default" 0.0; + target: "bar_0_on"; target: "bar_1_on"; target: "bar_2_on"; target: "bar_3_on"; @@ -8112,6 +8197,12 @@ CONNMAN_ICON(ethernet) target: "bar_1_on"; target: "bar_2_on"; target: "bar_3_on"; + after: "connecting,2"; + } + program { + name: "connecting,2"; + action: STATE_SET "visible" 0.0; + target: "bar_0_on"; after: "connecting,1,on"; } CONNMAN_CONNECTING_ON(1, 2) @@ -8162,32 +8253,6 @@ CONNMAN_ICON(ethernet) CONNMAN_IMAGES_SET(security2) parts { - part { - name: "state"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - aspect: 1 1; - aspect_preference: BOTH; - color: 255 255 255 0; - image.image: "connman_ready.png" COMP; - image.normal: "connman_ready.png"; - rel2.relative: 0.3 1; - } - description { - state: "ready" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; - } - description { - state: "online" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; - image.image: "connman_online.png" COMP; - image.normal: "connman_online.png"; - } - } part { name: "security"; type: IMAGE; @@ -8197,7 +8262,6 @@ CONNMAN_ICON(ethernet) aspect: 1 1; aspect_preference: BOTH; color: 255 255 255 0; - rel1.relative: 0.3 0; image.normal: "connman_security1"; } description { @@ -8214,27 +8278,6 @@ CONNMAN_ICON(ethernet) } } programs { - program { - name: "state,idle"; - signal: "e,state,idle"; - source: "e"; - action: STATE_SET "default" 0.0; - target: "state"; - } - program { - name: "state,ready"; - signal: "e,state,ready"; - source: "e"; - action: STATE_SET "ready" 0.0; - target: "state"; - } - program { - name: "state,online"; - signal: "e,state,online"; - source: "e"; - action: STATE_SET "online" 0.0; - target: "state"; - } program { name: "security,off"; signal: "e,security,off"; @@ -8266,6 +8309,7 @@ CONNMAN_ICON(ethernet) } } +#undef CONNMAN_STATE_PART_ADD #undef CONNMAN_IMAGES_SET ///////////////////////////////////////////////////////////////////////////// diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am index 30bb8a00c..0b91ee188 100644 --- a/data/themes/images/Makefile.am +++ b/data/themes/images/Makefile.am @@ -77,12 +77,14 @@ clock_base.png \ connman_bluetooth.png \ connman_cellular.png \ connman_ethernet.png \ -connman_online.png \ -connman_ready.png \ connman_security1_128.png \ connman_security1_32.png \ connman_security2_128.png \ connman_security2_32.png \ +connman_status_online_128.png \ +connman_status_online_32.png \ +connman_status_ready_128.png \ +connman_status_ready_32.png \ connman_wifi_0_on_128.png \ connman_wifi_0_on_32.png \ connman_wifi_1_on_128.png \ diff --git a/data/themes/images/connman_online.png b/data/themes/images/connman_online.png deleted file mode 100644 index fb485c5cadde797befdd732d07feeaec2de49858..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 318 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgf<4qgUJORLQfqJTn@C9V-A&iT2y zsd*&~&PAz-C8;S2<(VZJ3hti10pX2&;y^_+JzX3_EKVPtbegx>fyYID&UXj)9W8HL zrc4lWRt-3G$&qj8Z0DXNyVG8tDsG>ST7M4P#I`PM>+OsT21ca|x5}8@6ax3ot2|&` z!)(Reu~&up%YkI>pDm_$E*dOwG&Y{GJThskbH{JXj z^-mZl$L?N|a!)p4i)QB2)#gw3F+}c~@Gor1{M9vk)BLP$`7a;Z;RQL70(Y)*K0-AbW|YuPgf<4qgUJr483Kw*iGDOI#yLobz*Y zQ}ap~oQqNuOHxx5$}>wc6x=<11Hv2m#DR(?db&7H&`NHokP6gY8>?cSxN}f27@|an}!MF3drf<@e2$itT zSf^)q)4FwkMBR(o_`Qs4;)!jpjp3bt-tqQLJUemL9Cn|wJsz8_^O%2l%M~zuZTH*y whJC>dWz(GtmF<~4Hu~&+GjUz*)95cuJ&k>{KOd3319TjNr>mdKI;Vst07y%29{>OV diff --git a/data/themes/images/connman_status_online_128.png b/data/themes/images/connman_status_online_128.png new file mode 100644 index 0000000000000000000000000000000000000000..a331e98a8b5e3ee2a1d2bc2829763003c282a433 GIT binary patch literal 1615 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 literal 0 HcmV?d00001 diff --git a/src/modules/connman/e_mod_main.c b/src/modules/connman/e_mod_main.c index 1c3702a80..e21badcf1 100644 --- a/src/modules/connman/e_mod_main.c +++ b/src/modules/connman/e_mod_main.c @@ -53,7 +53,6 @@ static Evas_Object * _econnman_service_new_icon(struct Connman_Service *cs, static Evas_Object * _econnman_service_new_end(struct Connman_Service *cs, Evas *evas) { - const char *state = econnman_state_to_str(cs->state); Eina_Iterator *iter; Evas_Object *end; void *security; @@ -63,12 +62,6 @@ static Evas_Object * _econnman_service_new_end(struct Connman_Service *cs, e_theme_edje_object_set(end, "base/theme/modules/connman", "e/modules/connman/end"); - if (state) - { - snprintf(buf, sizeof(buf), "e,state,%s", state); - edje_object_signal_emit(end, buf, "e"); - } - if (!cs->security) return end;