Changeset 86835 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Nov 9, 2020 4:56:38 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Making the bookmark stuff a bit more useful.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser

Files:

• UIHelpBrowserWidget.cpp (modified) (14 diffs)
• UIHelpBrowserWidget.h (modified) (3 diffs)

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

@@ -31 +31 @@
 #endif
 #include <QLabel>
+#include <QListWidget>
 #include <QMenu>
 #include <QMouseEvent>
 #include <QPixmap>
+#include <QPushButton>
 #include <QScrollBar>
 #include <QSpacerItem>
@@ -73 +75 @@
 Q_DECLARE_METATYPE(HelpBrowserTabs);
 
+const int iBookmarkUrlDataType = 6;
+
+
+/*********************************************************************************************************************************
+*   UIBookmarksListContainer definition.                                                                                         *
+*********************************************************************************************************************************/
+class UIBookmarksListWidget : public QListWidget
+{
+
+    Q_OBJECT;
+
+signals:
+
+    void sigBookmarkDoubleClick(const QUrl &url);
+
+public:
+
+    UIBookmarksListWidget(QWidget *pParent = 0);
+
+protected:
+
+    void mouseDoubleClickEvent(QMouseEvent *event) /* override */;
+
+};
+
+
+/*********************************************************************************************************************************
+*   UIBookmarksListContainer definition.                                                                                         *
+*********************************************************************************************************************************/
+class UIBookmarksListContainer : public QIWithRetranslateUI<QWidget>
+{
+
+    Q_OBJECT;
+
+signals:
+
+    void sigBookmarkDoubleClick(const QUrl &url);
+    void sigListWidgetContextMenuRequest(const QPoint &listWidgetLocalPos);
+
+public:
+
+    UIBookmarksListContainer(QWidget *pParent = 0);
+    void addBookmark(const QUrl &url, const QString &strTitle);
+    QUrl currentBookmarkUrl();
+
+protected:
+
+    void retranslateUi() /* override */;
+
+private:
+
+    void prepare();
+    int itemIndex(const QUrl &url);
+
+    QVBoxLayout  *m_pMainLayout;
+    UIBookmarksListWidget  *m_pListWidget;
+};
 
 /*********************************************************************************************************************************
@@ -182 +241 @@
     void sigTitleUpdate(const QString &strTitle);
     void sigOpenLinkInNewTab(const QUrl &url);
+    void sigAddBookmark(const QUrl &url, const QString &strTitle);
 
 public:
@@ -240 +300 @@
 
     void sigSourceChanged(const QUrl &url);
+    void sigAddBookmark(const QUrl &url, const QString &strTitle);
 
 public:
@@ -271 +332 @@
     bool m_fSwitchToNewTab;
 };
+
+
+/*********************************************************************************************************************************
+*   UIBookmarksListContainer implementation.                                                                                     *
+*********************************************************************************************************************************/
+UIBookmarksListWidget::UIBookmarksListWidget(QWidget *pParent /* = 0 */)
+    :QListWidget(pParent)
+{
+}
+
+void UIBookmarksListWidget::mouseDoubleClickEvent(QMouseEvent *event)
+{
+    QListWidgetItem *pItem = currentItem();
+    if (!pItem)
+        return;
+    emit sigBookmarkDoubleClick(pItem->data(iBookmarkUrlDataType).toUrl());
+    QListWidget::mouseDoubleClickEvent(event);
+}
+
+
+/*********************************************************************************************************************************
+*   UIBookmarksListContainer implementation.                                                                                     *
+*********************************************************************************************************************************/
+
+UIBookmarksListContainer::UIBookmarksListContainer(QWidget *pParent /* = 0 */)
+    :QIWithRetranslateUI<QWidget>(pParent)
+    , m_pMainLayout(0)
+    , m_pListWidget(0)
+{
+    prepare();
+}
+
+void UIBookmarksListContainer::addBookmark(const QUrl &url, const QString &strTitle)
+{
+    if (!m_pListWidget)
+        return;
+    if (itemIndex(url) != -1)
+        return;
+    QListWidgetItem *pNewItem = new QListWidgetItem(strTitle, m_pListWidget);
+    pNewItem->setData(iBookmarkUrlDataType, url);
+    pNewItem->setToolTip(url.toString());
+}
+
+QUrl UIBookmarksListContainer::currentBookmarkUrl()
+{
+    if (!m_pListWidget || !m_pListWidget->currentItem())
+        return QUrl();
+    return m_pListWidget->currentItem()->data(iBookmarkUrlDataType).toUrl();
+}
+
+void UIBookmarksListContainer::retranslateUi()
+{
+}
+
+void UIBookmarksListContainer::prepare()
+{
+    m_pMainLayout = new QVBoxLayout(this);
+    AssertReturnVoid(m_pMainLayout);
+    m_pListWidget = new UIBookmarksListWidget;
+    AssertReturnVoid(m_pListWidget);
+    m_pMainLayout->addWidget(m_pListWidget);
+    m_pListWidget->setContextMenuPolicy(Qt::CustomContextMenu);
+    connect(m_pListWidget, &UIBookmarksListWidget::sigBookmarkDoubleClick,
+            this, &UIBookmarksListContainer::sigBookmarkDoubleClick);
+    connect(m_pListWidget, &UIBookmarksListWidget::customContextMenuRequested,
+            this, &UIBookmarksListContainer::sigListWidgetContextMenuRequest);
+}
+
+int UIBookmarksListContainer::itemIndex(const QUrl &url)
+{
+    if (!m_pListWidget || !url.isValid())
+        return -1;
+    for (int i = 0; i < m_pListWidget->count(); ++i)
+    {
+        if (m_pListWidget->item(i)->data(iBookmarkUrlDataType).toUrl() == url)
+            return i;
+    }
+    return -1;
+}
 
 
@@ -495 +635 @@
 
     connect(m_pHomeAction, &QAction::triggered, this, &UIHelpBrowserTab::sltHandleHomeAction);
