Changeset 86620 in vbox for trunk

Timestamp:

Oct 19, 2020 7:26:43 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Connecting content widget item click and link activation to the help viewer's setSource

Location:

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

Files:

• UIHelpBrowserWidget.cpp (modified) (3 diffs)
• UIHelpBrowserWidget.h (modified) (1 diff)

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

@@ -160 +160 @@
 #ifdef RT_OS_LINUX
     m_pHelpEngine = new QHelpEngine(m_strHelpFilePath, this);
-    connect(m_pHelpEngine, &QHelpEngine::setupFinished,
-            this, &UIHelpBrowserWidget::sltHandleHelpEngineSetupFinished);
 
     m_pTabWidget = new QITabWidget;
     AssertReturnVoid(m_pTabWidget);
+    AssertReturnVoid(m_pHelpEngine->contentWidget() && m_pHelpEngine->indexWidget());
     m_pSplitter->addWidget(m_pTabWidget);
     m_pTabWidget->addTab(m_pHelpEngine->contentWidget(), tr("Contents"));
@@ -177 +176 @@
     m_pSplitter->setChildrenCollapsible(false);
 
+    connect(m_pHelpEngine, &QHelpEngine::setupFinished,
+            this, &UIHelpBrowserWidget::sltHandleHelpEngineSetupFinished);
+
+    connect(m_pHelpEngine->contentWidget(), &QHelpContentWidget::linkActivated,
+            m_pTextBrowser, &UIHelpBrowserViewer::setSource);
+    connect(m_pHelpEngine->contentWidget(), &QHelpContentWidget::clicked,
+            this, &UIHelpBrowserWidget::sltHandleContentWidgetItemClicked);
+
+
+    connect(m_pHelpEngine->indexWidget(), &QHelpIndexWidget::linkActivated,
+            m_pTextBrowser, &UIHelpBrowserViewer::setSource);
+
     if (QFile(m_strHelpFilePath).exists() && m_pHelpEngine)
         m_pHelpEngine->setupData();
-
 #endif
 }
@@ -270 +280 @@
 }
 
+void UIHelpBrowserWidget::sltHandleContentWidgetItemClicked(const QModelIndex &index)
+{
+#ifdef RT_OS_LINUX
+    AssertReturnVoid(m_pTextBrowser && m_pHelpEngine && m_pHelpEngine->contentWidget());
+    QHelpContentModel *pContentModel =
+        qobject_cast<QHelpContentModel*>(m_pHelpEngine->contentWidget()->model());
+    if (!pContentModel)
+        return;
+    QHelpContentItem *pItem = pContentModel->contentItemAt(index);
+    if (!pItem)
+        return;
+    const QUrl &url = pItem->url();
+    m_pTextBrowser->setSource(url);
+#endif
+}
+
+
 #include "UIHelpBrowserWidget.moc"

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

@@ -85 +85 @@
 
     void sltHandleHelpEngineSetupFinished();
+    void sltHandleContentWidgetItemClicked(const QModelIndex &index);
 
 private: