Changeset 88411 in vbox for trunk

Timestamp:

Apr 8, 2021 11:25:05 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Saving/loading zoom percentage.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• extradata/UIExtraDataManager.cpp (modified) (2 diffs)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• helpbrowser/UIHelpBrowserWidget.cpp (modified) (6 diffs)
• helpbrowser/UIHelpViewer.cpp (modified) (1 diff)
• helpbrowser/UIHelpViewer.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp

@@ -242 +242 @@
 const char *UIExtraDataDefs::GUI_HelpBrowserDialogGeometry = "GUI/HelpBrowserDialogGeomety";
 const char *UIExtraDataDefs::GUI_HelpBrowserBookmarks = "GUI/HelpBrowserBookmarks";
+const char *UIExtraDataDefs::GUI_HelpBrowserZoomPercentage = "GUI/HelpBrowserZoomPercentage";
 
 /* VM Activity Overview: */

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -441 +441 @@
         SHARED_LIBRARY_STUFF extern const char *GUI_HelpBrowserDialogGeometry;
         SHARED_LIBRARY_STUFF extern const char *GUI_HelpBrowserBookmarks;
+        SHARED_LIBRARY_STUFF extern const char *GUI_HelpBrowserZoomPercentage;
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -1984 +1984 @@
            << GUI_HelpBrowserLastURLList
            << GUI_HelpBrowserDialogGeometry
-           << GUI_HelpBrowserBookmarks;
+           << GUI_HelpBrowserBookmarks
+           << GUI_HelpBrowserZoomPercentage;
 }
 
@@ -4603 +4604 @@
 {
     return extraDataStringList(GUI_HelpBrowserLastURLList);
+}
+
+void UIExtraDataManager::setHelpBrowserZoomPercentage(int iZoomPercentage)
+{
+    setExtraDataString(GUI_HelpBrowserZoomPercentage, QString::number(iZoomPercentage));
+}
+
+int UIExtraDataManager::helpBrowserZoomPercentage()
+{
+    return extraDataString(GUI_HelpBrowserZoomPercentage).toInt();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h

@@ -789 +789 @@
         void setHelpBrowserLastUrlList(const QStringList &urlList);
         QStringList helpBrowserLastUrlList();
+        void setHelpBrowserZoomPercentage(int iZoomPercentage);
+        int helpBrowserZoomPercentage();
         QRect helpBrowserDialogGeometry(QWidget *pWidget, QWidget *pParentWidget, const QRect &defaultGeometry);
         void setHelpBrowserDialogGeometry(const QRect &geometry, bool fMaximized);

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

@@ -201 +201 @@
     void print(QPrinter &printer);
     void zoom(UIHelpViewer::ZoomOperation enmZoomOperation);
+    int zoomPercentage() const;
+    void setZoomPercentage(int iZoomPercentage);
 
 private slots:
@@ -270 +272 @@
     void setZoomWidgetVisible(bool fToggled);
     void switchToTab(int iIndex);
+    /** returns the zoom percentage of 0th tab. */
+    int zoomPercentage() const;
+    /** Sets the zoom percentage of all tabs. */
+    void setZoomPercentage(int iZoomPercentage);
 
 public slots:
@@ -574 +580 @@
     if (m_pContentViewer)
         m_pContentViewer->zoom(enmZoomOperation);
+}
+
+void UIHelpBrowserTab::setZoomPercentage(int iZoomPercentage)
+{
+    if (m_pContentViewer)
+        m_pContentViewer->setZoomPercentage(iZoomPercentage);
+}
+
+int UIHelpBrowserTab::zoomPercentage() const
+{
+    if (m_pContentViewer)
+        return m_pContentViewer->zoomPercentage();
+    return 100;
 }
 
@@ -977 +996 @@
     setCurrentIndex(iIndex);
 }
+
+int UIHelpBrowserTabManager::zoomPercentage() const
+{
+    UIHelpBrowserTab *pTab = qobject_cast<UIHelpBrowserTab*>(widget(0));
+    if (pTab)
+        return pTab->zoomPercentage();
+    return 100;
+}
+
+void UIHelpBrowserTabManager::setZoomPercentage(int iZoomPercentage)
+{
+    for (int i = 0; i < count(); ++i)
+    {
+        UIHelpBrowserTab *pTab = qobject_cast<UIHelpBrowserTab*>(widget(i));
+        if (pTab)
+            pTab->setZoomPercentage(iZoomPercentage);
+    }
+}
+
 
 void UIHelpBrowserTabManager::sltHandletabTitleChange(const QString &strTitle)
@@ -1408 +1446 @@
 void UIHelpBrowserWidget::loadOptions()
 {
+    if (m_pTabManager)
+        m_pTabManager->setZoomPercentage(gEDataManager->helpBrowserZoomPercentage());
 }
 
@@ -1443 +1483 @@
 {
     if (m_pTabManager)
+    {
         gEDataManager->setHelpBrowserLastUrlList(m_pTabManager->tabUrlList());
+        gEDataManager->setHelpBrowserZoomPercentage(m_pTabManager->zoomPercentage());
+    }
 }
 

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

@@ -441 +441 @@
     {
         case ZoomOperation_In:
-            m_iZoomPercentage += iZoomPercentageStep;
+            iPrevZoom += iZoomPercentageStep;
             break;
         case ZoomOperation_Out:
-            m_iZoomPercentage -= iZoomPercentageStep;
+            iPrevZoom -= iZoomPercentageStep;
             break;
         case ZoomOperation_Reset:
         default:
-            m_iZoomPercentage = 100;
+            iPrevZoom = 100;
             break;
     }
-
-    if (m_iZoomPercentage > zoomPercentageMinMax.second ||
-        m_iZoomPercentage < zoomPercentageMinMax.first)
-        m_iZoomPercentage = iPrevZoom;
+    setZoomPercentage(iPrevZoom);
+}
+
+void UIHelpViewer::setZoomPercentage(int iZoomPercentage)
+{
+    if (iZoomPercentage > zoomPercentageMinMax.second ||
+        iZoomPercentage < zoomPercentageMinMax.first ||
+        m_iZoomPercentage == iZoomPercentage)
+        return;
+
+    m_iZoomPercentage = iZoomPercentage;
     scaleFont();
-
     emit sigZoomPercentageChanged(m_iZoomPercentage);
+}
+
+
+int UIHelpViewer::zoomPercentage() const
+{
+    return m_iZoomPercentage;
 }
 

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

@@ -67 +67 @@
     bool isFindInPageWidgetVisible() const;
     void zoom(ZoomOperation enmZoomOperation);
+    int zoomPercentage() const;
+    void setZoomPercentage(int iZoomPercentage);
 
     static const QPair<int, int> zoomPercentageMinMax;