Bug TT-96 Fixed 'Bookmark Manager' button in the More Menu 15/45815/7
authort.dakowicz <t.dakowicz@samsung.com>
Tue, 11 Aug 2015 12:46:23 +0000 (14:46 +0200)
committerTomasz Dakowicz <t.dakowicz@samsung.com>
Tue, 11 Aug 2015 14:08:12 +0000 (07:08 -0700)
[Issue#] https://bugs.tizen.org/jira/browse/TT-96
[Problem] Bookmark Manager couldn't be accessed from
          More Menu
[Cause] Proper signal wasn't created
[Solution] Added signal to MoreMenu class
[Verify] Check if Bookmark Manager button does anything

Change-Id: Idad6aaa774ad30fb9ff9b0207d4ef2a2004bf751

services/MoreMenuUI/MoreMenuUI.cpp
services/MoreMenuUI/MoreMenuUI.h
services/SimpleUI/SimpleUI.cpp

index 0a61323..2670648 100644 (file)
@@ -452,8 +452,10 @@ void MoreMenuUI::_thumbSelected(void* data, Evas_Object*, void*)
         case SETTINGS:
             itemData->moreMenuUI->settingsClicked(std::string());
             break;
-        case READER_MODE:
         case BOOKMARK_MANAGER:
+            itemData->moreMenuUI->bookmarkManagerClicked(std::string());
+            break;
+        case READER_MODE:
         case SCREEN_ZOOM:
         case START_MINIBROWSER:
         case FOCUS_MODE:
index 7f0812b..a837fad 100644 (file)
@@ -65,6 +65,7 @@ public:
     void clearItems();
     void getBookmarkFolderList(std::vector<std::shared_ptr<tizen_browser::services::BookmarkItem> > );
 
+    boost::signals2::signal<void (std::string)> bookmarkManagerClicked;
     boost::signals2::signal<void (std::string)> historyUIClicked;
     boost::signals2::signal<void (const char*, int, int)> BookmarkFolderCreated;
     boost::signals2::signal<void (std::string)> closeMoreMenuClicked;
index 1a2ad29..0ccc4d0 100644 (file)
@@ -1046,7 +1046,7 @@ void SimpleUI::showMainUI()
        m_mainUI->historyClicked.connect(boost::bind(&SimpleUI::onHistoryClicked, this,_1));
        m_mainUI->mostVisitedClicked.connect(boost::bind(&SimpleUI::onMostVisitedClicked, this,_1));
        m_mainUI->bookmarkClicked.connect(boost::bind(&SimpleUI::onBookmarkButtonClicked, this,_1));
-        m_mainUI->bookmarkManagerClicked.connect(boost::bind(&SimpleUI::onBookmarkManagerButtonClicked, this,_1));
+    m_mainUI->bookmarkManagerClicked.connect(boost::bind(&SimpleUI::onBookmarkManagerButtonClicked, this,_1));
        m_isHomePageActive = true;
 }
 
@@ -1107,6 +1107,7 @@ void SimpleUI::showMoreMenu()
                 <tizen_browser::base_ui::MoreMenuUI,tizen_browser::core::AbstractService>
                 (tizen_browser::core::ServiceManager::getInstance().getService("org.tizen.browser.moremenuui"));
         M_ASSERT(m_moreMenuUI);
+    m_moreMenuUI->bookmarkManagerClicked.connect(boost::bind(&SimpleUI::onBookmarkManagerButtonClicked, this, _1));
        m_moreMenuUI->historyUIClicked.connect(boost::bind(&SimpleUI::showHistoryUI, this,_1));
        m_moreMenuUI->settingsClicked.connect(boost::bind(&SimpleUI::showSettingsUI, this,_1));
        m_moreMenuUI->closeMoreMenuClicked.disconnect_all_slots();