Update wrt-setting_0.0.15

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 972d6ff..a4df002 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,6 @@
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 INCLUDE(FindPkgConfig)
-
+ADD_DEFINITIONS("-std=c++0x")
 ADD_SUBDIRECTORY(webapp-common)
 ADD_SUBDIRECTORY(webapp-detail)

diff --git a/debian/changelog b/debian/changelog
index 447cb8a..2c4653d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,50 @@
+wrt-setting (0.0.15) unstable; urgency=low
+
+  * Add std DEFINITIONS
+
+ * Git : apps/home/wrt-setting
+ * Tag : wrt-setting_0.0.15
+
+ -- Leerang Song <leerang.song@samsung.com>  Thu, 18 Oct 2012 15:51:52 +0900
+
+wrt-setting (0.0.14) unstable; urgency=low
+
+  * Add license installing
+
+  * Git : apps/home/wrt-setting
+  * Tag : wrt-setting_0.0.14
+
+ -- Jihoon Chung <jihoon.chung@samsung.com>  Fri, 12 Oct 2012 08:22:47 +0900
+
+wrt-setting (0.0.13) unstable; urgency=low
+
+  * Genlist style set for space between header and option
+
+  * Git : slp/pkgs/w/wrt-setting
+  * Tag : wrt-setting_0.0.13
+
+ -- SongERang <leerang.song@samsung.com>  Mon, 08 Oct 2012 09:38:40 +0900
+
+wrt-setting (0.0.12) unstable; urgency=low
+
+  * Adjusted spec and CMake to new dependencies
+
+  * Git : slp/pkgs/w/wrt-setting
+  * Tag : wrt-setting_0.0.12
+
+ -- Jihoon Chung <jihoon.chung@samsung.com>  Wed, 26 Sep 2012 20:22:04 +0900
+
+wrt-setting (0.0.11) unstable; urgency=low
+
+  * Genlist style set for webapplication list menu
+  * Add smack manifest
+
+  * Git : slp/pkgs/w/wrt-setting
+  * Tag : wrt-setting_0.0.11
+
+
+ -- Soyoung Kim <sy037.kim@samsung.com>  Thu, 20 Sep 2012 20:15:47 +0900
+
 wrt-setting (0.0.10) unstable; urgency=low
 
   * genlist style set for webapplication list menu

diff --git a/packaging/wrt-setting.spec b/packaging/wrt-setting.spec
index edce92e..1c49745 100644 (file)
--- a/packaging/wrt-setting.spec
+++ b/packaging/wrt-setting.spec
@@ -1,5 +1,5 @@
 Name: wrt-setting
-Version: 0.0.10
+Version: 0.0.15
 Release: 1
 Summary: WRT Setting UI Gadgets
 Group:   Development/Libraries
@@ -13,8 +13,8 @@ BuildRequires: pkgconfig(ecore)
 BuildRequires: pkgconfig(ui-gadget-1)
 BuildRequires: pkgconfig(dpl-wrt-dao-ro)
 BuildRequires: pkgconfig(dpl-wrt-dao-rw)
-BuildRequires: pkgconfig(ace)
-BuildRequires: pkgconfig(ace-dao-rw)
+BuildRequires: pkgconfig(security)
+BuildRequires: pkgconfig(security-dao-rw)
 BuildRequires: pkgconfig(dpl-efl)
 
 %description
@@ -29,11 +29,16 @@ make %{?jobs:-j%jobs}
 
 %install
 rm -rf %{buildroot}
+mkdir -p %{buildroot}/usr/share/license
+cp LICENSE  %{buildroot}/usr/share/license/%{name}
 %make_install
 
+
 %clean
 rm -rf %{buildroot}
 
 %files
+%manifest wrt-setting.manifest
 %defattr(-,root,root,-)
