Changeset 53465 in vbox for trunk/src

Timestamp:

Dec 5, 2014 3:47:11 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Mac OS X: 6278: Support for unscaled HiDPI (Retina) video-output: Machine settings: Display page: Machine Window tab extended with check-box for that option.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine

Files:

• UIMachineSettingsDisplay.cpp (modified) (6 diffs)
• UIMachineSettingsDisplay.h (modified) (3 diffs)
• UIMachineSettingsDisplay.ui (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp

@@ -143 +143 @@
     /* Cache Machine Window data: */
     displayData.m_dScaleFactor = gEDataManager->scaleFactor(m_machine.GetId());
+#ifdef Q_WS_MAC
+    displayData.m_fUseUnscaledHiDPIOutput = gEDataManager->useUnscaledHiDPIOutput(m_machine.GetId());
+#endif /* Q_WS_MAC */
     displayData.m_fShowMiniToolBar = gEDataManager->miniToolbarEnabled(m_machine.GetId());
     displayData.m_fMiniToolBarAtTop = gEDataManager->miniToolbarAlignment(m_machine.GetId()) == Qt::AlignTop;
@@ -199 +202 @@
     m_pMenuBarEditor->setActionPool(m_pActionPool);
     m_pEditorGuestScreenScale->setValue(displayData.m_dScaleFactor * 100);
+#ifdef Q_WS_MAC
+    m_pCheckBoxUnscaledHiDPIOutput->setChecked(displayData.m_fUseUnscaledHiDPIOutput);
+#endif /* Q_WS_MAC */
     m_pCheckBoxShowMiniToolBar->setChecked(displayData.m_fShowMiniToolBar);
     m_pComboToolBarAlignment->setChecked(displayData.m_fMiniToolBarAtTop);
@@ -246 +252 @@
     /* Gather Machine Window data from page: */
     displayData.m_dScaleFactor = (double)m_pEditorGuestScreenScale->value() / 100;
+#ifdef Q_WS_MAC
+    displayData.m_fUseUnscaledHiDPIOutput = m_pCheckBoxUnscaledHiDPIOutput->isChecked();
+#endif /* Q_WS_MAC */
     displayData.m_fShowMiniToolBar = m_pCheckBoxShowMiniToolBar->isChecked();
     displayData.m_fMiniToolBarAtTop = m_pComboToolBarAlignment->isChecked();
@@ -335 +344 @@
         {
             gEDataManager->setScaleFactor(displayData.m_dScaleFactor, m_machine.GetId());
+#ifdef Q_WS_MAC
+            gEDataManager->setUseUnscaledHiDPIOutput(displayData.m_fUseUnscaledHiDPIOutput, m_machine.GetId());
+#endif /* Q_WS_MAC */
             gEDataManager->setMiniToolbarEnabled(displayData.m_fShowMiniToolBar, m_machine.GetId());
             gEDataManager->setMiniToolbarAlignment(displayData.m_fMiniToolBarAtTop ? Qt::AlignTop : Qt::AlignBottom, m_machine.GetId());
@@ -503 +515 @@
     setTabOrder(m_pEditorVideoCaptureBitRate, m_pSliderGuestScreenScale);
     setTabOrder(m_pSliderGuestScreenScale, m_pEditorGuestScreenScale);
-    setTabOrder(m_pEditorGuestScreenScale, m_pCheckBoxShowMiniToolBar);
+    setTabOrder(m_pEditorGuestScreenScale, m_pCheckBoxUnscaledHiDPIOutput);
+    setTabOrder(m_pCheckBoxUnscaledHiDPIOutput, m_pCheckBoxShowMiniToolBar);
     setTabOrder(m_pCheckBoxShowMiniToolBar, m_pComboToolBarAlignment);
 }
@@ -560 +573 @@
 
     /* Machine-window tab: */
+    m_pMenuBarEditor->setEnabled(isMachineInValidMode());
+    m_pLabelGuestScreenScale->setEnabled(isMachineInValidMode());
+    m_pSliderGuestScreenScale->setEnabled(isMachineInValidMode());
+    m_pLabelGuestScreenScaleMin->setEnabled(isMachineInValidMode());
+    m_pLabelGuestScreenScaleMax->setEnabled(isMachineInValidMode());
+    m_pEditorGuestScreenScale->setEnabled(isMachineInValidMode());
+#ifdef Q_WS_MAC
+    m_pLabelHiDPI->setEnabled(isMachineInValidMode());
+    m_pCheckBoxUnscaledHiDPIOutput->setEnabled(isMachineInValidMode());
+#else /* !Q_WS_MAC */
+    m_pLabelHiDPI->hide();
+    m_pCheckBoxUnscaledHiDPIOutput->hide();
+#endif /* !Q_WS_MAC */
     m_pLabelMiniToolBar->setEnabled(isMachineInValidMode());
     m_pCheckBoxShowMiniToolBar->setEnabled(isMachineInValidMode());
     m_pComboToolBarAlignment->setEnabled(isMachineInValidMode() && m_pCheckBoxShowMiniToolBar->isChecked());
+    m_pStatusBarEditor->setEnabled(isMachineInValidMode());
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.h

@@ -53 +53 @@
         , m_iVideoCaptureBitRate(0)
         , m_dScaleFactor(1)
+#ifdef Q_WS_MAC
+        , m_fUseUnscaledHiDPIOutput(false)
+#endif /* Q_WS_MAC */
         , m_fShowMiniToolBar(false)
         , m_fMiniToolBarAtTop(false)
@@ -80 +83 @@
                (m_screens == other.m_screens) &&
                (m_dScaleFactor == other.m_dScaleFactor) &&
+#ifdef Q_WS_MAC
+               (m_fUseUnscaledHiDPIOutput == other.m_fUseUnscaledHiDPIOutput) &&
+#endif /* Q_WS_MAC */
                (m_fShowMiniToolBar == other.m_fShowMiniToolBar) &&
                (m_fMiniToolBarAtTop == other.m_fMiniToolBarAtTop);
@@ -116 +122 @@
     /* Variables: Machine Window stuff: */
     double m_dScaleFactor;
+#ifdef Q_WS_MAC
+    bool m_fUseUnscaledHiDPIOutput;
+#endif /* Q_WS_MAC */
     bool m_fShowMiniToolBar;
     bool m_fMiniToolBarAtTop;

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.ui

@@ -722 +722 @@
        </item>
        <item row="3" column="0">
+        <widget class="QLabel" name="m_pLabelHiDPI">
+         <property name="text">
+          <string>HiDPI:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1" colspan="2">
+        <widget class="QCheckBox" name="m_pCheckBoxUnscaledHiDPIOutput">
+         <property name="sizePolicy">
+          <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="whatsThis">
+          <string>If checked, guest screen content will not be logically scaled on hosts with HiDPI screens.</string>
+         </property>
+         <property name="text">
+          <string>Use &amp;Unscaled HiDPI Output</string>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="0">
         <widget class="QLabel" name="m_pLabelMiniToolBar">
          <property name="text">
@@ -731 +757 @@
         </widget>
        </item>
-       <item row="3" column="1" colspan="2">
+       <item row="4" column="1" colspan="2">
         <widget class="QCheckBox" name="m_pCheckBoxShowMiniToolBar">
          <property name="sizePolicy">
@@ -750 +776 @@
         </widget>
        </item>
-       <item row="4" column="1" colspan="2">
+       <item row="5" column="1" colspan="2">
         <widget class="QCheckBox" name="m_pComboToolBarAlignment">
          <property name="sizePolicy">
@@ -769 +795 @@
         </widget>
        </item>
-       <item row="5" column="0" colspan="3">
+       <item row="6" column="0" colspan="3">
         <spacer name="m_pSpacer">
          <property name="orientation">
@@ -782 +808 @@
         </spacer>
        </item>
-       <item row="6" column="0" colspan="3">
+       <item row="7" column="0" colspan="3">
         <widget class="UIStatusBarEditorWidget" name="m_pStatusBarEditor">
          <property name="whatsThis">