Changeset 75813 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 29, 2018 12:57:51 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9314. Adding a combo box to machine settings->display->settings to change machine's graphics controller type

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackend.h (modified) (3 diffs)
• converter/UIConverterBackendCOM.cpp (modified) (2 diffs)
• settings/machine/UIMachineSettingsDisplay.cpp (modified) (10 diffs)
• settings/machine/UIMachineSettingsDisplay.ui (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h

@@ -142 +142 @@
 template<> SHARED_LIBRARY_STUFF bool canConvert<KAudioControllerType>();
 template<> SHARED_LIBRARY_STUFF bool canConvert<KAuthType>();
+template<> SHARED_LIBRARY_STUFF bool canConvert<KGraphicsControllerType>();
 template<> SHARED_LIBRARY_STUFF bool canConvert<KStorageBus>();
 template<> SHARED_LIBRARY_STUFF bool canConvert<KStorageControllerType>();
@@ -287 +288 @@
 template<> SHARED_LIBRARY_STUFF QString toString(const KAuthType &type);
 template<> SHARED_LIBRARY_STUFF KAuthType fromString<KAuthType>(const QString &strType);
+template<> SHARED_LIBRARY_STUFF QString toString(const KGraphicsControllerType &type);
+template<> SHARED_LIBRARY_STUFF KGraphicsControllerType fromString<KGraphicsControllerType>(const QString &strType);
 template<> SHARED_LIBRARY_STUFF QString toString(const KStorageBus &bus);
 template<> SHARED_LIBRARY_STUFF QString toString(const KStorageControllerType &type);
@@ -297 +300 @@
 
 #endif /* !___UIConverterBackend_h___ */
-

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendCOM.cpp

@@ -55 +55 @@
 template<> bool canConvert<KAudioControllerType>() { return true; }
 template<> bool canConvert<KAuthType>() { return true; }
+template<> bool canConvert<KGraphicsControllerType>() { return true; }
 template<> bool canConvert<KStorageBus>() { return true; }
 template<> bool canConvert<KStorageControllerType>() { return true; }
@@ -542 +543 @@
 }
 
+/* QString <= KGraphicsControllerType: */
+template<> QString toString(const KGraphicsControllerType &type)
+{
+    switch (type)
+    {
+        case KGraphicsControllerType_Null:     return QApplication::translate("VBoxGlobal", "Null",     "GraphicsControllerType");
+        case KGraphicsControllerType_VBoxVGA:  return QApplication::translate("VBoxGlobal", "VBoxVGA",  "GraphicsControllerType");
+        case KGraphicsControllerType_VMSVGA:   return QApplication::translate("VBoxGlobal", "VMSVGA",   "GraphicsControllerType");
+        case KGraphicsControllerType_VBoxSVGA: return QApplication::translate("VBoxGlobal", "VBoxSVGA", "GraphicsControllerType");
+        default: AssertMsgFailed(("No text for %d", type)); break;
+    }
+    return QString();
+}
+
+/* KGraphicsControllerType <= QString: */
+template<> KGraphicsControllerType fromString<KGraphicsControllerType>(const QString &strType)
+{
+    QHash<QString, KGraphicsControllerType> list;
+    list.insert(QApplication::translate("VBoxGlobal", "Null",     "GraphicsControllerType"), KGraphicsControllerType_Null);
+    list.insert(QApplication::translate("VBoxGlobal", "VBoxVGA",  "GraphicsControllerType"), KGraphicsControllerType_VBoxVGA);
+    list.insert(QApplication::translate("VBoxGlobal", "VMSVGA",  "GraphicsControllerType"), KGraphicsControllerType_VMSVGA);
+    list.insert(QApplication::translate("VBoxGlobal", "VBoxSVGA", "GraphicsControllerType"), KGraphicsControllerType_VBoxSVGA);
+    if (!list.contains(strType))
+    {
+        AssertMsgFailed(("No value for '%s'", strType.toUtf8().constData()));
+    }
+    return list.value(strType, KGraphicsControllerType_Null);
+}
+
 /* QString <= KStorageBus: */
 template<> QString toString(const KStorageBus &bus)

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

@@ -53 +53 @@
         , m_f2dAccelerationEnabled(false)
 #endif /* VBOX_WITH_VIDEOHWACCEL */
+        , m_graphicsControllerType(KGraphicsControllerType_Null)
         , m_fRemoteDisplayServerSupported(false)
         , m_fRemoteDisplayServerEnabled(false)
@@ -80 +81 @@
                && (m_f2dAccelerationEnabled == other.m_f2dAccelerationEnabled)
 #endif /* VBOX_WITH_VIDEOHWACCEL */
+               && (m_graphicsControllerType == other.m_graphicsControllerType)
                && (m_fRemoteDisplayServerSupported == other.m_fRemoteDisplayServerSupported)
                && (m_fRemoteDisplayServerEnabled == other.m_fRemoteDisplayServerEnabled)
