From f54373ed4aa4cec1e4be46a7bbe085ab0c645c6f Mon Sep 17 00:00:00 2001 From: Seonah Moon Date: Mon, 2 Nov 2015 16:12:05 +0900 Subject: [PATCH] Fix genlist style Change-Id: I291f30fd4e144cf935742afff44a4cad850a8ed1 Signed-off-by: Seonah Moon --- packaging/wifi-efl-ug.spec | 2 +- sources/libraries/Common/common_eap_connect.c | 18 ++--- sources/libraries/Common/common_pswd_popup.c | 43 ++++------- sources/libraries/Common/common_utils.c | 16 ++--- sources/libraries/Common/include/common.h | 4 ++ sources/ui-gadget/viewers-layout/view_advanced.c | 84 +++++++++++++--------- sources/ui-gadget/viewers-layout/view_detail.c | 20 ++---- sources/ui-gadget/viewers-layout/view_ime_hidden.c | 1 - .../ui-gadget/viewers-layout/wifi_viewer_list.c | 24 ++----- sources/ui-gadget/wifi-efl-UG.c | 6 +- sources/ui-gadget/winset_popup.c | 1 - sources/wifi-syspopup/include/wifi-syspopup.h | 1 - sources/wifi-syspopup/viewer-popups/view-main.c | 16 +---- 13 files changed, 102 insertions(+), 134 deletions(-) diff --git a/packaging/wifi-efl-ug.spec b/packaging/wifi-efl-ug.spec index 7c51a11..9680e19 100644 --- a/packaging/wifi-efl-ug.spec +++ b/packaging/wifi-efl-ug.spec @@ -1,7 +1,7 @@ %define _unpackaged_files_terminate_build 0 Name: wifi-efl-ug Summary: Wi-Fi UI Gadget for TIZEN -Version: 1.0.156 +Version: 1.0.157 Release: 1 Group: App/Network License: Flora-1.1 diff --git a/sources/libraries/Common/common_eap_connect.c b/sources/libraries/Common/common_eap_connect.c index dc7d269..7efe03b 100755 --- a/sources/libraries/Common/common_eap_connect.c +++ b/sources/libraries/Common/common_eap_connect.c @@ -1183,7 +1183,7 @@ static void __common_eap_connect_popup_init_item_class(void *data) g_eap_entry_itc.func.state_get = NULL; g_eap_entry_itc.func.del = _gl_eap_entry_item_del; - g_eap_chkbox_itc.item_style = "1line"; + g_eap_chkbox_itc.item_style = WIFI_GENLIST_1LINE_TEXT_ICON_STYLE; g_eap_chkbox_itc.func.text_get = _gl_eap_chkbox_item_text_get; g_eap_chkbox_itc.func.content_get = _gl_eap_chkbox_item_content_get; g_eap_chkbox_itc.func.state_get = NULL; @@ -2212,7 +2212,7 @@ eap_info_list_t *eap_info_append_items(wifi_ap_h ap, Evas_Object* view_list, auth_type = __common_eap_connect_popup_get_auth_type(ap); item = common_utils_add_2_line_txt_disabled_item(view_list, - "2line.top", + WIFI_GENLIST_2LINE_TOP_TEXT_STYLE, sc(str_pkg_name, I18N_TYPE_EAP_method), list_eap_type[eap_type].name); eap_info_list_data->eap_method_item = item; @@ -2236,8 +2236,8 @@ eap_info_list_t *eap_info_append_items(wifi_ap_h ap, Evas_Object* view_list, if (eap_type == EAP_SEC_TYPE_PEAP || eap_type == EAP_SEC_TYPE_TTLS) { /* Add EAP phase2 authentication */ - item = common_utils_add_2_line_txt_disabled_item( - view_list, "2line.top", + item = common_utils_add_2_line_txt_disabled_item(view_list, + WIFI_GENLIST_2LINE_TOP_TEXT_STYLE, sc(str_pkg_name, I18N_TYPE_Phase_2_authentication), list_eap_auth[auth_type].name); eap_info_list_data->eap_auth_item = item; @@ -2255,8 +2255,8 @@ eap_info_list_t *eap_info_append_items(wifi_ap_h ap, Evas_Object* view_list, I18N_TYPE_Unspecified)); } - item = common_utils_add_2_line_txt_disabled_item( - view_list, "2line.top", + item = common_utils_add_2_line_txt_disabled_item(view_list, + WIFI_GENLIST_2LINE_TOP_TEXT_STYLE, sc(str_pkg_name, I18N_TYPE_User_Certificate), temp_str); eap_info_list_data->user_cert_item = item; @@ -2267,8 +2267,10 @@ eap_info_list_t *eap_info_append_items(wifi_ap_h ap, Evas_Object* view_list, bool is_paswd_set; temp_str = NULL; wifi_ap_get_eap_passphrase(ap, &temp_str, &is_paswd_set); - item = common_utils_add_2_line_txt_disabled_item(view_list, "2line.top", - sc(str_pkg_name, I18N_TYPE_Identity), temp_str); + item = common_utils_add_2_line_txt_disabled_item(view_list, + WIFI_GENLIST_2LINE_TOP_TEXT_STYLE, + sc(str_pkg_name, I18N_TYPE_Identity), + temp_str); eap_info_list_data->id_item = item; g_free(temp_str); diff --git a/sources/libraries/Common/common_pswd_popup.c b/sources/libraries/Common/common_pswd_popup.c index 2fd850b..61d5bc1 100755 --- a/sources/libraries/Common/common_pswd_popup.c +++ b/sources/libraries/Common/common_pswd_popup.c @@ -310,7 +310,7 @@ void create_pbc_popup(pswd_popup_t *pswd_popup_data, Evas_Smart_Cb cancel_cb, static char *_gl_wps_text_get(void *data, Evas_Object *obj, const char *part) { - if (!g_strcmp0(part, "elm.text.main.left")) { + if (!strcmp("elm.text", part)) { char buf[1024]; snprintf(buf, 1023, "%s", sc(PACKAGE, (int)data)); return g_strdup(dgettext(PACKAGE, buf)); @@ -361,7 +361,7 @@ void create_wps_options_popup(Evas_Object *win_main, elm_scroller_content_min_limit(genlist, EINA_FALSE, EINA_TRUE); evas_object_smart_callback_add(genlist, "realized", _gl_realized, NULL); - wps_itc.item_style = "1line"; + wps_itc.item_style = WIFI_GENLIST_1LINE_TEXT_STYLE; wps_itc.func.text_get = _gl_wps_text_get; wps_itc.func.content_get = NULL; wps_itc.func.state_get = NULL; @@ -378,7 +378,7 @@ void create_wps_options_popup(Evas_Object *win_main, evas_object_show(genlist); - eext_object_event_callback_add(popup, EA_CALLBACK_BACK, + eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, popup_info->cancel_cb, popup_info->cb_data); elm_object_content_set(popup, genlist); evas_object_show(popup); @@ -392,7 +392,7 @@ void create_wps_options_popup(Evas_Object *win_main, static char *_passwd_popup_wps_item_text_get(void *data, Evas_Object *obj, const char *part) { - if (!g_strcmp0(part, "elm.text.main.left")) { + if (!strcmp("elm.text", part)) { char buf[1024]; snprintf(buf, 1023, "%s", sc(PACKAGE, I18N_TYPE_WPS)); return strdup(buf); @@ -404,26 +404,18 @@ static Evas_Object *_passwd_popup_wps_item_content_get(void *data, Evas_Object *obj, const char *part) { Evas_Object *icon = NULL; - Evas_Object *ic = NULL; - - ic = elm_layout_add(obj); - retvm_if(NULL == ic, NULL); - - if (!g_strcmp0(part, "elm.icon.1")) { - elm_layout_theme_set(ic, "layout", "list/B/type.3", "default"); + if (!strcmp("elm.swallow.icon", part)) { /* image */ - icon = elm_image_add(ic); + icon = elm_image_add(obj); retvm_if(NULL == icon, NULL); elm_image_file_set(icon, CUSTOM_EDITFIELD_PATH, "wifi_icon_wps.png"); evas_object_color_set(icon, 2, 61, 132, 153); - evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_object_part_content_set(ic, "elm.swallow.content", icon); + evas_object_size_hint_min_set(icon, DEFAULT_BUTTON_CIRCLE_SIZE, DEFAULT_BUTTON_CIRCLE_SIZE); } - return ic; + return icon; } static void _entry_edit_mode_show_cb(void *data, Evas *e, Evas_Object *obj, @@ -524,7 +516,7 @@ static void _chk_changed_cb(void *data, Evas_Object *obj, void *ei) static char *_gl_pswd_check_box_item_text_get(void *data, Evas_Object *obj, const char *part) { - if (!g_strcmp0(part, "elm.text")) { + if (!strcmp("elm.text", part)) { char buf[1024]; snprintf(buf, 1023, "%s", sc(PACKAGE, I18N_TYPE_Show_password)); return strdup(buf); @@ -539,7 +531,7 @@ static Evas_Object *_gl_pswd_check_box_item_content_get(void *data, Evas_Object *check = NULL; pswd_popup_t *pswd_popup_data = (pswd_popup_t *)data; - if(!g_strcmp0(part, "elm.swallow.end")) { + if (!strcmp("elm.swallow.end", part)) { check = elm_check_add(obj); evas_object_propagate_events_set(check, EINA_FALSE); @@ -654,7 +646,6 @@ pswd_popup_t *create_passwd_popup(Evas_Object *conformant,Evas_Object *win_main, Evas_Object *passpopup = NULL; Evas_Object *genlist = NULL; Evas_Object *btn_ok = NULL; - Evas_Object *box = NULL; __COMMON_FUNC_ENTER__; @@ -718,10 +709,7 @@ pswd_popup_t *create_passwd_popup(Evas_Object *conformant,Evas_Object *win_main, elm_access_info_set(ao, ELM_ACCESS_INFO, popup_info->title); #endif - box = elm_box_add(passpopup); - evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - - genlist = elm_genlist_add(box); + genlist = elm_genlist_add(passpopup); elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS); elm_scroller_content_min_limit(genlist, EINA_FALSE, EINA_TRUE); evas_object_size_hint_weight_set(genlist, @@ -740,7 +728,7 @@ pswd_popup_t *create_passwd_popup(Evas_Object *conformant,Evas_Object *win_main, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); /* Checkbox genlist item */ - g_check_box_itc.item_style = "type1"; + g_check_box_itc.item_style = WIFI_GENLIST_1LINE_TEXT_ICON_STYLE; g_check_box_itc.func.text_get = _gl_pswd_check_box_item_text_get; g_check_box_itc.func.content_get = _gl_pswd_check_box_item_content_get; g_check_box_itc.func.state_get = NULL; @@ -752,7 +740,7 @@ pswd_popup_t *create_passwd_popup(Evas_Object *conformant,Evas_Object *win_main, if (popup_info->show_wps_btn) { /* WPS options genlist item */ - g_wps_itc.item_style = "1line"; + g_wps_itc.item_style = WIFI_GENLIST_1LINE_TEXT_ICON_STYLE; g_wps_itc.func.text_get = _passwd_popup_wps_item_text_get; g_wps_itc.func.content_get = _passwd_popup_wps_item_content_get; g_wps_itc.func.state_get = NULL; @@ -764,9 +752,8 @@ pswd_popup_t *create_passwd_popup(Evas_Object *conformant,Evas_Object *win_main, } evas_object_show(genlist); - elm_box_pack_end(box, genlist); - evas_object_size_hint_min_set(box, -1, ELM_SCALE_SIZE(100)); - elm_object_content_set(passpopup, box); + + elm_object_content_set(passpopup, genlist); evas_object_smart_callback_add(passpopup, "show,finished", popup_animation_finish_cb, entry_item); diff --git a/sources/libraries/Common/common_utils.c b/sources/libraries/Common/common_utils.c index 793ba46..be80608 100755 --- a/sources/libraries/Common/common_utils.c +++ b/sources/libraries/Common/common_utils.c @@ -61,10 +61,10 @@ static Ecore_Timer *scan_update_timer = NULL; static char *__common_utils_2line_text_get(void *data, Evas_Object *obj, const char *part) { two_line_disp_data_t *item_data = (two_line_disp_data_t *)data; - if (!g_strcmp0(part, "elm.text.sub.left.bottom")) { - return g_strdup(item_data->info_str); - } else if (!g_strcmp0(part, "elm.text.main.left.top")) { + if (!strcmp("elm.text", part)) { return g_strdup(item_data->title_str); + } else if (!strcmp("elm.text.sub", part)) { + return g_strdup(item_data->info_str); } return NULL; } @@ -367,12 +367,6 @@ Evas_Object *common_utils_create_layout(Evas_Object *navi_frame) layout = elm_layout_add(navi_frame); elm_layout_theme_set(layout, "layout", "application", "noindicator"); evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - - Evas_Object* bg = elm_bg_add(layout); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_object_style_set(bg, "group_list"); - elm_object_part_content_set(layout, "elm.swallow.bg", bg); - evas_object_show(layout); return layout; @@ -421,12 +415,12 @@ Evas_Object *common_utils_show_info_popup(Evas_Object *parent, if (popup_data->btn1_cb) { evas_object_smart_callback_add(btn_1, "clicked", popup_data->btn1_cb, popup_data->btn1_data); - eext_object_event_callback_add(popup, EA_CALLBACK_BACK, + eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, popup_data->btn1_cb, popup_data->btn1_data); } else { evas_object_smart_callback_add(btn_1, "clicked", __common_utils_del_popup, popup); - eext_object_event_callback_add(popup, EA_CALLBACK_BACK, + eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, __common_utils_del_popup, popup); } } diff --git a/sources/libraries/Common/include/common.h b/sources/libraries/Common/include/common.h index a04c432..136b242 100755 --- a/sources/libraries/Common/include/common.h +++ b/sources/libraries/Common/include/common.h @@ -78,6 +78,10 @@ extern "C" #define WIFI_GENLIST_MULTILINE_TEXT_STYLE "multiline" #define WIFI_GENLIST_GROUP_INDEX_STYLE "group_index" +/* Icon Size*/ +#define DEFAULT_BG_SIZE 96 +#define DEFAULT_BUTTON_CIRCLE_SIZE 40 + typedef enum { UG_VIEW_DEFAULT = 0, UG_VIEW_SETUP_WIZARD diff --git a/sources/ui-gadget/viewers-layout/view_advanced.c b/sources/ui-gadget/viewers-layout/view_advanced.c index 465e0c2..e206c71 100755 --- a/sources/ui-gadget/viewers-layout/view_advanced.c +++ b/sources/ui-gadget/viewers-layout/view_advanced.c @@ -19,7 +19,6 @@ #include #include -#include #include #include @@ -58,54 +57,58 @@ struct _private_data { struct _private_data g_pd; /* Prototype */ -static char *_gl_text_get(void *data, Evas_Object *obj, const char *part); static char *_gl_network_notification_text_get(void *data, Evas_Object *obj, const char *part); static char *_gl_sort_by_text_get(void *data, Evas_Object *obj, const char *part); static char *_gl_sort_by_sub_text_get(void *data, Evas_Object *obj, const char *part); -static char *_gl_never_text_get(void *data, Evas_Object *obj,const char *part); -static char *_gl_keep_wifi_on_during_sleep_text_get(void *data, Evas_Object *obj,const char *part); static Evas_Object *_gl_content_get_network_noti(void *data, Evas_Object *obj, const char *part); -static Evas_Object *_gl_content_get_keep_wifi_sub(void *data, Evas_Object *obj, const char *part); static Evas_Object *_gl_content_get_sort_by_sub(void *data, Evas_Object *obj, const char *part); static char *_gl_install_certificate_text_get(void *data, Evas_Object *obj, const char *part); +#if TIZEN_SLEEP_POLICY +static char *_gl_text_get(void *data, Evas_Object *obj, const char *part); +static char *_gl_never_text_get(void *data, Evas_Object *obj,const char *part); +static char *_gl_keep_wifi_on_during_sleep_text_get(void *data, Evas_Object *obj,const char *part); +static Evas_Object *_gl_content_get_keep_wifi_sub(void *data, Evas_Object *obj, const char *part); +#endif /* Global variables for elm_genlist itc */ static Elm_Genlist_Item_Class itc_network_noti = { - .item_style = "multiline_sub.main.1icon", + .item_style = WIFI_GENLIST_MULTILINE_TEXT_STYLE, .func.text_get = _gl_network_notification_text_get, .func.content_get = _gl_content_get_network_noti }; +#if TIZEN_SLEEP_POLICY static Elm_Genlist_Item_Class itc_keep_wifi = { - .item_style = "2line.top", + .item_style = WIFI_GENLIST_2LINE_TOP_TEXT_STYLE, .func.text_get = _gl_keep_wifi_on_during_sleep_text_get, }; static Elm_Genlist_Item_Class itc_keep_wifi_sub = { - .item_style = "1line", + .item_style = WIFI_GENLIST_1LINE_TEXT_ICON_STYLE, .func.text_get = _gl_text_get, .func.content_get = _gl_content_get_keep_wifi_sub, }; static Elm_Genlist_Item_Class itc_keep_wifi_sub_never = { - .item_style = "2line.top", + .item_style = WIFI_GENLIST_2LINE_TOP_TEXT_ICON_STYLE, .func.text_get = _gl_never_text_get, .func.content_get = _gl_content_get_keep_wifi_sub, }; +#endif static Elm_Genlist_Item_Class itc_sort_by = { - .item_style = "2line.top", + .item_style = WIFI_GENLIST_2LINE_TOP_TEXT_STYLE, .func.text_get = _gl_sort_by_text_get, }; static Elm_Genlist_Item_Class itc_sort_by_sub = { - .item_style = "1line", + .item_style = WIFI_GENLIST_1LINE_TEXT_ICON_STYLE, .func.text_get = _gl_sort_by_sub_text_get, .func.content_get = _gl_content_get_sort_by_sub, }; static Elm_Genlist_Item_Class itc_install_cert = { - .item_style = "1line", + .item_style = WIFI_GENLIST_1LINE_TEXT_STYLE, .func.text_get = _gl_install_certificate_text_get, }; @@ -114,7 +117,7 @@ static char *_gl_install_certificate_text_get(void *data, Evas_Object *obj, { char buf[1024]; - if (!g_strcmp0(part, "elm.text.main.left")) { + if (!strcmp("elm.text", part)) { snprintf(buf, 1023, "%s", sc(PACKAGE, I18N_TYPE_Install_certificate)); return strdup(buf); } @@ -148,6 +151,7 @@ static void _gl_cert_sel_cb(void *data, Evas_Object *obj, void *event_info) elm_genlist_item_selected_set(g_pd.item_install_cert, EINA_FALSE); } +#if TIZEN_SLEEP_POLICY static int _convert_wifi_keep_value_to_vconf(int i18n_key) { switch (i18n_key) { @@ -179,6 +183,7 @@ static int _convert_vconf_to_wifi_keep_value(int vconf_value) return -1; } +#endif int _convert_sort_by_value_to_vconf(int i18n_key) { @@ -210,12 +215,12 @@ static char *_gl_sort_by_text_get(void *data, Evas_Object *obj, const char *part) { char buf[1024]; - if (!g_strcmp0(part, "elm.text.main.left.top")||!g_strcmp0(part, "elm.text.main.left")) { + if (!strcmp("elm.text", part)) { if ((int) data != 0) { snprintf(buf, 1023, "%s", sc(PACKAGE, (int) data)); return strdup(buf); } - } else if (!g_strcmp0(part, "elm.text.sub.left.bottom")) { + } else if (!strcmp("elm.text.sub", part)) { int value; value = _convert_vconf_to_sort_by_value( @@ -232,7 +237,7 @@ static char *_gl_sort_by_text_get(void *data, Evas_Object *obj, static char *_gl_sort_by_sub_text_get(void *data, Evas_Object *obj, const char *part) { char buf[1024]; - if (!g_strcmp0(part, "elm.text.main.left")) { + if (!strcmp("elm.text", part)) { if ((int) data != 0) { snprintf(buf, 1023, "%s", sc(PACKAGE, (int) data)); return strdup(buf); @@ -245,21 +250,23 @@ static char *_gl_network_notification_text_get(void *data, Evas_Object *obj, con { char buf[1024]; - if (!g_strcmp0(part, "elm.text.main")) { + if (!strcmp("elm.text", part)) { snprintf(buf, 1023, "%s", sc(PACKAGE, I18N_TYPE_Network_notification)); return strdup(buf); - } else if (!g_strcmp0(part, "elm.text.multiline")) { - snprintf(buf, 1023, "%s", sc(PACKAGE, I18N_TYPE_Network_notify_me_later)); + } else if (!strcmp("elm.text.multiline", part)) { + snprintf(buf, 1023, "%s", + sc(PACKAGE, I18N_TYPE_Network_notify_me_later)); return strdup(buf); } return NULL; } +#if TIZEN_SLEEP_POLICY static char *_gl_text_get(void *data, Evas_Object *obj, const char *part) { char buf[1024]; - if (!g_strcmp0(part, "elm.text.main.left")) { + if (!strcmp("elm.text", part)) { if ((int) data != 0) { snprintf(buf, 1023, "%s", sc(PACKAGE, (int) data)); return strdup(buf); @@ -273,12 +280,10 @@ static char *_gl_keep_wifi_on_during_sleep_text_get(void *data, Evas_Object *obj { char buf[1024]; - if(!strcmp(part, "elm.text.main.left.top")) { + if (!strcmp("elm.text", part)) { snprintf(buf, 1023, "%s", sc(PACKAGE, I18N_TYPE_Keep_WIFI_on_during_sleep)); return strdup(buf); - } - - if(!strcmp(part, "elm.text.sub.left.bottom")) { + } else if (!strcmp("elm.text.sub", part)) { int value; value = _convert_vconf_to_wifi_keep_value( common_util_get_system_registry(VCONF_SLEEP_POLICY)); @@ -294,17 +299,19 @@ static char *_gl_keep_wifi_on_during_sleep_text_get(void *data, Evas_Object *obj } return NULL; } + static char *_gl_never_text_get(void *data, Evas_Object *obj, const char *part) { - if (!g_strcmp0(part, "elm.text.main.left.top")) { + if (!strcmp("elm.text", part)) { return g_strdup(sc(PACKAGE, I18N_TYPE_Donot_Use)); - } else if (!g_strcmp0(part, "elm.text.sub.left.bottom")) { + } else if (!strcmp("elm.text.sub", part)) { return g_strdup(sc(PACKAGE, I18N_TYPE_Increases_Data_Usage)); } return NULL; } +#endif static void _gl_changed_network_noti(void *data, Evas_Object *obj, void *event_info) @@ -353,8 +360,7 @@ static Evas_Object *_gl_content_get_network_noti(void *data, Evas_Object *toggle_btn = NULL; int ret; - - if (!strncmp(part, "elm.icon", strlen(part))) { + if (!strcmp("elm.swallow.end", part)) { toggle_btn = elm_check_add(obj); evas_object_size_hint_align_set(toggle_btn, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(toggle_btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -403,6 +409,7 @@ static Evas_Object *_gl_content_get_network_noti(void *data, return toggle_btn; } +#if TIZEN_SLEEP_POLICY static void _gl_changed_keep_wifi_sub(void *data, Evas_Object *obj, void *event_info) { @@ -452,14 +459,16 @@ static Evas_Object *_gl_content_get_keep_wifi_sub(void *data, __COMMON_FUNC_ENTER__; Evas_Object *radio; int value; - Evas_Object *content = elm_layout_add(obj); + Evas_Object *content = NULL; if (!g_pd.keep_wifi_radio_group) { g_pd.keep_wifi_radio_group = elm_radio_add(obj); elm_radio_state_value_set (g_pd.keep_wifi_radio_group, -1); } - if (!g_strcmp0(part, "elm.icon.2")) { + if (!strcmp("elm.swallow.end", part)) { + content = elm_layout_add(obj); + elm_layout_theme_set(content, "layout", "list/C/type.2", "default"); radio = elm_radio_add(content); #ifdef ACCESSIBLITY_FEATURE @@ -482,6 +491,7 @@ static Evas_Object *_gl_content_get_keep_wifi_sub(void *data, __COMMON_FUNC_EXIT__; return content; } +#endif static void _gl_changed_sort_by_sub(void *data, Evas_Object *obj, void *event_info) @@ -533,14 +543,16 @@ static Evas_Object *_gl_content_get_sort_by_sub(void *data, Evas_Object *radio; int value; - Evas_Object *content = elm_layout_add(obj); + Evas_Object *content = NULL; if (!g_pd.sort_by_radio_group) { g_pd.sort_by_radio_group = elm_radio_add(obj); elm_radio_state_value_set (g_pd.sort_by_radio_group, -1); } - if (!g_strcmp0(part, "elm.icon.2")) { + if (!strcmp("elm.swallow.end", part)) { + content = elm_layout_add(obj); + elm_layout_theme_set(content, "layout", "list/C/type.2", "default"); radio = elm_radio_add(content); #ifdef ACCESSIBLITY_FEATURE @@ -576,13 +588,14 @@ static void _block_clicked_cb(void *data, Evas_Object *obj, } } +#if TIZEN_SLEEP_POLICY static void _gl_keep_wifi(void *data, Evas_Object *obj, void *event_info) { __COMMON_FUNC_ENTER__; Evas_Object *genlist; g_pd.keep_wifi_popup = elm_popup_add(obj); - eext_object_event_callback_add(g_pd.keep_wifi_popup, EA_CALLBACK_BACK, eext_popup_back_cb, NULL); + eext_object_event_callback_add(g_pd.keep_wifi_popup, EEXT_CALLBACK_BACK, eext_popup_back_cb, NULL); elm_object_domain_translatable_part_text_set(g_pd.keep_wifi_popup, "title,text", PACKAGE, "IDS_ST_BODY_KEEP_WI_FI_ON_DURING_SLEEP"); elm_popup_align_set(g_pd.keep_wifi_popup, ELM_NOTIFY_ALIGN_FILL, 1.0); @@ -620,6 +633,7 @@ static void _gl_keep_wifi(void *data, Evas_Object *obj, void *event_info) elm_genlist_item_selected_set(g_pd.item_keep_wifi_switch, EINA_FALSE); __COMMON_FUNC_EXIT__; } +#endif static void _gl_sort_by(void *data, Evas_Object *obj, void *event_info) { @@ -627,7 +641,7 @@ static void _gl_sort_by(void *data, Evas_Object *obj, void *event_info) Evas_Object *genlist = NULL; g_pd.sort_by_popup = elm_popup_add(obj); - eext_object_event_callback_add(g_pd.sort_by_popup, EA_CALLBACK_BACK, eext_popup_back_cb, NULL); + eext_object_event_callback_add(g_pd.sort_by_popup, EEXT_CALLBACK_BACK, eext_popup_back_cb, NULL); elm_object_domain_translatable_part_text_set(g_pd.sort_by_popup, "title,text", PACKAGE, "IDS_WIFI_BODY_SORT_BY"); elm_popup_align_set(g_pd.sort_by_popup, ELM_NOTIFY_ALIGN_FILL, 1.0); @@ -686,10 +700,12 @@ static Evas_Object *_create_list(Evas_Object *parent) (const void *) I18N_TYPE_Network_notification, NULL, ELM_GENLIST_ITEM_NONE, _gl_changed_network_noti, NULL); +#if TIZEN_SLEEP_POLICY /* Keep WI-FI on during sleep */ g_pd.item_keep_wifi_switch = elm_genlist_item_append(gl, &itc_keep_wifi, (const void *) I18N_TYPE_Keep_WIFI_on_during_sleep, NULL, ELM_GENLIST_ITEM_NONE, _gl_keep_wifi, NULL); +#endif /* Sort By */ g_pd.item_sort_by= elm_genlist_item_append(gl, &itc_sort_by, diff --git a/sources/ui-gadget/viewers-layout/view_detail.c b/sources/ui-gadget/viewers-layout/view_detail.c index 95711ef..50c2390 100755 --- a/sources/ui-gadget/viewers-layout/view_detail.c +++ b/sources/ui-gadget/viewers-layout/view_detail.c @@ -80,9 +80,9 @@ static void _create_ctxpopup_forget_btn_cb(void *data, Evas_Object *obj, void *e elm_ctxpopup_auto_hide_disabled_set(_detail_data->ctxpopup, EINA_TRUE); elm_object_style_set(_detail_data->ctxpopup, "more/default"); - eext_object_event_callback_add(_detail_data->ctxpopup, EA_CALLBACK_BACK, + eext_object_event_callback_add(_detail_data->ctxpopup, EEXT_CALLBACK_BACK, _ctxpopup_del_cb, NULL); - eext_object_event_callback_add(_detail_data->ctxpopup, EA_CALLBACK_MORE, + eext_object_event_callback_add(_detail_data->ctxpopup, EEXT_CALLBACK_MORE, _ctxpopup_del_cb, NULL); evas_object_smart_callback_add(_detail_data->ctxpopup, "dismissed", _ctxpopup_dismissed_cb, NULL); @@ -256,9 +256,7 @@ static char *_view_detail_grouptitle_text_get(void *data, char *tmp = NULL; char *txt = NULL; - if (!strcmp("elm.text.sub", part)) { - ret = (char*) g_strdup(dgettext(PACKAGE, "IDS_WIFI_BODY_NAME")); - } else if (!strcmp("elm.text", part)) { + if (!strcmp("elm.text", part)) { _detail_data = (view_detail_data *)data; retvm_if(NULL == _detail_data, NULL); @@ -283,15 +281,12 @@ static Evas_Object *_view_detail_grouptitle_content_get(void *data, Evas_Object view_detail_data *_detail_data = (view_detail_data *)data; _detail_data = (view_detail_data *)data; Evas_Object* icon = NULL; - Evas_Object* ic = NULL; if (!strcmp("elm.swallow.end", part)) { char *temp_str = NULL; - ic = elm_layout_add(obj); - elm_layout_theme_set(ic, "layout", "list/C/type.1", "default"); /* for strength */ - icon = elm_image_add(ic); + icon = elm_image_add(obj); retvm_if(NULL == icon, NULL); if (_detail_data->ap_image_path != NULL) { @@ -306,11 +301,10 @@ static Evas_Object *_view_detail_grouptitle_content_get(void *data, Evas_Object elm_image_file_set(icon, CUSTOM_EDITFIELD_PATH, temp_str); g_free(temp_str); - evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_layout_content_set(ic, "elm.swallow.content", icon); + evas_object_size_hint_min_set(icon, ELM_SCALE_SIZE(DEFAULT_BUTTON_CIRCLE_SIZE), ELM_SCALE_SIZE(DEFAULT_BUTTON_CIRCLE_SIZE)); + } - return ic; + return icon; } static void _remove_all(view_detail_data *_detail_data) diff --git a/sources/ui-gadget/viewers-layout/view_ime_hidden.c b/sources/ui-gadget/viewers-layout/view_ime_hidden.c index 6013fff..8e1291a 100644 --- a/sources/ui-gadget/viewers-layout/view_ime_hidden.c +++ b/sources/ui-gadget/viewers-layout/view_ime_hidden.c @@ -18,7 +18,6 @@ */ #include -#include #include "ug_wifi.h" #include "view_ime_hidden.h" diff --git a/sources/ui-gadget/viewers-layout/wifi_viewer_list.c b/sources/ui-gadget/viewers-layout/wifi_viewer_list.c index 68c6ef1..5cb79af 100755 --- a/sources/ui-gadget/viewers-layout/wifi_viewer_list.c +++ b/sources/ui-gadget/viewers-layout/wifi_viewer_list.c @@ -87,7 +87,6 @@ static char* _gl_listview_text_get(void *data, Evas_Object *obj, const char *par { char* det = NULL; char* buf = NULL; - int r = 0, g = 0, b = 0, a = 0; ug_genlist_data_t* gdata = (ug_genlist_data_t*) data; retvm_if(NULL == gdata || NULL == gdata->device_info, NULL); @@ -99,11 +98,8 @@ static char* _gl_listview_text_get(void *data, Evas_Object *obj, const char *par gdata->device_info->ssid); assertm_if(NULL == det, "NULL!!"); if (VIEWER_ITEM_RADIO_MODE_CONNECTED == gdata->radio_mode) { - edje_color_class_get("T024S",&r, &g, &b, &a, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL); buf = g_strdup_printf("%s", - ConvertRGBAtoHex(r, g, b, a), det); + ConvertRGBAtoHex(2, 61, 132, 255), det); g_free(det); return buf; @@ -124,17 +120,13 @@ static Evas_Object *_gl_listview_content_get(void *data, Evas_Object *obj, const Evas_Object *icon = NULL; Evas_Object *btn = NULL; - Evas_Object *ic = NULL; if (gdata->device_info->ap_image_path == NULL) { /* if there is no ap_image_path (NO AP Found situation) */ DEBUG_LOG(UG_NAME_ERR, "Fatal: Image path is NULL"); } else if (!strcmp("elm.swallow.icon", part)) { - ic = elm_layout_add(obj); - elm_layout_theme_set(ic, "layout", "list/B/type.3", "default"); - - icon = elm_image_add(ic); + icon = elm_image_add(obj); retvm_if(NULL == icon, NULL); /* for strength */ @@ -144,24 +136,18 @@ static Evas_Object *_gl_listview_content_get(void *data, Evas_Object *obj, const g_free(temp_str); evas_object_color_set(icon, 2, 61, 132, 204); - - evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_layout_content_set(ic, "elm.swallow.content", icon); + evas_object_size_hint_min_set(icon, ELM_SCALE_SIZE(DEFAULT_BUTTON_CIRCLE_SIZE), ELM_SCALE_SIZE(DEFAULT_BUTTON_CIRCLE_SIZE)); } else if (!strcmp("elm.swallow.end", part)) { if (VIEWER_ITEM_RADIO_MODE_CONNECTING == gdata->radio_mode || VIEWER_ITEM_RADIO_MODE_CONFIGURATION == gdata->radio_mode) { - ic = elm_layout_add(obj); - elm_layout_theme_set(ic, "layout", "list/C/type.2", "default"); - icon = elm_progressbar_add(ic); + icon = elm_progressbar_add(obj); elm_object_style_set(icon, "process_medium"); evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, 0.5); evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_progressbar_pulse(icon, TRUE); - elm_layout_content_set(ic, "elm.swallow.content", icon); evas_object_propagate_events_set(icon, EINA_FALSE); } else { @@ -178,7 +164,7 @@ static Evas_Object *_gl_listview_content_get(void *data, Evas_Object *obj, const return btn; } } - return ic; + return icon; } static void _gl_listview_del(void *data, Evas_Object *obj) diff --git a/sources/ui-gadget/wifi-efl-UG.c b/sources/ui-gadget/wifi-efl-UG.c index cc394a5..c7c08f5 100755 --- a/sources/ui-gadget/wifi-efl-UG.c +++ b/sources/ui-gadget/wifi-efl-UG.c @@ -77,10 +77,8 @@ static void _bg_scan_status_callback(GDBusConnection *conn, if (g_strcmp0(key, "Scanning") == 0) { value = g_variant_get_boolean(var); if (value) { - if (header_mode != HEADER_MODE_CONNECTING) { - viewer_manager_show(VIEWER_WINSET_SEARCHING_GRP_TITLE); - viewer_manager_header_mode_set(HEADER_MODE_SEARCHING); - } + viewer_manager_header_mode_set(HEADER_MODE_SEARCHING); + viewer_manager_show(VIEWER_WINSET_SEARCHING); } g_variant_unref(var); diff --git a/sources/ui-gadget/winset_popup.c b/sources/ui-gadget/winset_popup.c index 1ba0c64..46efccf 100644 --- a/sources/ui-gadget/winset_popup.c +++ b/sources/ui-gadget/winset_popup.c @@ -18,7 +18,6 @@ */ #include -#include #include "common.h" #include "ug_wifi.h" diff --git a/sources/wifi-syspopup/include/wifi-syspopup.h b/sources/wifi-syspopup/include/wifi-syspopup.h index f6023b4..e385bd6 100644 --- a/sources/wifi-syspopup/include/wifi-syspopup.h +++ b/sources/wifi-syspopup/include/wifi-syspopup.h @@ -25,7 +25,6 @@ extern "C" { #endif -#include #include "common.h" #include "wlan_manager.h" diff --git a/sources/wifi-syspopup/viewer-popups/view-main.c b/sources/wifi-syspopup/viewer-popups/view-main.c index ea25541..68abdec 100755 --- a/sources/wifi-syspopup/viewer-popups/view-main.c +++ b/sources/wifi-syspopup/viewer-popups/view-main.c @@ -647,43 +647,33 @@ static Evas_Object *_gl_content_get(void *data, Evas_Object *obj, const char *pa devpkr_gl_data_t *gdata = (devpkr_gl_data_t *) data; Evas_Object* icon = NULL; - Evas_Object *ic = NULL; if (!strcmp("elm.swallow.icon", part)) { char *temp_str = NULL; - ic = elm_layout_add(obj); - icon = elm_image_add(ic); + icon = elm_image_add(obj); retvm_if(NULL == icon, NULL); - elm_layout_theme_set(ic, "layout", "list/B/type.3", "default"); - temp_str = g_strdup_printf("%s.png", gdata->dev_info->ap_image_path); elm_image_file_set(icon, CUSTOM_EDITFIELD_PATH, temp_str); g_free(temp_str); evas_object_color_set(icon, 2, 61, 132, 204); + evas_object_size_hint_min_set(icon, DEFAULT_BUTTON_CIRCLE_SIZE, DEFAULT_BUTTON_CIRCLE_SIZE); - evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_layout_content_set(ic, "elm.swallow.content", icon); } else if (!strcmp("elm.swallow.end", part)) { if (gdata->connection_mode == ITEM_CONNECTION_MODE_CONNECTING || gdata->connection_mode == ITEM_CONNECTION_MODE_CONFIGURATION) { - ic = elm_layout_add(obj); - elm_layout_theme_set(ic, "layout", "list/C/type.2", "default"); icon = elm_progressbar_add(obj); elm_object_style_set(icon, "process_medium"); evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, 0.5); evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_progressbar_pulse(icon, TRUE); - - elm_layout_content_set(ic, "elm.swallow.content", icon); } } - return ic; + return icon; } static void _gl_list_del(void* data, Evas_Object* obj) -- 2.7.4