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

Timestamp:

Nov 3, 2020 2:50:06 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Opening the link with right click as well

Location:

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

Files:

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

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

@@ -599 +599 @@
 
     AssertReturnVoid(m_pContentWidget && m_pIndexWidget && m_pContentModel);
-    m_pContentWidget->installEventFilter(this);
     m_pSplitter->addWidget(m_pTabWidget);
 
@@ -616 +615 @@
     connect(m_pHelpEngine, &QHelpEngine::setupFinished,
             this, &UIHelpBrowserWidget::sltHandleHelpEngineSetupFinished);
-    connect(m_pContentWidget, &QHelpContentWidget::clicked,
-            this, &UIHelpBrowserWidget::sltHandleContentWidgetItemClicked);
+    if (m_pContentWidget->selectionModel())
+        connect(m_pContentWidget->selectionModel(), &QItemSelectionModel::selectionChanged,
+                this, &UIHelpBrowserWidget::sltHandleContentWidgetSelectionChanged);
     connect(m_pContentModel, &QHelpContentModel::contentsCreated,
             this, &UIHelpBrowserWidget::sltHandleContentsCreated);
@@ -771 +771 @@
 }
 
-bool UIHelpBrowserWidget::eventFilter(QObject *pWatched, QEvent *pEvent)
-{
-    if (pWatched == m_pContentWidget)
-    {
-        if (pEvent->type() == QEvent::MouseButtonPress ||
-            pEvent->type() == QEvent::MouseMove ||
-            pEvent->type() == QEvent::KeyPress ||
-            pEvent->type() == QEvent::MouseButtonDblClick)
-            printf("xxxxxxxxxxx %d\n", pEvent->type());
-        else
-            printf("%d\n", pEvent->type());
-
-    }
-    return false;
-}
-
 void UIHelpBrowserWidget::cleanup()
 {
@@ -871 +855 @@
     const QUrl &url = pItem->url();
     m_pTabManager->setCurrentSource(url);
-}
-
+
+    m_pContentWidget->scrollTo(index, QAbstractItemView::EnsureVisible);
+    m_pContentWidget->expand(index);
+
+}
+
+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)

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

@@ -38 +38 @@
 /* Forward declarations: */
 class QHBoxLayout;
+class QItemSelection;
 class QVBoxLayout;
 class QHelpEngine;
@@ -85 +86 @@
     void sltHandleHelpEngineSetupFinished();
     void sltHandleContentWidgetItemClicked(const QModelIndex &index);
+    void sltHandleContentWidgetSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
     void sltHandleSideBarVisibility(bool togggled);
     void sltHandleToolBarVisibility(bool togggled);
@@ -107 +109 @@
     void cleanup();
     QUrl findIndexHtml() const;
-    bool eventFilter(QObject *pWatched, QEvent *pEvent);
+    //bool eventFilter(QObject *pWatched, QEvent *pEvent);
 
     /** @name Event handling stuff.