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

Timestamp:

Dec 5, 2019 5:48:54 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9390: UIGraphicsControllerEditor: Get rid of hardcoded graphics controller types, instead acquire these types through CSystemProperties interface; Besides that, adjust machine settings to advice recommended controller only if it's among supported.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• settings/machine/UIMachineSettingsDisplay.cpp (modified) (2 diffs)
• settings/machine/UIMachineSettingsDisplay.h (modified) (1 diff)
• widgets/UIGraphicsControllerEditor.cpp (modified) (4 diffs)
• widgets/UIGraphicsControllerEditor.h (modified) (2 diffs)

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

@@ -350 +350 @@
 #endif /* VBOX_WITH_VIDEOHWACCEL */
 
+KGraphicsControllerType UIMachineSettingsDisplay::graphicsControllerTypeRecommended() const
+{
+    return   m_pGraphicsControllerEditor->supportedValues().contains(m_enmGraphicsControllerTypeRecommended)
+           ? m_enmGraphicsControllerTypeRecommended
+           : graphicsControllerTypeCurrent();
+}
+
 KGraphicsControllerType UIMachineSettingsDisplay::graphicsControllerTypeCurrent() const
 {
@@ -662 +669 @@
         if (!m_comGuestOSType.isNull())
         {
-            if (m_pGraphicsControllerEditor->value() != m_enmGraphicsControllerTypeRecommended)
+            if (graphicsControllerTypeCurrent() != graphicsControllerTypeRecommended())
             {
 #ifdef VBOX_WITH_3D_ACCELERATION

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

@@ -60 +60 @@
 
     /** Returns recommended graphics controller type. */
-    KGraphicsControllerType graphicsControllerTypeRecommended() const { return m_enmGraphicsControllerTypeRecommended; }
+    KGraphicsControllerType graphicsControllerTypeRecommended() const;
     /** Returns current graphics controller type. */
     KGraphicsControllerType graphicsControllerTypeCurrent() const;

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIGraphicsControllerEditor.cpp

@@ -23 +23 @@
 /* GUI includes: */
 #include "QIComboBox.h"
+#include "UICommon.h"
 #include "UIConverter.h"
 #include "UIGraphicsControllerEditor.h"
+
+/* COM includes: */
+#include "CSystemProperties.h"
 
 
@@ -41 +45 @@
     if (m_pCombo)
     {
-        /* Update cached value: */
-        m_enmValue = enmValue;
+        /* Update cached value and
+         * combo if value has changed: */
+        if (m_enmValue != enmValue)
+        {
+            m_enmValue = enmValue;
+            populateCombo();
+        }
 
         /* Look for proper index to choose: */
@@ -100 +109 @@
             {
                 setFocusProxy(m_pCombo->focusProxy());
+                /* This is necessary since contents is dynamical now: */
+                m_pCombo->setSizeAdjustPolicy(QComboBox::AdjustToContents);
                 if (m_pLabel)
                     m_pLabel->setBuddy(m_pCombo->focusProxy());
@@ -124 +135 @@
 void UIGraphicsControllerEditor::populateCombo()
 {
-    for (int i = 0; i < KGraphicsControllerType_Max; ++i)
-        m_pCombo->addItem(QString(), QVariant::fromValue(static_cast<KGraphicsControllerType>(i)));
+    if (m_pCombo)
+    {
+        /* Clear combo first of all: */
+        m_pCombo->clear();
+
+        /* Load currently supported graphics controller types: */
+        CSystemProperties comProperties = uiCommon().virtualBox().GetSystemProperties();
+        m_supportedValues = comProperties.GetSupportedGraphicsControllerTypes();
+
+        /* Make sure requested value if sane is present as well: */
+        if (   m_enmValue != KGraphicsControllerType_Max
+            && !m_supportedValues.contains(m_enmValue))
+            m_supportedValues.prepend(m_enmValue);
+
+        /* Update combo with all the supported values: */
+        foreach (const KGraphicsControllerType &enmType, m_supportedValues)
+            m_pCombo->addItem(QString(), QVariant::fromValue(enmType));
+
+        /* Retranslate finally: */
+        retranslateUi();
+    }
 }

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIGraphicsControllerEditor.h

@@ -57 +57 @@
     KGraphicsControllerType value() const;
 
+    /** Returns the vector of supported values. */
+    QVector<KGraphicsControllerType> supportedValues() const { return m_supportedValues; }
+
 protected:
 
@@ -80 +83 @@
     KGraphicsControllerType  m_enmValue;
 
+    /** Holds the vector of supported values. */
+    QVector<KGraphicsControllerType>  m_supportedValues;
+
     /** Holds the label instance. */
     QLabel     *m_pLabel;