Changeset 23685 in vbox for trunk/src

Timestamp:

Oct 12, 2009 12:32:56 PM (15 years ago)

Author:

vboxsync

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

53400

Message:

video 2d accel: display a warning in VM settings UI if 2D is enabled for non-windows guests

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxVMSettingsDisplay.h (modified) (1 diff)
• include/VBoxVMSettingsGeneral.h (modified) (1 diff)
• src/VBoxSettingsDialogSpecific.cpp (modified) (2 diffs)
• src/VBoxVMSettingsDisplay.cpp (modified) (1 diff)
• src/VBoxVMSettingsGeneral.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxVMSettingsDisplay.h

@@ -37 +37 @@
     VBoxVMSettingsDisplay();
 
+#ifdef VBOX_WITH_VIDEOHWACCEL
+    bool isAcceleration2DVideoSelected() const;
+#endif
+
 protected:
 

trunk/src/VBox/Frontends/VirtualBox/include/VBoxVMSettingsGeneral.h

@@ -39 +39 @@
     bool is64BitOSTypeSelected() const;
 
+#ifdef VBOX_WITH_VIDEOHWACCEL
+    bool isWindowsOSTypeSelected() const;
+#endif
+
 protected:
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxSettingsDialogSpecific.cpp

@@ -405 +405 @@
         mMachine.SetHWVirtExEnabled (true);
 
+#ifdef VBOX_WITH_VIDEOHWACCEL
+    /* Disable 2D Video Acceleration for non-Windows guests */
+    if(!generalPage->isWindowsOSTypeSelected())
+    {
+        VBoxVMSettingsDisplay *displayPage =
+            qobject_cast <VBoxVMSettingsDisplay*> (mSelector->idToPage (DisplayId));
+        if(displayPage->isAcceleration2DVideoSelected())
+        {
+            mMachine.SetAccelerate2DVideoEnabled(false);
+        }
+    }
+#endif
+
     /* Clear the "GUI_FirstRun" extra data key in case if the boot order
      * and/or disk configuration were changed */
@@ -529 +542 @@
     }
 
+#ifdef VBOX_WITH_VIDEOHWACCEL
+    /* 2D Video Acceleration is available for Windows guests only */
+    if (aPage == mSelector->idToPage (DisplayId))
+    {
+        VBoxVMSettingsGeneral *generalPage =
+            qobject_cast <VBoxVMSettingsGeneral*> (mSelector->idToPage (GeneralId));
+        VBoxVMSettingsDisplay *displayPage =
+            qobject_cast <VBoxVMSettingsDisplay*> (mSelector->idToPage (DisplayId));
+        if(displayPage->isAcceleration2DVideoSelected() && !generalPage->isWindowsOSTypeSelected())
+        {
+            aWarning = tr (
+                "you have Video 2D Acceleration enabled. As Video 2D Acceleration "
+                "is supported for Windows guests only, this feature will be disabled.");
+            return true;
+        }
+    }
+#endif
+
     return true;
 }

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

@@ -100 +100 @@
 }
 
+#ifdef VBOX_WITH_VIDEOHWACCEL
+bool VBoxVMSettingsDisplay::isAcceleration2DVideoSelected() const
+{
+    return mCb2DVideo->isChecked();
+}
+#endif
+
 void VBoxVMSettingsDisplay::getFrom (const CMachine &aMachine)
 {

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

@@ -55 +55 @@
     return mOSTypeSelector->type().GetIs64Bit();
 }
+
+#ifdef VBOX_WITH_VIDEOHWACCEL
+bool VBoxVMSettingsGeneral::isWindowsOSTypeSelected() const
+{
+    return mOSTypeSelector->type().GetFamilyId() == "Windows";
+}
+#endif
 
 void VBoxVMSettingsGeneral::getFrom (const CMachine &aMachine)