X-Git-Url: http://review.tizen.org/git/?p=apps%2Fnative%2Fug-wifi-direct.git;a=blobdiff_plain;f=ug-wifidirect%2Fsrc%2Fwfd_ug_genlist.c;h=31405ccafe029d2db03338f66a4f4f4000137377;hp=0a6a44f3197aa3f019960798af1ec52420562b55;hb=2546b357b86ad468aeb6f9747acd1ded4c06089f;hpb=ea0eb10918bf56338ccea1405cab0eaa5fac0782 diff --git a/ug-wifidirect/src/wfd_ug_genlist.c b/ug-wifidirect/src/wfd_ug_genlist.c index 0a6a44f..31405cc 100755 --- a/ug-wifidirect/src/wfd_ug_genlist.c +++ b/ug-wifidirect/src/wfd_ug_genlist.c @@ -23,7 +23,6 @@ #include #include #include -#include #include "wfd_ug.h" #include "wfd_ug_view.h" @@ -61,28 +60,26 @@ static char *_gl_wfd_onoff_text_get(void *data, Evas_Object *obj, __FUNC_ENTER__; struct ug_data *ugd = (struct ug_data *) data; + char *dev_name = NULL; DBG(LOG_INFO, "%s", part); WFD_RETV_IF(ugd == NULL, NULL, "Incorrect parameter(NULL)\n"); wfd_get_vconf_device_name(ugd); - char *dev_name; - if (!g_strcmp0(part,"elm.text.main.left.bottom")) { + if (!strcmp("elm.text.sub", part)) { + __FUNC_EXIT__; + return g_strdup(D_("IDS_ST_HEADER_MY_DEVICE_NAME")); + } else if (!strcmp("elm.text", part)) { DBG(LOG_INFO, "%s", ugd->dev_name); if (ugd->dev_name) { dev_name = elm_entry_utf8_to_markup(ugd->dev_name); if (NULL == dev_name) { DBG(LOG_ERROR, "elm_entry_utf8_to_markup failed.\n"); - __FUNC_EXIT__; - return NULL; } - __FUNC_EXIT__; - return dev_name; } - } else if (!g_strcmp0(part, "elm.text.sub.left.top")) { - return g_strdup(_("IDS_ST_HEADER_MY_DEVICE_NAME")); } + __FUNC_EXIT__; - return NULL; + return dev_name; } static Evas_Object *_gl_wfd_onoff_content_get(void *data,Evas_Object *obj, @@ -94,25 +91,24 @@ static Evas_Object *_gl_wfd_onoff_content_get(void *data,Evas_Object *obj, WFD_RETV_IF(ugd == NULL, NULL, "Incorrect parameter(NULL)\n"); Evas_Object *btn = NULL; Evas_Object *icon = NULL; - icon = elm_layout_add(obj); - if (g_strcmp0(part, "elm.icon.2")) { - return NULL; + if (!strcmp("elm.swallow.end", part)) { + icon = elm_layout_add(obj); + elm_layout_theme_set(icon, "layout", "list/C/type.3", "default"); + + /* Wi-Fi on indication button */ + btn= elm_check_add(icon); + elm_object_style_set(btn, "on&off"); + elm_check_state_set(btn, ugd->wfd_onoff); + evas_object_propagate_events_set(btn, EINA_FALSE); + evas_object_smart_callback_add(btn, "changed",_onoff_changed_cb, ugd); + ugd->on_off_check = btn; + evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, + EVAS_HINT_EXPAND); + elm_layout_content_set(icon, "elm.swallow.content", btn); } - elm_layout_theme_set(icon, "layout", "list/C/type.3", "default"); - btn = elm_check_add(icon); - /* Wi-Fi on indication button */ - btn= elm_check_add(icon); - elm_object_style_set(btn, "on&off"); - evas_object_propagate_events_set(btn, EINA_FALSE); - elm_check_state_set(btn, ugd->wfd_onoff); - evas_object_propagate_events_set(btn, EINA_FALSE); - evas_object_smart_callback_add(btn, "changed",_onoff_changed_cb, ugd); - ugd->on_off_check = btn; - evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, - EVAS_HINT_EXPAND); - elm_layout_content_set(icon, "elm.swallow.content", btn); + __FUNC_EXIT__; return icon; } @@ -134,9 +130,12 @@ static char *_gl_device_name_label_get(void *data, Evas_Object *obj, DBG(LOG_INFO, "%s", part); WFD_RETV_IF(ugd == NULL, NULL, "Incorrect parameter(NULL)\n"); wfd_get_vconf_device_name(ugd); - char *dev_name; + char *dev_name = NULL; + char str[WFD_GLOBALIZATION_STR_LENGTH] = {0, }; + char buf[WFD_GLOBALIZATION_STR_LENGTH] = {0, }; + char *format_str = NULL; - if (!g_strcmp0(part,"elm.text.main.left.bottom")) { + if (!strcmp("elm.text.multiline", part)) { DBG(LOG_INFO, "%s", ugd->dev_name); if (ugd->dev_name) { dev_name = elm_entry_utf8_to_markup(ugd->dev_name); @@ -145,11 +144,17 @@ static char *_gl_device_name_label_get(void *data, Evas_Object *obj, __FUNC_EXIT__; return NULL; } + + format_str = D_("IDS_WIFI_BODY_YOUR_DEVICE_HPS_IS_CURRENTLY_VISIBLE_TO_NEARBY_DEVICES"); + snprintf(str, WFD_GLOBALIZATION_STR_LENGTH, format_str, dev_name); + + snprintf(buf, WFD_GLOBALIZATION_STR_LENGTH, + "%s", str); + + WFD_IF_FREE_MEM(dev_name); __FUNC_EXIT__; - return dev_name; + return g_strdup(buf); } - } else if (!g_strcmp0(part, "elm.text.sub.left.top")) { - return g_strdup(_("IDS_ST_HEADER_MY_DEVICE_NAME")); } __FUNC_EXIT__; return NULL; @@ -168,8 +173,8 @@ static char *_gl_title_label_get(void *data, Evas_Object *obj, const char *part) WFD_RETV_IF(data == NULL, NULL, "Incorrect parameter(NULL)\n"); DBG(LOG_INFO, "%s", part); - if (!g_strcmp0(part, "elm.text.main")) { - return g_strdup(_("IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB")); + if (!strcmp("elm.text", part)) { + return g_strdup(D_("IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB")); } __FUNC_EXIT__; return NULL; @@ -183,8 +188,8 @@ static char *_gl_title_no_device_label_get(void *data, Evas_Object *obj, WFD_RETV_IF(data == NULL, NULL, "Incorrect parameter(NULL)\n"); DBG(LOG_INFO, "%s", part); - if (!g_strcmp0(part, "elm.text.main")) { - return g_strdup(_("IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB")); + if (!strcmp("elm.text", part)) { + return g_strdup(D_("IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB")); } __FUNC_EXIT__; @@ -196,8 +201,8 @@ static char *_gl_multi_title_label_get(void *data, Evas_Object *obj, const char __FUNC_ENTER__; WFD_RETV_IF(data == NULL, NULL, "Incorrect parameter(NULL)\n"); - if (!g_strcmp0(part, "elm.text.main")) { - return g_strdup(_("IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB")); + if (!strcmp("elm.text", part)) { + return g_strdup(D_("IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB")); } __FUNC_EXIT__; @@ -212,19 +217,16 @@ static Evas_Object *_gl_multi_title_content_get(void *data, Evas_Object *obj, co struct ug_data *ugd = (struct ug_data *) data; WFD_RETV_IF(ugd == NULL, NULL, "Incorrect parameter(NULL)\n"); - if (!g_strcmp0(part, "elm.icon")) { - if (TITLE_CONTENT_TYPE_SCANNING == ugd->title_content_mode) { - progressbar = elm_progressbar_add(obj); - elm_object_style_set(progressbar, "process_small"); - elm_progressbar_horizontal_set(progressbar, EINA_TRUE); - elm_progressbar_pulse(progressbar, EINA_TRUE); - evas_object_show(progressbar); - return progressbar; - } + if (TITLE_CONTENT_TYPE_SCANNING == ugd->title_content_mode) { + progressbar = elm_progressbar_add(obj); + elm_object_style_set(progressbar, "process_small"); + elm_progressbar_horizontal_set(progressbar, EINA_TRUE); + elm_progressbar_pulse(progressbar, EINA_TRUE); + evas_object_show(progressbar); } __FUNC_EXIT__; - return NULL; + return progressbar; } static char *_gl_available_title_label_get(void *data, Evas_Object *obj, const char *part) @@ -236,8 +238,8 @@ static char *_gl_available_title_label_get(void *data, Evas_Object *obj, const c return NULL; } DBG(LOG_INFO, "available- %s", part); - if (!g_strcmp0(part, "elm.text.main")) { - return g_strdup(_("IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB")); + if (!strcmp("elm.text", part)) { + return g_strdup(D_("IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB")); } __FUNC_EXIT__; @@ -265,16 +267,12 @@ static Evas_Object *_gl_title_content_get(void *data, Evas_Object *obj, const ch DBG(LOG_INFO, "Title content- %s", part); - if (!g_strcmp0(part, "elm.icon")) { - if (TITLE_CONTENT_TYPE_SCANNING == ugd->title_content_mode) { - progressbar = elm_progressbar_add(obj); - elm_object_style_set(progressbar, "process_small"); - elm_progressbar_horizontal_set(progressbar, EINA_TRUE); - elm_progressbar_pulse(progressbar, EINA_TRUE); - evas_object_show(progressbar); - } else { - return NULL; - } + if (TITLE_CONTENT_TYPE_SCANNING == ugd->title_content_mode) { + progressbar = elm_progressbar_add(obj); + elm_object_style_set(progressbar, "process_small"); + elm_progressbar_horizontal_set(progressbar, EINA_TRUE); + elm_progressbar_pulse(progressbar, EINA_TRUE); + evas_object_show(progressbar); } __FUNC_EXIT__; @@ -305,7 +303,7 @@ static char *_gl_peer_label_get(void *data, Evas_Object *obj, const char *part) return NULL; } - if (!g_strcmp0(part, "elm.text.main.left.top")) { + if (!strcmp("elm.text", part)) { if (strlen(peer->ssid) != 0) { ssid = elm_entry_utf8_to_markup(peer->ssid); if (NULL == ssid) { @@ -316,29 +314,29 @@ static char *_gl_peer_label_get(void *data, Evas_Object *obj, const char *part) __FUNC_EXIT__; return ssid; } - } else if (!g_strcmp0(part, "elm.text.sub.left.bottom")) { + } else if (!strcmp("elm.text.sub", part)) { switch (peer->conn_status) { case PEER_CONN_STATUS_DISCONNECTED: - g_strlcpy(buf, _("IDS_CHATON_BODY_AVAILABLE"), WFD_GLOBALIZATION_STR_LENGTH); + g_strlcpy(buf, D_("IDS_CHATON_BODY_AVAILABLE"), WFD_GLOBALIZATION_STR_LENGTH); break; case PEER_CONN_STATUS_CONNECTING: - g_strlcpy(buf, _("IDS_WIFI_BODY_CONNECTING_ING"), WFD_GLOBALIZATION_STR_LENGTH); + g_strlcpy(buf, D_("IDS_WIFI_BODY_CONNECTING_ING"), WFD_GLOBALIZATION_STR_LENGTH); break; case PEER_CONN_STATUS_CONNECTED: if (peer->is_group_owner == FALSE) { - g_strlcpy(buf, _("IDS_COM_BODY_CONNECTED_M_STATUS"), WFD_GLOBALIZATION_STR_LENGTH); + g_strlcpy(buf, D_("IDS_COM_BODY_CONNECTED_M_STATUS"), WFD_GLOBALIZATION_STR_LENGTH); } else { - g_strlcpy(buf, _("IDS_CHATON_BODY_AVAILABLE"), WFD_GLOBALIZATION_STR_LENGTH); + g_strlcpy(buf, D_("IDS_CHATON_BODY_AVAILABLE"), WFD_GLOBALIZATION_STR_LENGTH); } break; case PEER_CONN_STATUS_FAILED_TO_CONNECT: - g_strlcpy(buf, _("IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"), WFD_GLOBALIZATION_STR_LENGTH); + g_strlcpy(buf, D_("IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"), WFD_GLOBALIZATION_STR_LENGTH); break; case PEER_CONN_STATUS_WAIT_FOR_CONNECT: - g_strlcpy(buf, _("IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"), WFD_GLOBALIZATION_STR_LENGTH); + g_strlcpy(buf, D_("IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB"), WFD_GLOBALIZATION_STR_LENGTH); break; default: - g_strlcpy(buf, _("IDS_CHATON_BODY_AVAILABLE"), WFD_GLOBALIZATION_STR_LENGTH); + g_strlcpy(buf, D_("IDS_CHATON_BODY_AVAILABLE"), WFD_GLOBALIZATION_STR_LENGTH); break; } } else { @@ -372,21 +370,9 @@ static Evas_Object *_gl_peer_icon_get(void *data, Evas_Object *obj, const char * return NULL; } DBG(LOG_INFO, "part = %s", part); - if (!g_strcmp0(part, "elm.icon.2")) { - DBG(LOG_INFO, "elm.icon.2 - connection status [%d]\n", peer->conn_status); - if (peer->conn_status == PEER_CONN_STATUS_CONNECTING) { - layout = elm_layout_add(obj); - elm_layout_theme_set(layout, "layout", "list/C/type.2", "default"); - icon = elm_progressbar_add(layout); - elm_object_style_set(icon, "process_medium"); - elm_progressbar_pulse(icon, EINA_TRUE); - } else if (peer->conn_status == PEER_CONN_STATUS_CONNECTED) { - return NULL; - } - evas_object_show(icon); - elm_layout_content_set(layout, "elm.swallow.content", icon); - } else if (!g_strcmp0(part, "elm.icon.1")) { - DBG(LOG_INFO, "elm.icon.1 - category [%d]\n", peer->category); + + if (!strcmp("elm.swallow.icon", part)) { + DBG(LOG_INFO, "elm.swallow.icon - category [%d]\n", peer->category); char *img_name = NULL; layout = elm_layout_add(obj); elm_layout_theme_set(layout, "layout", "list/B/type.3", "default"); @@ -453,10 +439,24 @@ static Evas_Object *_gl_peer_icon_get(void *data, Evas_Object *obj, const char * evas_object_show(icon); evas_object_propagate_events_set(icon, EINA_FALSE); elm_layout_content_set(layout, "elm.swallow.content", icon); + } else if (!strcmp("elm.swallow.end", part)) { + DBG(LOG_INFO, "elm.icon.2 - connection status [%d]\n", peer->conn_status); + if (peer->conn_status == PEER_CONN_STATUS_CONNECTING) { + layout = elm_layout_add(obj); + elm_layout_theme_set(layout, "layout", "list/C/type.2", "default"); + icon = elm_progressbar_add(layout); + elm_object_style_set(icon, "process_medium"); + elm_progressbar_pulse(icon, EINA_TRUE); + } else if (peer->conn_status == PEER_CONN_STATUS_CONNECTED) { + return NULL; + } + evas_object_show(icon); + elm_layout_content_set(layout, "elm.swallow.content", icon); } if (layout) evas_object_show(layout); + __FUNC_EXIT__; return layout; } @@ -481,9 +481,10 @@ static Evas_Object *_gl_conn_peer_icon_get(void *data, Evas_Object *obj, const c DBG(LOG_ERROR, "Incorrect parameter(NULL)\n"); return NULL; } + DBG(LOG_INFO, "part[%s]\n", part); - if (!g_strcmp0(part, "elm.icon.1")) { - DBG(LOG_INFO, "elm.icon.1 - category [%d]\n", peer->category); + if (!strcmp("elm.swallow.icon", part)) { + DBG(LOG_INFO, "elm.swallow.icon - category [%d]\n", peer->category); char *img_name = NULL; layout = elm_layout_add(obj); elm_layout_theme_set(layout, "layout", "list/B/type.3", "default"); @@ -551,8 +552,10 @@ static Evas_Object *_gl_conn_peer_icon_get(void *data, Evas_Object *obj, const c evas_object_propagate_events_set(icon, EINA_FALSE); elm_layout_content_set(layout, "elm.swallow.content", icon); } + if (layout) evas_object_show(layout); + __FUNC_EXIT__; return layout; } @@ -574,8 +577,8 @@ static char *_gl_noitem_text_get(void *data, Evas_Object *obj, const char *part) } DBG(LOG_INFO,"part = %s",part); - if (!g_strcmp0(part, "elm.text.main.left")) { - return g_strdup(_("IDS_BT_BODY_NO_DEVICES_FOUND_ABB")); + if (!strcmp("elm.text", part)) { + return g_strdup(D_("IDS_BT_BODY_NO_DEVICES_FOUND_ABB")); } __FUNC_EXIT__; return NULL; @@ -597,8 +600,8 @@ static char *_gl_conn_dev_title_label_get(void *data, Evas_Object *obj, const ch return NULL; } DBG(LOG_INFO,"part = %s",part); - if (!g_strcmp0(part, "elm.text.main")) { - return g_strdup(_("IDS_ST_HEADER_CONNECTED_DEVICES")); + if (!strcmp("elm.text", part)) { + return g_strdup(D_("IDS_ST_HEADER_CONNECTED_DEVICES")); } __FUNC_EXIT__; @@ -609,12 +612,12 @@ char* ConvertRGBAtoHex(int r, int g, int b, int a) { int hexcolor = 0; char *string = NULL; - string = g_try_malloc0(sizeof(char )* 255); + string = g_try_malloc0(MAX_HEX_COLOR_LENGTH); if (string == NULL) { return string; } hexcolor = (r << 24) + (g << 16) + (b << 8) + a; - sprintf(string, "%08x", hexcolor ); + snprintf(string, MAX_HEX_COLOR_LENGTH, "%08x", hexcolor ); return string; } @@ -635,16 +638,14 @@ static char *_gl_peer_conn_dev_label_get(void *data, Evas_Object *obj, const cha DBG(LOG_INFO, "%s", part); char *det = NULL; char *buf = NULL; - char *str = NULL; char *ssid; - int r = 0, g = 0, b = 0, a = 0; if (data == NULL) { DBG(LOG_ERROR, "Incorrect parameter(NULL)\n"); return NULL; } - if (!g_strcmp0(part, "elm.text.main.left.top")) { + if (!strcmp("elm.text", part)) { if (strlen(peer->ssid) != 0) { ssid = elm_entry_utf8_to_markup(peer->ssid); if (NULL == ssid) { @@ -655,20 +656,11 @@ static char *_gl_peer_conn_dev_label_get(void *data, Evas_Object *obj, const cha __FUNC_EXIT__; return ssid; } - } else if(!g_strcmp0(part, "elm.text.sub.left.bottom")){ - det = elm_entry_utf8_to_markup(_("IDS_COM_BODY_CONNECTED_M_STATUS")); - edje_color_class_get("T024S",&r, &g, &b, &a, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL); - str = ConvertRGBAtoHex(r, g, b, a); + } else if (!strcmp("elm.text.sub", part)) { + det = elm_entry_utf8_to_markup(D_("IDS_COM_BODY_CONNECTED_M_STATUS")); buf = g_strdup_printf("%s", - str, det); - if (det != NULL) { - g_free(det); - } - if (str != NULL) { - g_free(str); - } + ConvertRGBAtoHex(2, 61, 132, 255), det); + WFD_IF_FREE_MEM(det); __FUNC_EXIT__; return buf; } @@ -693,8 +685,8 @@ static char *_gl_conn_failed_dev_title_label_get(void *data, Evas_Object *obj, return NULL; } - if (!g_strcmp0(part, "elm.text")) { - return g_strdup(_("IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB")); + if (!strcmp("elm.text", part)) { + return g_strdup(D_("IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB")); } __FUNC_EXIT__; @@ -724,7 +716,7 @@ static char *_gl_peer_conn_failed_dev_label_get(void *data, Evas_Object *obj, co return NULL; } - if (!g_strcmp0(part, "elm.text.1")) { + if (!strcmp("elm.text", part)) { if (strlen(peer->ssid) != 0) { ssid = elm_entry_utf8_to_markup(peer->ssid); if (NULL == ssid) { @@ -735,8 +727,8 @@ static char *_gl_peer_conn_failed_dev_label_get(void *data, Evas_Object *obj, co __FUNC_EXIT__; return ssid; } - } else { - g_strlcpy(buf, _("IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"), + } else if (!strcmp("elm.text.sub", part)) { + g_strlcpy(buf, D_("IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2"), WFD_GLOBALIZATION_STR_LENGTH); __FUNC_EXIT__; return g_strdup(buf); @@ -762,11 +754,11 @@ static char *_gl_multi_connect_dev_title_label_get(void *data, Evas_Object *obj, } DBG(LOG_INFO, "%s", part); - if (!g_strcmp0(part, "elm.text.main")) { + if (!strcmp("elm.text", part)) { if (ugd->multi_connect_mode == WFD_MULTI_CONNECT_MODE_IN_PROGRESS) { - return g_strdup(_("IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB")); + return g_strdup(D_("IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB")); } else if (ugd->multi_connect_mode == WFD_MULTI_CONNECT_MODE_COMPLETED) { - return g_strdup(_("IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB")); + return g_strdup(D_("IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB")); } } @@ -791,9 +783,9 @@ static char *_gl_multi_connect_select_all_title_label_get(void *data, Evas_Objec } DBG(LOG_INFO, "%s", part); - if (!g_strcmp0(part, "elm.text.main.left")) { + if (!strcmp("elm.text", part)) { __FUNC_EXIT__; - return g_strdup(_("IDS_WIFI_BODY_SELECT_ALL")); + return g_strdup(D_("IDS_WIFI_BODY_SELECT_ALL")); } __FUNC_EXIT__; return NULL; @@ -816,7 +808,7 @@ static Evas_Object *_wfd_gl_select_all_icon_get(void *data, Evas_Object *obj, co DBG(LOG_INFO, "Part %s", part); - if (!g_strcmp0(part, "elm.icon.2")) { + if (!strcmp("elm.swallow.end", part)) { icon_layout = elm_layout_add(obj); elm_layout_theme_set(icon_layout, "layout", "list/C/type.2", "default"); DBG(LOG_INFO, "Part %s", part); @@ -853,8 +845,8 @@ static char *_gl_busy_dev_title_label_get(void *data, Evas_Object *obj, } DBG(LOG_INFO, "%s", part); - if (!g_strcmp0(part,"elm.text.main")) { - return g_strdup(_("IDS_ST_HEADER_BUSY_DEVICES")); + if (!strcmp("elm.text", part)) { + return g_strdup(D_("IDS_ST_HEADER_BUSY_DEVICES")); } __FUNC_EXIT__; @@ -885,7 +877,7 @@ static char *_gl_peer_busy_dev_label_get(void *data, Evas_Object *obj, const cha DBG(LOG_INFO, "peer->ssid = %s", peer->ssid); - if (!g_strcmp0(part, "elm.text.main.left.top")) { + if (!strcmp("elm.text", part)) { if (strlen(peer->ssid) != 0) { ssid = elm_entry_utf8_to_markup(peer->ssid); if (NULL == ssid) { @@ -896,14 +888,14 @@ static char *_gl_peer_busy_dev_label_get(void *data, Evas_Object *obj, const cha __FUNC_EXIT__; return ssid; } - } else if (!g_strcmp0(part, "elm.text.sub.left.bottom")) { - g_strlcpy(buf, _("IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"), + } else if (!strcmp("elm.text.sub", part)) { + g_strlcpy(buf, D_("IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB"), WFD_GLOBALIZATION_STR_LENGTH); __FUNC_EXIT__; return g_strdup(buf); } - return NULL; + return NULL; } /** @@ -931,99 +923,98 @@ void initialize_gen_item_class() { elm_theme_extension_add(NULL, WFD_UG_EDJ_PATH); - device_name_itc.item_style = "dialogue/2text.2"; - device_name_itc.func.text_get = NULL; + device_name_itc.item_style = WFD_GENLIST_MULTILINE_TEXT_STYLE; + device_name_itc.func.text_get = _gl_device_name_label_get; device_name_itc.func.content_get = NULL; device_name_itc.func.state_get = NULL; #ifdef WFD_ON_OFF_GENLIST - wfd_onoff_itc.item_style = "2line.bottom"; + wfd_onoff_itc.item_style = WFD_GENLIST_2LINE_BOTTOM_TEXT_ICON_STYLE; wfd_onoff_itc.func.text_get = _gl_wfd_onoff_text_get; wfd_onoff_itc.func.content_get = _gl_wfd_onoff_content_get; wfd_onoff_itc.func.state_get = NULL; wfd_onoff_itc.func.del = NULL; #endif - - title_itc.item_style = "groupindex"; + title_itc.item_style = WFD_GENLIST_GROUP_INDEX_STYLE; title_itc.func.text_get = _gl_title_label_get; title_itc.func.content_get = _gl_title_content_get; title_itc.func.state_get = NULL; title_itc.func.del = NULL; - multi_view_title_itc.item_style = "groupindex"; + multi_view_title_itc.item_style = WFD_GENLIST_GROUP_INDEX_STYLE; multi_view_title_itc.func.text_get = _gl_multi_title_label_get; multi_view_title_itc.func.content_get = _gl_multi_title_content_get; multi_view_title_itc.func.state_get = NULL; multi_view_title_itc.func.del = NULL; - title_no_device_itc.item_style = "groupindex"; + title_no_device_itc.item_style = WFD_GENLIST_GROUP_INDEX_STYLE; title_no_device_itc.func.text_get = _gl_title_no_device_label_get; title_no_device_itc.func.content_get = NULL; title_no_device_itc.func.state_get = NULL; title_no_device_itc.func.del = NULL; - title_available_itc.item_style = "groupindex"; + title_available_itc.item_style = WFD_GENLIST_GROUP_INDEX_STYLE; title_available_itc.func.text_get = _gl_available_title_label_get; title_available_itc.func.content_get = _gl_title_content_get; title_available_itc.func.state_get = NULL; title_available_itc.func.del = NULL; - peer_itc.item_style = "2line.top"; + peer_itc.item_style = WFD_GENLIST_2LINE_TOP_TEXT_ICON_STYLE; peer_itc.func.text_get = _gl_peer_label_get; peer_itc.func.content_get = _gl_peer_icon_get; peer_itc.func.state_get = NULL; peer_itc.func.del = _gl_peer_del; - noitem_itc.item_style = "1line"; + noitem_itc.item_style = WFD_GENLIST_1LINE_TEXT_STYLE; noitem_itc.func.text_get = _gl_noitem_text_get; noitem_itc.func.content_get = NULL; noitem_itc.func.state_get = NULL; noitem_itc.func.del = NULL; - title_conn_itc.item_style = "groupindex"; + title_conn_itc.item_style = WFD_GENLIST_GROUP_INDEX_STYLE; title_conn_itc.func.text_get = _gl_conn_dev_title_label_get; title_conn_itc.func.content_get = NULL; title_conn_itc.func.state_get = NULL; title_conn_itc.func.del = NULL; - peer_conn_itc.item_style = "2line.top"; + peer_conn_itc.item_style = WFD_GENLIST_2LINE_TOP_TEXT_ICON_STYLE; peer_conn_itc.func.text_get = _gl_peer_conn_dev_label_get; peer_conn_itc.func.content_get = _gl_conn_peer_icon_get; peer_conn_itc.func.state_get = NULL; peer_conn_itc.func.del = _gl_peer_del; - title_conn_failed_itc.item_style = "dialogue/title"; + title_conn_failed_itc.item_style = WFD_GENLIST_1LINE_TEXT_STYLE; title_conn_failed_itc.func.text_get = _gl_conn_failed_dev_title_label_get; title_conn_failed_itc.func.content_get = NULL; title_conn_failed_itc.func.state_get = NULL; title_conn_failed_itc.func.del = NULL; - peer_conn_failed_itc.item_style = "dialogue/2text.2icon.3"; + peer_conn_failed_itc.item_style = WFD_GENLIST_2LINE_TOP_TEXT_ICON_STYLE; peer_conn_failed_itc.func.text_get = _gl_peer_conn_failed_dev_label_get; peer_conn_failed_itc.func.content_get = _gl_peer_icon_get; peer_conn_failed_itc.func.state_get = NULL; peer_conn_failed_itc.func.del = _gl_peer_del; - title_busy_itc.item_style = "groupindex"; + title_busy_itc.item_style = WFD_GENLIST_GROUP_INDEX_STYLE; title_busy_itc.func.text_get = _gl_busy_dev_title_label_get; title_busy_itc.func.content_get = NULL; title_busy_itc.func.state_get = NULL; title_busy_itc.func.del = NULL; - peer_busy_itc.item_style = "2line.top"; + peer_busy_itc.item_style = WFD_GENLIST_2LINE_TOP_TEXT_ICON_STYLE; peer_busy_itc.func.text_get = _gl_peer_busy_dev_label_get; peer_busy_itc.func.content_get = _gl_peer_icon_get; peer_busy_itc.func.state_get = NULL; peer_busy_itc.func.del = _gl_peer_del; - title_multi_connect_itc.item_style = "groupindex"; + title_multi_connect_itc.item_style = WFD_GENLIST_GROUP_INDEX_STYLE; title_multi_connect_itc.func.text_get = _gl_multi_connect_dev_title_label_get; title_multi_connect_itc.func.content_get = NULL; title_multi_connect_itc.func.state_get = NULL; title_multi_connect_itc.func.del = NULL; - select_all_multi_connect_itc.item_style = "1line"; + select_all_multi_connect_itc.item_style = WFD_GENLIST_1LINE_TEXT_ICON_STYLE; select_all_multi_connect_itc.func.text_get = _gl_multi_connect_select_all_title_label_get; select_all_multi_connect_itc.func.content_get = _wfd_gl_select_all_icon_get;