apply naviframe to plugin-model

diff --git a/include/setting-plugin.h b/include/setting-plugin.h
index fd260c5..159b2c4 100755 (executable)
--- a/include/setting-plugin.h
+++ b/include/setting-plugin.h
@@ -53,7 +53,7 @@ typedef struct
        xmlNode *root;
 
        const char *cfg_file;
-       Evas_Object *win_get;
+       //Evas_Object *win_get;
        Evas_Object *ly_main;
        Evas_Object *scroller;
        Evas_Object *navi_bar;

diff --git a/src/setting-plugin.c b/src/setting-plugin.c
index a1e67fa..71daaef 100755 (executable)
--- a/src/setting-plugin.c
+++ b/src/setting-plugin.c
@@ -516,7 +516,10 @@ static void ___click_softkey_back_cb(void *data, Evas_Object *obj,
        }
 
        setting_plugin_destroy(node);
-
+       if (g_main_ad->navibar_main)
+       {
+               elm_naviframe_item_pop(g_main_ad->navibar_main);
+       }
        pd->scroller = NULL;
        pd->navi_bar = NULL;
        pd->cfg_file = NULL;
@@ -1174,7 +1177,7 @@ static Evas_Object *setting_create_win_layout2(Evas_Object *win_layout, Evas_Obj
     elm_layout_theme_set(layout, "layout", "application", "default");
     evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
     evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
-    elm_win_resize_object_add(win_obj, layout);
+       elm_win_resize_object_add(win_obj, layout);
 
     Evas_Object *bg = setting_create_bg(layout, win_obj, "group_list");
     elm_object_part_content_set(layout, "elm.swallow.bg", bg);
@@ -1215,23 +1218,22 @@ static void* setting_func(void *data, xmlNode *xmlObj)
        SETTING_TRACE("before setting_create_layout_navi_bar_genlist");
 
        // [UI] with DATA
-       pd->scroller = elm_genlist_add(pd->win_get);
+       pd->scroller = elm_genlist_add(g_main_ad->win_main);
        retvm_if(pd->scroller == NULL, NULL,
                 "Cannot set scroller object  as contento of layout");
        elm_object_style_set(pd->scroller, "dialogue");
        elm_genlist_clear(pd->scroller);        /* first to clear list */
 
-
        SETTING_TRACE("_(title):%s", _(title));
-       pd->ly_main = setting_create_layout_navi_bar2(pd->win_get, pd->win_get,
+
+       setting_push_layout_navi_bar(
                                           _(title),
                                           _("IDS_COM_BODY_BACK"), NULL, NULL,
                                           ___click_softkey_back_cb,
                                           NULL, NULL,
                                           data, pd->scroller,
-                                          &(pd->navi_bar), NULL);
+                                          g_main_ad->navibar_main, NULL);
        SETTING_TRACE("after setting_create_layout_navi_bar_genlist");
-
 #endif
        return NULL;
 }
@@ -1577,7 +1579,6 @@ bool setting_plugin_load(PluginNode* context, const char *cfg_file)
                return FALSE;
        }
        context->pd->cfg_file = cfg_file;
-       context->pd->win_get = (Evas_Object *) ug_get_window();
 
        //GError *error = NULL;