Remove unused classes 75/90875/4
authorMaciej Skrzypkowski <m.skrzypkows@samsung.com>
Tue, 4 Oct 2016 14:06:30 +0000 (16:06 +0200)
committerMaciej Skrzypkowski <m.skrzypkows@samsung.com>
Wed, 5 Oct 2016 12:36:09 +0000 (05:36 -0700)
[Issue]        N/A
[Problem]      Those classes are unused.
[Solution]     Removed.
[Verify]       Build and run.

Change-Id: I9f347a5e3d42294cbf75079eccd26a3b285dc61d
Signed-off-by: Maciej Skrzypkowski <m.skrzypkows@samsung.com>
services/CMakeLists.txt
services/MoreMenuUI/MoreMenuUI.cpp [deleted file]
services/MoreMenuUI/MoreMenuUI.h [deleted file]
services/SimpleUI/CMakeLists.txt
services/ZoomUI/CMakeLists.txt [deleted file]
services/ZoomUI/ZoomUI.cpp [deleted file]
services/ZoomUI/ZoomUI.h [deleted file]
services/ZoomUI/edc/ZoomUI.edc [deleted file]

index e88470d28d759300c07846b64f83f86e08904edc..03b6cd698fff9667c3886001e6286a05bdfc8ae1 100644 (file)
@@ -15,8 +15,4 @@ add_subdirectory(TabService)
 add_subdirectory(PlatformInputManager)
 add_subdirectory(BookmarkService)
 add_subdirectory(CertificateService)
