Changeset 86603 in vbox for trunk

Timestamp:

Oct 16, 2020 11:02:57 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Adding tabs for toc and index.

Location:

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

Files:

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

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

@@ -20 +20 @@
 #include <QDir>
 #include <QFont>
+#include <QHBoxLayout>
 #ifdef RT_OS_LINUX
  #include <QtHelp/QHelpEngine>
  #include <QtHelp/QHelpContentWidget>
+ #include <QtHelp/QHelpIndexWidget>
 #endif
 #include <QMenu>
 #include <QScrollBar>
 #include <QStyle>
+#include <QSplitter>
 #include <QTextBrowser>
-#include <QHBoxLayout>
 #ifdef RT_OS_SOLARIS
 # include <QFontDatabase>
@@ -108 +110 @@
 #endif
     , m_pTextBrowser(0)
+    , m_pSplitter(0)
 {
     /* Prepare VM Log-Viewer: */
@@ -150 +153 @@
     /* Create main layout: */
     m_pMainLayout = new QHBoxLayout(this);
-    AssertReturnVoid(m_pMainLayout);
+    m_pSplitter = new QSplitter;
+
+    AssertReturnVoid(m_pMainLayout && m_pSplitter);
+
+    m_pMainLayout->addWidget(m_pSplitter);
 #ifdef RT_OS_LINUX
     m_pHelpEngine = new QHelpEngine(m_strHelpFilePath, this);
@@ -156 +163 @@
             this, &UIHelpBrowserWidget::sltHandleHelpEngineSetupFinished);
 
-    // m_pTabWidget = new QITabWidget;
-    // m_pMainLayout->addWidget(m_pTabWidget);
+    m_pTabWidget = new QITabWidget;
+    AssertReturnVoid(m_pTabWidget);
+    m_pSplitter->addWidget(m_pTabWidget);
+    m_pTabWidget->addTab(m_pHelpEngine->contentWidget(), tr("Contents"));
+    m_pTabWidget->addTab(m_pHelpEngine->indexWidget(), tr("Index"));
+
     m_pTextBrowser = new UIHelpBrowserViewer(m_pHelpEngine);
     AssertReturnVoid(m_pTextBrowser);
-    m_pMainLayout->addWidget(m_pTextBrowser);
+    m_pSplitter->addWidget(m_pTextBrowser);
+
+    m_pSplitter->setStretchFactor(0, 1);
+    m_pSplitter->setStretchFactor(1, 4);
+    m_pSplitter->setChildrenCollapsible(false);
 
     if (QFile(m_strHelpFilePath).exists() && m_pHelpEngine)
-    {
-        bool fSetupResult = m_pHelpEngine->setupData();
-        //m_pHelpEngine->registerDocumentation(m_strHelpFilePath));
-        printf("setup data %d %s\n", fSetupResult, qPrintable(m_strHelpFilePath));
-    }
+        m_pHelpEngine->setupData();
+
 #endif
 }
@@ -251 +263 @@
 #ifdef RT_OS_LINUX
     AssertReturnVoid(m_pTextBrowser && m_pHelpEngine);
-
     QList<QUrl> files = m_pHelpEngine->files(m_pHelpEngine->namespaceName(m_strHelpFilePath), QStringList());
     if (!files.empty())

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

@@ -45 +45 @@
 class UIActionPool;
 class UIDialogPanel;
+class QSplitter;
 
 /** QWidget extension providing GUI for VirtualBox LogViewer. It
@@ -130 +131 @@
 #endif
     UIHelpBrowserViewer *m_pTextBrowser;
+    QSplitter           *m_pSplitter;
 };