[Release] wrt-setting_0.0.50

Change-Id: Ie5e284fea2a03cb6b0bc31b27d1e81ca9ad4b063

diff --git a/packaging/wrt-setting.spec b/packaging/wrt-setting.spec
old mode 100644 (file)
new mode 100755 (executable)
index 84b5285..8380f5a
--- a/packaging/wrt-setting.spec
+++ b/packaging/wrt-setting.spec
@@ -1,5 +1,5 @@
 Name: wrt-setting
-Version: 0.0.48
+Version: 0.0.50
 Release: 1
 Summary: WRT Setting UI Gadgets
 Group:   Development/Libraries
@@ -17,6 +17,7 @@ BuildRequires: pkgconfig(dpl-wrt-dao-ro)
 BuildRequires: pkgconfig(dpl-wrt-dao-rw)
 BuildRequires: pkgconfig(dpl-efl)
 BuildRequires: pkgconfig(security-settings)
+BuildRequires: pkgconfig(efl-assist)
 
 %description
 WRT Setting UI Gadgets

diff --git a/webapp-detail/CMakeLists.txt b/webapp-detail/CMakeLists.txt
index 46baa46..779e966 100755 (executable)
--- a/webapp-detail/CMakeLists.txt
+++ b/webapp-detail/CMakeLists.txt
@@ -31,6 +31,7 @@ SET(CMAKE_CXX_FLAGS_RELEASE    "-O2 -std=c++0x -g")
 PKG_CHECK_MODULES(UG_WEB_APP_DETAIL_DEPS
     ecore
     elementary
+    efl-assist
     ui-gadget-1
     dpl-efl
     dpl-wrt-dao-rw

diff --git a/webapp-detail/advancedview.cpp b/webapp-detail/advancedview.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 690d445..be2a921
--- a/webapp-detail/advancedview.cpp
+++ b/webapp-detail/advancedview.cpp
@@ -188,20 +188,11 @@ void AdvancedView::securityExceptionsSettingsSelectedCallback(void* data,
 
 bool AdvancedView::loadView(void)
 {
-    resetBase();
-
-    Evas_Object* genlist = NULL;
-    genlist = elm_genlist_add(m_naviframe);
-
-    loadSecuritySettingsMenu(genlist);
-
-    elm_naviframe_item_push(m_naviframe,
-                            TEXT_NAVIFRAME_TITLE,
-                            NULL,
-                            NULL,
-                            genlist,
-                            NULL);
-    resetBase(genlist);
+    m_exceptionsView.Reset(
+        new ExceptionsView(m_naviframe, m_appID));
+    if (!m_exceptionsView->loadView()) {
+        m_exceptionsView.Reset();
+    }
     return true;
 }
 

diff --git a/webapp-detail/detailview.cpp b/webapp-detail/detailview.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 726329f..ab69cc0
--- a/webapp-detail/detailview.cpp
+++ b/webapp-detail/detailview.cpp
@@ -16,6 +16,7 @@
 
 #include <sstream>
 #include <Elementary.h>
+#include <efl_assist.h>
 
 #include <dpl/wrt-dao-rw/widget_dao.h>
 #include <dpl/foreach.h>
@@ -51,23 +52,19 @@ Evas_Object *DetailView::loadView(void)
     try {
         win = static_cast<Evas_Object *>(ug_get_window());
         Assert(win);
-        m_gl = elm_genlist_add(m_naviframe);
-        elm_object_style_set(m_gl, "dialogue");
-
+        ea_object_event_callback_add(m_naviframe,
+            EA_CALLBACK_BACK,
+            onBackBtnClicked,
+            this);
         m_dao.Reset(new WrtDB::WidgetDAO(m_appID));
         getLocalizedInfo();
 
-        if (!m_gl) {
-            evas_object_del(m_naviframe);
-            return NULL;
-        }
         bindtextdomain("ug-webapp-common-efl", "/usr/ug/res/locale");
 
         m_advancedView.Reset(
             new AdvancedView(m_naviframe,
             m_appID));
-        m_advancedView->loadSecuritySettingsMenu(m_gl);
-        pushToNaviFrame();
+        m_advancedView->loadView();
         return win;
     } catch (const std::bad_alloc &) {
          return NULL;
@@ -84,26 +81,6 @@ void DetailView::onBackBtnClicked(void *data,
     Assert(This);
     ug_destroy_me(This->m_ug);
 }
-bool DetailView::pushToNaviFrame(void)
-{
-    Evas_Object *btn;
-
-    Assert(m_naviframe);
-    btn = elm_button_add(m_naviframe);
-    if (!btn)
-        return false;
-
-    elm_object_style_set(btn, "naviframe/end_btn/default");
-    evas_object_smart_callback_add(btn, "clicked", onBackBtnClicked, this);
-    bindtextdomain("ug-webapp-common-efl", "/usr/ug/res/locale");
-    elm_naviframe_item_push(m_naviframe,
-                            "Allow list",
-                            btn,
-                            NULL,
-                            m_gl,
-                            NULL);
-    return true;
-}
 
 DetailView::DetailView(Evas_Object* navi, ui_gadget_h ug, DPL::String appID) :
     m_naviframe(navi),

diff --git a/webapp-detail/detailview.h b/webapp-detail/detailview.h
index aa04f66..18dcc9e 100755 (executable)
--- a/webapp-detail/detailview.h
+++ b/webapp-detail/detailview.h
@@ -49,7 +49,6 @@ class DetailView : public View
     Evas_Object *m_bx;
     Evas_Object *check_webkit;
     Evas_Object *check_login;
-    Evas_Object *m_gl;
     ui_gadget_h m_ug;
     DPL::ScopedPtr<WrtDB::WidgetDAO> m_dao;
     WrtDB::WidgetLocalizedInfo m_localizedInfo;
@@ -61,7 +60,6 @@ class DetailView : public View
     static void onBackBtnClicked(void *data,
                                     Evas_Object *obj,
                                     void *event_info);
-    bool pushToNaviFrame(void);
   public:
     DetailView(Evas_Object* naviframe, ui_gadget_h ug, DPL::String appID);
     ~DetailView(void);

diff --git a/webapp-detail/exceptionsview.cpp b/webapp-detail/exceptionsview.cpp
index a6451cc..652353e 100644 (file)
--- a/webapp-detail/exceptionsview.cpp
+++ b/webapp-detail/exceptionsview.cpp
@@ -46,7 +46,7 @@ const char* const ELM_GENLIST_ITEM_CLASS_STYLE_3TEXT_1ICON = "3text.1icon";
 const char* const EVAS_SMART_CALLBACK_CLICKED = "clicked";
 // TEXT
 std::vector<std::string> featureText =
-    {"Geolocation", "Web Notification", "Web database", "FileSystem API"};
+    {"Geolocation", "Web Notification", "User media", "Fullscreen", "Web Database"};
 std::vector<std::string> resultText = {"Allow", "Deny"};
 const unsigned int INDEX_TEXT_ALLOW = 0;
 const unsigned int INDEX_TEXT_DENY = 1;
@@ -56,7 +56,7 @@ const char* const TEXT_EMPTY = "No exceptions data";
 const char* const TEXT_POPUP_CONTENT = "Do you want to remove data?";
 const char* const TEXT_POPUP_L_BUTTON = "YES";
 const char* const TEXT_POPUP_R_BUTTON = "NO";
-const char* const TEXT_NAVIFRAME_TITLE = "Exceptions Settings";
+const char* const TEXT_NAVIFRAME_TITLE = "Allow list";
 
 }