Changeset 81457 in vbox for trunk

Timestamp:

Oct 22, 2019 4:47:06 PM (5 years ago)

Author:

vboxsync

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

134177

Message:

FE/Qt: bugref:9314: VM settings / Display page: Warn user if current graphics controller type doesn't match recommended one; This also implies auto-correction upon settings being confirmed in case when 3D acceleration was enabled.

Location:

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

Files:

• UISettingsDialogSpecific.cpp (modified) (2 diffs)
• machine/UIMachineSettingsDisplay.cpp (modified) (5 diffs)
• machine/UIMachineSettingsDisplay.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp

@@ -450 +450 @@
     if (m_machine.isOk())
     {
-        /* Guest OS type & VT-x/AMD-V option correlation auto-fix: */
         UIMachineSettingsGeneral *pGeneralPage =
             qobject_cast<UIMachineSettingsGeneral*>(m_pSelector->idToPage(MachineSettingsPageType_General));
         UIMachineSettingsSystem *pSystemPage =
             qobject_cast<UIMachineSettingsSystem*>(m_pSelector->idToPage(MachineSettingsPageType_System));
+#if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_WITH_3D_ACCELERATION)
+        UIMachineSettingsDisplay *pDisplayPage =
+            qobject_cast<UIMachineSettingsDisplay*>(m_pSelector->idToPage(MachineSettingsPageType_Display));
+#endif /* VBOX_WITH_VIDEOHWACCEL || VBOX_WITH_3D_ACCELERATION */
+
+        /* Guest OS type & VT-x/AMD-V option correlation auto-fix: */
         if (pGeneralPage && pSystemPage &&
             pGeneralPage->is64BitOSTypeSelected() && !pSystemPage->isHWVirtExEnabled())
@@ -463 +468 @@
         if (pGeneralPage && !pGeneralPage->isWindowsOSTypeSelected())
         {
-            UIMachineSettingsDisplay *pDisplayPage =
-                qobject_cast<UIMachineSettingsDisplay*>(m_pSelector->idToPage(MachineSettingsPageType_Display));
             if (pDisplayPage && pDisplayPage->isAcceleration2DVideoSelected())
                 m_machine.SetAccelerate2DVideoEnabled(false);
         }
 #endif /* VBOX_WITH_VIDEOHWACCEL */
+
+#ifdef VBOX_WITH_3D_ACCELERATION
+        /* Adjust graphics controller type if necessary: */
+        if (   pDisplayPage
+            && pDisplayPage->isAcceleration3DSelected()
+            && pDisplayPage->graphicsControllerTypeCurrent() != pDisplayPage->graphicsControllerTypeRecommended())
+            m_machine.SetGraphicsControllerType(pDisplayPage->graphicsControllerTypeRecommended());
+#endif /* VBOX_WITH_3D_ACCELERATION */
 
         /* Enable OHCI controller if HID is enabled but no USB controllers present: */

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

@@ -293 +293 @@
     , m_f2DVideoAccelerationSupported(false)
 #endif
+    , m_enmGraphicsControllerTypeRecommended(KGraphicsControllerType_Null)
     , m_pCache(0)
 {
@@ -327 +328 @@
     m_pVideoMemoryEditor->set2DVideoAccelerationSupported(m_f2DVideoAccelerationSupported);
 #endif
+    /* Acquire recommended graphics controller type: */
+    m_enmGraphicsControllerTypeRecommended = m_comGuestOSType.GetRecommendedGraphicsController();
 
     /* Revalidate: */
@@ -332 +335 @@
 }
 
+#ifdef VBOX_WITH_3D_ACCELERATION
+bool UIMachineSettingsDisplay::isAcceleration3DSelected() const
+{
+    return m_pCheckbox3D->isChecked();
+}
+#endif /* VBOX_WITH_3D_ACCELERATION */
+
 #ifdef VBOX_WITH_VIDEOHWACCEL
 bool UIMachineSettingsDisplay::isAcceleration2DVideoSelected() const
@@ -338 +348 @@
 }
 #endif /* VBOX_WITH_VIDEOHWACCEL */
+
+KGraphicsControllerType UIMachineSettingsDisplay::graphicsControllerTypeCurrent() const
+{
+    return m_pGraphicsControllerEditor->value();
+}
 
 bool UIMachineSettingsDisplay::changed() const
@@ -636 +651 @@
         }
 #endif /* VBOX_WITH_VIDEOHWACCEL */
+
+        /* Graphics controller type test: */
+        if (!m_comGuestOSType.isNull())
+        {
+            if (m_pGraphicsControllerEditor->value() != m_enmGraphicsControllerTypeRecommended)
+            {
+#ifdef VBOX_WITH_3D_ACCELERATION
+                if (m_pCheckbox3D->isChecked())
+                    message.second << tr("The virtual machine is configured to use 3D acceleration. This will work only if you "
+                                         "pick a different graphics controller (%1). Either disable 3D acceleration or switch "
+                                         "to required graphics controller type. The latter will be done automatically if you "
+                                         "confirm your changes.")
+                                         .arg(gpConverter->toString(m_enmGraphicsControllerTypeRecommended));
+                else
+#endif /* VBOX_WITH_3D_ACCELERATION */
+                    message.second << tr("The virtual machine is configured to use a graphics controller other than the "
+                                         "recommended one (%1). Please consider switching unless you have a reason to keep the "
+                                         "currently selected graphics controller.")
+                                         .arg(gpConverter->toString(m_enmGraphicsControllerTypeRecommended));
+            }
+        }
 
         /* Serialize message: */

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

@@ -50 +50 @@
     void setGuestOSType(CGuestOSType comGuestOSType);
 
+#ifdef VBOX_WITH_3D_ACCELERATION
+    /** Returns whether 3D Acceleration is enabled. */
+    bool isAcceleration3DSelected() const;
+#endif
 #ifdef VBOX_WITH_VIDEOHWACCEL
     /** Returns whether 2D Video Acceleration is enabled. */
     bool isAcceleration2DVideoSelected() const;
 #endif
+
+    /** Returns recommended graphics controller type. */
+    KGraphicsControllerType graphicsControllerTypeRecommended() const { return m_enmGraphicsControllerTypeRecommended; }
+    /** Returns current graphics controller type. */
+    KGraphicsControllerType graphicsControllerTypeCurrent() const;
 
 protected:
@@ -172 +181 @@
     bool          m_f2DVideoAccelerationSupported;
 #endif
+    /** Holds recommended graphics controller type. */
+    KGraphicsControllerType  m_enmGraphicsControllerTypeRecommended;
 
     /** Holds the page data cache instance. */