summaryrefslogtreecommitdiff
path: root/ug-wifidirect/src/wfd_ug_multiconnect_view.c
diff options
context:
space:
mode:
Diffstat (limited to 'ug-wifidirect/src/wfd_ug_multiconnect_view.c')
-rwxr-xr-x[-rw-r--r--]ug-wifidirect/src/wfd_ug_multiconnect_view.c40
1 files changed, 21 insertions, 19 deletions
diff --git a/ug-wifidirect/src/wfd_ug_multiconnect_view.c b/ug-wifidirect/src/wfd_ug_multiconnect_view.c
index ef36a62..41b1095 100644..100755
--- a/ug-wifidirect/src/wfd_ug_multiconnect_view.c
+++ b/ug-wifidirect/src/wfd_ug_multiconnect_view.c
@@ -475,7 +475,7 @@ static char *_wfd_gl_device_label_get(void *data, Evas_Object *obj, const char *
return NULL;
}
- if (!g_strcmp0(part, "elm.text.main.left")) {
+ if (!strcmp("elm.text", part)) {
if (strlen(peer->ssid) != 0) {
ssid = elm_entry_utf8_to_markup(peer->ssid);
if (NULL == ssid) {
@@ -556,10 +556,22 @@ static Evas_Object *_wfd_gl_device_icon_get(void *data, Evas_Object *obj, const
Evas_Object *icon = NULL;
Evas_Object *icon_layout = NULL;
-
DBG(LOG_INFO, "Part %s", part);
- if (!g_strcmp0(part, "elm.icon.2")) {
+ if (!strcmp("elm.swallow.icon", part)) {
+ DBG(LOG_INFO, "Part %s", part);
+ icon_layout = elm_layout_add(obj);
+ elm_layout_theme_set(icon_layout, "layout", "list/B/type.3", "default");
+ img_name = __wfd_get_device_icon_path(peer);
+ icon = elm_image_add(icon_layout);
+ elm_image_file_set(icon, WFD_UG_EDJ_PATH, img_name);
+ 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);
+ evas_object_color_set(icon, 2, 61, 132, 204);
+ evas_object_show(icon);
+ evas_object_propagate_events_set(icon, EINA_FALSE);
+ elm_layout_content_set(icon_layout, "elm.swallow.content", icon);
+ } else 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);
@@ -572,21 +584,11 @@ static Evas_Object *_wfd_gl_device_icon_get(void *data, Evas_Object *obj, const
evas_object_smart_callback_add(icon,
"changed", _wfd_gl_multi_sel_cb, (void *)data);
elm_layout_content_set(icon_layout, "elm.swallow.content", icon);
- }else if (!g_strcmp0(part, "elm.icon.1")) {
- DBG(LOG_INFO, "Part %s", part);
- icon_layout = elm_layout_add(obj);
- elm_layout_theme_set(icon_layout, "layout", "list/B/type.3", "default");
- img_name = __wfd_get_device_icon_path(peer);
- icon = elm_image_add(icon_layout);
- elm_image_file_set(icon, WFD_UG_EDJ_PATH, img_name);
- 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);
- ea_theme_object_color_set(icon, "AO001");
- evas_object_show(icon);
- evas_object_propagate_events_set(icon, EINA_FALSE);
- elm_layout_content_set(icon_layout, "elm.swallow.content", icon);
}
- evas_object_show(icon_layout);
+
+ if (icon_layout)
+ evas_object_show(icon_layout);
+
return icon_layout;
}
@@ -928,7 +930,7 @@ void wfd_create_multiconnect_view(struct ug_data *ugd)
return;
}
- device_itc.item_style = "1line";
+ device_itc.item_style = WFD_GENLIST_1LINE_TEXT_ICON_STYLE;
device_itc.func.text_get = _wfd_gl_device_label_get;
device_itc.func.content_get = _wfd_gl_device_icon_get;
device_itc.func.state_get = NULL;
@@ -936,7 +938,7 @@ void wfd_create_multiconnect_view(struct ug_data *ugd)
/* Create layout */
layout = elm_layout_add(ugd->naviframe);
- elm_layout_file_set(layout, WFD_UG_EDJ_PATH, "main_layout");
+ elm_layout_file_set(layout, WFD_UG_EDJ_PATH, "bottom_btn");
ugd->multiconn_layout = layout;