Adding New Network UI contents to Popup.

Change-Id: I99e97f2eba99168cdf7aa59b1bb6e886e7aed1a2
Signed-off-by: Priya Kohli <priya.kohli@samsung.com>

diff --git a/src/view/view_new_network.c b/src/view/view_new_network.c
index 0cb9303..52c3787 100644 (file)
--- a/src/view/view_new_network.c
+++ b/src/view/view_new_network.c
@@ -79,6 +79,7 @@ const char *str_config_type_opt[] = {
 struct _priv {
        Evas_Object *win;
        Evas_Object *base;
+       Evas_Object *new_network_popup;
        Evas_Object *menu[LAYOUT_MAX];
        layoutmgr *lmgr;
 
@@ -369,8 +370,6 @@ static bool _draw_menu_area(struct _priv *priv)
                return false;
        }
 
-       elm_object_part_text_set(priv->base, PART_TITLE, _(STR_NEW_NETWORK));
-
        if (priv->content_manual) {
                evas_object_hide(priv->content_manual->layout_content_ip);
                evas_object_hide(priv->content_manual->layout_content_dns);
@@ -1385,6 +1384,7 @@ static Evas_Object *_create(Evas_Object *win, void *data)
        SETTING_TRACE_BEGIN;
        struct _priv *priv;
        Evas_Object *base;
+       Evas_Object *popup;
        Evas_Object *btn_cancel, *btn_done;
        layoutmgr *lmgr;
 
@@ -1404,7 +1404,9 @@ static Evas_Object *_create(Evas_Object *win, void *data)
                return NULL;
        }
 
-       base = utils_add_layout(win, GRP_VIEW_NEW_NETWORK, EINA_TRUE);
+       popup = utils_add_popup(win, STYLE_POPUP, STR_NEW_NETWORK, NULL);
+
+       base = utils_add_layout(popup, GRP_VIEW_NEW_NETWORK, EINA_FALSE);
        if (!base) {
                _ERR("Add layout failed.");
                free(priv);
@@ -1429,6 +1431,7 @@ static Evas_Object *_create(Evas_Object *win, void *data)
                return NULL;
        }
 
+       elm_object_content_set(popup, base);
        priv->btn_cancel = btn_cancel;
        priv->btn_done = btn_done;
 
@@ -1455,6 +1458,7 @@ static Evas_Object *_create(Evas_Object *win, void *data)
 
        priv->win = win;
        priv->base = base;
+       priv->new_network_popup = popup;
        priv->lmgr = lmgr;
        priv->conn = data;
        priv->input_panel_show = false;
@@ -1474,7 +1478,7 @@ static Evas_Object *_create(Evas_Object *win, void *data)
        _DBG("Add callback");
        inputmgr_add_callback(priv->base, 0, &_base_input_handler, priv);
 
-       return base;
+       return priv->new_network_popup;
 }
 
 static void _show(void *data)
@@ -1488,8 +1492,8 @@ static void _show(void *data)
        }
        priv = data;
 
-       if (priv->base)
-               evas_object_show(priv->base);
+       if (priv->new_network_popup)
+               evas_object_show(priv->new_network_popup);
 
        _draw_menu_area(priv);
 }
@@ -1505,8 +1509,8 @@ static void _hide(void *data)
        }
        priv = data;
 
-       if (priv->base)
-               evas_object_hide(priv->base);
+       if (priv->new_network_popup)
+               evas_object_hide(priv->new_network_popup);
 }
 
 static void _update(void *view_data, int update_type, void *data)