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

Timestamp:

Oct 27, 2020 2:39:16 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Adding a toolbar.

Location:

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

Files:

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

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

@@ -31 +31 @@
 #include <QSplitter>
 #include <QTextBrowser>
+#include <QVBoxLayout>
 #ifdef RT_OS_SOLARIS
 # include <QFontDatabase>
@@ -45 +46 @@
 #include "QIToolBar.h"
 #include "UICommon.h"
+#include "UIIconPool.h"
 
 /* COM includes: */
@@ -121 +123 @@
     , m_pBookmarksWidget(0)
     , m_pShowHideTabWidgetAction(0)
+    , m_pGoHomeAction(0)
     , m_fModelContentCreated(false)
 {
@@ -147 +150 @@
 void UIHelpBrowserWidget::prepare()
 {
+    /* Create main layout: */
+    m_pMainLayout = new QVBoxLayout(this);
+    AssertReturnVoid(m_pMainLayout);
+
     prepareActions();
+    prepareToolBar();
     prepareWidgets();
     prepareMenu();
@@ -159 +167 @@
     m_pShowHideTabWidgetAction->setChecked(true);
     connect(m_pShowHideTabWidgetAction, &QAction::toggled, this, &UIHelpBrowserWidget::sltHandleTabVisibility);
+    m_pGoHomeAction = new QAction(UIIconPool::iconSet(":/file_manager_go_home_16px.png"), "", this);
+    connect(m_pGoHomeAction, &QAction::triggered, this, &UIHelpBrowserWidget::sltHandleGoHomeAction);
 }
 
 void UIHelpBrowserWidget::prepareWidgets()
 {
-    /* Create main layout: */
-    m_pMainLayout = new QHBoxLayout(this);
     m_pSplitter = new QSplitter;
-
-    AssertReturnVoid(m_pMainLayout && m_pSplitter);
+    AssertReturnVoid(m_pSplitter);
 
     m_pMainLayout->addWidget(m_pSplitter);
@@ -226 +233 @@
         m_pToolBar->setIconSize(QSize(iIconMetric, iIconMetric));
         m_pToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
-
+        m_pToolBar->addAction(m_pGoHomeAction);
 
 #ifdef VBOX_WS_MAC
@@ -388 +395 @@
 }
 
+void sltHandleGoHomeAction();
+
 void UIHelpBrowserWidget::sltHandleContentWidgetItemClicked(const QModelIndex &index)
 {
@@ -435 +444 @@
         sltHandleHelpBrowserViewerSourceChange(m_pContentViewer->source());
 }
+
+void UIHelpBrowserWidget::sltHandleGoHomeAction()
+{
+    if (!m_pContentViewer)
+        return;
+
+    QUrl homeUrl = findIndexHtml();
+    if (!homeUrl.isValid())
+        return;
+    m_pContentViewer->setSource(homeUrl);
+}
+
 #include "UIHelpBrowserWidget.moc"

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

@@ -37 +37 @@
 
 /* Forward declarations: */
-class QHBoxLayout;
+class QVBoxLayout;
 class QHelpEngine;
 class QHelpContentModel;
@@ -83 +83 @@
     void sltHandleHelpBrowserViewerSourceChange(const QUrl &source);
     void sltHandleContentsCreated();
+    void sltHandleGoHomeAction();
 
 private:
@@ -119 +120 @@
 
     /** Holds container for log-pages. */
-    QHBoxLayout         *m_pMainLayout;
+    QVBoxLayout         *m_pMainLayout;
     QITabWidget *m_pTabWidget;
     /** @name Toolbar and menu variables.
@@ -138 +139 @@
     QWidget             *m_pBookmarksWidget;
     QAction             *m_pShowHideTabWidgetAction;
+    QAction             *m_pGoHomeAction;
     QString              m_strPageNotFoundText;
     /* This is set t true when handling QHelpContentModel::contentsCreated signal. */