Changeset 86958 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 23, 2020 11:23:43 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Saving/loding bookmarks

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• extradata/UIExtraDataManager.cpp (modified) (2 diffs)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• helpbrowser/UIHelpBrowserWidget.cpp (modified) (9 diffs)
• helpbrowser/UIHelpBrowserWidget.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp

@@ -241 +241 @@
 const char *UIExtraDataDefs::GUI_HelpBrowserLastURLList = "GUI/HelpBrowserLastURLList";
 const char *UIExtraDataDefs::GUI_HelpBrowserDialogGeometry = "GUI/HelpBrowserDialogGeomety";
+const char *UIExtraDataDefs::GUI_HelpBrowserBookmarks = "GUI/HelpBrowserBookmarks";
 
 /* VM Resource Monitor: */

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -440 +440 @@
         SHARED_LIBRARY_STUFF extern const char *GUI_HelpBrowserLastURLList;
         SHARED_LIBRARY_STUFF extern const char *GUI_HelpBrowserDialogGeometry;
+        SHARED_LIBRARY_STUFF extern const char *GUI_HelpBrowserBookmarks;
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -1983 +1983 @@
            << GUI_LogWindowGeometry
            << GUI_HelpBrowserLastURLList
-           << GUI_HelpBrowserDialogGeometry;
+           << GUI_HelpBrowserDialogGeometry
+           << GUI_HelpBrowserBookmarks;
 }
 
@@ -4631 +4632 @@
     /* Make sure 5th item has required value: */
     return data.size() == 5 && data[4] == GUI_Geometry_State_Max;
+}
+
+void UIExtraDataManager::setHelpBrowserBookmarks(const QStringList &bookmarks)
+{
+    setExtraDataStringList(GUI_HelpBrowserBookmarks, bookmarks);
+}
+
+QStringList UIExtraDataManager::helpBrowserBookmarks()
+{
+    return extraDataStringList(GUI_HelpBrowserBookmarks);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h

@@ -792 +792 @@
         void setHelpBrowserDialogGeometry(const QRect &geometry, bool fMaximized);
         bool helpBrowserDialogShouldBeMaximized();
+        void setHelpBrowserBookmarks(const QStringList &bookmarks);
+        QStringList helpBrowserBookmarks();
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserWidget.cpp

@@ -201 +201 @@
     UIBookmarksListContainer(QWidget *pParent = 0);
     void addBookmark(const QUrl &url, const QString &strTitle);
+    /** Return all bookmarks a url, title pair list. */
+    QStringList bookmarks() const;
     QUrl currentBookmarkUrl();
 
@@ -613 +615 @@
 
 /*********************************************************************************************************************************
-*   UIBookmarksListContainer implementation.                                                                                     *
+*   UIBookmarksListWidget implementation.                                                                                        *
 *********************************************************************************************************************************/
 UIBookmarksListWidget::UIBookmarksListWidget(QWidget *pParent /* = 0 */)
@@ -653 +655 @@
 }
 
