Fix MoreMenu options for QuickAccess and MostVisited

[Issue]    http://suprem.sec.samsung.net/jira/browse/TWF-2105
[Problem]  Bad options in context menu
[Solution] Removed bad options, added new ones
[Verify]   Open QuickAccess/MostVisited and press more menu
           Options should match guidelines

Change-Id: I94cdaeeb3b26b147ddf700f8dd6a2a40d7962aa3

diff --git a/services/QuickAccess/QuickAccess.cpp b/services/QuickAccess/QuickAccess.cpp
index 266165cc01a38921545a988e0aea61e109f91ae3..1412138b1bcf6a89379b855743ebc244e4f56ad2 100644 (file)
--- a/services/QuickAccess/QuickAccess.cpp
+++ b/services/QuickAccess/QuickAccess.cpp
@@ -657,7 +657,7 @@ void QuickAccess::backButtonClicked()
     switchViewToWebPage();
 }
 
-bool QuickAccess::isMostVisitedActive() const
+bool QuickAccess::isMostVisitedActive()
 {
     return m_currPage == MOST_VISITED_PAGE;
 }

diff --git a/services/QuickAccess/QuickAccess.h b/services/QuickAccess/QuickAccess.h
index 4a873d4e860ed8d97aeffd3206bb58c85e954e3d..3c5281ca783678c112d42a51ae2bdbb7296f22a2 100644 (file)
--- a/services/QuickAccess/QuickAccess.h
+++ b/services/QuickAccess/QuickAccess.h
@@ -51,7 +51,7 @@ public:
     void setDesktopMode(bool mode);
     bool canBeBacked(int tabCount);
     void backButtonClicked();
-    inline bool isMostVisitedActive() const;
+    bool isMostVisitedActive();
     void orientationChanged();
     void showMostVisited();
     void showQuickAccess();

diff --git a/services/SimpleUI/SimpleUI.cpp b/services/SimpleUI/SimpleUI.cpp
index cfde4211e391e3440688ed8b500c47f3eb06d0b5..f1afd627428c0dfcbc51aa0502d80ec4dadfbe86 100755 (executable)
--- a/services/SimpleUI/SimpleUI.cpp
+++ b/services/SimpleUI/SimpleUI.cpp
@@ -353,6 +353,7 @@ void SimpleUI::connectUISignals()
 #if PWA
     m_webPageUI->pwaRequestManifest.connect(boost::bind(&basic_webengine::AbstractWebEngine::requestManifest, m_webEngine.get()));
 #endif
+    m_webPageUI->isMostVisited.connect(boost::bind(&QuickAccess::isMostVisitedActive, m_quickAccess.get()));
 
     M_ASSERT(m_quickAccess.get());
     m_quickAccess->openURL.connect(boost::bind(&SimpleUI::onOpenURL, this, _1, _2));

diff --git a/services/WebPageUI/WebPageUI.cpp b/services/WebPageUI/WebPageUI.cpp
index 5608068ffe89966810fdabc34c7e0ede023b82e2..406531d5f6fe21d04a9fcebeb44961aecf7fa45f 100755 (executable)
--- a/services/WebPageUI/WebPageUI.cpp
+++ b/services/WebPageUI/WebPageUI.cpp
@@ -391,7 +391,11 @@ void WebPageUI::showContextMenu()
 
         if (m_statesMgr->equals(WPUState::QUICK_ACCESS)) {
             //TODO: Add translation
-            elm_ctxpopup_item_append(m_ctxpopup, "Edit Quick access", nullptr, _cm_edit_qa_clicked, this);
+            boost::optional<bool> isMostVisitedOpt(isMostVisited());
+            if (!isMostVisitedOpt || !(*isMostVisitedOpt))
+                elm_ctxpopup_item_append(m_ctxpopup, _("IDS_BR_OPT_EDIT_QUICK_ACCESS_ABB"), nullptr, _cm_edit_qa_clicked, this);
+            else
+                elm_ctxpopup_item_append(m_ctxpopup, _("IDS_BR_OPT_DELETE"), nullptr, nullptr, nullptr);
         } else if (m_statesMgr->equals(WPUState::MAIN_WEB_PAGE)) {
             elm_ctxpopup_item_append(m_ctxpopup, _("IDS_BR_OPT_SHARE"), nullptr, _cm_share_clicked, this);
             elm_ctxpopup_item_append(m_ctxpopup, _("IDS_BR_OPT_FIND_ON_PAGE"), nullptr, _cm_find_on_page_clicked, this);
@@ -400,7 +404,7 @@ void WebPageUI::showContextMenu()
             if (bookmark) {
                 //TODO: Add translation
                 if (*bookmark)
-                    elm_ctxpopup_item_append(m_ctxpopup, "Remove from bookmarks", nullptr,
+                    elm_ctxpopup_item_append(m_ctxpopup, _("IDS_BR_OPT_REMOVE_FROM_BOOKMARKS_ABB"), nullptr,
                         _cm_delete_bookmark_clicked, this);
                 else
                     elm_ctxpopup_item_append(m_ctxpopup, "Add to Bookmarks", nullptr,
@@ -419,10 +423,10 @@ void WebPageUI::showContextMenu()
             BROWSER_LOGW("[%s] State not handled, context menu not shown", __PRETTY_FUNCTION__);
             return;
         }
-
         elm_ctxpopup_item_append(m_ctxpopup, _("IDS_BR_BODY_SETTINGS"), nullptr, _cm_settings_clicked, this);
 #if PWA
-        elm_ctxpopup_item_append(m_ctxpopup, "Add to Homescreen", nullptr, _cm_add_to_hs_clicked, this);
+        if (!m_statesMgr->equals(WPUState::QUICK_ACCESS))
+            elm_ctxpopup_item_append(m_ctxpopup, "Add to Homescreen", nullptr, _cm_add_to_hs_clicked, this);
 #endif
         alignContextMenu(*window);
     } else

diff --git a/services/WebPageUI/WebPageUI.h b/services/WebPageUI/WebPageUI.h
index 54637d4d87b1fb59fde3e1f99385973934763dd5..482ee4ef9f6cdd0d351feb9fee80063d40e74a0c 100755 (executable)
--- a/services/WebPageUI/WebPageUI.h
+++ b/services/WebPageUI/WebPageUI.h
@@ -147,6 +147,7 @@ public:
     boost::signals2::signal<void ()> switchToDesktopMode;
     boost::signals2::signal<void ()> quickAccessEdit;
     boost::signals2::signal<void ()> addToQuickAccess;
+    boost::signals2::signal<bool ()> isMostVisited;
 
     boost::signals2::signal<std::string ()> requestCurrentPageForWebPageUI;
     boost::signals2::signal<basic_webengine::State ()> getEngineState;