Index: /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h (revision 75885) +++ /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h (revision 75886) @@ -130,4 +130,5 @@ template<> SHARED_LIBRARY_STUFF bool canConvert(); template<> SHARED_LIBRARY_STUFF bool canConvert(); +template<> SHARED_LIBRARY_STUFF bool canConvert(); template<> SHARED_LIBRARY_STUFF bool canConvert(); template<> SHARED_LIBRARY_STUFF bool canConvert(); @@ -142,5 +143,4 @@ template<> SHARED_LIBRARY_STUFF bool canConvert(); template<> SHARED_LIBRARY_STUFF bool canConvert(); -template<> SHARED_LIBRARY_STUFF bool canConvert(); template<> SHARED_LIBRARY_STUFF bool canConvert(); template<> SHARED_LIBRARY_STUFF bool canConvert(); @@ -271,4 +271,6 @@ template<> SHARED_LIBRARY_STUFF QString toString(const KDnDMode &mode); template<> SHARED_LIBRARY_STUFF QString toString(const KPointingHIDType &type); +template<> SHARED_LIBRARY_STUFF QString toString(const KGraphicsControllerType &type); +template<> SHARED_LIBRARY_STUFF KGraphicsControllerType fromString(const QString &strType); template<> SHARED_LIBRARY_STUFF QString toString(const KMediumType &type); template<> SHARED_LIBRARY_STUFF QString toString(const KMediumVariant &variant); @@ -288,6 +290,4 @@ template<> SHARED_LIBRARY_STUFF QString toString(const KAuthType &type); template<> SHARED_LIBRARY_STUFF KAuthType fromString(const QString &strType); -template<> SHARED_LIBRARY_STUFF QString toString(const KGraphicsControllerType &type); -template<> SHARED_LIBRARY_STUFF KGraphicsControllerType fromString(const QString &strType); template<> SHARED_LIBRARY_STUFF QString toString(const KStorageBus &bus); template<> SHARED_LIBRARY_STUFF QString toString(const KStorageControllerType &type); Index: /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendCOM.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendCOM.cpp (revision 75885) +++ /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendCOM.cpp (revision 75886) @@ -43,4 +43,5 @@ template<> bool canConvert() { return true; } template<> bool canConvert() { return true; } +template<> bool canConvert() { return true; } template<> bool canConvert() { return true; } template<> bool canConvert() { return true; } @@ -55,5 +56,4 @@ template<> bool canConvert() { return true; } template<> bool canConvert() { return true; } -template<> bool canConvert() { return true; } template<> bool canConvert() { return true; } template<> bool canConvert() { return true; } @@ -263,4 +263,33 @@ } +/* 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(const QString &strType) +{ + QHash 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 <= KMediumType: */ template<> QString toString(const KMediumType &type) @@ -543,33 +572,4 @@ } -/* 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(const QString &strType) -{ - QHash 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) Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp (revision 75885) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp (revision 75886) @@ -243,29 +243,29 @@ /** Holds the video RAM amount. */ - int m_iCurrentVRAM; + int m_iCurrentVRAM; /** Holds the guest screen count. */ - int m_cGuestScreenCount; + int m_cGuestScreenCount; /** Holds the guest screen scale-factor. */ - QList m_scaleFactors; + QList m_scaleFactors; /** Holds whether the 3D acceleration is enabled. */ - bool m_f3dAccelerationEnabled; + bool m_f3dAccelerationEnabled; #ifdef VBOX_WITH_VIDEOHWACCEL /** Holds whether the 2D video acceleration is enabled. */ - bool m_f2dAccelerationEnabled; + bool m_f2dAccelerationEnabled; #endif /* VBOX_WITH_VIDEOHWACCEL */ - /** Holds the graphics controller type of the virtual machine. */ - KGraphicsControllerType m_graphicsControllerType; + /** Holds the graphics controller type. */ + KGraphicsControllerType m_graphicsControllerType; /** Holds whether the remote display server is supported. */ - bool m_fRemoteDisplayServerSupported; + bool m_fRemoteDisplayServerSupported; /** Holds whether the remote display server is enabled. */ - bool m_fRemoteDisplayServerEnabled; + bool m_fRemoteDisplayServerEnabled; /** Holds the remote display server port. */ - QString m_strRemoteDisplayPort; + QString m_strRemoteDisplayPort; /** Holds the remote display server auth type. */ - KAuthType m_remoteDisplayAuthType; + KAuthType m_remoteDisplayAuthType; /** Holds the remote display server timeout. */ - ulong m_uRemoteDisplayTimeout; + ulong m_uRemoteDisplayTimeout; /** Holds whether the remote display server allows multiple connections. */ - bool m_fRemoteDisplayMultiConnAllowed; + bool m_fRemoteDisplayMultiConnAllowed; /** Holds whether recording is enabled. */ @@ -435,5 +435,5 @@ m_pCheckbox2DVideo->setChecked(oldDisplayData.m_f2dAccelerationEnabled); #endif - m_pComboGraphicsControllerType->setCurrentIndex((int)oldDisplayData.m_graphicsControllerType); + m_pComboGraphicsControllerType->setCurrentIndex(m_pComboGraphicsControllerType->findText(gpConverter->toString(oldDisplayData.m_graphicsControllerType))); // Should be the last one for this tab: m_pEditorVideoMemorySize->setValue(oldDisplayData.m_iCurrentVRAM); @@ -494,5 +494,5 @@ newDisplayData.m_f2dAccelerationEnabled = m_pCheckbox2DVideo->isChecked(); #endif - newDisplayData.m_graphicsControllerType = (KGraphicsControllerType) m_pComboGraphicsControllerType->currentIndex(); + newDisplayData.m_graphicsControllerType = gpConverter->fromString(m_pComboGraphicsControllerType->currentText()); /* If remote display server is supported: */ newDisplayData.m_fRemoteDisplayServerSupported = m_pCache->base().m_fRemoteDisplayServerSupported; @@ -720,4 +720,8 @@ m_pLabelVideoScreenCountMin->setText(QString::number(1)); m_pLabelVideoScreenCountMax->setText(QString::number(qMin(sys.GetMaxGuestMonitors(), (ULONG)8))); + m_pComboGraphicsControllerType->setItemText(0, gpConverter->toString(KGraphicsControllerType_Null)); + m_pComboGraphicsControllerType->setItemText(1, gpConverter->toString(KGraphicsControllerType_VBoxVGA)); + m_pComboGraphicsControllerType->setItemText(2, gpConverter->toString(KGraphicsControllerType_VMSVGA)); + m_pComboGraphicsControllerType->setItemText(3, gpConverter->toString(KGraphicsControllerType_VBoxSVGA)); /* Remote Display stuff: */ @@ -1021,4 +1025,14 @@ m_pScaleFactorEditor->setSpinBoxWidthHint(m_pEditorVideoMemorySize->minimumWidth()); } + + /* Graphics controller combo-box created in the .ui file. */ + AssertPtrReturnVoid(m_pComboGraphicsControllerType); + { + /* Configure combo-box: */ + m_pComboGraphicsControllerType->insertItem(0, ""); /* KGraphicsControllerType_Null */ + m_pComboGraphicsControllerType->insertItem(1, ""); /* KGraphicsControllerType_VBoxVGA */ + m_pComboGraphicsControllerType->insertItem(2, ""); /* KGraphicsControllerType_VMSVGA */ + m_pComboGraphicsControllerType->insertItem(3, ""); /* KGraphicsControllerType_VBoxSVGA */ + } } } @@ -1050,11 +1064,4 @@ 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)); } } Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.ui =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.ui (revision 75885) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.ui (revision 75886) @@ -171,46 +171,4 @@ - - - Acceleration: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - When checked, the virtual machine will be given access to the 3D graphics capabilities available on the host. - - - Enable &3D Acceleration - - - - - - - - 0 - 0 - - - - When checked, the virtual machine will be given access to the Video Acceleration capabilities available on the host. - - - Enable &2D Video Acceleration - - - - @@ -225,5 +183,5 @@ - + @@ -254,4 +212,46 @@ + + + + + Acceleration: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + When checked, the virtual machine will be given access to the 3D graphics capabilities available on the host. + + + Enable &3D Acceleration + + + + + + + + 0 + 0 + + + + When checked, the virtual machine will be given access to the Video Acceleration capabilities available on the host. + + + Enable &2D Video Acceleration + +