-    connect(m_pBackwardAction, &QAction::triggered, this, &UIHelpBrowserTab::sltHandleAddBookmarkAction);
+    connect(m_pAddBookmarkAction, &QAction::triggered, this, &UIHelpBrowserTab::sltHandleAddBookmarkAction);
     connect(m_pForwardAction, &QAction::triggered, this, &UIHelpBrowserTab::sltHandleForwardAction);
     connect(m_pBackwardAction, &QAction::triggered, this, &UIHelpBrowserTab::sltHandleBackwardAction);
@@ -614 +754 @@
 void UIHelpBrowserTab::sltHandleAddBookmarkAction()
 {
+    emit sigAddBookmark(source(), documentTitle());
 }
 
@@ -900 +1041 @@
    connect(pTabWidget, &UIHelpBrowserTab::sigOpenLinkInNewTab,
            this, &UIHelpBrowserTabManager::sltHandleOpenLinkInNewTab);
+   connect(pTabWidget, &UIHelpBrowserTab::sigAddBookmark,
+           this, &UIHelpBrowserTabManager::sigAddBookmark);
    if (m_fSwitchToNewTab)
        setCurrentIndex(index);
@@ -1107 +1250 @@
     m_pMainLayout->addWidget(m_pSplitter);
     m_pHelpEngine = new QHelpEngine(m_strHelpFilePath, this);
-    m_pBookmarksWidget = new QWidget(this);
+    m_pBookmarksWidget = new UIBookmarksListContainer(this);
     m_pTabWidget = new QITabWidget;
     m_pTabManager = new UIHelpBrowserTabManager(m_pHelpEngine, findIndexHtml(), loadSavedUrlList());
@@ -1125 +1268 @@
 
     m_pTabWidget->insertTab(HelpBrowserTabs_TOC, m_pContentWidget, QString());