-if (${PROFILE} MATCHES "mobile")    # mobile profile
-    add_subdirectory(FindOnPageUI)
-else (${PROFILE} MATCHES "mobile")
-    add_subdirectory(ZoomUI)
-endif (${PROFILE} MATCHES "mobile")
+add_subdirectory(FindOnPageUI)
diff --git a/services/MoreMenuUI/MoreMenuUI.cpp b/services/MoreMenuUI/MoreMenuUI.cpp
deleted file mode 100755 (executable)
index 226983b..0000000
+++ /dev/null
@@ -1,756 +0,0 @@
-/*
- * Copyright (c) 2015 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 "app_i18n.h"
-#include "MoreMenuUI.h"
-#include "ServiceManager.h"
-#include "BrowserLogger.h"
-#include "BrowserImage.h"
-
-namespace tizen_browser{
-namespace base_ui{
-
-EXPORT_SERVICE(MoreMenuUI, "org.tizen.browser.moremenuui")
-
-MoreMenuUI::MoreMenuUI()
-    : m_current_tab_bar(nullptr)
-    , m_mm_layout(nullptr)
-    , m_gengrid(nullptr)
-    , m_parent(nullptr)
-    , m_toastPopup(nullptr)
-    , m_icon(nullptr)
-    , m_bookmarkIcon(nullptr)
-    , m_item_class(nullptr)
-    , m_desktopMode(true)
-#if PROFILE_MOBILE
-    , m_shouldShowFindOnPage(false)
-    , m_blockThumbnails(false)
-#endif
-    , m_isVisible(false)
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    m_edjFilePath = EDJE_DIR;
-    m_edjFilePath.append("MoreMenuUI/MoreMenu.edj");
-    m_item_class = createItemClass();
-}
-
-MoreMenuUI::~MoreMenuUI()
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    if (m_item_class)
-        elm_gengrid_item_class_free(m_item_class);
-    evas_object_del(m_gengrid);
-}
-
-Elm_Gengrid_Item_Class* MoreMenuUI::createItemClass()
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    Elm_Gengrid_Item_Class* item_class = elm_gengrid_item_class_new();
-    item_class->item_style = "menu_item";
-    item_class->func.text_get = _grid_text_get;
-    item_class->func.content_get =  _grid_content_get;
-    item_class->func.state_get = NULL;
-    item_class->func.del = _genlist_del<MoreMenuItemData>;
-    return item_class;
-}
-
-void MoreMenuUI::init(Evas_Object* parent)
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    M_ASSERT(parent);
-    m_parent = parent;
-}
-
-#if PROFILE_MOBILE
-void MoreMenuUI::updateBookmarkButton()
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    elm_gengrid_item_update(m_map_menu_views[ADD_TO_BOOKMARK]);
-}
-#endif
-
-void MoreMenuUI::showUI()
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    if (!m_mm_layout)
-        createMoreMenuLayout();
-    createGengrid();    // recreate gengrid because icons could have changed
-    addItems();
-#if !PROFILE_MOBILE
-    m_focusManager.startFocusManager(m_gengrid);
-    setFocus(EINA_TRUE);
-#endif
-    evas_object_show(m_mm_layout);
-    evas_object_show(elm_object_part_content_get(m_mm_layout,"current_tab_bar"));
-#if PROFILE_MOBILE
-    resetContent();
-#endif
-    m_isVisible = true;
-}
-
-void MoreMenuUI::hideUI()
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    M_ASSERT(m_mm_layout);
-
-    evas_object_hide(m_mm_layout);
-    evas_object_hide(elm_object_part_content_get(m_mm_layout,"current_tab_bar"));
-    clearItems();
-    evas_object_del(m_gengrid);
-
-#if PROFILE_MOBILE
-    elm_object_signal_emit(m_parent, "hide_moremenu", "ui");
-    deleteMoreMenuLayout();
-#else
-    setFocus(EINA_FALSE);
-    m_focusManager.stopFocusManager();
-#endif
-    m_isVisible = false;
-}
-
-
-Evas_Object* MoreMenuUI::getContent()
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-
-    if(!m_mm_layout)
-        createMoreMenuLayout();
-    return m_mm_layout;
-}
-
-#if PROFILE_MOBILE
-void MoreMenuUI::resetContent()
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    boost::optional<bool> rotated = isRotated();
-    if (rotated) {
-        if (*rotated) {
-            elm_gengrid_item_size_set(m_gengrid, ELM_SCALE_SIZE(GENGRID_ITEM_WIDTH_LANDSCAPE),
-                                      ELM_SCALE_SIZE(GENGRID_ITEM_HEIGHT_LANDSCAPE));
-            elm_object_signal_emit(m_mm_layout, "switch_landscape", "ui");
-            if (evas_object_visible_get(m_mm_layout))
-                elm_object_signal_emit(m_parent, "show_moremenu_landscape", "ui");
-        } else {
-            elm_gengrid_item_size_set(m_gengrid, ELM_SCALE_SIZE(GENGRID_ITEM_WIDTH),
-                                      ELM_SCALE_SIZE(GENGRID_ITEM_HEIGHT));
-            elm_object_signal_emit(m_mm_layout, "switch_vertical", "ui");
-            if (evas_object_visible_get(m_mm_layout))
-                elm_object_signal_emit(m_parent, "show_moremenu_vertical", "ui");
-        }
-    } else
-        BROWSER_LOGE("[%s:%d] Signal not found", __PRETTY_FUNCTION__, __LINE__);
-}
-#endif
-
-void MoreMenuUI::createMoreMenuLayout()
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    M_ASSERT(m_parent);
-    elm_theme_extension_add(NULL, m_edjFilePath.c_str());
-    m_mm_layout = elm_layout_add(m_parent);
-    elm_layout_file_set(m_mm_layout, m_edjFilePath.c_str(), "moremenu-layout");
-    evas_object_size_hint_weight_set(m_mm_layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    evas_object_size_hint_align_set(m_mm_layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
-
-#if PROFILE_MOBILE
-    elm_object_part_content_set(m_parent, "moremenu", m_mm_layout);
-    elm_object_tree_focus_allow_set(m_mm_layout, EINA_FALSE);
-#endif
-}
-
-#if PROFILE_MOBILE
-void MoreMenuUI::deleteMoreMenuLayout()
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-
-    M_ASSERT(m_parent);
-    M_ASSERT(m_mm_layout);
-
-    evas_object_del(m_gengrid);
-    evas_object_hide(m_mm_layout);
-    elm_object_signal_emit(m_parent, "hide_moremenu", "ui");
-    evas_object_del(m_mm_layout);
-
-    m_mm_layout = nullptr;
-}
-#endif
-
-void MoreMenuUI::createGengrid()
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    m_gengrid = elm_gengrid_add(m_mm_layout);
-    elm_object_part_content_set(m_mm_layout, "elm.swallow.grid", m_gengrid);
-    elm_gengrid_align_set(m_gengrid, 0, 0);
-    elm_gengrid_select_mode_set(m_gengrid, ELM_OBJECT_SELECT_MODE_ALWAYS);
-    elm_gengrid_multi_select_set(m_gengrid, EINA_FALSE);
-    elm_gengrid_horizontal_set(m_gengrid, EINA_FALSE);
-    elm_scroller_policy_set(m_gengrid, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
-#if PROFILE_MOBILE
-    elm_scroller_bounce_set(m_gengrid, EINA_FALSE, EINA_FALSE);
-    elm_object_scroll_lock_x_set(m_gengrid, EINA_TRUE);
-#else
-    elm_scroller_page_size_set(m_gengrid, 0, 327);
-    elm_gengrid_item_size_set(m_gengrid, ELM_SCALE_SIZE(GENGRID_ITEM_WIDTH), ELM_SCALE_SIZE(GENGRID_ITEM_HEIGHT));
-#endif
-    evas_object_size_hint_weight_set(m_gengrid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    evas_object_size_hint_align_set(m_gengrid, EVAS_HINT_FILL, EVAS_HINT_FILL);
-}
-
-void MoreMenuUI::showCurrentTab()
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    m_current_tab_bar = elm_layout_add(m_mm_layout);
-    elm_layout_file_set(m_current_tab_bar, m_edjFilePath.c_str(), "current_tab_layout");
-    evas_object_size_hint_weight_set(m_current_tab_bar, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    elm_object_part_content_set(m_mm_layout, "current_tab_bar", m_current_tab_bar);
-
-    Evas_Object* button = elm_button_add(m_current_tab_bar);
-    elm_object_style_set(button, "hidden_button");
-    evas_object_smart_callback_add(button, "clicked", _close_clicked, this);
-    elm_object_part_content_set(m_current_tab_bar, "close_click", button);
-    evas_object_show(button);
-    elm_object_focus_set(button, EINA_TRUE);
-
-    m_bookmarkButton = elm_button_add(m_mm_layout);
-    elm_object_style_set(m_bookmarkButton, "hidden_button");
-    evas_object_show(m_bookmarkButton);
-    evas_object_smart_callback_add(m_bookmarkButton, "clicked", _bookmarkButton_clicked, this);
-
-    m_bookmarkIcon = elm_icon_add(m_mm_layout);
-    elm_object_part_content_set(m_current_tab_bar, "bookmark_ico", m_bookmarkIcon);
-    elm_object_part_content_set(m_current_tab_bar, "star_click", m_bookmarkButton);
-#if !PROFILE_MOBILE
-    createFocusVector();
-#endif
-}
-
-void MoreMenuUI::setFavIcon(tools::BrowserImagePtr favicon)
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    if(favicon && favicon->getSize() > 0) {
-        if(m_icon)
-            evas_object_del(m_icon);
-
-        m_icon = favicon->getEvasImage(m_current_tab_bar);
-        if(m_icon) {
-            evas_object_size_hint_weight_set(m_icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-            evas_object_size_hint_align_set(m_icon, EVAS_HINT_FILL, EVAS_HINT_FILL);
-            elm_object_part_content_set(m_current_tab_bar, "favicon", m_icon);
-            evas_object_show(m_icon);
-        }
-    }
-    else {
-        setDocIcon();
-    }
-}
-
-void MoreMenuUI::setDocIcon()
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    if(m_icon)
-        evas_object_del(m_icon);
-
-    m_icon = elm_icon_add(m_mm_layout);
-    elm_image_file_set(m_icon, m_edjFilePath.c_str(), "ico_url.png");
-    evas_object_size_hint_weight_set(m_icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    evas_object_size_hint_align_set(m_icon, EVAS_HINT_FILL, EVAS_HINT_FILL);
-    elm_object_part_content_set(m_current_tab_bar, "favicon", m_icon);
-}
-
-void MoreMenuUI::setWebTitle(const std::string& title)
-{
-    BROWSER_LOGD("[%s:%d] %s", __PRETTY_FUNCTION__, __LINE__, title.c_str());
-    elm_object_part_text_set(m_current_tab_bar, "webpage_title", title.c_str());
-}
-
-void MoreMenuUI::setURL(const std::string& url)
-{
-    BROWSER_LOGD("[%s:%d] %s", __PRETTY_FUNCTION__, __LINE__, url.c_str());
-
-    boost::optional<bool> bookmark = isBookmark();
-    if (bookmark) {
-        if (!url.empty()) {
-            elm_object_part_text_set(m_current_tab_bar, "webpage_url", url.c_str());
-            if (*bookmark) {
-                changeBookmarkStatus(true);
-                enableAddToBookmarkButton(true);
-            } else {
-                changeBookmarkStatus(false);
-                enableAddToBookmarkButton(true);
-            }
-        } else {
-            elm_object_part_text_set(m_current_tab_bar, "webpage_url", "");
-            elm_object_part_text_set(m_current_tab_bar, "webpage_title", "No Content");
-            changeBookmarkStatus(false);
-            enableAddToBookmarkButton(false);
-        }
-    } else
-        BROWSER_LOGE("[%s:%d] Signal not found", __PRETTY_FUNCTION__, __LINE__);
-}
-
-void MoreMenuUI::setHomePageInfo()
-{
-    setDocIcon();
-    setURL("");
-}
-
-void MoreMenuUI::changeBookmarkStatus(bool data)
-{
-    if (data) {
-        elm_object_part_text_set(m_current_tab_bar, "add_to_bookmark_text", "Remove Bookmark");
-        elm_image_file_set(m_bookmarkIcon, m_edjFilePath.c_str(), "ic_add_bookmark.png");
-    }
-    else {
-        elm_object_part_text_set(m_current_tab_bar, "add_to_bookmark_text", "Add to Bookmark");
-        elm_image_file_set(m_bookmarkIcon, m_edjFilePath.c_str(), "ic_add_bookmark_new.png");
-    }
-}
-
-void MoreMenuUI::enableAddToBookmarkButton(bool data)
-{
-    if (m_bookmarkButton) {
-        elm_object_disabled_set(m_bookmarkButton, data ? EINA_FALSE : EINA_TRUE);
-        elm_object_style_set(m_bookmarkButton, data ? "hidden_button" : "dimmed_button");
-    }
-}
-
-void MoreMenuUI::createToastPopup(const char* text)
-{
-    m_toastPopup = elm_popup_add(m_mm_layout);
-    elm_object_style_set(m_toastPopup, "toast");
-    evas_object_size_hint_weight_set(m_toastPopup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    evas_object_size_hint_align_set(m_toastPopup, EVAS_HINT_FILL, EVAS_HINT_FILL);
-    elm_object_part_content_set(m_current_tab_bar, "toast_popup", m_toastPopup);
-    elm_object_part_text_set(m_current_tab_bar, "toast_text", text);
-    evas_object_smart_callback_add(m_toastPopup, "timeout", _timeout, this);
-    elm_popup_timeout_set(m_toastPopup, 3.0);
-}
-
-void MoreMenuUI::_timeout(void *data, Evas_Object*, void*)
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    MoreMenuUI *moreMenuUI = static_cast<MoreMenuUI*>(data);
-    elm_object_part_text_set(moreMenuUI->m_current_tab_bar, "toast_text", "");
-    evas_object_del(moreMenuUI->m_toastPopup);
-}
-
-void MoreMenuUI::_bookmarkButton_clicked(void* data, Evas_Object*, void*)
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    if (data) {
-        MoreMenuUI *moreMenuUI = static_cast<MoreMenuUI*>(data);
-        moreMenuUI->bookmarkFlowClicked();
-    } else
-        BROWSER_LOGW("[%s] data = nullptr", __PRETTY_FUNCTION__);
-}
-
-void MoreMenuUI::_close_clicked(void* data, Evas_Object*, void*)
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    if (data) {
-        MoreMenuUI *moreMenuUI = static_cast<MoreMenuUI*>(data);
-        moreMenuUI->closeMoreMenuClicked();
-    }
-}
-
-void MoreMenuUI::addItems()
-{
-     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-#if PROFILE_MOBILE
-     for (int i = 0; i <= FIND_ON_PAGE; i++) {
-         ItemType type = static_cast<ItemType>(i);
-         if (type == ItemType::FIND_ON_PAGE && !m_shouldShowFindOnPage)
-             continue;
-         addItem(type);
-     }
-#else
-     for (int i = 0; i <= EXIT_BROWSER; i++) {
-         ItemType type = static_cast<ItemType>(i);
-         // take proper image for desktop/mobile view
-         if (type == ItemType::VIEW_DESKTOP_WEB && m_desktopMode)
-             continue;
-         if (type == ItemType::VIEW_MOBILE_WEB && !m_desktopMode)
-             continue;
-         addItem(type);
-     }
-#endif
-}
-
-void MoreMenuUI::addItem(ItemType type)
-{
-    MoreMenuItemData *itemData = new MoreMenuItemData();
-    itemData->item = type;
-    itemData->moreMenuUI = std::shared_ptr<tizen_browser::base_ui::MoreMenuUI>(this);
-    Elm_Object_Item* bookmarkView = elm_gengrid_item_append(m_gengrid, m_item_class, itemData, _thumbSelected, itemData);
-    m_map_menu_views.insert(std::pair<ItemType, Elm_Object_Item*>(itemData->item, bookmarkView));
-    elm_gengrid_item_selected_set(bookmarkView, EINA_FALSE);
-}
-
-void MoreMenuUI::clearItems()
-{
-    BROWSER_LOGD("[%s:%d]", __PRETTY_FUNCTION__, __LINE__);
-    for (auto it = m_map_menu_views.begin(); it != m_map_menu_views.end(); ++it) {
-        Elm_Object_Item* bookmarkView = it->second;
-        Evas_Object *button = elm_object_item_part_content_get(bookmarkView, "thumbbutton_item");
-        evas_object_event_callback_del(button, EVAS_CALLBACK_MOUSE_IN, __cb_mouse_in);
-        evas_object_event_callback_del(button, EVAS_CALLBACK_MOUSE_OUT, __cb_mouse_out);
-    }
-
-    elm_gengrid_clear(m_gengrid);
-    m_map_menu_views.clear();
-}
-
-char* MoreMenuUI::_grid_text_get(void* data, Evas_Object*, const char* part)
-{
-    BROWSER_LOGD("[%s:%d] part=%s", __PRETTY_FUNCTION__, __LINE__, part);
-    if (data && part) {
-        MoreMenuItemData *itemData = static_cast<MoreMenuItemData*>(data);
-#if PROFILE_MOBILE
-        const char *part_name = "thumbnail_text";
-#else
-        const char *part_name = "menu_label";
-#endif
-        static const int part_name_len = strlen(part_name);
-
-        if (!strncmp(part_name, part, part_name_len)) {
-            const char* item_name = NULL;
-            switch (itemData->item) {
-            case HISTORY:
-                item_name = "History Manager";
-                break;
-            case BOOKMARK_MANAGER:
-                item_name = "Bookmark Manager";
-                break;
-            case SETTINGS:
-                item_name = _("IDS_BR_OPT_SETTINGS");
-                break;
-#if PROFILE_MOBILE
-            case ADD_TO_BOOKMARK: {
-                boost::optional<bool> bookmark = itemData->moreMenuUI->isBookmark();
-                if (bookmark)
-                    item_name = *bookmark ? "Edit Bookmark" : "Add to Bookmark";
-                else
-                    BROWSER_LOGE("[%s:%d] Signal not found", __PRETTY_FUNCTION__, __LINE__);
-                }
-                break;
-#ifdef READER_MODE_ENABLED
-            case READER_MODE:
-                item_name = _("IDS_BR_OPT_READER_MODE_TTS");
-                break;
-#endif
-            case FIND_ON_PAGE:
-                item_name = _("IDS_BR_OPT_FIND_ON_PAGE");
-                break;
-#else
-#ifdef READER_MODE_ENABLED
-            case READER_MODE:
-                item_name = _("IDS_BR_OPT_READER_MODE_TTS");
-                break;
-#endif
-            case SCREEN_ZOOM:
-                item_name = "Screen Zoom";
-                break;
-#ifdef START_MINIBROWSER_ENABLED
-            case START_MINIBROWSER:
-                item_name = "Start Mini Browser";
-                break;
-#endif
-            case VIEW_MOBILE_WEB:
-                item_name = "View Mobile Web";
-                break;
-            case VIEW_DESKTOP_WEB:
-                item_name = "View Desktop Web";
-                break;
-            case EXIT_BROWSER:
-                item_name = "Exit Browser";
-                break;
-#endif
-            default:
-                item_name = "";
-            }
-            return strdup(item_name);
-        }
-    }
-    return NULL;
-}
-
-static const char* getImageFileNameForType(ItemType type, bool focused, Eina_Bool bookmarked)
-{
-#if PROFILE_MOBILE
-    M_UNUSED(focused);
-#else
-    M_UNUSED(bookmarked);
-#endif
-    const char* file_name = NULL;
-    switch (type) {
-#if PROFILE_MOBILE
-        case ADD_TO_BOOKMARK:
-            file_name = bookmarked == EINA_TRUE ? "moremenu_ic_01_edit.png" : "moremenu_ic_01.png";
-            break;
-#ifdef READER_MODE_ENABLED
-        case READER_MODE:
-            file_name = "moremenu_ic_02.png";
-            break;
-#endif
-        case HISTORY:
-            file_name = "moremenu_ic_04.png";
-            break;
-        case BOOKMARK_MANAGER:
-            file_name = "moremenu_ic_05.png";
-            break;
-        case SETTINGS:
-            file_name = "moremenu_ic_06.png";
-            break;
-        case FIND_ON_PAGE:
-            file_name = "moremenu_ic_07.png";
-            break;
-#else
-    #ifdef READER_MODE_ENABLED
-        case READER_MODE:
-            file_name = focused ? "ic_more_readermode_foc.png" : "ic_more_readermode_nor.png";
-            break;
-    #endif
-        case BOOKMARK_MANAGER:
-            file_name = focused ? "ic_more_bookmark_foc.png" : "ic_more_bookmark_nor.png";
-            break;
-        case HISTORY:
-            file_name = focused ? "ic_more_history_foc.png" : "ic_more_history_nor.png";
-            break;
-        case SCREEN_ZOOM:
-            file_name = focused ? "ic_more_zoom_foc.png" : "ic_more_zoom_nor.png";
-            break;
-    #ifdef START_MINIBROWSER_ENABLED
-        case START_MINIBROWSER:
-            file_name = focused ? "ic_more_minibrowser_foc.png" : "ic_more_minibrowser_nor.png";
-            break;
-    #endif
-        case VIEW_MOBILE_WEB:
-            file_name = focused ? "ic_more_mobileview_foc.png" : "ic_more_mobileview_nor.png";
-            break;
-        case VIEW_DESKTOP_WEB:
-            file_name = focused ? "ic_more_desktopview_foc.png" : "ic_more_desktopview_nor.png";
-            break;
-        case SETTINGS:
-            file_name = focused ? "ic_more_setting_foc.png" : "ic_more_setting_nor.png";
-            break;
-        case EXIT_BROWSER:
-            file_name = focused ? "ic_more_exit_foc.png" : "ic_more_exit_nor.png";
-            break;
-#endif
-    default:
-        file_name = "";
-    }
-    return file_name;
-}
-
-Evas_Object * MoreMenuUI::_grid_content_get(void *data, Evas_Object *obj, const char *part)
-{
-    BROWSER_LOGD("[%s:%d] part=%s", __PRETTY_FUNCTION__, __LINE__, part);
-    if (data && obj && part) {
-        MoreMenuItemData *itemData = static_cast<MoreMenuItemData*>(data);
-#if PROFILE_MOBILE
-        const char *part_name1 = "thumbnail_icon";
-#else
-        const char *part_name1 = "thumbnail_item";
-#endif
-        static const int part_name1_len = strlen(part_name1);
-        const char *part_name2 = "thumbbutton_item";
-        static const int part_name2_len = strlen(part_name2);
-
-        if (!strncmp(part_name1, part, part_name1_len)) {
-            Evas_Object* thumb_nail = elm_icon_add(obj);
-            boost::optional<bool> bookmark = itemData->moreMenuUI->isBookmark();
-            if (bookmark) {
-                const char* file_name = getImageFileNameForType(itemData->item, false, *bookmark);
-                elm_image_file_set(thumb_nail, itemData->moreMenuUI->m_edjFilePath.c_str(), file_name);
-                return thumb_nail;
-            } else
-                BROWSER_LOGE("[%s:%d] Signal not found", __PRETTY_FUNCTION__, __LINE__);
-        }
-
-        if (!strncmp(part_name2, part, part_name2_len)) {
-            Evas_Object *thumbButton = elm_button_add(obj);
-#if PROFILE_MOBILE
-            elm_object_style_set(thumbButton, "invisible_button");
-            evas_object_smart_callback_add(thumbButton, "clicked", _thumbSelected, data);
-            elm_object_part_content_set(obj, "thumbnail_click", thumbButton);
-#else
-            elm_object_style_set(thumbButton, "clickButton");
-            evas_object_event_callback_add(thumbButton, EVAS_CALLBACK_MOUSE_IN, __cb_mouse_in, data);
-            evas_object_event_callback_add(thumbButton, EVAS_CALLBACK_MOUSE_OUT, __cb_mouse_out, data);
-#endif
-            return thumbButton;
-        }
-    }
-    return NULL;
-}
-
-void MoreMenuUI::__cb_mouse_in(void * data, Evas *, Evas_Object *obj, void *)
-{
-    BROWSER_LOGD("[%s:%d]", __PRETTY_FUNCTION__, __LINE__);
-
-#if PROFILE_MOBILE
-    M_UNUSED(data);
-    M_UNUSED(obj);
-#else
-    if (data && obj) {
-        elm_object_focus_set(obj, EINA_TRUE);
-        MoreMenuItemData *itemData = static_cast<MoreMenuItemData*>(data);
-        Elm_Object_Item *selected = itemData->moreMenuUI->m_map_menu_views[itemData->item];
-        Evas_Object *thumb_nail = elm_object_item_part_content_get(selected, "thumbnail_item");
-        boost::optional<bool> bookmark = itemData->moreMenuUI->isBookmark();
-        if (bookmark) {
-            const char *file_name = getImageFileNameForType(itemData->item, true, *bookmark);
-            elm_image_file_set(thumb_nail, itemData->moreMenuUI->m_edjFilePath.c_str(), file_name);
-        } else
-            BROWSER_LOGE("[%s:%d] Signal not found", __PRETTY_FUNCTION__, __LINE__);
-    }
-#endif
-}
-
-void MoreMenuUI::__cb_mouse_out(void * data, Evas *, Evas_Object *obj, void *)
-{
-    BROWSER_LOGD("[%s:%d]", __PRETTY_FUNCTION__, __LINE__);
-#if PROFILE_MOBILE
-    M_UNUSED(data);
-    M_UNUSED(obj);
-#else
-    if (data && obj) {
-        elm_object_focus_set(obj, EINA_FALSE);
-        MoreMenuItemData *itemData = static_cast<MoreMenuItemData*>(data);
-        Elm_Object_Item *selected = itemData->moreMenuUI->m_map_menu_views[itemData->item];
-        Evas_Object *thumb_nail = elm_object_item_part_content_get(selected, "thumbnail_item");
-        boost::optional<bool> bookmark = itemData->moreMenuUI->isBookmark();
-        if (bookmark) {
-            const char *file_name = getImageFileNameForType(itemData->item, false, *bookmark);
-            elm_image_file_set(thumb_nail, itemData->moreMenuUI->m_edjFilePath.c_str(), file_name);
-        } else
-            BROWSER_LOGE("[%s:%d] Signal not found", __PRETTY_FUNCTION__, __LINE__);
-    }
-#endif
-}
-
-
-void MoreMenuUI::_thumbSelected(void* data, Evas_Object*, void*)
-{
-    BROWSER_LOGD("[%s:%d]", __PRETTY_FUNCTION__, __LINE__);
-    if (data) {
-        MoreMenuItemData *itemData = static_cast<MoreMenuItemData*>(data);
-    BROWSER_LOGD("type: %d", itemData->item);
-        switch (itemData->item) {
-            case HISTORY:
-                itemData->moreMenuUI->historyUIClicked();
-                break;
-            case SETTINGS:
-                itemData->moreMenuUI->settingsClicked();
-                break;
-            case BOOKMARK_MANAGER:
-                itemData->moreMenuUI->bookmarkManagerClicked();
-                break;
-#if PROFILE_MOBILE
-            case FIND_ON_PAGE:
-                itemData->moreMenuUI->closeMoreMenuClicked();
-                itemData->moreMenuUI->findOnPageClicked();
-                break;
-            case ADD_TO_BOOKMARK:
-                if (!itemData->moreMenuUI->m_blockThumbnails)
-                    elm_object_focus_allow_set(itemData->moreMenuUI->m_gengrid, EINA_FALSE);
-                    itemData->moreMenuUI->bookmarkFlowClicked();
-                break;
-#ifdef READER_MODE_ENABLED
-            case READER_MODE:
-                //TODO: Implement reader mode
-                break;
-#endif
-#else
-#ifdef READER_MODE_ENABLED
-            case READER_MODE:
-                //TODO: Implement reader mode
-                break;
-#endif
-            case SCREEN_ZOOM:
-                itemData->moreMenuUI->zoomUIClicked();
-                break;
-#ifdef START_MINIBROWSER_ENABLED
-            case START_MINIBROWSER:
-                //TODO: Implement minibrowser launching
-                break;
-#endif
-            case VIEW_MOBILE_WEB:
-                itemData->moreMenuUI->switchToMobileMode();
-                itemData->moreMenuUI->m_desktopMode = false;
-                itemData->moreMenuUI->closeMoreMenuClicked();
-                break;
-            case VIEW_DESKTOP_WEB:
-                itemData->moreMenuUI->switchToDesktopMode();
-                itemData->moreMenuUI->m_desktopMode = true;
-                itemData->moreMenuUI->closeMoreMenuClicked();
-                break;
-            case EXIT_BROWSER:
-                _exitClicked();
-                break;
-#endif
-        default:
-            BROWSER_LOGD("[%s:%d] Warning: Unhandled button.", __PRETTY_FUNCTION__, __LINE__);
-            break;
-        }
-    }
-}
-
-void MoreMenuUI::_exitClicked()
-{
-    BROWSER_LOGD("[%s:%d]", __PRETTY_FUNCTION__, __LINE__);
-    elm_exit();
-}
-
-void MoreMenuUI::setFocus(Eina_Bool focusable)
-{
-    BROWSER_LOGD("[%s:%d]", __PRETTY_FUNCTION__, __LINE__);
-    elm_object_tree_focus_allow_set(getContent(), focusable);
-    if (focusable == EINA_TRUE)
-        elm_object_focus_set(elm_object_part_content_get(m_current_tab_bar, "close_click"), focusable);
-}
-
-#if PROFILE_MOBILE
-void MoreMenuUI::shouldShowFindOnPage(bool show)
-{
-    m_shouldShowFindOnPage = show;
-}
-
-void MoreMenuUI::blockThumbnails(bool blockThumbnails)
-{
-    m_blockThumbnails = blockThumbnails;
-}
-#endif
-
-#if !PROFILE_MOBILE
-void MoreMenuUI::createFocusVector()
-{
-    BROWSER_LOGD("[%s:%d]", __PRETTY_FUNCTION__, __LINE__);
-    m_focusManager.addItem(elm_object_part_content_get(m_current_tab_bar, "close_click"));
-    m_focusManager.addItem(m_bookmarkButton);
-    m_focusManager.addItem(m_gengrid);
-    m_focusManager.setIterator();
-}
-#endif
-
-}
-}
diff --git a/services/MoreMenuUI/MoreMenuUI.h b/services/MoreMenuUI/MoreMenuUI.h
deleted file mode 100755 (executable)
index 9ab97ef..0000000
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * 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 MOREMENUUI_H
-#define MOREMENUUI_H
-
-#include <Evas.h>
-#include <Eina.h>
-#include <Elementary.h>
-#include <memory>
-#include <boost/signals2/signal.hpp>
-
-#include "AbstractUIComponent.h"
-#include "AbstractService.h"
-#include "ServiceFactory.h"
-#include "service_macros.h"
-#include "BrowserImageTypedef.h"
-
-#include "BookmarkItem.h"
-#include "services/HistoryService/HistoryItem.h"
-#include "Tools/EflTools.h"
-
-#if !PROFILE_MOBILE
-#include "FocusManager.h"
-#endif
-
-#include <Ecore_Wayland.h>
-
-#define M_UNUSED(x) (void)(x)
-
-namespace tizen_browser{
-namespace base_ui{
-
-class SimpleUI;
-enum ItemType {
-#if PROFILE_MOBILE
-    ADD_TO_BOOKMARK,
-#ifdef READER_MODE_ENABLED
-    READER_MODE,
-#endif
-    HISTORY,
-    BOOKMARK_MANAGER,
-    SETTINGS,
-    FIND_ON_PAGE
-#else
-#ifdef READER_MODE_ENABLED
-    READER_MODE,
-#endif
-    BOOKMARK_MANAGER,
-    HISTORY,
-    SCREEN_ZOOM,
-#ifdef START_MINIBROWSER_ENABLED
-    START_MINIBROWSER,
-#endif
-    VIEW_MOBILE_WEB,
-    VIEW_DESKTOP_WEB,
-    SETTINGS,
-    EXIT_BROWSER
-#endif
-} item;
-
-class BROWSER_EXPORT MoreMenuUI
-        : public interfaces::AbstractUIComponent
-        , public core::AbstractService
-{
-public:
-    MoreMenuUI();
-    ~MoreMenuUI();
-
-    //AbstractUIComponent interface methods
-    void init(Evas_Object* parent);
-    Evas_Object* getContent();
-    void showUI();
-    void hideUI();
-    bool isVisible() { return m_isVisible; }
-
-    void setDesktopMode(bool desktopMode) {m_desktopMode = desktopMode;}
-
-    void showCurrentTab();
-    virtual std::string getName();
-    void setFavIcon(tools::BrowserImagePtr favicon);
-    void setWebTitle(const std::string& title);
-    void setURL(const std::string& url);
-    void setHomePageInfo();
-
-    void changeBookmarkStatus(bool data);
-    void enableAddToBookmarkButton(bool data);
-    void createToastPopup(const char* text);
-    void setFocus(Eina_Bool focusable);
-#if PROFILE_MOBILE
-    void updateBookmarkButton();
-    void blockThumbnails(bool blockThumbnails);
-    void shouldShowFindOnPage(bool show);
-    void resetContent();
-
-    boost::signals2::signal<void ()> findOnPageClicked;
-    boost::signals2::signal<bool ()> isRotated;
-#endif
-    boost::signals2::signal<void (int)> addToBookmarkClicked;
-    boost::signals2::signal<void ()> bookmarkManagerClicked;
-    boost::signals2::signal<void ()> historyUIClicked;
-    boost::signals2::signal<void ()> settingsClicked;
-    boost::signals2::signal<void ()> closeMoreMenuClicked;
-    boost::signals2::signal<void ()> zoomUIClicked;
-    boost::signals2::signal<void ()> switchToMobileMode;
-    boost::signals2::signal<void ()> switchToDesktopMode;
-    boost::signals2::signal<bool ()> isBookmark;
-    boost::signals2::signal<void ()> bookmarkFlowClicked;
-private:
-    struct MoreMenuItemData
-    {
-        ItemType item;
-        std::shared_ptr<MoreMenuUI> moreMenuUI;
-    };
-    Elm_Gengrid_Item_Class* createItemClass();
-    void createMoreMenuLayout();
-#if PROFILE_MOBILE
-    void deleteMoreMenuLayout();
-#endif
-    void createGengrid();
-    void addItems();
-    void addItem(ItemType item);
-    void clearItems();
-    static char* _grid_text_get(void *data, Evas_Object *obj, const char *part);
-    static Evas_Object * _grid_content_get(void *data, Evas_Object *obj, const char *part);
-    static void _thumbSelected(void * data, Evas_Object * obj, void * event_info);
-    static void _exitClicked();
-#if !PROFILE_MOBILE
-    void createFocusVector();
-#endif
-
-    void setDocIcon();
-
-    static void _bookmarkButton_clicked(void *data, Evas_Object *obj, void *event_info);
-    static void _close_clicked(void *data, Evas_Object *obj, void *event_info);
-
-    static void _timeout(void *data, Evas_Object *obj, void *event_info);
-
-    static void __cb_mouse_in(void *data, Evas *e, Evas_Object *obj, void *event_info);
-    static void __cb_mouse_out(void *data, Evas *e, Evas_Object *obj, void *event_info);
-    Evas_Object *m_current_tab_bar;
-    Evas_Object *m_mm_layout;
-    Evas_Object *m_gengrid;
-    Evas_Object *m_parent;
-    Evas_Object *m_toastPopup;
-    Evas_Object *m_icon;
-    Evas_Object *m_bookmarkIcon;
-    Evas_Object *m_bookmarkButton;
-    Elm_Gengrid_Item_Class * m_item_class;
-    std::map<ItemType,Elm_Object_Item*> m_map_menu_views;
-    std::string m_edjFilePath;
-    bool m_desktopMode;
-#if PROFILE_MOBILE
-    bool m_shouldShowFindOnPage;
-    bool m_blockThumbnails;
-    const unsigned int GENGRID_ITEM_WIDTH = 228;
-    const unsigned int GENGRID_ITEM_HEIGHT = 213;
-    const unsigned int GENGRID_ITEM_WIDTH_LANDSCAPE = 208;
-    const unsigned int GENGRID_ITEM_HEIGHT_LANDSCAPE = 213;
-#else
-    FocusManager m_focusManager;
-    const unsigned int GENGRID_ITEM_WIDTH = 364;
-    const unsigned int GENGRID_ITEM_HEIGHT = 320;
-#endif
-    bool m_isVisible;
-};
-
-}
-}
-
-#endif // BOOKMARKSUI_H
index 72abfa66dfa3ab117d0fbba60df86248c3fd42bf..c0b7e461e2005ca55bc972f4a2ac7145c626644c 100644 (file)
@@ -39,11 +39,7 @@ 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/CertificateService)
-if (${PROFILE} MATCHES "mobile")
-    include_directories(${CMAKE_SOURCE_DIR}/services/FindOnPageUI)
-else (${PROFILE} MATCHES "mobile")
-    include_directories(${CMAKE_SOURCE_DIR}/services/ZoomUI)
-endif (${PROFILE} MATCHES "mobile")
+include_directories(${CMAKE_SOURCE_DIR}/services/FindOnPageUI)
 
 include(FindPkgConfig)
 
@@ -63,11 +59,7 @@ add_dependencies(${PROJECT_NAME} TabUI)
 add_dependencies(${PROJECT_NAME} SettingsUI)
 add_dependencies(${PROJECT_NAME} PlatformInputManager)
 add_dependencies(${PROJECT_NAME} CertificateService)
-if (${PROFILE} MATCHES "mobile")
-    add_dependencies(${PROJECT_NAME} FindOnPageUI)
-else (${PROFILE} MATCHES "mobile")
-    add_dependencies(${PROJECT_NAME} ZoomUI)
-endif (${PROFILE} MATCHES "mobile")
+add_dependencies(${PROJECT_NAME} FindOnPageUI)
 target_link_libraries(${PROJECT_NAME} WebPageUI)
 target_link_libraries(${PROJECT_NAME} StorageService)
 target_link_libraries(${PROJECT_NAME} HistoryService)
@@ -80,11 +72,7 @@ target_link_libraries(${PROJECT_NAME} BookmarkFlowUI)
 target_link_libraries(${PROJECT_NAME} BookmarkManagerUI)
 target_link_libraries(${PROJECT_NAME} PlatformInputManager)
 target_link_libraries(${PROJECT_NAME} CertificateService)
-if (${PROFILE} MATCHES "mobile")
-    target_link_libraries(${PROJECT_NAME} FindOnPageUI)
-else (${PROFILE} MATCHES "mobile")
-    target_link_libraries(${PROJECT_NAME} ZoomUI)
-endif (${PROFILE} MATCHES "mobile")
+target_link_libraries(${PROJECT_NAME} FindOnPageUI)
 target_link_libraries(${PROJECT_NAME} ${EFL_LDFLAGS})
 
 IF (${capi_net_FOUND})
diff --git a/services/ZoomUI/CMakeLists.txt b/services/ZoomUI/CMakeLists.txt
deleted file mode 100644 (file)
index 29d4b85..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-project(ZoomUI)
-
-set(ZoomUI_SRCS
-    ZoomUI.cpp
-    )
-
-include(Coreheaders)
-include(EFLHelpers)
-
-include_directories(${CMAKE_SOURCE_DIR}/services/FavoriteService)
-
-add_library(${PROJECT_NAME} SHARED ${ZoomUI_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)
-
-#please do not add edc/ directory
-set(edcFiles
-    ZoomUI.edc
-    )
-
-foreach(edec ${edcFiles})
-    string(REPLACE ".edc" ".edj" target_name ${edec})
-    EDJ_TARGET(${target_name}
-               ${CMAKE_CURRENT_SOURCE_DIR}/edc/${edec}
-               ${CMAKE_CURRENT_BINARY_DIR})
-endforeach(edec)
diff --git a/services/ZoomUI/ZoomUI.cpp b/services/ZoomUI/ZoomUI.cpp
deleted file mode 100644 (file)
index 76827de..0000000
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright (c) 2015 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 "ZoomUI.h"
-#include "BrowserLogger.h"
-#include "ServiceManager.h"
-
-#define DX 50
-#define iDX -50
-
-namespace tizen_browser{
-namespace base_ui{
-
-EXPORT_SERVICE(ZoomUI, "org.tizen.browser.zoomui")
-
-ZoomUI::ZoomUI()
-    : m_layout(nullptr)
-    , m_zoom_slider(nullptr)
-    , m_zoom_menu(nullptr)
-    , m_parent(nullptr)
-    , m_current_translation_x(0)
-    , m_current_translation_y(0)
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    m_edjFilePath = EDJE_DIR;
-    m_edjFilePath.append("ZoomUI/ZoomUI.edj");
-    elm_theme_extension_add(nullptr, m_edjFilePath.c_str());
-}
-
-ZoomUI::~ZoomUI() {}
-
-void ZoomUI::init(Evas_Object* parent)
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    M_ASSERT(parent);
-    m_parent = parent;
-}
-
-Evas_Object* ZoomUI::getContent()
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    M_ASSERT(m_parent);
-    if(!m_layout)
-        createLayout(m_parent);
-    return m_layout;
-}
-
-void ZoomUI::showUI()
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    evas_object_show(m_layout);
-    evas_object_show(m_zoom_menu);
-    evas_object_show(m_zoom_slider);
-    int zoomFactor = *(getZoom());
-    elm_slider_value_set(m_zoom_slider, calculateSliderValue(zoomFactor));
-}
-
-void ZoomUI::hideUI()
-{
-    evas_object_hide(m_zoom_slider);
-    evas_object_hide(m_zoom_menu);
-    evas_object_hide(m_layout);
-}
-
-void ZoomUI::show(Evas_Object* parent)
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    init(parent);
-    if (!m_layout)
-        createLayout(parent);
-    showUI();
-    elm_object_focus_set(m_zoom_slider, EINA_TRUE);
-}
-
-bool ZoomUI::isVisible()
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    if (evas_object_visible_get(m_layout) || (*getZoom() != ZOOM_DEFAULT && *getZoom() != 0))
-        return true;
-    else
-        return false;
-}
-
-void ZoomUI::createLayout(Evas_Object *parent)
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-
-    m_layout = elm_layout_add(parent);
-    elm_layout_file_set(m_layout, m_edjFilePath.c_str(), "zoom-layout");
-    evas_object_size_hint_weight_set(m_layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    evas_object_size_hint_align_set(m_layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
-    createZoomSlider();
-}
-
-void ZoomUI::createZoomSlider()
-{
-    m_zoom_menu = elm_layout_add(m_layout);
-    elm_layout_file_set(m_zoom_menu, m_edjFilePath.c_str(), "zoom-menu");
-    evas_object_size_hint_weight_set(m_zoom_menu, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    evas_object_size_hint_align_set(m_zoom_menu, EVAS_HINT_FILL, EVAS_HINT_FILL);
-
-    m_zoom_slider = elm_slider_add(m_zoom_menu);
-    evas_object_size_hint_weight_set(m_zoom_slider, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    evas_object_size_hint_align_set(m_zoom_slider, EVAS_HINT_FILL, EVAS_HINT_FILL);
-    evas_object_smart_callback_add(m_zoom_slider, "changed", _zoom_slider_changed, this);
-    elm_object_style_set(m_zoom_slider, "default");
-    elm_slider_horizontal_set(m_zoom_slider, EINA_TRUE);
-    elm_slider_min_max_set(m_zoom_slider, 1, 6);
-    elm_slider_step_set(m_zoom_slider, 0.2);
-    int zoomFactor = *(getZoom());
-    elm_slider_value_set(m_zoom_slider, calculateSliderValue(zoomFactor));
-    elm_slider_indicator_show_set(m_zoom_slider, EINA_FALSE);
-
-    elm_object_part_content_set(m_zoom_menu, "slider_swallow", m_zoom_slider);
-    evas_object_event_callback_add(m_zoom_slider, EVAS_CALLBACK_KEY_DOWN, _zoom_value_confirmed, this);
-}
-
-void ZoomUI::clearItems()
-{
-    evas_object_del(m_layout);
-    setZoom(ZOOM_DEFAULT);
-}
-
-void ZoomUI::_zoom_slider_changed(void *data, Evas_Object *obj, void*)
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    if(data && obj) {
-        int val = elm_slider_value_get(obj);
-        int zoomLevel = ZOOM_DEFAULT;    
-        ZoomUI *zoomUI = static_cast<ZoomUI*>(data);
-
-        switch (val) {
-            case 1: zoomLevel = ZOOM_50;
-                    break;
-            case 2: zoomLevel = ZOOM_75;
-                    break;
-            case 3: zoomLevel = ZOOM_DEFAULT;
-                    break;
-            case 4: zoomLevel = ZOOM_150;
-                    break;
-            case 5: zoomLevel = ZOOM_200;
-                    break;
-            case 6: zoomLevel = ZOOM_300;
-                    break;
-            default:BROWSER_LOGD("[%s:%d] Warning: Unhandled zoom level", __PRETTY_FUNCTION__, __LINE__);
-                    break;
-        }
-        zoomUI->setZoom(zoomLevel);
-    }
-}
-
-void ZoomUI::_zoom_value_confirmed(void* data, Evas*, Evas_Object*, void* event_info)
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    Evas_Event_Key_Down* ev = static_cast<Evas_Event_Key_Down*>(event_info);
-
-    if (!data || !ev || !ev->keyname)
-        return;
-
-    ZoomUI* self = static_cast<ZoomUI*>(data);
-    if ((std::string(ev->keyname) == "Return") || (std::string(ev->keyname) == "Up") || (std::string(ev->keyname) == "Down")) {
-        int val = (int)elm_slider_value_get(self->m_zoom_slider);
-        BROWSER_LOGD("[%s:%d] val: %d", __PRETTY_FUNCTION__, __LINE__, val);
-        evas_object_hide(self->m_zoom_menu);
-    }
-}
-
-void ZoomUI::escapeZoom()
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    if (isVisible()) {
-        setZoom(ZoomUI::ZOOM_DEFAULT);
-        hideUI();
-    }
-}
-
-int ZoomUI::calculateSliderValue(int zoom)
-{
-    BROWSER_LOGD("[%s:%d] zoom factor: %d", __PRETTY_FUNCTION__, __LINE__, zoom);
-    int rv = 1; //for zoom < ZOOM_75
-    if (zoom >= ZOOM_300)
-        rv = 6;
-    else if (zoom >= ZOOM_200)
-        rv = 5;
-    else if (zoom >= ZOOM_150)
-        rv = 4;
-    else if (zoom >= ZOOM_100)
-        rv = 3;
-    else if (zoom >= ZOOM_75)
-        rv = 2;
-
-    return rv;
-}
-
-
-}
-}
diff --git a/services/ZoomUI/ZoomUI.h b/services/ZoomUI/ZoomUI.h
deleted file mode 100644 (file)
index 63c451f..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2015 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 ZOOMUI_H
-#define ZOOMUI_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 ZoomUI
-        : public tizen_browser::interfaces::AbstractUIComponent
-        , public tizen_browser::core::AbstractService
-{
-public:
-    ZoomUI();
-    ~ZoomUI();
-
-    //AbstractUIComponent interface methods
-    void init(Evas_Object* parent);
-    Evas_Object* getContent();
-    void showUI();
-    void hideUI();
-    std::string getName();
-
-    void show(Evas_Object* parent);
-    void clearItems();
-    bool isVisible();
-    void escapeZoom();
-
-    boost::signals2::signal<void ()> closeZoomUI;
-    boost::signals2::signal<void (int)> setZoom;
-    boost::signals2::signal<int ()> getZoom;
-    boost::signals2::signal<void (const int&, const int&)> scrollView;
-private:
-    void createLayout(Evas_Object* parent);
-    void createZoomSlider();
-    int calculateSliderValue(int zoom);
-
-    static void _zoom_slider_changed(void * data, Evas_Object * obj, void * event_info);
-    static void _zoom_value_confirmed(void* data, Evas* e, Evas_Object* obj, void* event_info);
-
-    std::string m_edjFilePath;
-    Evas_Object* m_layout;
-    Evas_Object* m_zoom_slider;
-    Evas_Object* m_zoom_menu;
-    Evas_Object* m_parent;
-
-    int m_current_translation_x;
-    int m_current_translation_y;
-
-    enum ZoomLevel {
-        ZOOM_50 = 50,
-        ZOOM_75 = 75,
-        ZOOM_100 = 100,
-        ZOOM_150 = 150,
-        ZOOM_200 = 200,
-        ZOOM_300 = 300, 
-
-        ZOOM_MIN = ZOOM_50,
-        ZOOM_DEFAULT = ZOOM_100,
-        ZOOM_MAX = ZOOM_300
-    };
-    enum ArrowType {
-        LEFT = 1,
-        RIGHT = 2,
-        UP = 3,
-        DOWN = 4
-    };
-};
-
-}
-}
-
-#endif // ZOOMUI_H
diff --git a/services/ZoomUI/edc/ZoomUI.edc b/services/ZoomUI/edc/ZoomUI.edc
deleted file mode 100644 (file)
index 4691b64..0000000
+++ /dev/null
@@ -1,187 +0,0 @@
-collections { base_scale: 2.0;
-   
-#define WIDTH 1920
-#define HEIGHT 976
-
-    group {
-        name: "zoom-layout";
-
-        parts {
-        
-            part { name: "bg";
-                type: RECT;
-                mouse_events: 1;
-                description { state: "default" 0.0;
-                    color: 0 0 0 0;
-                    visible: 0;
-                    min: WIDTH HEIGHT;
-                    max: WIDTH HEIGHT;
-                    align: 0.0 0.0;
-                    rel1 {relative: 0.0 0.0; offset: 0 104;}
-                    rel2 {relative: 1.0 1.0;}
-                }
-            }
-
-            part {
-                name: "zoom_menu";
-                type : SWALLOW;
-                scale: 1;
-                description {
-                    state: "default" 0.0;
-                    visible: 1;
-                    min: 700 300;
-                    max: 700 300;
-                    align: 0.0 0.0;
-                    fixed: 1 1;
-                    rel1 { relative: 0.0 0.0; to: "bg"; }
-                    rel2 { relative: 1.0 1.0; to: "bg"; }
-                }
-            }
-
-        }
-    }
-
-    group {
-        name: "zoom-menu";
-
-        parts {
-
-            part { name: "bg";
-                type: RECT;
-                mouse_events: 1;
-                description { state: "default" 0.0;
-                    color: 0 0 0 0;
-                    visible: 0;
-                    min: WIDTH HEIGHT;
-                    max: WIDTH HEIGHT;
-                    align: 0.0 0.0;
-                    rel1 {relative: 0.0 0.0; offset: 0 104;}
-                    rel2 {relative: 1.0 1.0;}
-                }
-            }
-
-            part { name: "zoom_rect";
-                type: RECT;
-                mouse_events: 1;
-                description { state: "default" 0.0;
-                    color: 230 230 230 255;
-                    min: 700 300;
-                    max: 700 300;
-                    visible: 1;
-                    align: 0.0 1.0;
-                    rel1 {
-                        to: "bg";
-                        offset: 0 0;
-                        relative: 0.0 0.0;
-                    }
-                    rel2 {
-                        to: "bg";
-                        relative: 1.0 1.0;
-                    }
-                }
-            }
-            
-            part { name: "slider_swallow";
-                type: SWALLOW;
-                description {
-                    min: 500 100;
-                    max: 500 100;
-                    visible: 1;
-                    fixed: 1 1;
-                    align: 0.0 0.0;
-                    rel1 {
-                        relative: 0.15 0.4;
-                        to: "zoom_rect";
-                    }
-                    rel2 {
-                        relative: 0.0 0.0;
-                        to: "zoom_rect";
-                   }
-                }
-            }
-
-            part { name: "zoom_text";
-                type: TEXT;
-                description {
-                    visible: 1;
-                    min: 200 122;
-                    max: 200 122;
-                    align: 0.0 0.0;
-                    fixed: 1 1;
-                    color: 51 51 51 255;
-                    rel1 {
-                        to: "zoom_rect";
-                        relative: 0.45 0.0;
-                        offset: 0 0;
-                    }
-                    rel2 {
-                        to: "zoom_rect";
-                        relative: 1.0 1.0;
-                    }
-                    text {
-                        text: "Zoom";
-                        font: "Sans";
-                        size: 32;
-                        align: 0 0.5;
-                    }
-                }
-            }
-
-            part { name: "slider_begin_text";
-                type: TEXT;
-                description {
-                    visible: 1;
-                    min: 100 122;
-                    max: 100 122;
-                    align: 0.0 0.0;
-                    fixed: 1 1;
-                    color: 51 51 51 255;
-                    rel1 {
-                        to: "slider_swallow";
-                        relative: 0.0 0.0;
-                        offset: -50 -10;
-                    }
-                    rel2 {
-                        to: "slider_swallow";
-                        relative: 1.0 1.0;
-                        offset: 0 0;
-                    }
-                    text {
-                        text: "50%";
-                        font: "Sans";
-                        size: 22;
-                        align: 0 0.5;
-                    }
-                }
-            }
-            
-            part { name: "slider_end_text";
-                type: TEXT;
-                description {
-                    visible: 1;
-                    min: 100 122;
-                    max: 100 122;
-                    align: 0.0 0.0;
-                    fixed: 1 1;
-                    color: 51 51 51 255;
-                    rel1 {
-                        to: "slider_swallow";
-                        relative: 1.0 0.0;
-                        offset: 5 -10;
-                    }
-                    rel2 {
-                        to: "slider_swallow";
-                        relative: 1.0 1.0;
-                        offset: 0 0;
-                    }
-                    text {
-                        text: "300%";
-                        font: "Sans";
-                        size: 22;
-                        align: 0 0.5;
-                    }
-                }
-            }
-        }
-    }
-}
\ No newline at end of file