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

Timestamp:

Nov 4, 2020 2:22:52 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Adding a context menu to the search results widget

Location:

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

Files:

• UIHelpBrowserWidget.cpp (modified) (8 diffs)
• UIHelpBrowserWidget.h (modified) (2 diffs)

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

@@ -739 +739 @@
     connect(m_pHelpEngine, &QHelpEngine::setupFinished,
             this, &UIHelpBrowserWidget::sltHandleHelpEngineSetupFinished);
-    // if (m_pContentWidget->selectionModel())
-    //     connect(m_pContentWidget->selectionModel(), &QItemSelectionModel::selectionChanged,
-    //             this, &UIHelpBrowserWidget::sltHandleContentWidgetSelectionChanged);
     connect(m_pContentWidget, &QHelpContentWidget::clicked,
             this, &UIHelpBrowserWidget::sltHandleContentWidgetItemClicked);
@@ -747 +744 @@
             this, &UIHelpBrowserWidget::sltHandleContentsCreated);
     connect(m_pContentWidget, &QHelpContentWidget::customContextMenuRequested,
-            this, &UIHelpBrowserWidget::sltOpenLinksContextMenu);
+            this, &UIHelpBrowserWidget::sltShowLinksContextMenu);
 
     if (QFile(m_strHelpFilePath).exists() && m_pHelpEngine)
@@ -766 +763 @@
     m_pSearchResultWidget = m_pSearchEngine->resultWidget();
     AssertReturnVoid(m_pSearchQueryWidget && m_pSearchResultWidget);
+    m_pSearchResultWidget->setContextMenuPolicy(Qt::CustomContextMenu);
 
     QVBoxLayout *pSearchLayout = new QVBoxLayout(m_pSearchContainerWidget);
@@ -774 +772 @@
     connect(m_pSearchQueryWidget, &QHelpSearchQueryWidget::search,
             this, &UIHelpBrowserWidget::sltHandleSearchStart);
-    // connect(m_pSearchResultWidget, &QHelpSearchResultWidget::requestShowLink,
-    //         m_pContentViewer, &UIHelpBrowserViewer::setSource);
+    connect(m_pSearchResultWidget, &QHelpSearchResultWidget::requestShowLink,
+            this, &UIHelpBrowserWidget::sltOpenLinkWithUrl);
+    connect(m_pSearchResultWidget, &QHelpContentWidget::customContextMenuRequested,
+            this, &UIHelpBrowserWidget::sltShowLinksContextMenu);
 
     // connect(searchEngine, &QHelpSearchEngine::searchingStarted,
@@ -993 +993 @@
 }
 
-void UIHelpBrowserWidget::sltHandleContentWidgetSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected)
-{
-    Q_UNUSED(deselected);
-    QModelIndexList selectedItemIndices = selected.indexes();
-    if (selectedItemIndices.isEmpty())
-        return;
-    sltHandleContentWidgetItemClicked(selectedItemIndices[0]);
-}
-
 void UIHelpBrowserWidget::sltHandleHelpBrowserViewerSourceChange(const QUrl &source)
 {
@@ -1052 +1043 @@
 }
 
-void UIHelpBrowserWidget::sltOpenLinksContextMenu(const QPoint &pos)
+void UIHelpBrowserWidget::sltShowLinksContextMenu(const QPoint &pos)
 {
     QWidget *pSender = qobject_cast<QWidget*>(sender());
@@ -1059 +1050 @@
 
     QUrl url;
-
     if (pSender == m_pContentWidget)
         url = contentWidgetUrl(m_pContentWidget->currentIndex());
+    else if (pSender == m_pSearchResultWidget)
+    {
+        QTextBrowser* browser = m_pSearchResultWidget->findChild<QTextBrowser*>();
+        if (!browser)
+            return;
+        if (!browser->rect().contains(pos, true))
+            return;
+        QPoint browserPos = browser->mapFromGlobal(m_pSearchResultWidget->mapToGlobal(pos));
+        printf("pos %d %d\n", pos.x(), pos.y());
+        url = browser->anchorAt(browserPos);
+    }
 
     if (!url.isValid())
@@ -1099 +1100 @@
 }
 
+void UIHelpBrowserWidget::sltOpenLinkWithUrl(const QUrl &url)
+{
+    if (m_pTabManager && url.isValid())
+        m_pTabManager->setSource(url, false);
+}
 #include "UIHelpBrowserWidget.moc"
 

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

@@ -86 +86 @@
     void sltHandleHelpEngineSetupFinished();
     void sltHandleContentWidgetItemClicked(const QModelIndex &index);
-    void sltHandleContentWidgetSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
     void sltHandleSideBarVisibility(bool togggled);
     void sltHandleToolBarVisibility(bool togggled);
@@ -95 +94 @@
     void sltHandleSearchStart();
     void sltHandleHelpBrowserViewerSourceChange(const QUrl &source);
-    void sltOpenLinksContextMenu(const QPoint &pos);
+    void sltOpenLinkWithUrl(const QUrl &url);
+    void sltShowLinksContextMenu(const QPoint &pos);
     void sltOpenLinkInNewTab();
     void sltOpenLink();