[Porting_2.4_UI_to_3.0] Single Select Folder

[Issue]        http://suprem.sec.samsung.net/jira/browse/TWF-1847
[Problem]      Old UI.
[Solution]     Create new UI.
[Verify]       Open browser, Add Bookmark, Click on Folder. Choose
               folder and press DONE. Go to Bookmark Manager and
               edit bookmark changing folder.

Change-Id: I999ba3aad5d0b951ba947386324570b742730e09

diff --git a/services/BookmarkFlowUI/BookmarkFlowUI.cpp b/services/BookmarkFlowUI/BookmarkFlowUI.cpp
index 2cace3bac9b4251db821d2cf5104b0294ada1f94..5f86ba366adb58dfc1946041db25b42a3e0b8c74 100755 (executable)
--- a/services/BookmarkFlowUI/BookmarkFlowUI.cpp
+++ b/services/BookmarkFlowUI/BookmarkFlowUI.cpp
@@ -269,7 +269,7 @@ void BookmarkFlowUI::fillGenlist()
 
     //Add folder picker
     elm_genlist_item_append(m_genlist, m_folder_item_class, folderData, nullptr, ELM_GENLIST_ITEM_NONE,
-        _folder_selector_clicked, folderData);
+        _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,
@@ -510,8 +510,8 @@ void BookmarkFlowUI::_folder_selector_clicked(void *data, Evas_Object *, void *)
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     if (data) {
-        //BookmarkFlowUI* bookmarkFlowUI = static_cast<BookmarkFlowUI*>(data);
-        //TODO: Add location selector functionality
+        BookmarkFlowUI* bookmarkFlowUI = static_cast<BookmarkFlowUI*>(data);
+        bookmarkFlowUI->showSelectFolderUI(bookmarkFlowUI->m_bookmarkItem);
     } else
         BROWSER_LOGW("[%s] data = nullptr", __PRETTY_FUNCTION__);
 }

diff --git a/services/BookmarkFlowUI/BookmarkFlowUI.h b/services/BookmarkFlowUI/BookmarkFlowUI.h
index 94bf4da6b15e97fd25c5f6c84593d9aa60225556..7e27eda5e10542df47e8f48b406ba6ce295a8904 100644 (file)
--- a/services/BookmarkFlowUI/BookmarkFlowUI.h
+++ b/services/BookmarkFlowUI/BookmarkFlowUI.h
@@ -75,6 +75,7 @@ public:
     boost::signals2::signal<void ()> closeBookmarkFlowClicked;
     boost::signals2::signal<void (BookmarkUpdate)> saveBookmark;
     boost::signals2::signal<void (BookmarkUpdate)> editBookmark;
+    boost::signals2::signal<void (services::SharedBookmarkItem)> showSelectFolderUI;
 
 private:
     struct FolderData {

diff --git a/services/BookmarkManagerUI/BookmarkManagerUI.cpp b/services/BookmarkManagerUI/BookmarkManagerUI.cpp
index 2eb13eaafeaf9a93290c01e86be8ad3dc26a5e89..f86d65145212531115f01ea896aa661f65cb70a1 100644 (file)
--- a/services/BookmarkManagerUI/BookmarkManagerUI.cpp
+++ b/services/BookmarkManagerUI/BookmarkManagerUI.cpp
@@ -45,7 +45,7 @@ BookmarkManagerUI::BookmarkManagerUI()
     , b_mm_layout(nullptr)
     , m_content(nullptr)
     , m_cancel_button(nullptr)
-    , m_delete_button(nullptr)
+    , m_accept_button(nullptr)
     , m_prev_button(nullptr)
     , m_modulesToolbar(nullptr)
     , m_navigatorToolbar(nullptr)
@@ -93,7 +93,7 @@ Evas_Object* BookmarkManagerUI::getContent()
     M_ASSERT(m_parent);
     if (!b_mm_layout)
       b_mm_layout = createBookmarksLayout(m_parent);
-    changeState(BookmarkManagerState::Default);
+    changeState(m_state);
 
     return b_mm_layout;
 }