+    m_pTabWidget->insertTab(HelpBrowserTabs_Bookmarks, m_pBookmarksWidget, QString());
     m_pTabWidget->insertTab(HelpBrowserTabs_Index, m_pIndexWidget, QString());
-    m_pTabWidget->insertTab(HelpBrowserTabs_Bookmarks, m_pBookmarksWidget, QString());
 
     m_pSplitter->addWidget(m_pTabManager);
@@ -1136 +1279 @@
     connect(m_pTabManager, &UIHelpBrowserTabManager::sigSourceChanged,
             this, &UIHelpBrowserWidget::sltHandleHelpBrowserViewerSourceChange);
+    connect(m_pTabManager, &UIHelpBrowserTabManager::sigAddBookmark,
+           this, &UIHelpBrowserWidget::sltAddNewBookmark);
     connect(m_pHelpEngine, &QHelpEngine::setupFinished,
             this, &UIHelpBrowserWidget::sltHandleHelpEngineSetupFinished);
@@ -1143 +1288 @@
             this, &UIHelpBrowserWidget::sltHandleContentsCreated);
     connect(m_pContentWidget, &QHelpContentWidget::customContextMenuRequested,
+            this, &UIHelpBrowserWidget::sltShowLinksContextMenu);
+    connect(m_pBookmarksWidget, &UIBookmarksListContainer::sigBookmarkDoubleClick,
+            this, &UIHelpBrowserWidget::sltOpenLinkWithUrl);
+    connect(m_pBookmarksWidget, &UIBookmarksListContainer::sigListWidgetContextMenuRequest,
             this, &UIHelpBrowserWidget::sltShowLinksContextMenu);
 
@@ -1459 +1608 @@
         if (!browser)
             return;
-        if (!browser->rect().contains(pos, true))
-            return;
+        // if (!browser->rect().contains(pos, true))
+        //     return;
         QPoint browserPos = browser->mapFromGlobal(m_pSearchResultWidget->mapToGlobal(pos));
         url = browser->anchorAt(browserPos);
     }
+    else if (pSender == m_pBookmarksWidget)
+    {
+        /* Assuming that only the UIBookmarksListWidget under the m_pBookmarksWidget sends the context menu request: */
+        UIBookmarksListWidget *pListWidget = m_pBookmarksWidget->findChild<UIBookmarksListWidget*>();
+        if (!pListWidget)
+            return;
+        url = m_pBookmarksWidget->currentBookmarkUrl();
+    }
+    else
+        return;
 
     if (!url.isValid())
@@ -1491 +1650 @@
 }
 
+void UIHelpBrowserWidget::sltAddNewBookmark(const QUrl &url, const QString &strTitle)
+{
+    if (m_pBookmarksWidget)
+        m_pBookmarksWidget->addBookmark(url, strTitle);
+}
+
 void UIHelpBrowserWidget::openLinkSlotHandler(QObject *pSenderObject, bool fOpenInNewTab)
 {

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

@@ -52 +52 @@
 class QIToolBar;
 class UIActionPool;
+class UIBookmarksListContainer;
 class UIDialogPanel;
 class UIHelpBrowserTabManager;
@@ -98 +99 @@
     void sltOpenLinkInNewTab();
     void sltOpenLink();
+    void sltAddNewBookmark(const QUrl &url, const QString &strTitle);
 
 private:
@@ -157 +159 @@
     QHelpSearchEngine   *m_pSearchEngine;
     QHelpSearchQueryWidget *m_pSearchQueryWidget;
-    QHelpSearchResultWidget *m_pSearchResultWidget;
-    UIHelpBrowserTabManager *m_pTabManager;
-    QWidget             *m_pBookmarksWidget;
+    QHelpSearchResultWidget  *m_pSearchResultWidget;
+    UIHelpBrowserTabManager  *m_pTabManager;
+    UIBookmarksListContainer *m_pBookmarksWidget;
     QWidget             *m_pSearchContainerWidget;
     QAction             *m_pShowHideSideBarAction;