Remove unused layout style

Change-Id: Ic58858dd1de94de634f60630ea2829c912389784
Signed-off-by: Yu jiung <jiung.yu@samsung.com>

diff --git a/packaging/ug-setting-wifidirect-efl.spec b/packaging/ug-setting-wifidirect-efl.spec
index 1791d00..731a13d 100644 (file)
--- a/packaging/ug-setting-wifidirect-efl.spec
+++ b/packaging/ug-setting-wifidirect-efl.spec
@@ -1,6 +1,6 @@
 Name:       ug-setting-wifidirect-efl
 Summary:    Wi-Fi Direct setting UI gadget
-Version:    1.11.82
+Version:    1.11.83
 Release:    1
 Group:      Applications/Network
 License:    Flora-1.1

diff --git a/ug-wifidirect/include/wfd_ug_view.h b/ug-wifidirect/include/wfd_ug_view.h
index 9997f30..5ff7090 100644 (file)
--- a/ug-wifidirect/include/wfd_ug_view.h
+++ b/ug-wifidirect/include/wfd_ug_view.h
@@ -60,6 +60,8 @@
 
 #define WFD_ICON_DEVICE_MORE_HELP                              "A09_popup_help.png"
 
+#define WFD_UG_EDJ_ICON_SIZE 40
+
 enum {
        HEAD_TEXT_TYPE_DIRECT,
        HEAD_TEXT_TYPE_DEACTIVATING,

diff --git a/ug-wifidirect/src/wfd_ug_genlist.c b/ug-wifidirect/src/wfd_ug_genlist.c
index 18fabf1..329d26c 100755 (executable)
--- a/ug-wifidirect/src/wfd_ug_genlist.c
+++ b/ug-wifidirect/src/wfd_ug_genlist.c
@@ -358,7 +358,6 @@ static Evas_Object *_gl_peer_icon_get(void *data, Evas_Object *obj, const char *
        assertm_if(NULL == part, "NULL!!");
        device_type_s *peer = (device_type_s *) data;
        Evas_Object *icon = NULL;
-       Evas_Object *layout = NULL;
 
        if (data == NULL) {
                DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
@@ -367,10 +366,8 @@ static Evas_Object *_gl_peer_icon_get(void *data, Evas_Object *obj, const char *
        DBG(LOG_INFO, "part = %s", part);
 
        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");
+               DBG(LOG_INFO, "elm.swallow.icon - category [%d]\n", peer->category);
                /*
                * the icon of connected device is
                * different from available and busy device
@@ -424,34 +421,28 @@ static Evas_Object *_gl_peer_icon_get(void *data, Evas_Object *obj, const char *
                        break;
                }
 
-               icon = elm_image_add(layout);
+               icon = elm_image_add(obj);
                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_size_hint_min_set(icon, ELM_SCALE_SIZE(WFD_UG_EDJ_ICON_SIZE),
+                               ELM_SCALE_SIZE(WFD_UG_EDJ_ICON_SIZE));
                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(layout, "elm.swallow.content", icon);
+               if(img_name)
+                       DBG(LOG_INFO, "img_name = %s", img_name);
+
        } 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);
+                       icon = elm_progressbar_add(obj);
                        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;
+
+       return icon;
 }
 
 /**
@@ -468,7 +459,6 @@ static Evas_Object *_gl_conn_peer_icon_get(void *data, Evas_Object *obj, const c
        assertm_if(NULL == part, "NULL!!");
        device_type_s *peer = (device_type_s *) data;
        Evas_Object *icon = NULL;
-       Evas_Object *layout = NULL;
 
        if (data == NULL) {
                DBG(LOG_ERROR, "Incorrect parameter(NULL)\n");
@@ -479,8 +469,6 @@ static Evas_Object *_gl_conn_peer_icon_get(void *data, Evas_Object *obj, const c
        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");
                /*
                * the icon of connected device is
                * different from available and busy device
@@ -534,21 +522,15 @@ static Evas_Object *_gl_conn_peer_icon_get(void *data, Evas_Object *obj, const c
                        break;
                }
 
-               icon = elm_image_add(layout);
+               icon = elm_image_add(obj);
                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_size_hint_min_set(icon, ELM_SCALE_SIZE(WFD_UG_EDJ_ICON_SIZE),
+                               ELM_SCALE_SIZE(WFD_UG_EDJ_ICON_SIZE));
                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(layout, "elm.swallow.content", icon);
        }
 
-       if (layout)
-               evas_object_show(layout);
-
        __FUNC_EXIT__;
-       return layout;
+       return icon;
 }
 
 /**