Changeset 88401 in vbox for trunk

Timestamp:

Apr 7, 2021 2:39:51 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Some refactoring.

Location:

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

Files:

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

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

@@ -73 +73 @@
 
 /*********************************************************************************************************************************
-*   UIFontScaleWidget definition.                                                                                         *
+*   UIContentZoomWidget definition.                                                                                         *
 *********************************************************************************************************************************/
-class UIFontScaleWidget : public QIWithRetranslateUI<QWidget>
+class UIContentZoomWidget : public QIWithRetranslateUI<QWidget>
 {
 
@@ -86 +86 @@
 public:
 
-    UIFontScaleWidget(int iInitialFontPointSize, QWidget *pParent = 0);
+    UIContentZoomWidget(int iInitialFontPointSize, QWidget *pParent = 0);
     void setFontPointSize(int iFontPointSize);
     int fontPointSize() const;
@@ -259 +259 @@
 
 public:
+
+    enum ZoomOperation
+    {
+        ZoomOperation_In = 0,
+        ZoomOperation_Out,
+        ZoomOperation_Reset,
+        ZoomOperation_Max
+    };
 
     UIHelpBrowserTabManager(const QHelpEngine  *pHelpEngine, const QUrl &homeUrl,
@@ -311 +319 @@
     int  findTab(const QUrl &Url) const;
     const QHelpEngine* m_pHelpEngine;
-    UIFontScaleWidget *m_pFontScaleWidget;
+    UIContentZoomWidget *m_pFontScaleWidget;
     QUrl m_homeUrl;
     QStringList m_savedUrlList;
@@ -322 +330 @@
 
 /*********************************************************************************************************************************
-*   UIFontScaleWidget implementation.                                                                                            *
+*   UIContentZoomWidget implementation.                                                                                          *
 *********************************************************************************************************************************/
 
-UIFontScaleWidget::UIFontScaleWidget(int iInitialFontPointSize, QWidget *pParent /* = 0 */)
+UIContentZoomWidget::UIContentZoomWidget(int iInitialFontPointSize, QWidget *pParent /* = 0 */)
     :QIWithRetranslateUI<QWidget>(pParent)
     , m_pMainLayout(0)
@@ -338 +346 @@
 }
 
-void UIFontScaleWidget::setFontPointSize(int iFontPointSize)
+void UIContentZoomWidget::setFontPointSize(int iFontPointSize)
 {
     if (m_iFontPointSize == iFontPointSize)
@@ -347 +355 @@
 }
 
-int UIFontScaleWidget::fontPointSize() const
+int UIContentZoomWidget::fontPointSize() const
 {
     return m_iFontPointSize;
 }
 
-void UIFontScaleWidget::retranslateUi()
-{
-}
-
-void UIFontScaleWidget::prepare()
+void UIContentZoomWidget::retranslateUi()
+{
+}
+
+void UIContentZoomWidget::prepare()
 {
     setAutoFillBackground(true);
@@ -378 +386 @@
     m_pPlusButton->setIcon(UIIconPool::iconSet(":/help_browser_plus_32px.png"));
 
-    connect(m_pPlusButton, &QIToolButton::pressed, this, &UIFontScaleWidget::sltSetFontPointSize);
-    connect(m_pMinusButton, &QIToolButton::pressed, this, &UIFontScaleWidget::sltSetFontPointSize);
-    connect(m_pResetButton, &QIToolButton::pressed, this, &UIFontScaleWidget::sltSetFontPointSize);
+    connect(m_pPlusButton, &QIToolButton::pressed, this, &UIContentZoomWidget::sltSetFontPointSize);
+    connect(m_pMinusButton, &QIToolButton::pressed, this, &UIContentZoomWidget::sltSetFontPointSize);
+    connect(m_pResetButton, &QIToolButton::pressed, this, &UIContentZoomWidget::sltSetFontPointSize);
 
     m_pMainLayout->addWidget(m_pResetButton);
@@ -388 +396 @@
 }
 
-int UIFontScaleWidget::fontPercentage() const
+int UIContentZoomWidget::fontPercentage() const
 {
     if (m_iInitialFontPointSize == 0)
@@ -395 +403 @@
 }
 
-void UIFontScaleWidget::sltSetFontPointSize()
+void UIContentZoomWidget::sltSetFontPointSize()
 {
     if (!sender())
@@ -870 +878 @@
     if (!m_pFontScaleWidget)
     {
-        m_pFontScaleWidget = new UIFontScaleWidget(initialFontPointSize(), this);
-        connect(m_pFontScaleWidget, &UIFontScaleWidget::sigFontPointSizeChanged,
+        m_pFontScaleWidget = new UIContentZoomWidget(initialFontPointSize(), this);
+        connect(m_pFontScaleWidget, &UIContentZoomWidget::sigFontPointSizeChanged,
                 this, &UIHelpBrowserTabManager::sltHandleFontSizeChange);
     }
@@ -1308 +1316 @@
 
     connect(m_pFontSizeLargerAction, &QAction::triggered,
-            this, &UIHelpBrowserWidget::sltHandleFontSizeActions);
+            this, &UIHelpBrowserWidget::sltHandleZoomActions);
     connect(m_pFontSizeSmallerAction, &QAction::triggered,
-            this, &UIHelpBrowserWidget::sltHandleFontSizeActions);
+            this, &UIHelpBrowserWidget::sltHandleZoomActions);
     connect(m_pFontSizeResetAction, &QAction::triggered,
-            this, &UIHelpBrowserWidget::sltHandleFontSizeActions);
+            this, &UIHelpBrowserWidget::sltHandleZoomActions);
 }
 
@@ -1597 +1605 @@
 
     if (m_pFontSizeLargerAction)
-        m_pFontSizeLargerAction->setText(tr("Increase Font Size"));
+        m_pFontSizeLargerAction->setText(tr("Zoom &In"));
     if (m_pFontSizeSmallerAction)
-        m_pFontSizeSmallerAction->setText(tr("Decrease Font Size"));
+        m_pFontSizeSmallerAction->setText(tr("Zoom &Out"));
     if (m_pFontSizeResetAction)
-        m_pFontSizeResetAction->setText(tr("Reset Font Size"));
+        m_pFontSizeResetAction->setText(tr("&Reset Zoom"));
 }
 
@@ -1870 +1878 @@
 }
 
-void UIHelpBrowserWidget::sltHandleFontSizeActions()
+void UIHelpBrowserWidget::sltHandleZoomActions()
 {
     if (!sender() || !m_pTabManager)

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

@@ -93 +93 @@
     void sltCopyLink();
     void sltAddNewBookmark(const QUrl &url, const QString &strTitle);
-    void sltHandleFontSizeActions();
+    void sltHandleZoomActions();
     void sltHandleTabListChanged(const QStringList &titleList);
     void sltHandleTabChoose();

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

@@ -375 +375 @@
     QTextBrowser::setSource(url);
     QTextDocument *pDocument = document();
-    //iterateDocumentImages();
+    iterateDocumentImages();
     if (!pDocument || pDocument->isEmpty())
     {
@@ -508 +508 @@
 void UIHelpViewer::wheelEvent(QWheelEvent *pEvent)
 {
+    Q_UNUSED(pEvent);
+    /* Disable wheel scaling for now: */
+#if 0
     int iPreviousSize = font().pointSize();
+    /* QTextBrowser::wheelEvent sets a new font size: */
     QTextBrowser::wheelEvent(pEvent);
     /* Don't allow font size to get too large or small: */
@@ -520 +524 @@
     else
         emit sigFontPointSizeChanged(font().pointSize());
+#endif
 }