+%{_datadir}/license/%{name}
 /opt/ug/*

diff --git a/webapp-common/listview.cpp b/webapp-common/listview.cpp
index daaa02e..225fbcd 100755 (executable)
--- a/webapp-common/listview.cpp
+++ b/webapp-common/listview.cpp
@@ -45,9 +45,9 @@ char *ListView::getWhiteListTitle(void */*data*/,
     return strdup("White list");
 }
 
-char *ListView::getOnOffTitle(void *data,
-                              Evas_Object */*obj*/,
-                              const char *part)
+char *ListView::getText(void *data,
+                        Evas_Object */*obj*/,
+                        const char *part)
 {
     OnOffData *onOffData;
     const char *str;
@@ -55,16 +55,12 @@ char *ListView::getOnOffTitle(void *data,
     onOffData = static_cast<OnOffData *>(data);
     Assert(onOffData);
 
-    if (!strcmp(part, "elm.text.1"))
+    if (!strcmp(part, "elm.text"))
+        str = onOffData->m_title.c_str();
+    else if (!strcmp(part, "elm.text.1"))
         str = onOffData->m_title.c_str();
-    else if (!strcmp(part, "elm.text.2"))
-        str = onOffData->m_desc.c_str();
     else
         str = NULL;
-
-    if (!str)
-        return NULL;
-
     return strdup(str);
 }
 
@@ -735,7 +731,6 @@ void ListView::addWhiteList(Evas_Object *gl)
 
 void ListView::addOnOffItem(Evas_Object *gl,
                             const char *title,
-                            const char *desc,
                             GetOnOffVal getOnOffVal,
                             Evas_Smart_Cb changedCb)
 {
@@ -747,11 +742,10 @@ void ListView::addOnOffItem(Evas_Object *gl,
     try {
         onOffData = new OnOffData(this,
                                   title,
-                                  desc,
                                   getOnOffVal,
                                   changedCb);
-        itc.item_style = "dialogue/2text.1icon.6";
-        itc.func.text_get = getOnOffTitle;
+        itc.item_style = "dialogue/1text.1icon";
+        itc.func.text_get = getText;
         itc.func.content_get = getOnOffIcon;
         itc.func.state_get = NULL;
         itc.func.del = delOnOffData;
@@ -766,7 +760,61 @@ void ListView::addOnOffItem(Evas_Object *gl,
     } catch (const std::bad_alloc &) {
     }
 }
+void ListView::addDesc(Evas_Object *gl,
+                       const char *title)
+{
+    OnOffData *onOffData;
+    static Elm_Genlist_Item_Class itc;
+
+    Assert(gl);
+
+    try {
+        onOffData = new OnOffData(this,
+                                  title,
+                                  NULL,
+                                  NULL);
+        itc.item_style = "multiline/1text";
+        itc.func.text_get = getText;
+        itc.func.content_get = NULL;
+        itc.func.state_get = NULL;
+        itc.func.del = delOnOffData;
+        elm_genlist_mode_set(gl, ELM_LIST_COMPRESS);
+        if (!elm_genlist_item_append(gl,
+                                     &itc,
+                                     static_cast<void *>(onOffData),
+                                     NULL,
+                                     ELM_GENLIST_ITEM_NONE,
+                                     NULL,
+                                     static_cast<void *>(onOffData)))
+            delete onOffData;
+    } catch (const std::bad_alloc &) {
+    }
+}
 
+void ListView::addDepth(Evas_Object *gl)
+{
+    static Elm_Genlist_Item_Class itc;
+    Elm_Object_Item *it;
+    Assert(gl);
+
+    try {
+        itc.item_style = "dialogue/separator/21/with_line";
+        itc.func.text_get = NULL;
+        itc.func.content_get = NULL;
+        itc.func.state_get = NULL;
+        itc.func.del = NULL;
+        it = elm_genlist_item_append(gl,
+                                &itc,
+                                NULL,
+                                NULL,
+                                ELM_GENLIST_ITEM_NONE,
+                                NULL,
+                                NULL);
+        elm_genlist_item_select_mode_set(it,
+        ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+    } catch (const std::bad_alloc &) {
+    }
+}
 void ListView::addRoamingItem(Evas_Object *gl)
 {
     Evas_Object *rg;
@@ -915,7 +963,7 @@ bool ListView::loadView(void)
     conform = elm_conformant_add(m_naviFrame);
     if (!conform)
         return false;
-    elm_object_style_set(conform, "internal_layout");
+    elm_object_style_set(conform, "layout");
 
     gl = elm_genlist_add(conform);
     if (!gl) {
@@ -925,31 +973,14 @@ bool ListView::loadView(void)
     elm_object_style_set(gl, "dialogue");
     elm_object_content_set(conform, gl);
     resetBase(conform);
-
+    addDepth(gl);
     addOnOffItem(gl,
                  "Cookie sharing",
-                 "Share cookies between web apps",
                  getCookieSharingVal,
                  onCookieSharingChanged);
+    addDesc(gl,
+            "Share cookies between web apps");
 
-//These menus are currently being discussed.
-//so later to be merged
-#if 0
-    addOnOffItem(gl,
-                 "Untrusted applications",
-                 "Allow untrusted applications",
-                 getUntrustedAppApprovalVal,
-                 onUntrustedAppApprovalChanged);
-    addRoamingItem(gl);
-    addWhiteList(gl);
-    addWacTitle(gl);
-    addOnOffItem(gl,
-                 "Developer mode",
-                 "Enable developer mode",
-                 getDevModeVal,
-                 onDevModeChanged);
-    addComplianceModeItem(gl);
-#endif
     pushToNaviFrame();
 
     return true;

diff --git a/webapp-common/listview.h b/webapp-common/listview.h
index c75ec91..430bbd1 100644 (file)
--- a/webapp-common/listview.h
+++ b/webapp-common/listview.h
@@ -44,7 +44,7 @@ class ListView : public View
     static char *getWhiteListTitle(void *data,
                                    Evas_Object *obj,
                                    const char *part);
-    static char *getOnOffTitle(void *data,
+    static char *getText(void *data,
                                Evas_Object *obj,
                                const char *part);
     static Evas_Object *getOnOffIcon(void *data,
@@ -142,9 +142,10 @@ class ListView : public View
     void addWhiteList(Evas_Object *gl);
     void addOnOffItem(Evas_Object *gl,
                       const char *title,
-                      const char *desc,
                       GetOnOffVal getOnOffVal,
                       Evas_Smart_Cb cb);
+    void addDesc(Evas_Object *gl, const char *title);
+    void addDepth(Evas_Object *gl);
     void addRoamingItem(Evas_Object *gl);
     void addRoamingOpts(Evas_Object *obj, Elm_Object_Item *it);
     enum ComplianceOpt {
@@ -174,19 +175,16 @@ class OnOffData
   public:
     ListView *m_listView;
     std::string m_title;
-    std::string m_desc;
     Evas_Object *m_chk;
     GetOnOffVal m_getOnOffVal;
     Evas_Smart_Cb m_changedCb;
 
     OnOffData(ListView *listView,
               const char *title,
-              const char *desc,
               GetOnOffVal getOnOffVal,
               Evas_Smart_Cb changedCb) :
         m_listView(listView),
         m_title(title),
-        m_desc(desc),
         m_chk(NULL),
         m_getOnOffVal(getOnOffVal),
         m_changedCb(changedCb) { };

diff --git a/webapp-detail/CMakeLists.txt b/webapp-detail/CMakeLists.txt
index f807a72..f7f2fe2 100755 (executable)
--- a/webapp-detail/CMakeLists.txt
+++ b/webapp-detail/CMakeLists.txt
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-SET(TARGET_UG_LIB "ug-webapp-detail-efl")
+SET(TARGET_UG_DETAIL_LIB "ug-webapp-detail-efl")
 SET(TARGET_UG_EDJ "web-app.edj")
 SET(UGDIR "${UG_INSTALL_PREFIX}/ug/lib")
 SET(EDJDIR "${UG_INSTALL_PREFIX}/ug/res/edje/${TARGET_UG_LIB}")
@@ -33,13 +33,13 @@ PKG_CHECK_MODULES(UG_WEB_APP_DETAIL_DEPS
     elementary
     ui-gadget-1
     dpl-efl
-    ace
-    ace-dao-rw
     dpl-wrt-dao-rw
     dpl-utils-efl
+    security
+    security-dao-rw
     REQUIRED)
 
-SET(UG_SOURCES
+SET(UG_DETAIL_SOURCES
     ug.cpp
     view.cpp
     mainview.cpp
@@ -50,12 +50,12 @@ SET(UG_SOURCES
 )
 
 INCLUDE_DIRECTORIES(${UG_WEB_APP_DETAIL_DEPS_INCLUDE_DIRS})
-ADD_LIBRARY(${TARGET_UG_LIB} SHARED ${UG_SOURCES})
+ADD_LIBRARY(${TARGET_UG_DETAIL_LIB} SHARED ${UG_DETAIL_SOURCES})
 ADD_DEFINITIONS("-DEDJFILE=\"${EDJDIR}/${TARGET_UG_EDJ}\"")
 
-SET_TARGET_PROPERTIES(${TARGET_UG_LIB} PROPERTIES SOVERSION ${PROJECT_API_VERSION})
-SET_TARGET_PROPERTIES(${TARGET_UG_LIB} PROPERTIES VERSION   ${PROJECT_VERSION})
-TARGET_LINK_LIBRARIES(${TARGET_UG_LIB} ${UG_WEB_APP_DETAIL_DEPS_LDFLAGS})
-INSTALL(TARGETS ${TARGET_UG_LIB} DESTINATION ${UGDIR})
+SET_TARGET_PROPERTIES(${TARGET_UG_DETAIL_LIB} PROPERTIES SOVERSION ${PROJECT_API_VERSION})
+SET_TARGET_PROPERTIES(${TARGET_UG_DETAIL_LIB} PROPERTIES VERSION   ${PROJECT_VERSION})
+TARGET_LINK_LIBRARIES(${TARGET_UG_DETAIL_LIB} ${UG_WEB_APP_DETAIL_DEPS_LDFLAGS} ${UG_WEB_APP_DETAIL_DEPS_LIBRARIES})
+INSTALL(TARGETS ${TARGET_UG_DETAIL_LIB} DESTINATION ${UGDIR})
 
 ADD_SUBDIRECTORY(edc)

diff --git a/webapp-detail/edc/CMakeLists.txt b/webapp-detail/edc/CMakeLists.txt
index ba342f1..9eea5df 100644 (file)
--- a/webapp-detail/edc/CMakeLists.txt
+++ b/webapp-detail/edc/CMakeLists.txt
@@ -19,5 +19,5 @@ ADD_CUSTOM_TARGET(${TARGET_UG_EDJ}
                ${CMAKE_CURRENT_SOURCE_DIR}/main.edc ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_UG_EDJ}
                DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/main.edc
 )
-ADD_DEPENDENCIES(${TARGET_UG_LIB} ${TARGET_UG_EDJ})
+ADD_DEPENDENCIES(${TARGET_UG_DETAIL_LIB} ${TARGET_UG_EDJ})
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_UG_EDJ} DESTINATION ${EDJDIR})

diff --git a/wrt-setting.manifest b/wrt-setting.manifest
new file mode 100644 (file)
index 0000000..2a0cec5
--- /dev/null
+++ b/wrt-setting.manifest
@@ -0,0 +1,5 @@
+<manifest>
+  <request>
+    <domain name="_"/>
+  </request>
+</manifest>