From 74b8654da0f17dc604b7d4fb30e5785cc9742454 Mon Sep 17 00:00:00 2001 From: Jiwan Kim Date: Thu, 24 Dec 2015 09:44:14 +0900 Subject: [PATCH] Changes for failed/connected icon - Update icon image when connection request to another AP failed Change-Id: I722883c31522333fbef1fe222434d1c38edf32b3 --- include/layout/network.h | 2 ++ res/images/ic_thumb_failed.png | Bin 0 -> 1814 bytes res/widget/gengrid.edc | 41 +++++++++++++++++++++++++++++++++++++++++ src/data/data_wireless.c | 2 ++ src/grid/grid_wireless.c | 4 +++- src/layout/layout_network.c | 16 ++++++++++++---- 6 files changed, 60 insertions(+), 5 deletions(-) create mode 100644 res/images/ic_thumb_failed.png diff --git a/include/layout/network.h b/include/layout/network.h index 7af7cc1..c52cc18 100644 --- a/include/layout/network.h +++ b/include/layout/network.h @@ -41,6 +41,7 @@ /* Signal for network layout */ #define SIG_NO_WIRELESS "sig.no.wireless" #define SIG_WIRELESS_EXISTS "sig.wireless.exists" +#define SIG_CONNECTION_FAIL "sig.connection.wireless.fail" #define SIG_LOADING_START "sig.loading.start" #define SIG_LOADING_STOP "sig.loading.stop" @@ -80,6 +81,7 @@ #define IC_LOCK_NETWORK_FOC_04_PNG "ic_lock_network_foc_04.png" #define IC_CHECK_NOR_PNG "ic_thumb_check_sel.png" #define IC_CHECK_FOC_PNG "ic_thumb_check_foc.png" +#define IC_CHECK_FAIL_PNG "ic_thumb_failed.png" #define IC_NETWORK_LOADING_01_PNG "network_loading_01.png" #define IC_NETWORK_LOADING_02_PNG "network_loading_02.png" #define IC_NETWORK_LOADING_03_PNG "network_loading_03.png" diff --git a/res/images/ic_thumb_failed.png b/res/images/ic_thumb_failed.png new file mode 100644 index 0000000000000000000000000000000000000000..e07987dab362bab544bd60e089455e40fc63e64d GIT binary patch literal 1814 zcmbVNX;2eq7!Gm-QLF(30V~Vmfl7|u+$)jh!k`8NM2(`Bm@Ke`WaDNr!Gcyn1W!N& zJWxC0HA7J=jwcGON3np#Qp5_yqP7TCJg7%2+Kqzk562(f+1>Bh_j#W8dym;XP4sk6 zj{pxEjpiApQp8dt?0DSWsQ1{2+@sXsPbzg}9G*zp^aM(i8u2A45M|OQp|Pmmn7*_Q z4X4qZ6EUrh)Tw772HeEbJ8W2XlZ8UlXyFldi{6lelE4x)2{TK;-ZSSx05eL!d3-fT zZIPqNm})tJ#x0N58kVOR#6~b;8W3(rC;}5o>H)hc)oexV67UT#Ld_l9Y!G;3LZ(Q- zw@&HQ8bFQ{D8OfNnFbC70RjOF;_(FnC=7r(5X|OKw}1)p5WWC`g}}fCQfh=T5s6hq z4roy;37AZh7KF{V*=#HumxU8aY)C8?J2+sNNm($h>1I-IXPT`cgA5APY9KHRiQ#6z z!Khz?r;!qn^7QQyOcu5J9kJOu5GX2SY`fmVhFBc7$>ccK8*3{Wi~j4zd#$b7bPLLk zMXh)mVW9Gn7%~W^V)tPohau$+GMm7tr07!>xFOAin#m}I1f;&OjF=ITDFi%N#FvW2 zN|BNWK_Venpipq7LYWX2DTUA=$NR7%hzr9CjvVHQA3_-O<91>7TbzEeWLaMd@{KvLJU4(jt{=+&Hht zyWJ;Mr5^UG7&1&cs+6{_me%El*G#d{+d6H_*42mPjH`)$So3J^xvcdG1#6HCojKl} ziIyR=?q+^;ve9>CoqHeWu|euudifyJE#&$6xtgoVt^oyJmME;c zY^HT0Y1bIg$5l<~!d7RG;ir`Wyj2}lliHd0PUO$ulQkkJiwNxBQ9GTuQg4tlU;TAWO-|9(p=l->s!6}(OF*}~z#L%-k22to1Kg8$Pa}B4vKF>Rp@3S|!F_9kn&AtK|tJLF0 zr2LtDWN^{yPj`lKC&;!>DrdPcSi<>hnGO zw_1=LHm7(p>XerYRo}5xmsB19$@FDYSo{^7aV?>&?^OG5yD|&mF4o^+vce48y`FB3 zU&Z1l(az+pl3bU-EBbEirRH_dU0v|7r&FG7t8IxGJ2PORQ(!53F&%kX-`_H&pbq|i zNkAStBjBlXskh?6yw>vJm)N)5LtBo7Y-vj$|LwuD96oljPVAqaF4^rA_+-{DnQLo9 z#@4_ahj$+E(wA*k&377+wN-4`U-o-Q$Mejbi3_m1{x9x_i5ioRulEe@K6-QRk$`%7 z-OBLmbyessid, ap_info->connection_state); + if (ap_info->connection_state == WIFI_CONNECTION_STATE_CONNECTED && priv->event_cb) priv->event_cb(EVENT_DATA_SELECT_DONE, priv->cb_data); diff --git a/src/grid/grid_wireless.c b/src/grid/grid_wireless.c index 265a8c9..45aefad 100644 --- a/src/grid/grid_wireless.c +++ b/src/grid/grid_wireless.c @@ -57,8 +57,10 @@ static Eina_Bool _state_get(void *data, Evas_Object *obj, const char *part) return EINA_FALSE; } else if (!strcmp(part, PART_STATE_CHECK)) { if (ap_info->connection_state - == WIFI_CONNECTION_STATE_CONNECTED) + == WIFI_CONNECTION_STATE_CONNECTED) { + _DBG("AP[%s] part[%s] state : [%d]", ap_info->essid, part, ap_info->connection_state); return EINA_TRUE; + } else return EINA_FALSE; } diff --git a/src/layout/layout_network.c b/src/layout/layout_network.c index d940c85..d47e54e 100644 --- a/src/layout/layout_network.c +++ b/src/layout/layout_network.c @@ -261,16 +261,16 @@ static void _grid_realized_cb(int id, void *data, Evas_Object *obj, if (ap_info) { switch(ap_info->signal_level) { case SIGNAL_LEVEL_1: - elm_object_item_signal_emit(item, "wifi_signal_level,1", "elm"); + elm_object_item_signal_emit(item, "wifi_signal_level,1", SRC_ELM); break; case SIGNAL_LEVEL_2: - elm_object_item_signal_emit(item, "wifi_signal_level,2", "elm"); + elm_object_item_signal_emit(item, "wifi_signal_level,2", SRC_ELM); break; case SIGNAL_LEVEL_3: - elm_object_item_signal_emit(item, "wifi_signal_level,3", "elm"); + elm_object_item_signal_emit(item, "wifi_signal_level,3", SRC_ELM); break; case SIGNAL_LEVEL_4: - elm_object_item_signal_emit(item, "wifi_signal_level,4", "elm"); + elm_object_item_signal_emit(item, "wifi_signal_level,4", SRC_ELM); break; } } @@ -349,6 +349,14 @@ static void _data_event_cb(enum event_type type, void *data) _DBG("Failed to connect"); elm_object_item_signal_emit(priv->selected_wireless_item, SIG_LOADING_STOP, SRC_ELM); + elm_object_item_signal_emit(priv->selected_wireless_item, + SIG_CONNECTION_FAIL, SRC_ELM); + + /* Update connection state for all items. + * When profile is switched to ethernet, + * 'Connected' check icon still remains.. */ + if (!listmgr_update_list(priv->listmgr, LIST_WIRELESS)) + _ERR("Listmgr update list failed."); break; default: -- 2.7.4