@@ -301,13 +301,12 @@ void BookmarkManagerUI::createTopContent()
     evas_object_size_hint_weight_set(m_cancel_button, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
     evas_object_size_hint_align_set(m_cancel_button, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
-    m_delete_button = elm_button_add(b_mm_layout);
-    elm_object_part_content_set(b_mm_layout, "title_right_btn", m_delete_button);
-    elm_object_style_set(m_delete_button, "naviframe/title_right");
-    elm_object_text_set(m_delete_button, _("IDS_TPLATFORM_ACBUTTON_DELETE_ABB"));
-    evas_object_smart_callback_add(m_delete_button, "clicked", _delete_clicked, this);
-    evas_object_size_hint_weight_set(m_delete_button, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    evas_object_size_hint_align_set(m_delete_button, EVAS_HINT_FILL, EVAS_HINT_FILL);
+    m_accept_button = elm_button_add(b_mm_layout);
+    elm_object_part_content_set(b_mm_layout, "title_right_btn", m_accept_button);
+    elm_object_style_set(m_accept_button, "naviframe/title_right");
+    evas_object_smart_callback_add(m_accept_button, "clicked", _accept_clicked, this);
+    evas_object_size_hint_weight_set(m_accept_button, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+    evas_object_size_hint_align_set(m_accept_button, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
     m_prev_button = elm_button_add(b_mm_layout);
     elm_object_part_content_set(b_mm_layout, "elm.swallow.prev_btn", m_prev_button);
@@ -322,25 +321,33 @@ void BookmarkManagerUI::_cancel_clicked(void* data, Evas_Object*, void*)
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     if (data) {
         BookmarkManagerUI* bookmarkManagerUI = static_cast<BookmarkManagerUI*>(data);
-        bookmarkManagerUI->updateGenlistItems();
-        bookmarkManagerUI->changeState(BookmarkManagerState::Default);
+        bookmarkManagerUI->onBackPressed();
     } else
         BROWSER_LOGW("[%s] data = nullptr", __PRETTY_FUNCTION__);
 }
 
-void BookmarkManagerUI::_delete_clicked(void* data, Evas_Object*, void*)
+void BookmarkManagerUI::_accept_clicked(void* data, Evas_Object*, void*)
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     if (data) {
         BookmarkManagerUI* bookmarkManagerUI = static_cast<BookmarkManagerUI*>(data);
-        for (auto it = bookmarkManagerUI->m_map_delete.begin(); it != bookmarkManagerUI->m_map_delete.end(); ++it)
-            if (it->second) {
-                BookmarkData *bookmarkData = static_cast<BookmarkData*>(elm_object_item_data_get(bookmarkManagerUI->m_map_bookmark[it->first]));
-                bookmarkManagerUI->bookmarkItemDeleted(bookmarkData->bookmarkItem);
-                elm_object_item_del(bookmarkManagerUI->m_map_bookmark[it->first]);
-                bookmarkManagerUI->m_map_bookmark.erase(it->first);
-            }
-        bookmarkManagerUI->changeState(BookmarkManagerState::Default);
+        switch (bookmarkManagerUI->m_state) {
+        case BookmarkManagerState::Delete:
+            for (auto it = bookmarkManagerUI->m_map_delete.begin(); it != bookmarkManagerUI->m_map_delete.end(); ++it)
+                if (it->second) {
+                    BookmarkData *bookmarkData = static_cast<BookmarkData*>(elm_object_item_data_get(bookmarkManagerUI->m_map_bookmark[it->first]));
+                    bookmarkManagerUI->bookmarkItemDeleted(bookmarkData->bookmarkItem);
+                    elm_object_item_del(bookmarkManagerUI->m_map_bookmark[it->first]);
+                    bookmarkManagerUI->m_map_bookmark.erase(it->first);
+                }
+            break;
+        case BookmarkManagerState::SelectFolder:
+            bookmarkManagerUI->folderSelected(bookmarkManagerUI->m_folder_path.back());
+        break;
+        default:
+            break;
+        }
+        bookmarkManagerUI->onBackPressed();
     } else
         BROWSER_LOGW("[%s] data = nullptr", __PRETTY_FUNCTION__);
 }
@@ -410,10 +417,12 @@ void BookmarkManagerUI::_select_all_state_changed(void *data, Evas_Object *obj,
         BROWSER_LOGW("[%s] data = nullptr", __PRETTY_FUNCTION__);
 }
 
-void BookmarkManagerUI::addBookmarkItems(std::shared_ptr<services::BookmarkItem> parent, std::vector<std::shared_ptr<services::BookmarkItem> > items)
+void BookmarkManagerUI::addBookmarkItems(std::shared_ptr<services::BookmarkItem> parent,
+                                         std::vector<std::shared_ptr<services::BookmarkItem> > items)
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    if (parent && (m_folder_path.empty() || m_folder_path.back() != parent)) {
+
+    if (parent && (m_folder_path.empty() || m_folder_path.back()->getId() != parent->getId())) {
         if (parent->getParent() == -1) {
             int count = elm_toolbar_items_count(m_navigatorToolbar);
             for (int i = 0; i < count; ++i)
@@ -457,13 +466,17 @@ void BookmarkManagerUI::onBackPressed()
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     switch (m_state) {
-        case BookmarkManagerState::Default:
-            //TODO: We should go to the previous navigatorToolbar element if it exists.
-            closeBookmarkManagerClicked();
-            break;
-        default:
-            changeState(BookmarkManagerState::Default);
-            break;
+    case BookmarkManagerState::SelectFolder:
+        closeBookmarkManagerClicked();
+        changeState(BookmarkManagerState::Default);
+        break;
+    case BookmarkManagerState::Default:
+        //TODO: We should go to the previous navigatorToolbar element if it exists.
+        closeBookmarkManagerClicked();
+        break;
+    default:
+        changeState(BookmarkManagerState::Default);
+        break;
     }
 }
 
@@ -472,9 +485,10 @@ void BookmarkManagerUI::showContextMenu()
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     boost::optional<Evas_Object*> window = getWindow();
     if (window) {
-        if (m_state == BookmarkManagerState::Default) {
+        if (m_state == BookmarkManagerState::Default ||
+            m_state == BookmarkManagerState::SelectFolder) {
             createContextMenu(*window);
-            if (elm_genlist_items_count(m_genlist)) {
+            if (m_state == BookmarkManagerState::Default && elm_genlist_items_count(m_genlist)) {
                 elm_ctxpopup_item_append(m_ctxpopup, _("IDS_BR_SK_DELETE"), nullptr,
                                          _cm_delete_clicked, this);
                 elm_ctxpopup_item_append(m_ctxpopup, _("IDS_BR_OPT_SHARE"), nullptr,
@@ -596,6 +610,9 @@ void BookmarkManagerUI::_bookmarkItemClicked(void * data, Evas_Object *, void *)
         case BookmarkManagerState::Default:
             bookmarkData->bookmarkManagerUI->bookmarkItemClicked(bookmarkData->bookmarkItem);
             break;
+        case BookmarkManagerState::SelectFolder:
+            bookmarkData->bookmarkManagerUI->bookmarkItemClicked(bookmarkData->bookmarkItem);
+            break;
         case BookmarkManagerState::Edit:
             bookmarkData->bookmarkManagerUI->bookmarkItemEdit(bookmarkData->bookmarkItem);
             bookmarkData->bookmarkManagerUI->changeState(BookmarkManagerState::Default);
@@ -618,6 +635,17 @@ void BookmarkManagerUI::changeState(BookmarkManagerState state)
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     m_state = state;
     switch (state) {
+    case BookmarkManagerState::SelectFolder:
+        elm_genlist_realized_items_update(m_genlist);
+        elm_object_signal_emit(b_mm_layout, "elm,state,prev_btn,hide", "elm");
+        elm_object_signal_emit(b_mm_layout, "elm,state,title_left_btn,show", "elm");
+        elm_object_signal_emit(b_mm_layout, "elm,state,title_right_btn,show", "elm");
+        elm_object_text_set(m_accept_button, _("IDS_TPLATFORM_ACBUTTON_DONE_ABB"));
+        elm_object_signal_emit(m_content, "show_toolbars", "ui");
+        evas_object_show(m_navigatorToolbar);
+        elm_object_signal_emit(m_content, "hide_modules_toolbar", "ui");
+        evas_object_hide(m_modulesToolbar);
+        break;
     case BookmarkManagerState::Edit:
         m_reordered = false;
         elm_object_signal_emit(b_mm_layout, "elm,state,title_left_btn,hide", "elm");
@@ -638,6 +666,7 @@ void BookmarkManagerUI::changeState(BookmarkManagerState state)
         elm_object_signal_emit(b_mm_layout, "elm,state,prev_btn,hide", "elm");
         elm_object_signal_emit(b_mm_layout, "elm,state,title_left_btn,show", "elm");
         elm_object_signal_emit(b_mm_layout, "elm,state,title_right_btn,show", "elm");
+        elm_object_text_set(m_accept_button, _("IDS_TPLATFORM_ACBUTTON_DELETE_ABB"));
         updateDeleteTopContent();
         elm_object_signal_emit(m_content, "hide_toolbars", "ui");
         evas_object_hide(m_modulesToolbar);
@@ -675,16 +704,6 @@ void BookmarkManagerUI::changeState(BookmarkManagerState state)
     elm_genlist_realized_items_update(m_genlist);
 }
 
-void BookmarkManagerUI::updateGenlistItems()
-{
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    for (auto it = m_map_delete.begin(); it != m_map_delete.end(); ++it)
-        if (it->second) {
-            it->second = false;
-            elm_genlist_item_update(m_map_bookmark[it->first]);
-        }
-}
-
 void BookmarkManagerUI::reoderBookmarkItems()
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
@@ -730,11 +749,11 @@ void BookmarkManagerUI::updateDeleteTopContent()
     if (m_delete_count) {
         elm_object_part_text_set(b_mm_layout, "elm.text.title",
                 (boost::format(_("IDS_BR_HEADER_PD_SELECTED_ABB")) % m_delete_count).str().c_str());
-        elm_object_signal_emit(m_delete_button, "elm,state,enabled", "elm");
+        elm_object_signal_emit(m_accept_button, "elm,state,enabled", "elm");
     } else {
         elm_object_part_text_set(b_mm_layout, "elm.text.title", "Select Items");
         //TODO: Add translation
-        elm_object_signal_emit(m_delete_button, "elm,state,disabled", "elm");
+        elm_object_signal_emit(m_accept_button, "elm,state,disabled", "elm");
     }
 }
 

diff --git a/services/BookmarkManagerUI/BookmarkManagerUI.h b/services/BookmarkManagerUI/BookmarkManagerUI.h
index a3eadd2c1ca67b47c22890dca6a980330291d9f4..2407f6a76c5dae9f99ffec269c1e4cd11c9e29af 100644 (file)
--- a/services/BookmarkManagerUI/BookmarkManagerUI.h
+++ b/services/BookmarkManagerUI/BookmarkManagerUI.h
@@ -35,6 +35,7 @@ namespace base_ui{
 
 enum class BookmarkManagerState {
     Default,
+    SelectFolder,
     Edit,
     Delete,
     Reorder
@@ -59,6 +60,7 @@ public:
 
     void orientationChanged() {};
     void onBackPressed();
+    void setState(BookmarkManagerState state) { m_state = state; }
 
     //AbstractContextMenu interface implementation
     virtual void showContextMenu() override;
@@ -68,6 +70,7 @@ public:
 
     boost::signals2::signal<void ()> showHistory;
     boost::signals2::signal<void ()> closeBookmarkManagerClicked;
+    boost::signals2::signal<void (services::SharedBookmarkItem)> folderSelected;
     boost::signals2::signal<void (std::shared_ptr<tizen_browser::services::BookmarkItem>)> bookmarkItemClicked;
     boost::signals2::signal<void (std::shared_ptr<tizen_browser::services::BookmarkItem>)> bookmarkItemEdit;
     boost::signals2::signal<void (std::shared_ptr<tizen_browser::services::BookmarkItem>)> bookmarkItemOrderEdited;
@@ -99,7 +102,6 @@ private:
     void addBookmarkItem(BookmarkData* item);
 
     void changeState(BookmarkManagerState state);
-    void updateGenlistItems();
     void reoderBookmarkItems();
     void updateNoBookmarkText();
     void updateDeleteClick(int id);
@@ -110,7 +112,7 @@ private:
     static void _modules_history_clicked(void* data, Evas_Object* obj, void* event_info);
     static void _bookmarkItemClicked(void* data, Evas_Object*, void*);
     static void _cancel_clicked(void *data, Evas_Object *, void *);
-    static void _delete_clicked(void *data, Evas_Object *, void *);
+    static void _accept_clicked(void *data, Evas_Object *, void *);
     static void _prev_clicked(void *data, Evas_Object *, void *);
     static void _check_state_changed(void *data, Evas_Object *, void *);
     static void _genlist_bookmark_moved(void *data, Evas_Object *, void *);
@@ -130,7 +132,7 @@ private:
     Evas_Object *b_mm_layout;
     Evas_Object *m_content;
     Evas_Object *m_cancel_button;
-    Evas_Object *m_delete_button;
+    Evas_Object *m_accept_button;
     Evas_Object *m_prev_button;
     Evas_Object *m_modulesToolbar;
     Evas_Object *m_navigatorToolbar;

diff --git a/services/BookmarkManagerUI/edc/BookmarkManagerUI_mob.edc b/services/BookmarkManagerUI/edc/BookmarkManagerUI_mob.edc
index 5b6eaba491b1cb7368938b4e056ab6edeffeafb9..dc0dcbe7586b7ee30a52d6a11999e91719890e93 100644 (file)
--- a/services/BookmarkManagerUI/edc/BookmarkManagerUI_mob.edc
+++ b/services/BookmarkManagerUI/edc/BookmarkManagerUI_mob.edc
@@ -78,6 +78,10 @@ collections {
                     inherit: "default";
                     visible: 0;
                 }
+                description {
+                    state: "hidden_modules_toolbar" 0.0;
+                    inherit: "hidden_toolbar";
+                }
             }
             part {
                 name: "navigator_toolbar";
@@ -96,6 +100,14 @@ collections {
                     }
                     rel2.relative: 1.0 1.0;
                 }
+                description {
+                    state: "hidden_modules_toolbar" 0.0;
+                    inherit: "default";
+                    rel1 {
+                        relative: 0.0 0.0;
+                        to: "bg";
+                    }
+                }
                 description {
                     state: "hidden_toolbar" 0.0;
                     inherit: "default";
@@ -169,6 +181,14 @@ collections {
                 action: STATE_SET "default" 0.0;
                 target: "elm.swallow.content_overlay";
             }
+            program {
+                name: "hide_modules_toolbar";
+                signal: "hide_modules_toolbar";
+                source: "ui";
+                action: STATE_SET "hidden_modules_toolbar" 0.0;
+                target: "modules_toolbar";
+                target: "navigator_toolbar";
+            }
             program {
                 name: "hide_toolbars";
                 signal: "hide_toolbars";

diff --git a/services/SimpleUI/SimpleUI.cpp b/services/SimpleUI/SimpleUI.cpp
index ed5479c7173fd51275aea86b8d71cd1caad5db02..3da67e89edf1470465554642a13e7aecbc620c7f 100755 (executable)
--- a/services/SimpleUI/SimpleUI.cpp
+++ b/services/SimpleUI/SimpleUI.cpp
@@ -298,13 +298,15 @@ void SimpleUI::connectUISignals()
     m_webPageUI->backPage.connect(boost::bind(&SimpleUI::switchViewToWebPage, this));
     m_webPageUI->backPage.connect(boost::bind(&tizen_browser::basic_webengine::AbstractWebEngine<Evas_Object>::back, m_webEngine.get()));
     m_webPageUI->showTabUI.connect(boost::bind(&SimpleUI::showTabUI, this));
-    m_webPageUI->showBookmarksUI.connect(boost::bind(&SimpleUI::showBookmarkManagerUI, this,m_favoriteService->getRoot()));
+    m_webPageUI->showBookmarksUI.connect(boost::bind(&SimpleUI::showBookmarkManagerUI, this,
+        m_favoriteService->getRoot(), BookmarkManagerState::Default));
     m_webPageUI->forwardPage.connect(boost::bind(&tizen_browser::basic_webengine::AbstractWebEngine<Evas_Object>::forward, m_webEngine.get()));
     m_webPageUI->showQuickAccess.connect(boost::bind(&SimpleUI::showQuickAccess, this));
     m_webPageUI->hideQuickAccess.connect(boost::bind(&QuickAccess::hideUI, m_quickAccess));
     m_webPageUI->focusWebView.connect(boost::bind(&tizen_browser::basic_webengine::AbstractWebEngine<Evas_Object>::setFocus, m_webEngine.get()));
     m_webPageUI->unfocusWebView.connect(boost::bind(&tizen_browser::basic_webengine::AbstractWebEngine<Evas_Object>::clearFocus, m_webEngine.get()));
-    m_webPageUI->bookmarkManagerClicked.connect(boost::bind(&SimpleUI::showBookmarkManagerUI, this, m_favoriteService->getRoot()));
+    m_webPageUI->bookmarkManagerClicked.connect(boost::bind(&SimpleUI::showBookmarkManagerUI, this,
+        m_favoriteService->getRoot(), BookmarkManagerState::Default));
     m_webPageUI->getWindow.connect(boost::bind(&SimpleUI::getMainWindow, this));
     m_webPageUI->isBookmark.connect(boost::bind(&SimpleUI::checkBookmark, this));
     m_webPageUI->deleteBookmark.connect(boost::bind(&SimpleUI::deleteBookmark, this));
@@ -332,7 +334,8 @@ void SimpleUI::connectUISignals()
     m_quickAccess->mostVisitedTileClicked.connect(boost::bind(&SimpleUI::onMostVisitedTileClicked, this, _1, _2));
     m_quickAccess->getMostVisitedItems.connect(boost::bind(&SimpleUI::onMostVisitedClicked, this));
     m_quickAccess->getBookmarksItems.connect(boost::bind(&SimpleUI::onBookmarkButtonClicked, this));
-    m_quickAccess->bookmarkManagerClicked.connect(boost::bind(&SimpleUI::showBookmarkManagerUI, this, m_favoriteService->getRoot()));
+    m_quickAccess->bookmarkManagerClicked.connect(boost::bind(&SimpleUI::showBookmarkManagerUI, this,
+        m_favoriteService->getRoot(), BookmarkManagerState::Default));
     m_quickAccess->switchViewToWebPage.connect(boost::bind(&SimpleUI::switchViewToWebPage, this));
 #if PROFILE_MOBILE
     m_quickAccess->isLandscape.connect(boost::bind(&SimpleUI::isLandscape, this));
@@ -367,6 +370,8 @@ void SimpleUI::connectUISignals()
     m_bookmarkFlowUI->closeBookmarkFlowClicked.connect(boost::bind(&SimpleUI::closeBookmarkFlowUI, this));
     m_bookmarkFlowUI->saveBookmark.connect(boost::bind(&SimpleUI::addBookmark, this, _1));
     m_bookmarkFlowUI->editBookmark.connect(boost::bind(&SimpleUI::editBookmark, this, _1));
+    m_bookmarkFlowUI->showSelectFolderUI.connect(boost::bind(&SimpleUI::showBookmarkManagerUI, this,
+        _1, BookmarkManagerState::SelectFolder));
 
     M_ASSERT(m_findOnPageUI.get());
     m_findOnPageUI->closeFindOnPageUIClicked.connect(boost::bind(&SimpleUI::closeFindOnPageUI, this));
@@ -375,14 +380,15 @@ void SimpleUI::connectUISignals()
     M_ASSERT(m_bookmarkManagerUI.get());
     m_bookmarkManagerUI->showHistory.connect(boost::bind(&SimpleUI::showHistoryUI, this));
     m_bookmarkManagerUI->closeBookmarkManagerClicked.connect(boost::bind(&SimpleUI::closeBookmarkManagerUI, this));
+    m_bookmarkManagerUI->folderSelected.connect(boost::bind(&BookmarkFlowUI::setFolder, m_bookmarkFlowUI.get(), _1));
     m_bookmarkManagerUI->getWindow.connect(boost::bind(&SimpleUI::getMainWindow, this));
     m_bookmarkManagerUI->bookmarkItemClicked.connect(boost::bind(&SimpleUI::onBookmarkClicked, this, _1));
     m_bookmarkManagerUI->bookmarkItemEdit.connect(boost::bind(&SimpleUI::onBookmarkEdit, this, _1));
     m_bookmarkManagerUI->bookmarkItemOrderEdited.connect(boost::bind(&SimpleUI::onBookmarkOrderEdited, this, _1));
     m_bookmarkManagerUI->bookmarkItemDeleted.connect(boost::bind(&SimpleUI::onBookmarkDeleted, this, _1));
-#if PROFILE_MOBILE
     m_bookmarkManagerUI->newFolderItemClicked.connect(boost::bind(&SimpleUI::onNewFolderClicked, this, _1));
     m_bookmarkManagerUI->isLandscape.connect(boost::bind(&SimpleUI::isLandscape, this));
+#if PROFILE_MOBILE
     m_quickAccess->addQuickAccessClicked.connect(boost::bind(&SimpleUI::onNewQuickAccessClicked, this));
 #else
     M_ASSERT(m_zoomUI.get());
@@ -1552,12 +1558,14 @@ void SimpleUI::closeBookmarkFlowUI()
         m_viewManager.popTheStack();
 }
 
-void SimpleUI::showBookmarkManagerUI(std::shared_ptr<services::BookmarkItem> parent)
+void SimpleUI::showBookmarkManagerUI(std::shared_ptr<services::BookmarkItem> parent,
+    BookmarkManagerState state)
 {
-    BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
+    BROWSER_LOGD("[%s:%d]", __PRETTY_FUNCTION__, __LINE__);
+    m_bookmarkManagerUI->setState(state);
     m_viewManager.pushViewToStack(m_bookmarkManagerUI.get());
-    m_bookmarkManagerUI->addBookmarkItems(parent, m_favoriteService->getAllBookmarkItems());
-    m_bookmarkManagerUI->showUI();
+    m_bookmarkManagerUI->addBookmarkItems(parent,
+        m_favoriteService->getAllBookmarkItems(parent->getId()));
 }
 
 void SimpleUI::redirectedWebPage(const std::string& oldUrl, const std::string& newUrl)

diff --git a/services/SimpleUI/SimpleUI.h b/services/SimpleUI/SimpleUI.h
index 8b14422788b264448d9c25f45dbd253598b29fc9..78c8eaf3a3b7c4c5fda343cae5b00c2ef9b8f73a 100644 (file)
--- a/services/SimpleUI/SimpleUI.h
+++ b/services/SimpleUI/SimpleUI.h
@@ -264,12 +264,12 @@ private:
     std::string requestSettingsCurrentPage();
 
     void showBookmarkFlowUI();
+    void closeBookmarkFlowUI();
     void showFindOnPageUI(const std::string& str);
 #if PROFILE_MOBILE
     void showCertificatePopup();
     void showCertificatePopup(const std::string& host, const std::string& pem, services::CertificateContents::HOST_TYPE type);
     void showUnsecureConnectionPopup();
-    void closeBookmarkFlowUI();
 
     void findWord(const struct FindData& fdata);
     void closeFindOnPageUI();
@@ -285,7 +285,8 @@ private:
 #endif
     Evas_Object* getMainWindow();
     void closeBookmarkManagerUI();
-    void showBookmarkManagerUI(std::shared_ptr<services::BookmarkItem> parent);
+    void showBookmarkManagerUI(std::shared_ptr<services::BookmarkItem> parent,
+                               BookmarkManagerState state);
     void redirectedWebPage(const std::string& oldUrl, const std::string& newUrl);
 
     void showPopup(interfaces::AbstractPopup* popup);
@@ -323,8 +324,9 @@ private:
     std::shared_ptr<interfaces::AbstractFavoriteService> m_favoriteService;
     std::shared_ptr<services::HistoryService> m_historyService;
     services::TabServicePtr m_tabService;
-#if PROFILE_MOBILE
+
     std::shared_ptr<BookmarkFlowUI> m_bookmarkFlowUI;
+#if PROFILE_MOBILE
     std::shared_ptr<FindOnPageUI> m_findOnPageUI;
 #else
     std::shared_ptr<tizen_browser::base_ui::ZoomUI> m_zoomUI;