+QStringList UIBookmarksListContainer::bookmarks() const
+{
+    if (!m_pListWidget)
+        return QStringList();
+    QStringList bookmarks;
+    for (int i = 0; i < m_pListWidget->count(); ++i)
+    {
+        QListWidgetItem *pItem = m_pListWidget->item(i);
+        if (!pItem)
+            continue;
+        bookmarks << pItem->data(iBookmarkUrlDataType).toUrl().toString() << pItem->text();
+    }
+    return bookmarks;
+}
+
 QUrl UIBookmarksListContainer::currentBookmarkUrl()
 {
@@ -668 +685 @@
     m_pMainLayout = new QVBoxLayout(this);
     AssertReturnVoid(m_pMainLayout);
+    m_pMainLayout->setContentsMargins(0, 0, 0, 0);
+
     m_pListWidget = new UIBookmarksListWidget;
     AssertReturnVoid(m_pListWidget);
@@ -992 +1011 @@
 void UIHelpBrowserTab::retranslateUi()
 {
-    setActionTextAndToolTip(m_pHomeAction, tr("Home"), tr("Return to start page"));
-    setActionTextAndToolTip(m_pBackwardAction, tr("Backward"), tr("Navigate to previous page"));
-    setActionTextAndToolTip(m_pForwardAction, tr("Forward"), tr("Navigate to next page"));
-    setActionTextAndToolTip(m_pAddBookmarkAction, tr("Bookmark"), tr("Add a new bookmark"));
-    setActionTextAndToolTip(m_pFindInPageAction, tr("Find in Page"), tr("Find a string in the current page"));
+    setActionTextAndToolTip(m_pHomeAction, tr("Home"), tr("Return to Start Page"));
+    setActionTextAndToolTip(m_pBackwardAction, tr("Backward"), tr("Navigate to Previous Page"));
+    setActionTextAndToolTip(m_pForwardAction, tr("Forward"), tr("Navigate to Next Page"));
+    setActionTextAndToolTip(m_pAddBookmarkAction, tr("Bookmark"), tr("Add a New Bookmark"));
+    setActionTextAndToolTip(m_pFindInPageAction, tr("Find in Page"), tr("Find a String in the Current Page"));
 }
 
@@ -1663 +1682 @@
         return;
     QMenu menu;
-    QAction *pCloseAll = menu.addAction(UIHelpBrowserWidget::tr("Close other tabs"));
+    QAction *pCloseAll = menu.addAction(UIHelpBrowserWidget::tr("Close Other Tabs"));
     connect(pCloseAll, &QAction::triggered, this, &UIHelpBrowserTabManager::sltHandleCloseOtherTabs);
     pCloseAll->setData(tabBar()->tabAt(pos));
 
-    QAction *pClose = menu.addAction(UIHelpBrowserWidget::tr("Close tab"));
+    QAction *pClose = menu.addAction(UIHelpBrowserWidget::tr("Close Tab"));
     connect(pClose, &QAction::triggered, this, &UIHelpBrowserTabManager::sltHandleContextMenuTabClose);
     pClose->setData(tabBar()->tabAt(pos));
@@ -1781 +1800 @@
     prepareSearchWidgets();
     prepareMenu();
+    loadBookmarks();
     retranslateUi();
 }
@@ -1978 +1998 @@
 }
 
+void UIHelpBrowserWidget::loadBookmarks()
+{
+    if (!m_pBookmarksWidget)
+        return;
+
+    QStringList bookmarks = gEDataManager->helpBrowserBookmarks();
+    /* bookmarks list is supposed to have url title pair: */
+    for (int i = 0; i < bookmarks.size(); ++i)
+    {
+        const QString &url = bookmarks[i];
+        if (i+1 >= bookmarks.size())
+            break;
+        ++i;
+        const QString &strTitle = bookmarks[i];
+        printf("%s %s\n", qPrintable(url), qPrintable(strTitle));
+        m_pBookmarksWidget->addBookmark(url, strTitle);
+    }
+}
+
+void UIHelpBrowserWidget::saveBookmarks()
+{
+    if (!m_pBookmarksWidget)
+        return;
+    gEDataManager->setHelpBrowserBookmarks(m_pBookmarksWidget->bookmarks());
+}
+
 void UIHelpBrowserWidget::saveOptions()
 {
@@ -2029 +2075 @@
 void UIHelpBrowserWidget::cleanup()
 {
-    /* Save options: */
     saveOptions();
+    saveBookmarks();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserWidget.h

@@ -47 +47 @@
 class QHelpSearchQueryWidget;
 class QHelpSearchResultWidget;
+class QListWidget;
 class QPlainTextEdit;
 class QSplitter;
@@ -111 +112 @@
     void loadOptions();
     QStringList loadSavedUrlList();
+    /** Bookmark list is save as url-title pairs. */
+    void loadBookmarks();
+    void saveBookmarks();
     void saveOptions();
     void cleanup();
@@ -168 +172 @@
     QAction             *m_pFontSizeSmallerAction;
     QAction             *m_pFontSizeResetAction;
+
     /* This is set t true when handling QHelpContentModel::contentsCreated signal. */
     bool                 m_fModelContentCreated;