Menu Tree fixes

[Issue]    N/A
[Problem]  Wrong texts.
[Solution] Change text.
[Verify]   Open browser, go to bookmarks, press menu, create folder.
           Cancel/Create button should be visible. Go to share,
           Cancel/Done should be visible on Naviframe. Go to History,
           Menu key, Remove. Cancel/Done should be visible on
           Naviframe.

Change-Id: I0aaff1197fcea818c26c11e434837c3c783e0f12

diff --git a/services/BookmarkFlowUI/BookmarkFlowUI.cpp b/services/BookmarkFlowUI/BookmarkFlowUI.cpp
index 4f9f69b10de8bb9e3cfc283324bcb839750f28b0..4691cc32962608e6e35e1f1c1b0ca03d16194923 100755 (executable)
--- a/services/BookmarkFlowUI/BookmarkFlowUI.cpp
+++ b/services/BookmarkFlowUI/BookmarkFlowUI.cpp
@@ -273,8 +273,9 @@ void BookmarkFlowUI::fillGenlist()
         _folder_selector_clicked, this);
 
     //Add QuickAccess checkbox
-    elm_genlist_item_append(m_genlist, m_add_to_qa_item_class, this, nullptr, ELM_GENLIST_ITEM_NONE,
-        _qa_clicked, this);
+    if (!m_state)
+        elm_genlist_item_append(m_genlist, m_add_to_qa_item_class, this, nullptr, ELM_GENLIST_ITEM_NONE,
+            _qa_clicked, this);
 }
 
 void BookmarkFlowUI::updateTopContent()

diff --git a/services/BookmarkManagerUI/BookmarkManagerUI.cpp b/services/BookmarkManagerUI/BookmarkManagerUI.cpp
index e0e4bad1439ca3fc37edf75078a66e5fb6f0c471..faac373aeb09dd6c1805e56c1ba8a9f52b07c0fe 100644 (file)
--- a/services/BookmarkManagerUI/BookmarkManagerUI.cpp
+++ b/services/BookmarkManagerUI/BookmarkManagerUI.cpp
@@ -779,7 +779,8 @@ void BookmarkManagerUI::changeState(BookmarkManagerState state)
         addFilteredBookmarkItems(BookmarkManagerGenlistFilter::Websites);
         elm_genlist_realized_items_update(m_genlist);
         showNaviframePrevButton(false);
-        m_naviframe->setRightButtonText(_("IDS_TPLATFORM_ACBUTTON_DONE_ABB"));
+        //TODO: Missing translation. In guidelines this should be uppercase
+        m_naviframe->setRightButtonText(_("IDS_BR_SK_DONE"));
         updateDeleteTopContent();
         showToolbars(false);
         evas_object_hide(m_navigatorToolbar);
@@ -807,7 +808,7 @@ void BookmarkManagerUI::changeState(BookmarkManagerState state)
         updateNoBookmarkText();
         m_naviframe->setTitle(_("IDS_BR_MBODY_HISTORY"));
         showNaviframePrevButton(false);
-        m_naviframe->setRightButtonText(_("IDS_BR_SK_DELETE"));
+        m_naviframe->setRightButtonText(_("IDS_BR_SK_DONE"));
         updateDeleteTopContent();
         showToolbars(false);
         evas_object_hide(m_navigatorToolbar);

diff --git a/services/SimpleUI/SimpleUI.cpp b/services/SimpleUI/SimpleUI.cpp
index c1f4924335bd6d3bc972ad4c8ec274803955832c..2e8ea174cbfb166fbee6eca99277fb873a88114e 100755 (executable)
--- a/services/SimpleUI/SimpleUI.cpp
+++ b/services/SimpleUI/SimpleUI.cpp
@@ -954,10 +954,11 @@ void SimpleUI::onNewFolderClicked(int parent)
     InputPopup *inputPopup =
         InputPopup::createPopup(
             m_viewManager.getContent(),
-            "New Folder",
-            "Add New Folder?",
+            _("IDS_BR_SK3_CREATE_FOLDER"),
+            "",
             "New Folder #",
-            _("IDS_BR_OPT_ADD"),
+                //TODO: Missing translation
+            "Create",
             _("IDS_BR_SK_CANCEL_ABB"));
     services::SharedBookmarkItemList badWords = m_favoriteService->getFolders(parent);
     for (auto it = badWords.begin(); it != badWords.end(); ++it)