Changeset 89390 in vbox for trunk

Timestamp:

May 31, 2021 10:14:43 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Adding page reload action

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• VirtualBox1.qrc (modified) (1 diff)
• src/helpbrowser/UIHelpBrowserWidget.cpp (modified) (6 diffs)
• src/helpbrowser/UIHelpViewer.cpp (modified) (1 diff)
• src/helpbrowser/UIHelpViewer.h (modified) (2 diffs)

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

@@ -398 +398 @@
         <file alias="help_browser_search.png">images/help_browser_search.png</file>
         <file alias="help_browser_star_16px.png">images/help_browser_star_16px.png</file>
+        <file alias="help_browser_reload_32px.png">images/help_browser_reload_32px.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

@@ -225 +225 @@
     void sltAnchorClicked(const QUrl &link);
     void sltFindInPageWidgetVisibilityChanged(bool  fVisible);
+    void sltReloadPageAction();
 
 private:
@@ -239 +240 @@
     QAction     *m_pAddBookmarkAction;
     QAction     *m_pFindInPageAction;
+    QAction     *m_pReloadPageAction;
 
     QVBoxLayout *m_pMainLayout;
@@ -716 +718 @@
     m_pFindInPageAction =
         new QAction(UIIconPool::iconSet(":/help_browser_search.png"), QString(), this);
+    m_pReloadPageAction =
+        new QAction(UIIconPool::iconSet(":/help_browser_reload_32px.png"), QString(), this);
 
     AssertReturnVoid(m_pHomeAction && m_pForwardAction &&
@@ -727 +731 @@
     connect(m_pBackwardAction, &QAction::triggered, this, &UIHelpBrowserTab::sltBackwardAction);
     connect(m_pFindInPageAction, &QAction::toggled, this, &UIHelpBrowserTab::sltFindInPageAction);
+    connect(m_pReloadPageAction, &QAction::triggered, this, &UIHelpBrowserTab::sltReloadPageAction);
 
     m_pForwardAction->setEnabled(false);
@@ -736 +741 @@
     m_pToolBar->addAction(m_pForwardAction);
     m_pToolBar->addAction(m_pHomeAction);
+    m_pToolBar->addAction(m_pReloadPageAction);
     m_pToolBar->addAction(m_pAddBookmarkAction);
     m_pToolBar->addAction(m_pFindInPageAction);
@@ -791 +797 @@
     if (m_pContentViewer)
         m_pContentViewer->toggleFindInPageWidget(fToggled);
+}
+
+void UIHelpBrowserTab::sltReloadPageAction()
+{
+    if (m_pContentViewer)
+        m_pContentViewer->reload();
 }
 

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

@@ -434 +434 @@
         m_pFindInPageWidget->setFocus();
     emit sigFindInPageWidgetToogle(fVisible);
+}
+
+void UIHelpViewer::reload()
+{
+    setSource(source());
 }
 

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

@@ -66 +66 @@
     virtual QVariant loadResource(int type, const QUrl &name) /* override */;
     void emitHistoryChangedSignal();
-    void setSource(const QUrl &url) /* override */;
+    virtual void setSource(const QUrl &url) /* override */;
     void setFont(const QFont &);
     bool isFindInPageWidgetVisible() const;
@@ -76 +76 @@
     static const QPair<int, int> zoomPercentageMinMax;
     void toggleFindInPageWidget(bool fVisible);
+    void reload();
 
 public slots: