Changeset 33620 in vbox

Timestamp:

Oct 29, 2010 3:54:58 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: more gui settings fixes

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm

Files:

• VBoxVMSettingsDisplay.cpp (modified) (6 diffs)
• VBoxVMSettingsDisplay.h (modified) (1 diff)
• VBoxVMSettingsGeneral.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsDisplay.cpp

@@ -151 +151 @@
 
     m_bWddmMode = bWddm;
-    checkMultiMonitorReqs();
+    checkVRAMRequirements();
 }
 #endif
@@ -161 +161 @@
     int currentSize = mMachine.GetVRAMSize();
     m_initialVRAM = RT_MIN(currentSize, m_maxVRAM);
-
-    /* must come _before_ setting the initial memory value */
-    checkMultiMonitorReqs();
 
     /* Memory Size */
@@ -176 +173 @@
     mCb3D->setEnabled (isAccelerationSupported);
     mCb3D->setChecked (mMachine.GetAccelerate3DEnabled());
+
+    /* must come _before_ setting the initial memory value */
+    checkVRAMRequirements();
 
 #ifdef VBOX_WITH_VIDEOHWACCEL
@@ -273 +273 @@
     }
 #endif
+#ifdef VBOX_WITH_CRHGSMI
+    checkVRAMRequirements();
+#endif
 
     /* 3D Acceleration support test */
@@ -335 +338 @@
 {
     mLeMonitors->setText (QString().setNum (aVal));
-    checkMultiMonitorReqs();
+    checkVRAMRequirements();
 }
 
@@ -343 +346 @@
 }
 
-void VBoxVMSettingsDisplay::checkMultiMonitorReqs()
+void VBoxVMSettingsDisplay::checkVRAMRequirements()
 {
     int cVal = mSlMonitors->value();

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsDisplay.h

@@ -65 +65 @@
 private:
 
-    void checkMultiMonitorReqs();
+    void checkVRAMRequirements();
 
     CMachine mMachine;

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsGeneral.cpp

@@ -61 +61 @@
 
 #ifdef VBOX_WITH_CRHGSMI
-#include <stdio.h>
 bool VBoxVMSettingsGeneral::isWddmSupportedForOSType() const
 {
     const QString & id = mOSTypeSelector->type().GetId();
-    printf("%S\n", id.utf16());
     bool bWddm = id == "WindowsVista" || id == "Windows7";
     return bWddm;