Changeset 86735 in vbox

Timestamp:

Oct 28, 2020 11:43:16 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Adding forward/backward actions

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• VirtualBox1.qrc (modified) (1 diff)
• images/help_browser_add_bookmark.png (added)
• images/help_browser_backward_32px.png (added)
• images/help_browser_backward_disabled_32px.png (added)
• images/help_browser_forward_32px.png (added)
• images/help_browser_forward_disabled_32px.png (added)
• images/help_browser_home_32px.png (added)
• images/help_browser_search.png (added)
• src/helpbrowser/UIHelpBrowserWidget.cpp (modified) (8 diffs)
• src/helpbrowser/UIHelpBrowserWidget.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc

@@ -379 +379 @@
         <file alias="hd_warning_16px.png">images/hd_warning_16px.png</file>
         <file alias="hd_write_16px.png">images/hd_write_16px.png</file>
+        <file alias="help_browser_add_bookmark.png">images/help_browser_add_bookmark.png</file>
+        <file alias="help_browser_backward_32px.png">images/help_browser_backward_32px.png</file>
+        <file alias="help_browser_backward_disabled_32px.png">images/help_browser_backward_disabled_32px.png</file>
+        <file alias="help_browser_forward_disabled_32px.png">images/help_browser_forward_disabled_32px.png</file>
+        <file alias="help_browser_forward_32px.png">images/help_browser_forward_32px.png</file>
+        <file alias="help_browser_home_32px.png">images/help_browser_home_32px.png</file>
+        <file alias="help_browser_search.png">images/help_browser_search.png</file>
         <file alias="help_16px.png">images/help_16px.png</file>
         <file alias="help_button_normal_mac_24px.png">images/help_button_normal_mac_24px.png</file>

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

@@ -123 +123 @@
     , m_pBookmarksWidget(0)
     , m_pShowHideTabWidgetAction(0)
-    , m_pGoHomeAction(0)
+    , m_pHomeAction(0)
+    , m_pForwardAction(0)
+    , m_pBackwardAction(0)
     , m_fModelContentCreated(false)
 {
@@ -167 +169 @@
     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);
+    m_pHomeAction =
+        new QAction(UIIconPool::iconSet(":/help_browser_home_32px.png"), QString(), this);
+    connect(m_pHomeAction, &QAction::triggered, this, &UIHelpBrowserWidget::sltHandleHomeAction);
+
+    m_pForwardAction =
+        new QAction(UIIconPool::iconSet(":/help_browser_forward_32px.png", ":/help_browser_forward_disabled_32px.png"), QString(), this);
+    connect(m_pForwardAction, &QAction::triggered, this, &UIHelpBrowserWidget::sltHandleForwardAction);
+    sltHandleForwardAvailable(false);
+
+    m_pBackwardAction =
+        new QAction(UIIconPool::iconSet(":/help_browser_backward_32px.png", ":/help_browser_backward_disabled_32px.png"), QString(), this);
+    connect(m_pBackwardAction, &QAction::triggered, this, &UIHelpBrowserWidget::sltHandleBackwardAction);
+    sltHandleBackwardAvailable(false);
 }
 
@@ -198 +211 @@
     AssertReturnVoid(m_pContentViewer);
 
-
     connect(m_pContentViewer, &UIHelpBrowserViewer::sourceChanged,
         this, &UIHelpBrowserWidget::sltHandleHelpBrowserViewerSourceChange);
+    connect(m_pContentViewer, &UIHelpBrowserViewer::forwardAvailable,
+        this, &UIHelpBrowserWidget::sltHandleForwardAvailable);
+    connect(m_pContentViewer, &UIHelpBrowserViewer::backwardAvailable,
+        this, &UIHelpBrowserWidget::sltHandleBackwardAvailable);
+    connect(m_pContentViewer, &UIHelpBrowserViewer::sourceChanged,
+        this, &UIHelpBrowserWidget::sltHandleHelpBrowserViewerSourceChange);
+
     m_pSplitter->addWidget(m_pContentViewer);
 
@@ -230 +249 @@
     {
         /* Configure toolbar: */
+        m_pToolBar->setToolButtonStyle(Qt::ToolButtonIconOnly);
         const int iIconMetric = (int)(QApplication::style()->pixelMetric(QStyle::PM_LargeIconSize));
         m_pToolBar->setIconSize(QSize(iIconMetric, iIconMetric));
-        m_pToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
-        m_pToolBar->addAction(m_pGoHomeAction);
+        m_pToolBar->addAction(m_pBackwardAction);
+        m_pToolBar->addAction(m_pForwardAction);
+        m_pToolBar->addAction(m_pHomeAction);
 
 #ifdef VBOX_WS_MAC
@@ -312 +333 @@
 
     m_strPageNotFoundText = tr("<div><p><h3>404. Not found.</h3>The page <b>%1</b> could not be found.</p></div>");
+
+    if (m_pHomeAction)
+    {
+        m_pHomeAction->setText(tr("Home"));
+        m_pHomeAction->setToolTip(tr("Return to start page"));
+    }
+
+    if (m_pBackwardAction)
+    {
+        m_pBackwardAction->setText(tr("Backward"));
+        m_pBackwardAction->setToolTip(tr("Navigate to previous page"));
+    }
+
+    if (m_pForwardAction)
+    {
+        m_pForwardAction->setText(tr("Forward"));
+        m_pForwardAction->setToolTip(tr("Navigate to next page"));
+    }
 }
 
@@ -395 +434 @@
 }
 
-void sltHandleGoHomeAction();
+void sltHandleHomeAction();
 
 void UIHelpBrowserWidget::sltHandleContentWidgetItemClicked(const QModelIndex &index)
@@ -445 +484 @@
 }
 
-void UIHelpBrowserWidget::sltHandleGoHomeAction()
+void UIHelpBrowserWidget::sltHandleHomeAction()
 {
     if (!m_pContentViewer)
@@ -456 +495 @@
 }
 
+void UIHelpBrowserWidget::sltHandleForwardAction()
+{
+    if (m_pContentViewer)
+        m_pContentViewer->forward();
+}
+
+void UIHelpBrowserWidget::sltHandleBackwardAction()
+{
+    if (m_pContentViewer)
+        m_pContentViewer->backward();
+}
+
+void UIHelpBrowserWidget::sltHandleForwardAvailable(bool fAvailable)
+{
+    if (m_pForwardAction)
+        m_pForwardAction->setEnabled(fAvailable);
+}
+
+void UIHelpBrowserWidget::sltHandleBackwardAvailable(bool fAvailable)
+{
+    if (m_pBackwardAction)
+        m_pBackwardAction->setEnabled(fAvailable);
+}
+
 #include "UIHelpBrowserWidget.moc"

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

@@ -83 +83 @@
     void sltHandleHelpBrowserViewerSourceChange(const QUrl &source);
     void sltHandleContentsCreated();
-    void sltHandleGoHomeAction();
+    void sltHandleHomeAction();
+    void sltHandleForwardAction();
+    void sltHandleBackwardAction();
+    void sltHandleForwardAvailable(bool fAvailable);
+    void sltHandleBackwardAvailable(bool fAvailable);
 
 private:
@@ -139 +143 @@
     QWidget             *m_pBookmarksWidget;
     QAction             *m_pShowHideTabWidgetAction;
-    QAction             *m_pGoHomeAction;
+    QAction             *m_pHomeAction;
+    QAction             *m_pForwardAction;
+    QAction             *m_pBackwardAction;
     QString              m_strPageNotFoundText;
     /* This is set t true when handling QHelpContentModel::contentsCreated signal. */