@@ -252 +254 @@
     bool    m_f2dAccelerationEnabled;
 #endif /* VBOX_WITH_VIDEOHWACCEL */
-
+    /** Holds the graphics controller type of the virtual machine. */
+    KGraphicsControllerType m_graphicsControllerType;
     /** Holds whether the remote display server is supported. */
     bool       m_fRemoteDisplayServerSupported;
@@ -368 +371 @@
     oldDisplayData.m_f2dAccelerationEnabled = m_machine.GetAccelerate2DVideoEnabled();
 #endif
-
+    oldDisplayData.m_graphicsControllerType = m_machine.GetGraphicsControllerType();
     /* Check whether remote display server is valid: */
     const CVRDEServer &vrdeServer = m_machine.GetVRDEServer();
@@ -432 +435 @@
     m_pCheckbox2DVideo->setChecked(oldDisplayData.m_f2dAccelerationEnabled);
 #endif
+    m_pComboGraphicsControllerType->setCurrentIndex((int)oldDisplayData.m_graphicsControllerType);
     // Should be the last one for this tab:
     m_pEditorVideoMemorySize->setValue(oldDisplayData.m_iCurrentVRAM);
@@ -490 +494 @@
     newDisplayData.m_f2dAccelerationEnabled = m_pCheckbox2DVideo->isChecked();
 #endif
-
+    newDisplayData.m_graphicsControllerType = (KGraphicsControllerType) m_pComboGraphicsControllerType->currentIndex();
     /* If remote display server is supported: */
     newDisplayData.m_fRemoteDisplayServerSupported = m_pCache->base().m_fRemoteDisplayServerSupported;
@@ -680 +684 @@
 #ifdef VBOX_WITH_VIDEOHWACCEL
     setTabOrder(m_pCheckbox3D, m_pCheckbox2DVideo);
-    setTabOrder(m_pCheckbox2DVideo, m_pCheckboxRemoteDisplay);
+    setTabOrder(m_pCheckbox2DVideo, m_pComboGraphicsControllerType);
 #else /* VBOX_WITH_VIDEOHWACCEL */
-    setTabOrder(m_pCheckbox3D, m_pCheckboxRemoteDisplay);
+    setTabOrder(m_pCheckbox3D, m_pComboGraphicsControllerType);
 #endif /* !VBOX_WITH_VIDEOHWACCEL */
+    setTabOrder(m_pComboGraphicsControllerType, m_pCheckboxRemoteDisplay);
 
     /* Remote Display tab-order: */
@@ -760 +765 @@
     m_pCheckbox2DVideo->hide();
 #endif /* !VBOX_WITH_VIDEOHWACCEL */
+    m_pComboGraphicsControllerType->setEnabled(isMachineOffline());
 
     /* Polish 'Remote Display' availability: */
@@ -1044 +1050 @@
             m_pComboRemoteDisplayAuthMethod->insertItem(1, ""); /* KAuthType_External */
             m_pComboRemoteDisplayAuthMethod->insertItem(2, ""); /* KAuthType_Guest */
+        }
+        AssertPtrReturnVoid(m_pComboGraphicsControllerType);
+        {
+            m_pComboGraphicsControllerType->insertItem((int)KGraphicsControllerType_Null, gpConverter->toString(KGraphicsControllerType_Null));
+            m_pComboGraphicsControllerType->insertItem((int)KGraphicsControllerType_VBoxVGA, gpConverter->toString(KGraphicsControllerType_VBoxVGA));
+            m_pComboGraphicsControllerType->insertItem((int)KGraphicsControllerType_VMSVGA, gpConverter->toString(KGraphicsControllerType_VMSVGA));
+            m_pComboGraphicsControllerType->insertItem((int)KGraphicsControllerType_VBoxSVGA, gpConverter->toString(KGraphicsControllerType_VBoxSVGA));
         }
     }
@@ -1413 +1426 @@
         }
 #endif
+        /* Save the Graphics Controller Type: */
+        if (fSuccess && isMachineOffline() && newDisplayData.m_graphicsControllerType != oldDisplayData.m_graphicsControllerType)
+        {
+            m_machine.SetGraphicsControllerType(newDisplayData.m_graphicsControllerType);
+            fSuccess = m_machine.isOk();
+        }
 
         /* Get machine ID for further activities: */

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

@@ -211 +211 @@
             </property>
            </widget>
+          </item>
+          <item row="8" column="0">
+           <widget class="QLabel" name="m_pLabelGraphicsControllerType">
+            <property name="text">
+             <string>&amp;Graphics Controller:</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+            <property name="buddy">
+             <cstring>m_pComboGraphicsControllerType</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="8" column="1" colspan="3">
+           <layout class="QHBoxLayout">
+            <item>
+             <widget class="QComboBox" name="m_pComboGraphicsControllerType" >
+              <property name="sizePolicy" >
+               <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="whatsThis" >
+               <string>Selects the graphics adapter type the virtual machine will use.</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="m_pSpacerHorizontalGraphicsAdapterType">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>0</width>
+                <height>0</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
           </item>
          </layout>