Changeset 55720 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

May 7, 2015 12:37:21 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

100132

Message:

FE/Qt: Selector UI: Details pane: Moving scaling related stuff from User Interface to Display element.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElements.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElements.cpp

@@ -411 +411 @@
         if (machine().GetAccessible())
         {
+            /* Damn GetExtraData should be const already :( */
+            CMachine localMachine = machine();
+
             /* Video memory: */
             m_text << UITextTableLine(QApplication::translate("UIGDetails", "Video Memory", "details (display)"),
-                                      QApplication::translate("UIGDetails", "%1 MB", "details").arg(machine().GetVRAMSize()));
+                                      QApplication::translate("UIGDetails", "%1 MB", "details").arg(localMachine.GetVRAMSize()));
 
             /* Screen count: */
-            int cGuestScreens = machine().GetMonitorCount();
+            int cGuestScreens = localMachine.GetMonitorCount();
             if (cGuestScreens > 1)
                 m_text << UITextTableLine(QApplication::translate("UIGDetails", "Screens", "details (display)"),
                                           QString::number(cGuestScreens));
 
+            /* Get scale-factor value: */
+            const QString strScaleFactor = localMachine.GetExtraData(UIExtraDataDefs::GUI_ScaleFactor);
+            {
+                /* Try to convert loaded data to double: */
+                bool fOk = false;
+                double dValue = strScaleFactor.toDouble(&fOk);
+                /* Invent the default value: */
+                if (!fOk || !dValue)
+                    dValue = 1.0;
+                /* Append information: */
+                if (dValue != 1.0)
+                    m_text << UITextTableLine(QApplication::translate("UIGDetails", "Scale-factor", "details (display)"),
+                                              QString::number(dValue, 'f', 2));
+            }
+
+#ifdef Q_WS_MAC
+            /* Get 'Unscaled HiDPI Video Output' mode value: */
+            const QString strUnscaledHiDPIMode = localMachine.GetExtraData(UIExtraDataDefs::GUI_HiDPI_UnscaledOutput);
+            {
+                /* Try to convert loaded data to bool: */
+                const bool fEnabled  = strUnscaledHiDPIMode.compare("true", Qt::CaseInsensitive) == 0 ||
+                                       strUnscaledHiDPIMode.compare("yes", Qt::CaseInsensitive) == 0 ||
+                                       strUnscaledHiDPIMode.compare("on", Qt::CaseInsensitive) == 0 ||
+                                       strUnscaledHiDPIMode == "1";
+                /* Append information: */
+                if (fEnabled)
+                    m_text << UITextTableLine(QApplication::translate("UIGDetails", "Unscaled HiDPI Video Output", "details (display)"),
+                                              QApplication::translate("UIGDetails", "Enabled", "details (display/Unscaled HiDPI Video Output)"));
+            }
+#endif /* Q_WS_MAC */
+
             QStringList acceleration;
 #ifdef VBOX_WITH_VIDEOHWACCEL
             /* 2D acceleration: */
-            if (machine().GetAccelerate2DVideoEnabled())
+            if (localMachine.GetAccelerate2DVideoEnabled())
                 acceleration << QApplication::translate("UIGDetails", "2D Video", "details (display)");
 #endif /* VBOX_WITH_VIDEOHWACCEL */
             /* 3D acceleration: */
-            if (machine().GetAccelerate3DEnabled())
+            if (localMachine.GetAccelerate3DEnabled())
                 acceleration << QApplication::translate("UIGDetails", "3D", "details (display)");
             if (!acceleration.isEmpty())
@@ -435 +469 @@
 
             /* VRDE info: */
-            CVRDEServer srv = machine().GetVRDEServer();
+            CVRDEServer srv = localMachine.GetVRDEServer();
             if (!srv.isNull())
             {
@@ -447 +481 @@
 
             /* Video Capture info: */
-            if (machine().GetVideoCaptureEnabled())
+            if (localMachine.GetVideoCaptureEnabled())
             {
                 m_text << UITextTableLine(QApplication::translate("UIGDetails", "Video Capture File", "details (display/video capture)"),
-                                          machine().GetVideoCaptureFile());
+                                          localMachine.GetVideoCaptureFile());
                 m_text << UITextTableLine(QApplication::translate("UIGDetails", "Video Capture Attributes", "details (display/video capture)"),
                                           QApplication::translate("UIGDetails", "Frame Size: %1x%2, Frame Rate: %3fps, Bit Rate: %4kbps")
-                                             .arg(machine().GetVideoCaptureWidth()).arg(machine().GetVideoCaptureHeight())
-                                             .arg(machine().GetVideoCaptureFPS()).arg(machine().GetVideoCaptureRate()));
+                                             .arg(localMachine.GetVideoCaptureWidth()).arg(localMachine.GetVideoCaptureHeight())
+                                             .arg(localMachine.GetVideoCaptureFPS()).arg(localMachine.GetVideoCaptureRate()));
             }
             else
@@ -1105 +1139 @@
             }
 
-            /* Get scale-factor value: */
-            const QString strScaleFactor = localMachine.GetExtraData(UIExtraDataDefs::GUI_ScaleFactor);
-            {
-                /* Try to convert loaded data to double: */
-                bool fOk = false;
-                double dValue = strScaleFactor.toDouble(&fOk);
-                /* Invent the default value: */
-                if (!fOk || !dValue)
-                    dValue = 1.0;
-                /* Append information: */
-                m_text << UITextTableLine(QApplication::translate("UIGDetails", "Scale-factor", "details (user interface)"), QString::number(dValue, 'f', 2));
-            }
-
-#ifdef Q_WS_MAC
-            /* Get 'Unscaled HiDPI Video Output' mode value: */
-            const QString strUnscaledHiDPIMode = localMachine.GetExtraData(UIExtraDataDefs::GUI_HiDPI_UnscaledOutput);
-            {
-                /* Try to convert loaded data to bool: */
-                const bool fEnabled  = strUnscaledHiDPIMode.compare("true", Qt::CaseInsensitive) == 0 ||
-                                       strUnscaledHiDPIMode.compare("yes", Qt::CaseInsensitive) == 0 ||
-                                       strUnscaledHiDPIMode.compare("on", Qt::CaseInsensitive) == 0 ||
-                                       strUnscaledHiDPIMode == "1";
-                /* Append information: */
-                if (fEnabled)
-                    m_text << UITextTableLine(QApplication::translate("UIGDetails", "Unscaled HiDPI Video Output", "details (user interface)"),
-                                              QApplication::translate("UIGDetails", "Enabled", "details (user interface/Unscaled HiDPI Video Output)"));
-            }
-#endif /* Q_WS_MAC */
-
 #ifndef Q_WS_MAC
             /* Get mini-toolbar availability status: */