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

Timestamp:

Sep 26, 2023 11:41:17 AM (16 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10523. Addendum to r159247.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICommon.cpp (modified) (1 diff)
• globals/UICommon.h (modified) (1 diff)
• globals/UIGuestOSTypeII.cpp (modified) (1 diff)
• globals/UIGuestOSTypeII.h (modified) (1 diff)
• settings/UIAdvancedSettingsDialogSpecific.cpp (modified) (1 diff)
• settings/UISettingsDialogSpecific.cpp (modified) (1 diff)
• settings/machine/UIMachineSettingsDisplay.cpp (modified) (5 diffs)
• settings/machine/UIMachineSettingsDisplay.h (modified) (3 diffs)
• settings/machine/UIMachineSettingsGeneral.cpp (modified) (1 diff)
• settings/machine/UIMachineSettingsGeneral.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp

@@ -2567 +2567 @@
 }
 
+KGraphicsControllerType UICommon::getRecommendedGraphicsController(const QString &strGuestOSTypeId) const
+{
+    if (!m_pGuestOSTypeManager)
+        return KGraphicsControllerType_Null;
+    return m_pGuestOSTypeManager->getRecommendedGraphicsController(strGuestOSTypeId);
+}
+
 /* static */
 void UICommon::setHelpKeyword(QObject *pObject, const QString &strHelpKeyword)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.h

@@ -502 +502 @@
           * resolution at maximum possible screen depth in bpp. */
         static quint64 requiredVideoMemory(const QString &strGuestOSTypeId, int cMonitors = 1);
+        KGraphicsControllerType getRecommendedGraphicsController(const QString &strGuestOSTypeId) const;
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIGuestOSTypeII.cpp

@@ -121 +121 @@
 }
 
+KGraphicsControllerType UIGuestOSTypeManager::getRecommendedGraphicsController(const QString &strTypeId) const
+{
+    if (strTypeId.isEmpty())
+        return KGraphicsControllerType_Null;
+    foreach (const UIGuestOSTypeII &type, m_guestOSTypes)
+    {
+        if (type.getId() == strTypeId)
+            return type.getRecommendedGraphicsController();
+    }
+    return KGraphicsControllerType_Null;
+}
+
 UIGuestOSTypeII::UIGuestOSTypeII()
 {

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIGuestOSTypeII.h

@@ -63 +63 @@
     UIGuestOSTypeII findGuestTypeById(const QString &strTypeId) const;
 
+    KGraphicsControllerType getRecommendedGraphicsController(const QString &strTypeId) const;
+
 private:
 

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

@@ -514 +514 @@
             UIMachineSettingsDisplay *pDisplayPage = qobject_cast<UIMachineSettingsDisplay*>(m_pSelector->idToPage(MachineSettingsPageType_Display));
             if (pGeneralPage && pDisplayPage)
-                pDisplayPage->setGuestOSType(pGeneralPage->guestOSType());
+                pDisplayPage->setGuestOSTypeId(pGeneralPage->guestOSTypeId());
             break;
         }

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

@@ -518 +518 @@
             UIMachineSettingsDisplay *pDisplayPage = qobject_cast<UIMachineSettingsDisplay*>(m_pSelector->idToPage(MachineSettingsPageType_Display));
             if (pGeneralPage && pDisplayPage)
-                pDisplayPage->setGuestOSType(pGeneralPage->guestOSType());
+                pDisplayPage->setGuestOSTypeId(pGeneralPage->guestOSTypeId());
             break;
         }

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

@@ -294 +294 @@
 
 UIMachineSettingsDisplay::UIMachineSettingsDisplay()
-    : m_guestOSType(CGuestOSType())
+    : m_strGuestOSTypeId(QString())
 #ifdef VBOX_WITH_3D_ACCELERATION
     , m_fWddmModeSupported(false)
@@ -322 +322 @@
 }
 
