diff options
author | Kim Gibyoung <lastkgb.kim@samsung.com> | 2013-03-28 20:10:59 +0900 |
---|---|---|
committer | Kim Gibyoung <lastkgb.kim@samsung.com> | 2013-03-28 20:10:59 +0900 |
commit | 8f7486dcac9783bd8db01582a8767a24541af5e6 (patch) | |
tree | 5421d10da60cbec16138d19030b5b61cfef3e480 | |
parent | 8c1fc71a171e53f4776aeda158adb418e725a9e5 (diff) | |
parent | 3ca99f3a9e6093b52f94e864781696b2f229fa8d (diff) | |
download | ug-wifi-direct-8f7486dcac9783bd8db01582a8767a24541af5e6.tar.gz ug-wifi-direct-8f7486dcac9783bd8db01582a8767a24541af5e6.tar.bz2 ug-wifi-direct-8f7486dcac9783bd8db01582a8767a24541af5e6.zip |
package update
Change-Id: Ibc459e45512828558de54be7469c80f9810c74a4
-rwxr-xr-x | debian/changelog | 24 | ||||
-rwxr-xr-x | packaging/libug-setting-wifidirect-efl.spec | 2 | ||||
-rwxr-xr-x | popup-wifidirect/src/wfd-app-popup-view.c | 1 | ||||
-rwxr-xr-x | ug-wifidirect/src/wfd_ug_genlist.c | 31 | ||||
-rwxr-xr-x | ug-wifidirect/src/wfd_ug_main_view.c | 30 |
5 files changed, 85 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 40bd29f..f66e7b0 100755 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,27 @@ +ug-setting-wifidirect-efl (1.0.11) precise; urgency=low + + * Fix bug N_SE-29625, N_SE-30229, N_SE-30234 + * Git: rsa/apps/home/ug-wifi-direct + * Tag: libug-setting-wifidirect-efl_1.0.11 + + -- Gibyoung Kim <laskgb.kim@samsung.com> Tur, 28 Mar 2013 12:25:01 +0900 + +ug-setting-wifidirect-efl (1.0.10) precise; urgency=low + + * Update for SR + * Git: rsa/apps/home/ug-wifi-direct + * Tag: libug-setting-wifidirect-efl_1.0.10 + + -- sunil85.kim <isurit@sunil85.kim> Fri, 15 Mar 2013 12:08:21 +0900 + +ug-setting-wifidirect-efl (1.0.9) precise; urgency=low + + * [N_SE-25814] Modify check button event + * Git: rsa/apps/home/ug-wifi-direct + * Tag: libug-setting-wifidirect-efl_1.0.9 + + -- sunil85.kim <isurit@sunil85.kim> Wed, 13 Mar 2013 17:06:19 +0900 + ug-setting-wifidirect-efl (1.0.8) precise; urgency=low * Fix bug of invitation behavior diff --git a/packaging/libug-setting-wifidirect-efl.spec b/packaging/libug-setting-wifidirect-efl.spec index 298dd2b..3ccf6f6 100755 --- a/packaging/libug-setting-wifidirect-efl.spec +++ b/packaging/libug-setting-wifidirect-efl.spec @@ -3,7 +3,7 @@ Name: libug-setting-wifidirect-efl Summary: Wi-Fi Direct setting UI gadget -Version: 1.0.8 +Version: 1.0.11 Release: 1 Group: TO_BE_FILLED License: Flora License diff --git a/popup-wifidirect/src/wfd-app-popup-view.c b/popup-wifidirect/src/wfd-app-popup-view.c index 3b07f3d..091b88f 100755 --- a/popup-wifidirect/src/wfd-app-popup-view.c +++ b/popup-wifidirect/src/wfd-app-popup-view.c @@ -400,6 +400,7 @@ static void _check_changed_cb(void *data, Evas_Object * obj, void *event_info) Eina_Bool state = elm_check_state_get(obj); elm_entry_password_set(ad->pin_entry, !state); + elm_entry_autocapital_type_set(ad->pin_entry, ELM_AUTOCAPITAL_TYPE_NONE); } /** diff --git a/ug-wifidirect/src/wfd_ug_genlist.c b/ug-wifidirect/src/wfd_ug_genlist.c index bb2345c..35d4103 100755 --- a/ug-wifidirect/src/wfd_ug_genlist.c +++ b/ug-wifidirect/src/wfd_ug_genlist.c @@ -96,6 +96,36 @@ static char *_gl_header_label_get(void *data, Evas_Object *obj, const char *part } /** + * This function let the ug call it when click header + * @return void + * @param[in] data the pointer to the main data structure + * @param[in] obj the pointer to the evas object + * @param[in] event_info the pointer to the event information + */ +static void _gl_header_sel(void *data, Evas_Object *obj, void *event_info) +{ + __WDUG_LOG_FUNC_ENTER__; + struct ug_data *ugd = (struct ug_data *) data; + + Elm_Object_Item *item = (Elm_Object_Item *)event_info; + if (item != NULL) + elm_genlist_item_selected_set(item, EINA_FALSE); + + if (ugd == NULL) + WDUG_LOGE("Incorrect parameter(NULL)\n"); + else { + if(!ugd->wfd_onoff) { + WDUG_LOGD("Wi-Fi direct switch on\n"); + wfd_client_switch_on(ugd); + } else { + WDUG_LOGD("Wi-Fi direct switch off\n"); + wfd_client_switch_off(ugd); + } + } + __WDUG_LOG_FUNC_EXIT__; +} + +/** * This function let the ug get the icon of header * @return the icon of header * @param[in] data the pointer to the main data structure @@ -122,6 +152,7 @@ static Evas_Object *_gl_header_icon_get(void *data, Evas_Object *obj, const char onoff = elm_check_add(obj); elm_object_style_set(onoff, "on&off"); elm_check_state_set(onoff, ugd->wfd_onoff); + evas_object_smart_callback_add(onoff, "changed", _gl_header_sel , ugd); evas_object_show(onoff); } diff --git a/ug-wifidirect/src/wfd_ug_main_view.c b/ug-wifidirect/src/wfd_ug_main_view.c index 59c2439..62c6988 100755 --- a/ug-wifidirect/src/wfd_ug_main_view.c +++ b/ug-wifidirect/src/wfd_ug_main_view.c @@ -172,6 +172,32 @@ static void _gl_header_sel(void *data, Evas_Object *obj, void *event_info) } /** + * This function let the ug call it when click genlist item + * @return void + * @param[in] data the pointer to the main data structure + * @param[in] obj the pointer to the evas object + * @param[in] event_info the pointer to the event information + */ +static void _gl_item_sel(void *data, Evas_Object *obj, void *event_info) +{ + __WDUG_LOG_FUNC_ENTER__; + if (NULL == data) { + WDUG_LOGE("Incorrect parameter(NULL)\n"); + __WDUG_LOG_FUNC_EXIT__; + return; + } + + struct ug_data *ugd = (struct ug_data *) data; + Elm_Object_Item *item = (Elm_Object_Item *)event_info; + + if (item != NULL) { + elm_genlist_item_selected_set(item, EINA_FALSE); + } + + __WDUG_LOG_FUNC_EXIT__; +} + +/** * This function let the ug call it when click avaliable peer to connect * @return void * @param[in] data the pointer to the main data structure @@ -670,7 +696,7 @@ int _create_multi_button_genlist(void *data) ugd->wfd_status == WIFI_DIRECT_STATE_CONNECTING) { ugd->multi_button_sep_item = wfd_add_dialogue_separator(ugd->genlist, "dialogue/separator"); ugd->multi_button_item = elm_genlist_item_append(ugd->genlist, &button_itc, ugd, NULL, - ELM_GENLIST_ITEM_NONE, NULL, NULL); + ELM_GENLIST_ITEM_NONE, _gl_item_sel, (void *)ugd); } } else { if (ugd->gl_available_peer_cnt > 1 || @@ -678,7 +704,7 @@ int _create_multi_button_genlist(void *data) ugd->wfd_status == WIFI_DIRECT_STATE_CONNECTING) { ugd->multi_button_sep_item = wfd_add_dialogue_separator(ugd->genlist, "dialogue/separator"); ugd->multi_button_item = elm_genlist_item_append(ugd->genlist, &button_itc, ugd, NULL, - ELM_GENLIST_ITEM_NONE, NULL, NULL); + ELM_GENLIST_ITEM_NONE, _gl_item_sel, (void *)ugd); } } |