Task TT-79 Implement Setting view 22/45222/3
authork.lis2 <k.lis2@samsung.com>
Tue, 4 Aug 2015 08:31:47 +0000 (10:31 +0200)
committerJanusz Majnert <j.majnert@samsung.com>
Wed, 5 Aug 2015 09:52:20 +0000 (11:52 +0200)
    [Issue#]   https://bugs.tizen.org/jira/browse/TT-79
    [Problem]  Task TT-79 Implement Setting view
    [Cause]    -
    [Solution] Add SettingsUI. Enable code referring to
               SettingsUI in SimpleUI.
    [Verify]   Perform basic sanity check.

Change-Id: Ia1c25f3ac47e25a8b0707b1679671ea6325d8fd4

19 files changed:
services/CMakeLists.txt
services/SettingsUI/CMakeLists.txt [new file with mode: 0644]
services/SettingsUI/SettingsUI.cpp [new file with mode: 0644]
services/SettingsUI/SettingsUI.h [new file with mode: 0644]
services/SettingsUI/edc/Settings.edc [new file with mode: 0644]
services/SettingsUI/edc/error.edc [new file with mode: 0644]
services/SettingsUI/images/btn_bar_incognito_dis.png [new file with mode: 0644]
services/SettingsUI/images/btn_bar_incognito_foc.png [new file with mode: 0644]
services/SettingsUI/images/btn_bar_incognito_nor.png [new file with mode: 0644]
services/SettingsUI/images/btn_bar_new_dis.png [new file with mode: 0644]
services/SettingsUI/images/btn_bar_new_foc.png [new file with mode: 0644]
services/SettingsUI/images/btn_bar_new_nor.png [new file with mode: 0644]
services/SettingsUI/images/btn_bar_stop_nor.png [new file with mode: 0644]
services/SettingsUI/images/ico_delete.png [new file with mode: 0644]
services/SettingsUI/images/web_frame_selected.png [new file with mode: 0644]
services/SettingsUI/images/web_shadow.png [new file with mode: 0644]
services/SimpleUI/CMakeLists.txt
services/SimpleUI/SimpleUI.cpp
services/SimpleUI/SimpleUI.h

index 167a2f87e71c44bffa1895c3887c41f2072b12c4..b4944bfa9d49b6f9f22c1efa941607e363dadcbc 100644 (file)
@@ -6,8 +6,7 @@ add_subdirectory(MainUI)
 add_subdirectory(HistoryUI)
 add_subdirectory(TabUI)
 add_subdirectory(SimpleUI)
-# MERGE_ME
-#add_subdirectory(SettingsUI)
+add_subdirectory(SettingsUI)
 add_subdirectory(SimpleURI)
 add_subdirectory(BookmarkManagerUI)
 add_subdirectory(StorageService)
diff --git a/services/SettingsUI/CMakeLists.txt b/services/SettingsUI/CMakeLists.txt
new file mode 100644 (file)
index 0000000..a018161
--- /dev/null
@@ -0,0 +1,27 @@
+project(SettingsUI)
+
+set(SettingsUI_SRCS
+    SettingsUI.cpp
+    )
+
+set(SettingsUI_HEADERS
+    SettingsUI.h
+    )
+
+include(Coreheaders)
+include(EFLHelpers)
+
+add_library(${PROJECT_NAME} SHARED ${SettingsUI_SRCS})
+
+if(TIZEN_BUILD)
+    target_link_libraries(${PROJECT_NAME} ${pkgs_LDFLAGS})
+endif(TIZEN_BUILD)
+
+install(TARGETS ${PROJECT_NAME}
+            LIBRARY DESTINATION services
+            ARCHIVE DESTINATION services/static)
+
+include(EDCCompile)
+EDJ_TARGET(SettingsUI.edj
+    ${CMAKE_CURRENT_SOURCE_DIR}/edc/Settings.edc
+    ${CMAKE_CURRENT_BINARY_DIR})
diff --git a/services/SettingsUI/SettingsUI.cpp b/services/SettingsUI/SettingsUI.cpp
new file mode 100644 (file)
index 0000000..9fe988b
--- /dev/null
@@ -0,0 +1,279 @@
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <Elementary.h>
+#include <boost/concept_check.hpp>
+#include <vector>
+#include <AbstractMainWindow.h>
+
+#include "SettingsUI.h"
+#include "ServiceManager.h"
+#include "BrowserLogger.h"
+#include "Tools/EflTools.h"
+
+#define efl_scale       (elm_config_scale_get() / elm_app_base_scale_get())
+
+namespace tizen_browser{
+namespace base_ui{
+
+EXPORT_SERVICE(SettingsUI, "org.tizen.browser.settingsui")
+
+struct ItemData{
+        tizen_browser::base_ui::SettingsUI* settingsUI;
+        Elm_Object_Item * e_item;
+};
+
+SettingsUI::SettingsUI()
+    : m_settings_layout(NULL)
+    , m_genListActionBar(NULL)
+    , m_parent(NULL)
+    , m_itemClassActionBar(NULL)
+    , m_item_class(NULL)
+{
+    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
+    edjFilePath = EDJE_DIR;
+    edjFilePath.append("SettingsUI/SettingsUI.edj");
+}
+
+SettingsUI::~SettingsUI()
+{
+
+}
+
+void SettingsUI::show(Evas_Object* parent)
+{
+    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
+    //m_parent = p;
+    elm_theme_extension_add(NULL, edjFilePath.c_str());
+    m_settings_layout = elm_layout_add(parent);
+    elm_layout_file_set(m_settings_layout, edjFilePath.c_str(), "settings-layout");
+    evas_object_size_hint_weight_set(m_settings_layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+    evas_object_size_hint_align_set(m_settings_layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
+    evas_object_show(m_settings_layout);
+
+    showActionBar();
+    showSettingsGenlist();
+}
+
+
+void SettingsUI::showActionBar()
+{
+    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
+    elm_theme_extension_add(NULL, edjFilePath.c_str());
+    m_genListActionBar = elm_genlist_add(m_settings_layout);
+    elm_object_part_content_set(m_settings_layout, "actionbar_swallow", m_genListActionBar);
+    elm_genlist_homogeneous_set(m_genListActionBar, EINA_FALSE);
+    elm_genlist_multi_select_set(m_genListActionBar, EINA_FALSE);
+    elm_genlist_select_mode_set(m_genListActionBar, ELM_OBJECT_SELECT_MODE_ALWAYS);
+    elm_genlist_mode_set(m_genListActionBar, ELM_LIST_LIMIT);
+    elm_genlist_decorate_mode_set(m_genListActionBar, EINA_TRUE);
+    evas_object_size_hint_weight_set(m_genListActionBar, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+
+    m_itemClassActionBar = elm_genlist_item_class_new();
+    m_itemClassActionBar->item_style = "settings_action_bar_items";
+    m_itemClassActionBar->func.text_get = NULL;
+    m_itemClassActionBar->func.content_get = &listActionBarContentGet;
+    m_itemClassActionBar->func.state_get = 0;
+    m_itemClassActionBar->func.del = 0;
+
+    ItemData * id = new ItemData;
+    id->settingsUI = this;
+    Elm_Object_Item* elmItem = elm_genlist_item_append(m_genListActionBar,            //genlist
+                                                       m_itemClassActionBar,          //item Class
+                                                      id,
+                                                      NULL,                    //parent item
+                                                      ELM_GENLIST_ITEM_NONE,//item type
+                                                      NULL,
+                                                      NULL                  //data passed to above function
+                                                     );
+    id->e_item = elmItem; 
+
+    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
+
+}
+
+void SettingsUI::showSettingsGenlist()
+{
+    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
+    elm_theme_extension_add(NULL, edjFilePath.c_str());
+    m_genList = elm_genlist_add(m_settings_layout);
+    elm_object_part_content_set(m_settings_layout, "settings_genlist_swallow", m_genList);
+    elm_genlist_homogeneous_set(m_genList, EINA_FALSE);
+    elm_genlist_multi_select_set(m_genList, EINA_FALSE);
+    elm_genlist_select_mode_set(m_genList, ELM_OBJECT_SELECT_MODE_ALWAYS);
+    elm_genlist_mode_set(m_genList, ELM_LIST_SCROLL);
+    elm_genlist_decorate_mode_set(m_genList, EINA_TRUE);
+    evas_object_size_hint_weight_set(m_genList, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+    elm_genlist_scroller_policy_set(m_genList, ELM_SCROLLER_POLICY_ON, ELM_SCROLLER_POLICY_AUTO);
+
+    m_item_class = elm_genlist_item_class_new();
+    m_item_class->item_style = "settings_items";
+    m_item_class->func.text_get = NULL;
+    m_item_class->func.content_get = &listSettingsGenlistContentGet;
+    m_item_class->func.state_get = 0;
+    m_item_class->func.del = 0;
+
+    ItemData * id = new ItemData;
+    id->settingsUI = this;
+    Elm_Object_Item* elmItem = elm_genlist_item_append(m_genList,            //genlist
+                                                       m_item_class,          //item Class
+                                                      id,
+                                                      NULL,                    //parent item
+                                                      ELM_GENLIST_ITEM_NONE,//item type
+                                                      NULL,
+                                                      NULL                  //data passed to above function
+                                                     );
+    id->e_item = elmItem;
+
+    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
+
+}
+
+Evas_Object* SettingsUI::listActionBarContentGet(void* data, Evas_Object* obj , const char* part)
+{
+        BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
+        if(!strcmp(part, "close_click"))
+       {
+               Evas_Object *close_click = elm_button_add(obj);
+               elm_object_style_set(close_click, "basic_button");
+               evas_object_smart_callback_add(close_click, "clicked", SettingsUI::close_clicked_cb, data);
+               return close_click;
+       }
+        return NULL;
+}
+
+Evas_Object* SettingsUI::listSettingsGenlistContentGet(void* data, Evas_Object* obj , const char* part)
+{
+        BROWSER_LOGD("[%s:%d] Part %s", __PRETTY_FUNCTION__, __LINE__, part);
+        if(!strcmp(part, "del_selected_data_click"))
+        {
+                Evas_Object *button = elm_button_add(obj);
+                elm_object_style_set(button, "basic_button");
+                evas_object_smart_callback_add(button, "clicked", SettingsUI::_del_selected_data_clicked_cb, data);
+                return button;
+        }
+       else if(!strcmp(part, "reset_mv_click"))
+        {
+                Evas_Object *button = elm_button_add(obj);
+                elm_object_style_set(button, "basic_button");
+                evas_object_smart_callback_add(button, "clicked", SettingsUI::_reset_mv_clicked_cb, data);
+                return button;
+        }
+       else if(!strcmp(part, "reset_browser_click"))
+        {
+                Evas_Object *button = elm_button_add(obj);
+                elm_object_style_set(button, "basic_button");
+                evas_object_smart_callback_add(button, "clicked", SettingsUI::_reset_browser_clicked_cb, data);
+                return button;
+        }
+       else if(!strcmp(part, "cache_cb") || !strcmp(part, "cookies_cb") || !strcmp(part, "history_cb"))
+        {
+               Evas_Object *checkbox = elm_check_add(obj);
+                elm_object_style_set(checkbox, "on&off");
+                evas_object_smart_callback_add(checkbox, "changed", __check_changed_cb, data);
+                elm_check_state_set(checkbox, EINA_TRUE);
+                return checkbox;
+       }
+       else if(!strcmp(part, "accept_all_rb") || !strcmp(part, "ask_rb") || !strcmp(part, "sr_disable_rb") || !strcmp(part, "bs_enable_rb")
+               || !strcmp(part, "bs_disable_rb") || !strcmp(part, "ts_enable_rb") || !strcmp(part, "ts_disable_rb"))
+        {
+                Evas_Object *rb = elm_radio_add(obj);
+                elm_object_style_set(rb, "on&off");
+                //evas_object_smart_callback_add(rb, "changed", __radio_changed_cb, data);
+                return rb;
+        }
+        return NULL;
+}
+
+void SettingsUI::__check_changed_cb(void* data, Evas_Object* /* obj */, void* /* event_info */)
+{
+    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
+    //ItemData * id = static_cast<ItemData *>(data);
+}
+
+void SettingsUI::close_clicked_cb(void* data, Evas_Object* /* obj */, void* /* event_info */)
+{
+    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
+    ItemData * id = static_cast<ItemData *>(data);
+    id->settingsUI->closeSettingsUIClicked(std::string());
+    id->settingsUI->clearItems();
+}
+
+void SettingsUI::hide()
+{
+        evas_object_hide(elm_layout_content_get(m_settings_layout, "action_bar_swallow"));
+        evas_object_hide(elm_layout_content_get(m_settings_layout, "settings_genlist_swallow"));
+        evas_object_hide(m_settings_layout);
+}
+
+void SettingsUI::_del_selected_data_clicked_cb(void * data, Evas_Object * /* obj */, void * event_info)
+{
+        BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
+       ItemData* itemData = reinterpret_cast<ItemData *>(data);
+       Evas_Object *cb1 = elm_object_item_part_content_get(itemData->e_item, "cache_cb");
+       Evas_Object *cb2 = elm_object_item_part_content_get(itemData->e_item, "cookies_cb");
+       Evas_Object *cb3 = elm_object_item_part_content_get(itemData->e_item, "history_cb");
+       std::string type;
+       elm_check_state_get(cb1) ? type += "_CACHE" : "";
+       elm_check_state_get(cb2) ? type += "_COOKIES" : "";
+       elm_check_state_get(cb3) ? type += "_HISTORY" : "";
+        itemData->settingsUI->deleteSelectedDataClicked(type);
+}
+
+void SettingsUI::_reset_mv_clicked_cb(void * data, Evas_Object * /* obj */, void * event_info)
+{
+        BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
+       ItemData* itemData = reinterpret_cast<ItemData *>(data);
+        itemData->settingsUI->resetMostVisitedClicked(std::string());
+}
+
+void SettingsUI::_reset_browser_clicked_cb(void * data, Evas_Object * /* obj */, void * event_info)
+{
+        BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
+        ItemData* itemData = reinterpret_cast<ItemData *>(data);
+        itemData->settingsUI->resetBrowserClicked(std::string());
+}
+
+void SettingsUI::clearItems()
+{
+    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
+    hide();
+    elm_genlist_clear(m_genListActionBar);
+    elm_genlist_clear(m_genList);
+}
+
+void SettingsUI::focusItem(void* /*data*/, Evas_Object* /*obj*/, void* event_info)
+{
+    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
+    Elm_Object_Item *item = reinterpret_cast<Elm_Object_Item*>(event_info);
+    elm_object_item_signal_emit( item, "mouse,in", "over2");
+
+    // selected manually
+    elm_gengrid_item_selected_set(item, EINA_TRUE);
+}
+
+void SettingsUI::unFocusItem(void* /*data*/, Evas_Object* /*obj*/, void* event_info)
+{
+    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
+    Elm_Object_Item *item = reinterpret_cast<Elm_Object_Item*>(event_info);
+    elm_object_item_signal_emit( item, "mouse,out", "over2");
+
+    // unselected manually
+    elm_gengrid_item_selected_set(item, EINA_FALSE);
+}
+
+}
+}
diff --git a/services/SettingsUI/SettingsUI.h b/services/SettingsUI/SettingsUI.h
new file mode 100644 (file)
index 0000000..43bf8d2
--- /dev/null
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef SETTINGSUI_H
+#define SETTINGSUI_H
+
+#include <Evas.h>
+#include <boost/signals2/signal.hpp>
+
+#include "AbstractUIComponent.h"
+#include "AbstractService.h"
+#include "ServiceFactory.h"
+#include "service_macros.h"
+
+namespace tizen_browser{
+namespace base_ui{
+
+class BROWSER_EXPORT SettingsUI
+        : public tizen_browser::interfaces::AbstractUIComponent
+        , public tizen_browser::core::AbstractService
+{
+public:
+    SettingsUI();
+    ~SettingsUI();
+    void show(Evas_Object *main_layout);
+    virtual std::string getName();
+    void showActionBar();
+    void showSettingsGenlist();
+    void clearItems();
+    void hide();
+
+    /*boost::signals2::signal<void (const tizen_browser::basic_webengine::TabId&)> tabClicked;
+    boost::signals2::signal<void (const std::string & )> newTabClicked;
+    boost::signals2::signal<void (const std::string & )> newIncognitoTabClicked;*/
+    boost::signals2::signal<void (const std::string & )> resetBrowserClicked;
+    boost::signals2::signal<void (const std::string & )> resetMostVisitedClicked;
+    boost::signals2::signal<void (const std::string & )> deleteSelectedDataClicked;
+    boost::signals2::signal<void (const std::string & )> closeSettingsUIClicked;
+
+private:
+    static Evas_Object* listActionBarContentGet(void *data, Evas_Object *obj, const char *part);
+    static Evas_Object* listSettingsGenlistContentGet(void *data, Evas_Object *obj, const char *part);
+
+    static char* _grid_text_get(void *data, Evas_Object *obj, const char *part);
+    static Evas_Object * _tab_grid_content_get(void *data, Evas_Object *obj, const char *part);
+    static void _itemSelected(void * data, Evas_Object * obj, void * event_info);
+    static void close_clicked_cb(void *data, Evas_Object *obj, void *event_info);
+    static void __check_changed_cb(void *data, Evas_Object *obj, void *event_info);
+
+    static void _del_selected_data_clicked_cb(void * data, Evas_Object * obj, void * event_info);
+    static void _reset_mv_clicked_cb(void * data, Evas_Object * obj, void * event_info);
+    static void _reset_browser_clicked_cb(void * data, Evas_Object * obj, void * event_info);
+    static void _closetabs_clicked(void * data, Evas_Object * obj, void * event_info);
+    static void _onotherdevices_clicked(void * data, Evas_Object * obj, void * event_info);
+
+private:
+    Evas_Object *m_settings_layout;
+    Evas_Object *m_genListActionBar;
+    Evas_Object *m_genList;
+    Elm_Genlist_Item_Class *m_itemClassActionBar;
+    Evas_Object *m_parent;
+    
+    Elm_Gengrid_Item_Class * m_item_class;
+    std::string edjFilePath;
+
+    static void focusItem(void* data, Evas_Object* obj, void* event_info);
+    static void unFocusItem(void* data, Evas_Object* obj, void* event_info);
+};
+
+}
+}
+
+#endif // BOOKMARKSUI_H
diff --git a/services/SettingsUI/edc/Settings.edc b/services/SettingsUI/edc/Settings.edc
new file mode 100644 (file)
index 0000000..76e5dc2
--- /dev/null
@@ -0,0 +1,1398 @@
+#define DEBUG_RECT_OVER(over_part, r, g, b)                         \
+    part { name: __CONCAT("dbg_rect_at_", __stringify(__LINE__));   \
+                                                                   \
+scale:1;                                                            \
+        type : RECT;                                                \
+        repeat_events: 1;                                           \
+        description {                                               \
+            state: "default" 0.0;                                   \
+            visible: 1;                                             \
+            color: r g b 128;                                       \
+            rel1 { to: over_part; relative: 0 0; }                  \
+            rel2 { to: over_part; relative: 1 1; }                  \
+        }                                                           \
+    }
+
+#define STYLE_TAGS \
+   tag:  "br" "\n";\
+   tag:  "ps" "ps";\
+   tag:  "tab" "\t";\
+   tag:  "b" "+ font_weight=Bold";
+
+collections 
+{
+    group{
+        name: "elm/button/base/basic_button";
+        parts{
+            part{
+                name: "button";
+                type: RECT;
+                scale: 1;
+                description { state: "default" 0.0;
+                    visible: 1;
+                    fixed: 1 1;
+                    color: 0 0 0 0;
+                }
+            }
+            part{
+                name: "over";
+                type: RECT;
+                scale: 1;
+                description { state: "default" 0.0;
+                    visible: 1;
+                    fixed: 1 1;
+                    rel1 { relative: 0.0 0.0;to: "button";}
+                    rel2 { relative: 1.0 1.0;to: "button";}
+                    color: 0 0 0 0;
+                }
+            }
+        }
+        programs{
+            program {
+                name: "mouse_click";
+                signal: "mouse,clicked,1";
+                source: "over";
+                script {
+                    emit("elm,action,click", "");
+                }
+            }
+        }
+    }
+
+group { name: "settings-layout";
+    data {
+        item: "focus_highlight" "off";
+    }
+       images {
+               image: "btn_bar_stop_nor.png" COMP;
+       }
+       color_classes{
+            color_class{
+                name: "defaultBgColor";
+                color: 18 22 34 255;
+            }
+            color_class{
+                name: "focusBgColor";
+                color: 69 143 255 255;
+            }
+            color_class{
+                name: "highlightBgColor";
+                color: 69 143 255 102;
+            }
+            color_class{
+                name: "imageHighlight";
+                color: 255 255 255 102;
+            }
+            color_class{
+                name: "focusbtBgColor";
+                color: 22 120 224 255;
+            }
+            color_class{
+                name: "subTitleTextColor";
+                color: 128 128 128 255;
+            }
+            color_class{
+                name: "focusTextColor";
+                color: 255 255 255 255;
+            }
+            color_class{
+                name: "highlightTextColor";
+                color: 255 255 255 51;
+            }
+            color_class{
+                name: "urlTextColor";
+                color: 116 116 116 204;
+            }
+            color_class{
+                name: "transparent";
+                color: 0 0 0 0;
+            }
+        }
+
+       images {
+            image: "web_shadow.png" COMP;
+        }
+       min: 2957 1080;
+       max: 2957 1080;
+        parts {
+           part { name: "background";
+                type: RECT;
+                mouse_events: 0;
+                description { state: "default" 0.0;
+               align: 0.0 0.0;
+                                       color: 231 231 231 255;
+               min: 2957 1080;
+               max: 2957 1080;
+                    rel1 {
+                                               relative: 0 0;
+                    }
+                    rel2{
+                                               relative: 1 1;
+                    }
+                }
+            }
+            part { name: "actionbar_swallow";
+                type: SWALLOW;
+                description { state: "default" 0.0;
+               align: 0.0 0.0;
+               min: 1920 104;
+               max: 1920 104;
+                    rel1 {
+                       relative: 0 0; to: "background";
+                    }
+                    rel2 {
+                        relative: 1 1;
+                    }
+                }
+            }
+          part { name: "uri_bar_shadow";
+                type: IMAGE;
+                scale: 1;
+                repeat_events: 1;
+                description {
+                    state: "default" 0.0;
+                    visible: 1;
+                    align: 0.0 0.0;
+                    fixed: 0 0;
+                    min: 1920 14;
+                    max: 1920 14;
+                    image.normal: "web_shadow.png";
+                    rel1 { relative: 0.0 0.0; offset: 0 104; }
+                    rel2 { relative: 1.0 1.0; }
+                }
+             }
+          part { name: "settings_genlist_swallow";
+                type: SWALLOW;
+                description { state: "default" 0.0;
+               align: 0.0 0.0;
+                                        color: 231 231 231 255;
+               min: 1920 962;
+               max: 1920 962;
+                    rel1 {
+                        relative: 0 0; to: "background"; offset: 0 118;
+                    }
+                    rel2 {
+                        relative: 1 1;
+                    }
+                }
+            }
+    }
+}
+
+group { name: "elm/genlist/item/settings_items/default";
+       data.item: "contents" "del_selected_data_click reset_mv_click reset_browser_click cache_cb cookies_cb history_cb accept_all_rb ask_rb sr_disable_rb bs_enable_rb bs_disable_rb ts_enable_rb ts_disable_rb";
+       images {
+               image: "web_frame_selected.png" COMP;
+               image: "ico_bg_round_shape_37x37.png" COMP;
+       }
+       styles {
+               style { name: "sub_title_text";
+                       base: "font=Sans:style=Regular font_size="28" color=#808080 color_class=T024D text_class=T024D wrap=mixed";
+                       STYLE_TAGS
+               }
+       }
+
+       min: 2957 962;
+       max: 2957 962;
+       parts {
+               part { name: "bg";
+                       type: RECT;
+                       mouse_events: 0;
+                       description { state: "default" 0.0;
+                               min: 2597 626;
+                               max: 2597 626;
+                               visible: 1;
+                               color: 231 231 231 255;
+                               rel1.offset: 0 160;
+                       }
+               }
+               part { name: "del_web_browsing_text_bg";
+                        type: RECT;
+                        description { state: "default" 0.0;
+                                min: 420 152;
+                                max: 420 152;
+                                align: 0.0 0.0;
+                                color: 231 231 231 255;
+                                rel1 {
+                                        to: "bg"; offset: 86 0;
+                                        relative: 0.0  0.0;
+                                }
+                                rel2 {
+                                        relative: 1.0  1.0;
+                                }
+                        }
+                }
+                part { name: "del_web_browsing_text";
+                        type: TEXT;
+                        description { state: "default" 0.0;
+                                min: 420 36;
+                                max: 420 36;
+                                align: 0.0 0.0;
+                                rel1 {
+                                        to: "del_web_browsing_text_bg";
+                                        relative: 0.0 0.0;
+                                        offset: 0 0;
+                                }
+                                rel2 {
+                                        relative: 1.0  1.0;
+                                }
+                    color: 51 51 51 255;
+                    text {
+                        text: "Delete web browsing data";
+                        font: "Sans";
+                        size: 32;
+                        align: 0 0.5;
+                    }
+                }
+               }
+               part { name: "del_web_browsing_sub_text";
+                        type: TEXTBLOCK;
+                        description { state: "default" 0.0;
+                                min: 420 116;
+                                max: 420 116;
+                                align: 0.0 0.0;
+                                rel1 {
+                                        to: "del_web_browsing_text_bg";
+                                        relative: 0.0 0.0;
+                                        offset: 0 42;
+                                }
+                                rel2 {
+                                        relative: 1.0  1.0;
+                                }
+                    color: 128 128 128 255;
+                    text {
+                        text: "You can delete web browsing data optionally";
+                       style: "sub_title_text";
+                        align: 0 0;
+                    }
+                }
+       }
+          part {
+                name: "del_selected_data_button";
+                scale:1;
+                mouse_events: 1;
+                type: RECT;
+                description {
+                    state: "default" 0.0;
+                    visible: 1;
+                    fixed: 1 1;
+                    align: 0 0;
+
+                    min: 348 64;
+                    max: 348 64;
+                    rel1 { relative: 0.0 1.0; to: "del_web_browsing_text_bg"; }
+                    rel2 { relative: 1.0 1.0; to: "del_web_browsing_text_bg"; }
+                    color_class: focusBgColor;
+                }
+                description {
+                    state: "highlight" 0.0;
+                    inherit: "default" 0.0;
+                    color_class: focusBgColor;
+                    visible: 1;
+                }
+                  description {
+                    state: "focus" 0.0;
+                    inherit: "default" 0.0;
+                    color_class: focusbtBgColor;
+                    visible: 1;
+                }
+             }
+               part{
+                name: "del_selected_data_text";
+                type: TEXT;
+                scale: 1;
+                description { state: "default" 0.0;
+                    visible: 1;
+                    fixed: 1 1;
+                    rel1 { relative: 0.0 0.0;to: "del_selected_data_button";}
+                    rel2 { relative: 1.0 1.0;to: "del_selected_data_button";}
+                    color: 255 255 255 255;
+                    text {
+                        text: "Delete selected data";
+                        font: "Sans";
+                        size: 24;
+                        align: 0.5 0.5;
+                    }
+                }
+            }
+          part {
+                name: "del_selected_data_over";
+                scale:1;
+                type: RECT;
+                description {
+                    state: "default" 0.0;
+                    visible: 1;
+                    align: 0 0;
+                    fixed: 1 1;
+
+                    min: 348 64;
+                    max: 348 64;
+                    rel1 { relative: 0.0 0.0; to: "del_selected_data_button";}
+                    rel2 { relative: 1.0 1.0; to: "del_selected_data_button";}
+                    color_class: transparent;
+                }
+            }
+
+          part {
+                name: "del_selected_data_click";
+                scale:1;
+                type: SWALLOW;
+                description {
+                    state: "default" 0.0;
+                    visible: 1;
+                    align: 0 0;
+                    fixed: 1 1;
+                    min: 348 64;
+                    max: 348 64;
+                    rel1 { relative: 0.0 0.0; to: "del_selected_data_over";}
+                    rel2 { relative: 1.0 1.0; to: "del_selected_data_over";}
+                    color_class: transparent;
+                }
+            }
+       part {
+                name: "cache_cb";
+                scale:1;
+                type: SWALLOW;
+                description {
+                    state: "default" 0.0;
+                    visible: 1;
+                    align: 0 0;
+                    fixed: 1 1;
+                    min: 420 42;
+                    max: 420 42;
+                    rel1 { relative: 0.0 1.0; to: "del_selected_data_button"; offset: 0 74;}
+                    rel2 { relative: 1.0 1.0; to: "del_selected_data_button";}
+                    color_class: transparent;
+                }
+            }
+       part{
+                name: "cache_cb_text";
+                type: TEXT;
+                scale: 1;
+                description { state: "default" 0.0;
+                    visible: 1;
+                    fixed: 1 1;
+                    rel1 { relative: 0.0 0.0;to: "cache_cb"; offset: 80 0;}
+                    rel2 { relative: 1.0 1.0;to: "cache_cb";}
+                    color: 0 0 0 255;
+                    text {
+                        text: "Cache";
+                        font: "Sans";
+                        size: 24;
+                        align: 0 0.5;
+                    }
+                }
+            }
+       part {
+                name: "cookies_cb";
+                scale:1;
+                type: SWALLOW;
+                description {
+                    state: "default" 0.0;
+                    visible: 1;
+                    align: 0 0;
+                    fixed: 1 1;
+                    min: 420 42;
+                    max: 420 42;
+                    rel1 { relative: 0.0 1.0; to: "cache_cb"; offset: 0 40;}
+                    rel2 { relative: 1.0 1.0; to: "cache_cb";}
+                    color_class: transparent;
+                }
+            }
+       part{
+                name: "cookies_cb_text";
+                type: TEXT;
+                scale: 1;
+                description { state: "default" 0.0;
+                    visible: 1;
+                    fixed: 1 1;
+                    rel1 { relative: 0.0 0.0;to: "cookies_cb"; offset: 80 0;}
+                    rel2 { relative: 1.0 1.0;to: "cookies_cb";}
+                    color: 0 0 0 255;
+                    text {
+                        text: "Cookies";
+                        font: "Sans";
+                        size: 24;
+                        align: 0 0.5;
+                    }
+                }
+            }
+       part {
+                name: "history_cb";
+                scale:1;
+                type: SWALLOW;
+                description {
+                    state: "default" 0.0;
+                    visible: 1;
+                    align: 0 0;
+                    fixed: 1 1;
+                    min: 420 42;
+                    max: 420 42;
+                    rel1 { relative: 0.0 1.0; to: "cookies_cb"; offset: 0 40;}
+                    rel2 { relative: 1.0 1.0; to: "cookies_cb";}
+                    color_class: transparent;
+                }
+            }
+       part{
+                name: "history_cb_text";
+                type: TEXT;
+                scale: 1;
+                description { state: "default" 0.0;
+                    visible: 1;
+                    fixed: 1 1;
+                    rel1 { relative: 0.0 0.0;to: "history_cb"; offset: 80 0;}
+                    rel2 { relative: 1.0 1.0;to: "history_cb";}
+                    color: 0 0 0 255;
+                    text {
+                        text: "History";
+                        font: "Sans";
+                        size: 24;
+                        align: 0 0.5;
+                    }
+                }
+            }
+       part { name: "reset_mv_text_bg";
+                        type: RECT;
+                        description { state: "default" 0.0;
+                                min: 420 152;
+                                max: 420 152;
+                                align: 0.0 0.0;
+                                color: 231 231 231 255;
+                                rel1 {
+                                        to: "bg"; offset: 605 0;
+                                        relative: 0.0  0.0;
+                                }
+                                rel2 {
+                                        relative: 1.0  1.0;
+                                }
+                        }
+                }
+                part { name: "reset_mv_text";
+                        type: TEXT;
+                        description { state: "default" 0.0;
+                                min: 420 36;
+                                max: 420 36;
+                                align: 0.0 0.0;
+                                rel1 {
+                                        to: "reset_mv_text_bg";
+                                        relative: 0.0 0.0;
+                                        offset: 0 0;
+                                }
+                                rel2 {
+                                        relative: 1.0  1.0;
+                                }
+                    color: 51 51 51 255;
+                    text {
+                        text: "Reset most visited site";
+                        font: "Sans";
+                        size: 32;
+                        align: 0 0.5;
+                    }
+                }
+               }
+               part { name: "reset_mv_text_sub_text";
+                        type: TEXTBLOCK;
+                        description { state: "default" 0.0;
+                                min: 420 116;
+                                max: 420 116;
+                                align: 0.0 0.0;
+                                rel1 {
+                                        to: "reset_mv_text_bg";
+                                        relative: 0.0 0.0;
+                                        offset: 0 42;
+                                }
+                                rel2 {
+                                        relative: 1.0  1.0;
+                                }
+                    color: 128 128 128 255;
+                    text {
+                        text: "You can delete all items of most visited site.";
+                       style: "sub_title_text";
+                        align: 0 0.0;
+                       }
+                    }
+          }
+          part {
+                name: "reset_mv_button";
+                scale:1;
+                mouse_events: 1;
+                type: RECT;
+                description {
+                    state: "default" 0.0;
+                    visible: 1;
+                    fixed: 1 1;
+                    align: 0 0;
+
+                    min: 348 64;
+                    max: 348 64;
+                    rel1 { relative: 0.0 1.0; to: "reset_mv_text_bg"; }
+                    rel2 { relative: 1.0 1.0; to: "reset_mv_text_bg"; }
+                    color_class: focusBgColor;
+                }
+                description {
+                    state: "highlight" 0.0;
+                    inherit: "default" 0.0;
+                    color_class: focusBgColor;
+                    visible: 1;
+                }
+                  description {
+                    state: "focus" 0.0;
+                    inherit: "default" 0.0;
+                    color_class: focusbtBgColor;
+                    visible: 1;
+                }
+             }
+               part{
+                name: "reset_mv_button_text";
+                type: TEXT;
+                scale: 1;
+                description { state: "default" 0.0;
+                    visible: 1;
+                    fixed: 1 1;
+                    rel1 { relative: 0.0 0.0;to: "reset_mv_button";}
+                    rel2 { relative: 1.0 1.0;to: "reset_mv_button";}
+                    color: 255 255 255 255;
+                    text {
+                        text: "Reset most visited site";
+                        font: "Sans";
+                        size: 24;
+                        align: 0.5 0.5;
+                    }
+                }
+            }
+          part {
+                name: "reset_mv_over";
+                scale:1;
+                type: RECT;
+                description {
+                    state: "default" 0.0;
+                    visible: 1;
+                    align: 0 0;
+                    fixed: 1 1;
+
+                    min: 348 64;
+                    max: 348 64;
+                    rel1 { relative: 0.0 0.0; to: "reset_mv_button";}
+                    rel2 { relative: 1.0 1.0; to: "reset_mv_button";}
+                    color_class: transparent;
+                }
+            }
+
+          part {
+                name: "reset_mv_click";
+                scale:1;
+                type: SWALLOW;
+                description {
+                    state: "default" 0.0;
+                    visible: 1;
+                    align: 0 0;
+                    fixed: 1 1;
+                    min: 348 64;
+                    max: 348 64;
+                    rel1 { relative: 0.0 0.0; to: "reset_mv_over";}
+                    rel2 { relative: 1.0 1.0; to: "reset_mv_over";}
+                    color_class: transparent;
+                }
+            }
+
+       part { name: "webcontents_sharing_text_bg";
+                        type: RECT;
+                        description { state: "default" 0.0;
+                                min: 942 166;
+                                max: 942 166;
+                                align: 0.0 0.0;
+                                color: 231 231 231 255;
+                                rel1 {
+                                        to: "bg"; offset: 1124 0;
+                                        relative: 0.0  0.0;
+                                }
+                                rel2 {
+                                        relative: 1.0  1.0;
+                                }
+                        }
+                }
+       part { name: "webcontents_sharing_text";
+                        type: TEXT;
+                        description { state: "default" 0.0;
+                                min: 942 32;
+                                max: 942 32;
+                                align: 0.0 0.0;
+                                rel1 {
+                                        to: "webcontents_sharing_text_bg";
+                                        relative: 0.0 0.0;
+                                        offset: 0 0;
+                                }
+                                rel2 {
+                                        to: "webcontents_sharing_text_bg";
+                                        relative: 1.0  1.0;
+                                }
+                    color: 51 51 51 255;
+                    text {
+                        text: "Web contents Sharing";
+                        font: "Sans";
+                        size: 32;
+                        align: 0 0.5;
+                    }
+                }
+                }
+                part { name: "webcontents_sharing_sub_text";
+                        type: TEXTBLOCK;
+                        description { state: "default" 0.0;
+                                min: 942 126;
+                                max: 942 126;
+                                align: 0.0 0.0;
+                                rel1 {
+                                        to: "webcontents_sharing_text_bg";
+                                        relative: 0.0 0.0;
+                                        offset: 0 42;
+                                }
+                                rel2 {
+                                        relative: 1.0  1.0;
+                                }
+                    color: 128 128 128 255;
+                    text {
+                        text: "You can set option about web contents sharing.";
+                       style: "sub_title_text";
+                        align: 0 0.0;
+                    }
+                }
+               }
+           part{
+                name: "webcontents_sharing_header_text";
+                type: TEXT;
+                scale: 1;
+                description { state: "default" 0.0;
+                    visible: 1;
+                    fixed: 1 1;
+                    rel1 { relative: 0.0 1.0;to: "webcontents_sharing_text_bg"; offset: 0 10;}
+                    rel2 { relative: 1.0 1.0;to: "webcontents_sharing_text_bg";}
+                       color: 51 51 51 255;
+                    text {
+                        text: "Sharing request         Bookmark Sync        Tab Sync";
+                        font: "Sans";
+                        size: 32;
+                        align: 0 0.5;
+                    }
+                }
+            }
+           part {
+                name: "accept_all_rb";
+                scale:1;
+                type: SWALLOW;
+                description {
+                    state: "default" 0.0;
+                    visible: 1;
+                    align: 0 0;
+                    fixed: 1 1;
+                    min: 266 48;
+                    max: 266 48;
+                    rel1 { relative: 0.0 1.0; to: "webcontents_sharing_text_bg"; offset: 0 72;}
+                    rel2 { relative: 1.0 1.0; to: "webcontents_sharing_text_bg";}
+                    color_class: transparent;
+                }
+            }
+        part{
+                name: "accept_all_rb_text";
+                type: TEXT;
+                scale: 1;
+                description { state: "default" 0.0;
+                    visible: 1;
+                    fixed: 1 1;
+                    rel1 { relative: 0.0 0.0;to: "accept_all_rb"; offset: 70 0;}
+                    rel2 { relative: 1.0 1.0;to: "accept_all_rb";}
+                    color: 0 0 0 255;
+                    text {
+                        text: "Accept all";
+                        font: "Sans";
+                        size: 24;
+                        align: 0 0.5;
+                    }
+                }
+            }
+       part {
+                name: "ask_rb";
+                scale:1;
+                type: SWALLOW;
+                description {
+                    state: "default" 0.0;
+                    visible: 1;
+                    align: 0 0;
+                    fixed: 1 1;
+                    min: 266 48;
+                    max: 266 48;
+                    rel1 { relative: 0.0 1.0; to: "accept_all_rb"; offset: 0 34;}
+                    rel2 { relative: 1.0 1.0; to: "accept_all_rb";}
+                    color_class: transparent;
+                }
+            }
+        part{
+                name: "ask_rb_text";
+                type: TEXT;
+                scale: 1;
+                description { state: "default" 0.0;
+                    visible: 1;
+                    fixed: 1 1;
+                    rel1 { relative: 0.0 0.0;to: "ask_rb"; offset: 70 0;}
+                    rel2 { relative: 1.0 1.0;to: "ask_rb";}
+                    color: 0 0 0 255;
+                    text {
+                        text: "Ask";
+                        font: "Sans";
+                        size: 24;
+                        align: 0 0.5;
+                    }
+                }
+            }
+       part {
+                name: "sr_disable_rb";
+                scale:1;
+                type: SWALLOW;
+                description {
+                    state: "default" 0.0;
+                    visible: 1;
+                    align: 0 0;
+                    fixed: 1 1;
+                    min: 266 48;
+                    max: 266 48;
+                    rel1 { relative: 0.0 1.0; to: "ask_rb"; offset: 0 34;}
+                    rel2 { relative: 1.0 1.0; to: "ask_rb";}
+                    color_class: transparent;
+                }
+            }
+        part{
+                name: "sr_disable_rb_text";
+                type: TEXT;
+                scale: 1;
+                description { state: "default" 0.0;
+                    visible: 1;
+                    fixed: 1 1;
+                    rel1 { relative: 0.0 0.0;to: "sr_disable_rb"; offset: 70 0;}
+                    rel2 { relative: 1.0 1.0;to: "sr_disable_rb";}
+                    color: 0 0 0 255;
+                    text {
+                        text: "Disable";
+                        font: "Sans";
+                        size: 24;
+                        align: 0 0.5;
+                    }
+                }
+            }
+       part {
+                name: "bs_enable_rb";
+                scale:1;
+                type: SWALLOW;
+                description {
+                    state: "default" 0.0;
+                    visible: 1;
+                    align: 0 0;
+                    fixed: 1 1;
+                    min: 266 48;
+                    max: 266 48;
+                    rel1 { relative: 0.0 1.0; to: "webcontents_sharing_text_bg"; offset: 338 72;}
+                    rel2 { relative: 1.0 1.0; to: "webcontents_sharing_text_bg";}
+                    color_class: transparent;
+                }
+            }
+        part{
+                name: "bs_enable_rb_text";
+                type: TEXT;
+                scale: 1;
+                description { state: "default" 0.0;
+                    visible: 1;
+                    fixed: 1 1;
+                    rel1 { relative: 0.0 0.0;to: "bs_enable_rb"; offset: 70 0;}
+                    rel2 { relative: 1.0 1.0;to: "bs_enable_rb";}
+                    color: 0 0 0 255;
+                    text {
+                        text: "Enable";
+                        font: "Sans";
+                        size: 24;
+                        align: 0 0.5;
+                    }
+                }
+            }
+       part {
+                name: "bs_disable_rb";
+                scale:1;
+                type: SWALLOW;
+                description {
+                    state: "default" 0.0;
+                    visible: 1;
+                    align: 0 0;
+                    fixed: 1 1;
+                    min: 266 48;
+                    max: 266 48;
+                    rel1 { relative: 0.0 1.0; to: "bs_enable_rb"; offset: 0 34;}
+                    rel2 { relative: 1.0 1.0; to: "bs_enable_rb";}
+                    color_class: transparent;
+                }
+            }
+        part{
+                name: "bs_disable_rb_text";
+                type: TEXT;
+                scale: 1;
+                description { state: "default" 0.0;
+                    visible: 1;
+                    fixed: 1 1;
+                    rel1 { relative: 0.0 0.0;to: "bs_disable_rb"; offset: 70 0;}
+                    rel2 { relative: 1.0 1.0;to: "bs_disable_rb";}
+                    color: 0 0 0 255;
+                    text {
+                        text: "Disable";
+                        font: "Sans";
+                        size: 24;
+                        align: 0 0.5;
+                    }
+                }
+            }
+       part {
+                name: "ts_enable_rb";
+                scale:1;
+                type: SWALLOW;
+                description {
+                    state: "default" 0.0;
+                    visible: 1;
+                    align: 0 0;
+                    fixed: 1 1;
+                    min: 266 48;
+                    max: 266 48;
+                    rel1 { relative: 0.0 1.0; to: "webcontents_sharing_text_bg"; offset: 676 72;}
+                    rel2 { relative: 1.0 1.0; to: "webcontents_sharing_text_bg";}
+                    color_class: transparent;
+                }
+            }
+        part{
+                name: "ts_enable_rb_text";
+                type: TEXT;
+                scale: 1;
+                description { state: "default" 0.0;
+                    visible: 1;
+                    fixed: 1 1;
+                    rel1 { relative: 0.0 0.0;to: "ts_enable_rb"; offset: 70 0;}
+                    rel2 { relative: 1.0 1.0;to: "ts_enable_rb";}
+                    color: 0 0 0 255;
+                    text {
+                        text: "Enable";
+                        font: "Sans";
+                        size: 24;
+                        align: 0 0.5;
+                    }
+                }
+            }
+       part {
+                name: "ts_disable_rb";
+                scale:1;
+                type: SWALLOW;
+                description {
+                    state: "default" 0.0;
+                    visible: 1;
+                    align: 0 0;
+                    fixed: 1 1;
+                    min: 266 48;
+                    max: 266 48;
+                    rel1 { relative: 0.0 1.0; to: "ts_enable_rb"; offset: 0 34;}
+                    rel2 { relative: 1.0 1.0; to: "ts_enable_rb";}
+                    color_class: transparent;
+                }
+            }
+        part{
+                name: "ts_disable_rb_text";
+                type: TEXT;
+                scale: 1;
+                description { state: "default" 0.0;
+                    visible: 1;
+                    fixed: 1 1;
+                    rel1 { relative: 0.0 0.0;to: "ts_disable_rb"; offset: 70 0;}
+                    rel2 { relative: 1.0 1.0;to: "ts_disable_rb";}
+                    color: 0 0 0 255;
+                    text {
+                        text: "Disable";
+                        font: "Sans";
+                        size: 24;
+                        align: 0 0.5;
+                    }
+                }
+            }
+
+
+       part { name: "reset_browser_text_bg";
+                        type: RECT;
+                        description { state: "default" 0.0;
+                                min: 420 152;
+                                max: 420 152;
+                                align: 0.0 0.0;
+                                color: 231 231 231 255;
+                                rel1 {
+                                        to: "bg"; offset: 2165 0;
+                                        relative: 0.0  0.0;
+                                }
+                                rel2 {
+                                        relative: 1.0  1.0;
+                                }
+                        }
+                }
+                part { name: "reset_browser_text";
+                        type: TEXT;
+                        description { state: "default" 0.0;
+                                min: 420 36;
+                                max: 420 36;
+                                align: 0.0 0.0;
+                                rel1 {
+                                        to: "reset_browser_text_bg";
+                                        relative: 0.0 0.0;
+                                        offset: 0 0;
+                                }
+                                rel2 {
+                                        to: "reset_browser_text_bg";
+                                        relative: 1.0  1.0;
+                                }
+                    color: 51 51 51 255;
+                    text {
+                        text: "Reset Browser";
+                        font: "Sans";
+                        size: 32;
+                        align: 0 0.5;
+                    }
+                }
+               }
+               part { name: "reset_browser_sub_text";
+                        type: TEXTBLOCK;
+                        description { state: "default" 0.0;
+                                min: 420 116;
+                                max: 420 116;
+                                align: 0.0 0.0;
+                                rel1 {
+                                        to: "reset_browser_text_bg";
+                                        relative: 0.0 0.0;
+                                        offset: 0 42;
+                                }
+                                rel2 {
+                                        relative: 1.0  1.0;
+                                }
+                    color: 128 128 128 255;
+                    text {
+                        text: "You can delete all data and return to initial settings.";
+                       style: "sub_title_text";
+                        align: 0 0.0;
+                    }
+                }
+          }
+          part {
+                name: "reset_browser_button";
+                scale:1;
+                mouse_events: 1;
+                type: RECT;
+                description {
+                    state: "default" 0.0;
+                    visible: 1;
+                    fixed: 1 1;
+                    align: 0 0;
+
+                    min: 348 64;
+                    max: 348 64;
+                    rel1 { relative: 0.0 1.0; to: "reset_browser_text_bg"; }
+                    rel2 { relative: 1.0 1.0; to: "reset_browser_text_bg"; }
+                    color_class: focusBgColor;
+                }
+                description {
+                    state: "highlight" 0.0;
+                    inherit: "default" 0.0;
+                    color_class: focusBgColor;
+                    visible: 1;
+                }
+                  description {
+                    state: "focus" 0.0;
+                    inherit: "default" 0.0;
+                    color_class: focusbtBgColor;
+                    visible: 1;
+                }
+             }
+               part{
+                name: "reset_browser_button_text";
+                type: TEXT;
+                scale: 1;
+                description { state: "default" 0.0;
+                    visible: 1;
+                    fixed: 1 1;
+                    rel1 { relative: 0.0 0.0;to: "reset_browser_button";}
+                    rel2 { relative: 1.0 1.0;to: "reset_browser_button";}
+                    color: 255 255 255 255;
+                    text {
+                        text: "Reset browser";
+                        font: "Sans";
+                        size: 24;
+                        align: 0.5 0.5;
+                    }
+                }
+            }
+          part {
+                name: "reset_browser_over";
+                scale:1;
+                type: RECT;
+                description {
+                    state: "default" 0.0;
+                    visible: 1;
+                    align: 0 0;
+                    fixed: 1 1;
+
+                    min: 348 64;
+                    max: 348 64;
+                    rel1 { relative: 0.0 0.0; to: "reset_browser_button";}
+                    rel2 { relative: 1.0 1.0; to: "reset_browser_button";}
+                    color_class: transparent;
+                }
+            }
+
+          part {
+                name: "reset_browser_click";
+                scale:1;
+                type: SWALLOW;
+                description {
+                    state: "default" 0.0;
+                    visible: 1;
+                    align: 0 0;
+                    fixed: 1 1;
+                    min: 348 64;
+                    max: 348 64;
+                    rel1 { relative: 0.0 0.0; to: "reset_browser_over";}
+                    rel2 { relative: 1.0 1.0; to: "reset_browser_over";}
+                    color_class: transparent;
+                }
+            }
+
+       part {
+                name: "line1";
+                scale:1;
+                type: RECT;
+                description {
+                    state: "default" 0.0;
+                    visible: 1;
+                    align: 0 0;
+                    fixed: 1 1;
+
+                    min: 1 626;
+                    max: 1 626;
+                    rel1 { relative: 0.0 0.0; to: "bg"; offset: 518 0; }
+                    rel2 { relative: 1.0 1.0; }
+                    color: 128 128 128 255;
+                }
+            }
+         part {
+                name: "line2";
+                scale:1;
+                type: RECT;
+                description {
+                    state: "default" 0.0;
+                    visible: 1;
+                    align: 0 0;
+                    fixed: 1 1;
+
+                    min: 1 626;
+                    max: 1 626;
+                    rel1 { relative: 0.0 0.0; to: "bg"; offset: 1037 0; }
+                    rel2 { relative: 1.0 1.0; }
+                    color: 128 128 128 255;
+                }
+            }
+        part {
+                name: "line3";
+                scale:1;
+                type: RECT;
+                description {
+                    state: "default" 0.0;
+                    visible: 1;
+                    align: 0 0;
+                    fixed: 1 1;
+
+                    min: 1 626;
+                    max: 1 626;
+                    rel1 { relative: 0.0 0.0; to: "bg"; offset: 2078 0; }
+                    rel2 { relative: 1.0 1.0; }
+                    color: 128 128 128 255;
+                }
+            }
+       }
+       programs{
+           program {
+                name: "mouse_click_del_selected_data";
+                signal: "mouse,clicked,1";
+                source: "del_selected_data_over";
+                script {
+                    emit("elm,action,click", "");
+                } 
+            }
+           program {
+                name: "mouse_in_del_selected_data_click";
+                signal: "mouse,in";
+                source: "del_selected_data_*";
+                action: STATE_SET "highlight" 0.0;
+                target: "del_selected_data_button";
+                target: "del_selected_data_over";
+                target: "del_selected_data_text";
+             }
+            program {
+                name: "mouse_out_del_selected_data_click";
+                signal: "mouse,out";
+                source: "del_selected_data_*";
+                action: STATE_SET "default" 0.0;
+                target: "del_selected_data_button";
+                target: "del_selected_data_over";
+                target: "del_selected_data_text";
+            }
+
+           program {
+                name: "mouse_click_reset_mv";
+                signal: "mouse,clicked,1";
+                source: "reset_mv_over";
+                script {
+                    emit("elm,action,click", "");
+                }
+            }
+           program {
+                name: "mouse_in_reset_mv_click";
+                signal: "mouse,in";
+                source: "reset_mv_*";
+                action: STATE_SET "highlight" 0.0;
+                target: "reset_mv_button";
+                target: "reset_mv_over";
+                target: "reset_mv_text";
+             }
+            program {
+                name: "mouse_out_reset_mv_click";
+                signal: "mouse,out";
+                source: "reset_mv_*";
+                action: STATE_SET "default" 0.0;
+                target: "reset_mv_button";
+                target: "reset_mv_over";
+                target: "reset_mv_text";
+            }
+
+           program {
+                name: "mouse_click_reset_browser";
+                signal: "mouse,clicked,1";
+                source: "reset_browser_over";
+                script {
+                    emit("elm,action,click", "");
+                }
+            }
+           program {
+                name: "mouse_in_reset_browser_click";
+                signal: "mouse,in";
+                source: "reset_browser_*";
+                action: STATE_SET "highlight" 0.0;
+                target: "reset_browser_button";
+                target: "reset_browser_over";
+                target: "reset_browser_text";
+             }
+            program {
+                name: "mouse_out_reset_browser_click";
+                signal: "mouse,out";
+                source: "reset_browser_*";
+                action: STATE_SET "default" 0.0;
+                target: "reset_browser_button";
+                target: "reset_browser_over";
+                target: "reset_browser_text";
+            }
+    }
+}
+
+
+group { name: "elm/genlist/item/settings_action_bar_items/default";
+        min: 1920 104;
+        max: 1920 104;
+        data.item: "texts" "settings_title";
+        data.item: "contents" "close_click";
+       images {
+               }
+        parts{
+            part {
+                name: "bg_clipper";
+                scale:1;
+                type: RECT;
+                description {
+                    state: "default" 0.0;
+                    color: 255 255 255 255;
+                    align: 0 0;
+                    min: 1920 104;
+                    max: 1920 104;
+                    rel1 { relative: 0.0 0.0;}
+                    rel2 { relative: 1.0 1.0;}
+                            }
+                 }
+
+             part {
+                name: "settings_bg";
+                type: SWALLOW;
+                scale: 1;
+                description { state: "default" 0.0;
+                    visible: 1;
+                    fixed: 1 1;
+                    min: 348 65;
+                    max: 348 65;
+                    align: 0.5 0.5;
+                    rel1 { relative: 0.0 0.0;to: "bg_clipper";}
+                    rel2 { relative: 1.0 1.0;to: "bg_clipper";}
+                    color : 255 255 255 255;
+
+                }
+                   }
+
+            part {
+                name: "settings_title";
+                scale:1;
+                mouse_events: 1;
+                type: TEXT;
+                description {
+                    state: "default" 0.0;
+                    visible: 1;
+                    fixed: 1 1;
+                    align: 0 .3;
+                    min: 348 65;
+                    max: 348 65;
+                    color: 51 51 51 255;
+                    rel1 { relative: 0.0 0.0; to: "settings_bg"; }
+                    rel2 { relative: 1.0 1.0; to: "settings_bg"; }
+                    text {
+                        text: "Settings";
+                        font: "Sans";
+                        size: 58;
+                        align: 0.5 0.5;
+                    }
+                }
+                description {
+                    state: "highlight" 0.0;
+                    inherit: "default" 0.0;
+                    color_class: focusBgColor1;
+                    visible: 1;
+                  }
+                  description {
+                    state: "focus" 0.0;
+                    inherit: "default" 0.0;
+                    color_class: focusbtBgColor1;
+                    visible: 1;
+                }
+            } 
+       part {
+                name: "close_bg";
+                scale:1;
+                mouse_events: 1;
+                type: RECT;
+                description {
+                    state: "default" 0.0;
+                    visible: 1;
+                    fixed: 1 1;
+                    align: 0 0.5;
+                    min: 82 102;
+                    max: 82 102;
+                    rel1 { relative: 0.0 0.0; to: "bg_clipper"; offset: 1758 0;}
+                    rel2 { relative: 1.0 1.0; to: "bg_clipper";}
+                    color_class: transparent;
+                }
+                description {
+                    state: "highlight" 0.0;
+                    inherit: "default" 0.0;
+                    color_class: focusBgColor;
+                    visible: 1;
+                }
+                  description {
+                    state: "focus" 0.0;
+                    inherit: "default" 0.0;
+                    color_class: focusDelBgColor;
+                    visible: 1;
+                }
+            }
+           part {
+                name: "close_icon";
+                type: IMAGE;
+                scale: 1;
+                description { state: "default" 0.0;
+                    visible: 1;
+                    fixed: 1 1;
+                    align: 0 0;
+                    min: 82 102;
+                    max: 82 102;
+                    rel1 { relative: 0.0 0.0; to: "close_bg";}
+                    rel2 { relative: 1.0 1.0; to: "close_bg";}
+                    image.normal: "btn_bar_stop_nor.png";
+                }
+                description { state: "highlight" 0.0;
+                    inherit: "default" 0.0;
+                    visible: 1;
+                }
+                description { state: "focus" 0.0;
+                    inherit: "highlight" 0.0;
+                }
+            }
+           part {
+                name: "close_over";
+                scale:1;
+                type: RECT;
+                description {
+                    state: "default" 0.0;
+                    visible: 1;
+                    align: 0 0;
+                    fixed: 1 1;
+                    min: 82 102;
+                    max: 82 102;
+                    rel1 { relative: 0.0 0.0; to: "close_bg";}
+                    rel2 { relative: 1.0 1.0; to: "close_bg";}
+                    color_class: transparent;
+                }
+            }
+            part {
+                name: "close_click";
+                scale:1;
+                type: SWALLOW;
+                description {
+                    state: "default" 0.0;
+                    visible: 1;
+                    align: 0 0;
+                    fixed: 1 1;
+                    min: 82 102;
+                    max: 82 102;
+                    rel1 { relative: 0.0 0.0; to: "close_over";}
+                    rel2 { relative: 1.0 1.0; to: "close_over";}
+                    color_class: transparent;
+                }
+            }
+        
+        programs{
+
+           program {
+                name: "mouse_in_close_click";
+                signal: "mouse,in";
+                source: "close_click";
+                script {
+                    emit("mouse_in_close_click", "");
+                }
+            }
+            program {
+                name: "mouse_out_close_click";
+                signal: "mouse,out";
+                source: "close_click";
+                script {
+                    emit("mouse_out_close_click", "");
+                }
+            }
+            program {
+                name: "mouse_in_close";
+                signal: "mouse_in_close_click";
+                source: "";
+                action: STATE_SET "highlight" 0.0;
+                target: "close_over";
+                target: "close_bg";
+                target: "close_icon";
+            }
+            program {
+                name: "mouse_out_close";
+                signal: "mouse_out_close_click";
+                source: "";
+                action: STATE_SET "default" 0.0;
+                target: "close_over";
+                target: "close_bg";
+                target: "close_icon";
+            }
+       }
+    }           
+}
+
diff --git a/services/SettingsUI/edc/error.edc b/services/SettingsUI/edc/error.edc
new file mode 100644 (file)
index 0000000..0291971
--- /dev/null
@@ -0,0 +1,144 @@
+collections {
+    images {
+        image: "web_browsing_icon_error.png" COMP;
+    }
+    group { name: "error_message";
+    styles {
+        style { name: "mssage_style";
+            base: "font=Sans font_size=35 color=#d3d3d3 wrap=word align=0.5";
+        }
+        style { name: "mssage_hint_style";
+            base: "font=Sans font_size=24 color=#868686 wrap=word align=0.5";
+        }
+    }
+    parts {
+        part{
+            name: "message_background";
+            type: RECT;
+            description{
+                state: "default" 0.0;
+                visible: 1;
+                rel1.relative: 0 0;
+                rel2.relative: 1 1;
+                color: 42 50 64 255;
+            }
+        }
+        part{
+            name: "error_message_background";
+            type:RECT;
+            description{
+                state: "default" 0.0;
+                visible: 1;
+                min: 1582 730;
+                max: 1582 730;
+                fixed: 1 1;
+                align: 0.5 0.5;
+                color: 30 38 50 153;
+            }
+        }
+        part{
+            name: "err_ico";
+            type: IMAGE;
+            description{
+                state: "default" 0.0;
+                visible: 1;
+                min: 140 140;
+                max:140 140;
+                fixed: 1 1;
+                align: 0.5 0;
+                rel1{
+                    relative: 0 0;
+                    offset:0 163;
+                    to: "error_message_background";
+                }
+                rel2{
+                    relative: 1 1;
+                    to: "error_message_background";
+                    }
+                image{
+                    normal: "web_browsing_icon_error.png";
+                }
+            }
+        }
+
+        part{
+            name: "error_text";
+            type: TEXTBLOCK;
+            description{
+                state: "default" 0.0;
+                visible: 1;
+                fixed: 1 1;
+                min: 1502 96;
+                max: 1502 96;
+                //color: 211 211 211 255;
+                align: 0.5 0;
+                rel1{
+                    relative: 0 1;
+                    to_x: "error_message_background";
+                    to_y: "err_ico";
+                }
+                rel2{
+                    relative: 1 1;
+                    to: "error_message_background";
+                }
+                text{
+                    style: "mssage_style";
+                    text: "Server not found.<br/>sdf Please check the followings:";
+                    //min: 0 0;
+                    //max: 1 1;
+                    //align: 1 0;
+                    //size: 35;
+                }
+            }
+        }
+
+
+        part{
+            name: "error_hint";
+            type: TEXTBLOCK;
+            description{
+                state: "default" 0.0;
+                visible: 1;
+                fixed: 1 1;
+                min: 1502 117;
+                max: 1502 117;
+                color: 134 134 134 255;
+                align: 0.5 0;
+                rel1{
+                    relative: 0 1;
+                    to_x: "error_message_background";
+                    to_y: "error_text";
+                }
+                rel2{
+                    relative: 1 1;
+                    to: "error_message_background";
+                }
+                text{
+                    max: 0 1;
+                    style: "mssage_hint_style";
+                    text: "Check for any typing error in URL. <br/>"
+                    "Check your network settings.<br/>"
+                    "Try again later.<br/>"
+                    "Click refresh to reload.";
+                }
+            }
+        }
+    }
+/*
+      programs {
+         program { name: "mouse_down";
+            signal: "mouse,down,1";
+            source: "logo";
+            action: STATE_SET "hide" 0.0;
+            target: "logo";
+         }
+         program { name: "mouse_up";
+            signal: "mouse,up,1";
+            source: "logo";
+            action: STATE_SET "default" 0.0;
+            target: "logo";
+         }
+      }
+*/
+   }
+}
diff --git a/services/SettingsUI/images/btn_bar_incognito_dis.png b/services/SettingsUI/images/btn_bar_incognito_dis.png
new file mode 100644 (file)
index 0000000..a6bbd1a
Binary files /dev/null and b/services/SettingsUI/images/btn_bar_incognito_dis.png differ
diff --git a/services/SettingsUI/images/btn_bar_incognito_foc.png b/services/SettingsUI/images/btn_bar_incognito_foc.png
new file mode 100644 (file)
index 0000000..686e40d
Binary files /dev/null and b/services/SettingsUI/images/btn_bar_incognito_foc.png differ
diff --git a/services/SettingsUI/images/btn_bar_incognito_nor.png b/services/SettingsUI/images/btn_bar_incognito_nor.png
new file mode 100644 (file)
index 0000000..3dbffec
Binary files /dev/null and b/services/SettingsUI/images/btn_bar_incognito_nor.png differ
diff --git a/services/SettingsUI/images/btn_bar_new_dis.png b/services/SettingsUI/images/btn_bar_new_dis.png
new file mode 100644 (file)
index 0000000..af49c5a
Binary files /dev/null and b/services/SettingsUI/images/btn_bar_new_dis.png differ
diff --git a/services/SettingsUI/images/btn_bar_new_foc.png b/services/SettingsUI/images/btn_bar_new_foc.png
new file mode 100644 (file)
index 0000000..2a5c00b
Binary files /dev/null and b/services/SettingsUI/images/btn_bar_new_foc.png differ
diff --git a/services/SettingsUI/images/btn_bar_new_nor.png b/services/SettingsUI/images/btn_bar_new_nor.png
new file mode 100644 (file)
index 0000000..352a2f4
Binary files /dev/null and b/services/SettingsUI/images/btn_bar_new_nor.png differ
diff --git a/services/SettingsUI/images/btn_bar_stop_nor.png b/services/SettingsUI/images/btn_bar_stop_nor.png
new file mode 100644 (file)
index 0000000..c5cdc11
Binary files /dev/null and b/services/SettingsUI/images/btn_bar_stop_nor.png differ
diff --git a/services/SettingsUI/images/ico_delete.png b/services/SettingsUI/images/ico_delete.png
new file mode 100644 (file)
index 0000000..92f42cc
Binary files /dev/null and b/services/SettingsUI/images/ico_delete.png differ
diff --git a/services/SettingsUI/images/web_frame_selected.png b/services/SettingsUI/images/web_frame_selected.png
new file mode 100644 (file)
index 0000000..4470ca4
Binary files /dev/null and b/services/SettingsUI/images/web_frame_selected.png differ
diff --git a/services/SettingsUI/images/web_shadow.png b/services/SettingsUI/images/web_shadow.png
new file mode 100644 (file)
index 0000000..f9018b0
Binary files /dev/null and b/services/SettingsUI/images/web_shadow.png differ
index 96ceae12d8a7403d7543c42a9cb7612909fe82fc..0e0a5fdba7d2722b2d6a8edbdb8c155388290b21 100644 (file)
@@ -50,8 +50,7 @@ include_directories(${CMAKE_SOURCE_DIR}/services/HistoryService)
 include_directories(${CMAKE_SOURCE_DIR}/services/MoreMenuUI)
 include_directories(${CMAKE_SOURCE_DIR}/services/HistoryUI)
 include_directories(${CMAKE_SOURCE_DIR}/services/MainUI)
-#MERGE_ME
-#include_directories(${CMAKE_SOURCE_DIR}/services/SettingsUI)
+include_directories(${CMAKE_SOURCE_DIR}/services/SettingsUI)
 include_directories(${CMAKE_SOURCE_DIR}/services/TabUI)
 include_directories(${CMAKE_SOURCE_DIR}/services/PlatformInputManager)
 include_directories(${CMAKE_SOURCE_DIR}/services/SessionStorage)
@@ -65,14 +64,12 @@ add_library(${PROJECT_NAME} SHARED ${SimpleUI_SRCS})
 add_dependencies(${PROJECT_NAME} SimpleURI)
 add_dependencies(${PROJECT_NAME} StorageService)
 add_dependencies(${PROJECT_NAME} HistoryService)
-#MERGE_ME
-#add_dependencies(${PROJECT_NAME} MoreMenuUI)
+add_dependencies(${PROJECT_NAME} MoreMenuUI)
 add_dependencies(${PROJECT_NAME} BookmarkManagerUI)
 add_dependencies(${PROJECT_NAME} MainUI)
 add_dependencies(${PROJECT_NAME} HistoryUI)
-#MERGE_ME
-#add_dependencies(${PROJECT_NAME} SettingsUI)
 add_dependencies(${PROJECT_NAME} TabUI)
+add_dependencies(${PROJECT_NAME} SettingsUI)
 add_dependencies(${PROJECT_NAME} PlatformInputManager)
 add_dependencies(${PROJECT_NAME} SessionStorage)
 target_link_libraries(${PROJECT_NAME} SimpleURI)
@@ -81,9 +78,8 @@ target_link_libraries(${PROJECT_NAME} HistoryService)
 target_link_libraries(${PROJECT_NAME} MoreMenuUI)
 target_link_libraries(${PROJECT_NAME} MainUI)
 target_link_libraries(${PROJECT_NAME} HistoryUI)
-#MERGE_ME
-#target_link_libraries(${PROJECT_NAME} SettingsUI)
 target_link_libraries(${PROJECT_NAME} TabUI)
+target_link_libraries(${PROJECT_NAME} SettingsUI)
 target_link_libraries(${PROJECT_NAME} BookmarkManagerUI)
 target_link_libraries(${PROJECT_NAME} PlatformInputManager)
 target_link_libraries(${PROJECT_NAME} SessionStorage)
index 0862b660c8aa74cad8e7db48a51c1a9641fcf51c..1a2ad29fb3a822156d5b387f485b67e21c586cc3 100644 (file)
@@ -62,9 +62,7 @@ SimpleUI::SimpleUI()
     , m_mainLayout(nullptr)
     , m_progressBar(nullptr)
     , m_popup(nullptr)
-#if MERGE_ME
     , m_settings()
-#endif
     , m_moreMenuUI()
     , m_tabUI()
     , m_bookmarkManagerUI()
@@ -422,18 +420,10 @@ void SimpleUI::connectActions()
     m_showMoreMenu->triggered.connect(boost::bind(&SimpleUI::showMoreMenu, this));
 
 //  m_settingPointerMode->toggled.connect(boost::bind(&tizen_browser::services::PlatformInputManager::setPointerModeEnabled, m_platformInputManager.get(), _1));
-#if MERGE_ME
     m_settingPrivateBrowsing->toggled.connect(boost::bind(&SimpleUI::settingsPrivateModeSwitch, this, _1));
-#endif
-    //m_settingDeleteHistory->triggered.connect(boost::bind(&SimpleUI::settingsDeleteHistory, this));
-    //m_settingDeleteData->triggered.connect(boost::bind(&SimpleUI::settingsDeleteData, this));;
-    //m_settingDeleteFavorite->triggered.connect(boost::bind(&SimpleUI::settingsDeleteFavorite, this));;
-#if MERGE_ME
-//    m_settingPrivateBrowsing->toggled.connect(boost::bind(&SimpleUI::settingsPrivateModeSwitch, this, _1));
-    m_settingDeleteHistory->triggered.connect(boost::bind(&SimpleUI::settingsDeleteHistory, this));
-    m_settingDeleteData->triggered.connect(boost::bind(&SimpleUI::settingsDeleteData, this));;
-    m_settingDeleteFavorite->triggered.connect(boost::bind(&SimpleUI::settingsDeleteFavorite, this));;
-#endif
+//  m_settingDeleteHistory->triggered.connect(boost::bind(&SimpleUI::settingsDeleteHistory, this));
+//  m_settingDeleteData->triggered.connect(boost::bind(&SimpleUI::settingsDeleteData, this));;
+//  m_settingDeleteFavorite->triggered.connect(boost::bind(&SimpleUI::settingsDeleteFavorite, this));;
 }
 
 void SimpleUI::updateURIBarView()
@@ -1081,7 +1071,6 @@ void SimpleUI::closeHistoryUI(const std::string& str)
 
 void SimpleUI::showSettingsUI(const std::string& str)
 {
-#if MERGE_ME
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     if(!m_settingsUI){
         m_settingsUI =
@@ -1100,15 +1089,12 @@ void SimpleUI::showSettingsUI(const std::string& str)
         m_settingsUI->show(m_window.get());
         BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     }
-#endif
 }
 
 void SimpleUI::closeSettingsUI(const std::string& str)
 {
-#if MERGE_ME
-        BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-        m_settingsUI.reset();
-#endif
+    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
+    m_settingsUI.reset();
 }
 
 void SimpleUI::showMoreMenu()
index 713beda8279cd56fb43c74141e6f50c831c2ce07..31bd390419175788dc04bf6381aaf74468a44082 100644 (file)
@@ -36,9 +36,7 @@
 #include "AbstractWebEngine.h"
 #include "MoreMenuUI.h"
 #include "HistoryUI.h"
-#if MERGE_ME
 #include "SettingsUI.h"
-#endif
 #include "MainUI.h"
 #include "TabUI.h"
 #include "ButtonBar.h"
@@ -296,9 +294,7 @@ private:
     std::shared_ptr<tizen_browser::base_ui::BookmarkManagerUI> m_bookmarkManagerUI;
     std::shared_ptr<tizen_browser::base_ui::MainUI> m_mainUI;
     std::shared_ptr<tizen_browser::base_ui::HistoryUI> m_historyUI;
-#if MERGE_ME
     std::shared_ptr<tizen_browser::base_ui::SettingsUI> m_settingsUI;
-#endif
     std::shared_ptr<tizen_browser::base_ui::TabUI> m_tabUI;
     std::shared_ptr<tizen_browser::base_ui::ZoomList> m_zoomList;
     std::shared_ptr<tizen_browser::base_ui::TabList> m_tabList;