-void UIMachineSettingsDisplay::setGuestOSType(UIGuestOSTypeII guestOSType)
+void UIMachineSettingsDisplay::setGuestOSTypeId(const QString &strGuestOSTypeId)
 {
     /* Check if guest OS type changed: */
-    if (m_guestOSType == guestOSType)
+    if (m_strGuestOSTypeId == strGuestOSTypeId)
         return;
 
     /* Remember new guest OS type: */
-    m_guestOSType = guestOSType;
-    m_pEditorVideoMemorySize->setGuestOSTypeId(m_guestOSType.getId());
+    m_strGuestOSTypeId = strGuestOSTypeId;
+    m_pEditorVideoMemorySize->setGuestOSTypeId(m_strGuestOSTypeId);
 
 #ifdef VBOX_WITH_3D_ACCELERATION
     /* Check if WDDM mode supported by the guest OS type: */
-    const QString strGuestOSTypeId = m_guestOSType.isOk() ? m_guestOSType.getId() : QString();
-    m_fWddmModeSupported = UICommon::isWddmCompatibleOsType(strGuestOSTypeId);
+    m_fWddmModeSupported = UICommon::isWddmCompatibleOsType(m_strGuestOSTypeId);
     m_pEditorVideoMemorySize->set3DAccelerationSupported(m_fWddmModeSupported);
 #endif /* VBOX_WITH_3D_ACCELERATION */
     /* Acquire recommended graphics controller type: */
-    m_enmGraphicsControllerTypeRecommended = m_guestOSType.getRecommendedGraphicsController();
-
+    m_enmGraphicsControllerTypeRecommended = uiCommon().getRecommendedGraphicsController(m_strGuestOSTypeId);
     /* Revalidate: */
     revalidate();
@@ -636 +634 @@
 
         /* Video RAM amount test: */
-        if (shouldWeWarnAboutLowVRAM() && m_guestOSType.isOk())
-        {
-            quint64 uNeedBytes = UICommon::requiredVideoMemory(m_guestOSType.getId(), m_pEditorMonitorCount->value());
+        if (shouldWeWarnAboutLowVRAM() && !m_strGuestOSTypeId.isEmpty())
+        {
+            quint64 uNeedBytes = UICommon::requiredVideoMemory(m_strGuestOSTypeId, m_pEditorMonitorCount->value());
 
             /* Basic video RAM amount test: */
@@ -664 +662 @@
 
         /* Graphics controller type test: */
-        if (m_guestOSType.isOk())
+        if (!m_strGuestOSTypeId.isEmpty())
         {
             if (graphicsControllerTypeCurrent() != graphicsControllerTypeRecommended())
@@ -1023 +1021 @@
 bool UIMachineSettingsDisplay::shouldWeWarnAboutLowVRAM()
 {
-    bool fResult = true;
-
     QStringList excludingOSList = QStringList()
         << "Other" << "DOS" << "Netware" << "L4" << "QNX" << "JRockitVE";
-    if (!m_guestOSType.isOk() || excludingOSList.contains(m_guestOSType.getId()))
-        fResult = false;
-
-    return fResult;
+    return !excludingOSList.contains(m_strGuestOSTypeId);
 }
 

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

@@ -33 +33 @@
 
 /* GUI includes: */
-#include "UIGuestOSTypeII.h"
 #include "UISettingsPage.h"
 
@@ -63 +62 @@
 
     /** Defines @a comGuestOSType. */
-    void setGuestOSType(UIGuestOSTypeII comGuestOSType);
+    void setGuestOSTypeId(const QString &strGuestOSTypeId);
 
 #ifdef VBOX_WITH_3D_ACCELERATION
@@ -149 +148 @@
 
     /** Holds the guest OS type. */
-    UIGuestOSTypeII  m_guestOSType;
+    QString m_strGuestOSTypeId;
 #ifdef VBOX_WITH_3D_ACCELERATION
     /** Holds whether the guest OS supports WDDM. */

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

@@ -158 +158 @@
 }
 
-UIGuestOSTypeII UIMachineSettingsGeneral::guestOSType() const
-{
-    AssertPtrReturn(m_pEditorNameAndSystem, UIGuestOSTypeII());
-    return m_pEditorNameAndSystem->type();
+QString UIMachineSettingsGeneral::guestOSTypeId() const
+{
+    AssertPtrReturn(m_pEditorNameAndSystem, QString());
+    return m_pEditorNameAndSystem->typeId();
 }
 

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

@@ -33 +33 @@
 
 /* GUI includes: */
-#include "UIGuestOSTypeII.h"
 #include "UISettingsPage.h"
 
@@ -59 +58 @@
     virtual ~UIMachineSettingsGeneral() RT_OVERRIDE;
 
-    /** Returns the VM OS type. */
-    UIGuestOSTypeII guestOSType() const;
+    /** Returns the VM OS type Id. */
+    QString guestOSTypeId() const;
 
 protected: