Changeset 101382 in vbox for trunk

Timestamp:

Oct 6, 2023 10:02:08 AM (16 months ago)

Author:

vboxsync

Message:

FE/Qt: Marking up some more guest OS ID strings. bugref:10384

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICommon.cpp (modified) (2 diffs)
• globals/UIIconPool.cpp (modified) (1 diff)
• manager/UIVirtualMachineItemCloud.cpp (modified) (3 diffs)
• settings/machine/UIMachineSettingsDisplay.cpp (modified) (2 diffs)
• wizards/newvm/UIWizardNewVMNameOSTypePage.cpp (modified) (3 diffs)

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

@@ -119 +119 @@
 #include "CUSBDeviceFilters.h"
 #include "CVRDEServer.h"
+#include <VBox/com/VirtualBox.h> /* For GUEST_OS_ID_STR_PARTIAL. */
 
 /* Other VBox includes: */
@@ -2435 +2436 @@
 bool UICommon::isWddmCompatibleOsType(const QString &strGuestOSTypeId)
 {
-    return    strGuestOSTypeId.startsWith("WindowsVista")
-           || strGuestOSTypeId.startsWith("Windows7")
-           || strGuestOSTypeId.startsWith("Windows8")
-           || strGuestOSTypeId.startsWith("Windows81")
-           || strGuestOSTypeId.startsWith("Windows10")
-           || strGuestOSTypeId.startsWith("Windows11")
-           || strGuestOSTypeId.startsWith("Windows2008")
-           || strGuestOSTypeId.startsWith("Windows2012")
-           || strGuestOSTypeId.startsWith("Windows2016")
-           || strGuestOSTypeId.startsWith("Windows2019");
+    return    strGuestOSTypeId.startsWith(GUEST_OS_ID_STR_PARTIAL("WindowsVista"))
+           || strGuestOSTypeId.startsWith(GUEST_OS_ID_STR_PARTIAL("Windows7"))
+           || strGuestOSTypeId.startsWith(GUEST_OS_ID_STR_PARTIAL("Windows8"))
+           || strGuestOSTypeId.startsWith(GUEST_OS_ID_STR_PARTIAL("Windows81"))
+           || strGuestOSTypeId.startsWith(GUEST_OS_ID_STR_PARTIAL("Windows10"))
+           || strGuestOSTypeId.startsWith(GUEST_OS_ID_STR_PARTIAL("Windows11"))
+           || strGuestOSTypeId.startsWith(GUEST_OS_ID_STR_PARTIAL("Windows2008"))
+           || strGuestOSTypeId.startsWith(GUEST_OS_ID_STR_PARTIAL("Windows2012"))
+           || strGuestOSTypeId.startsWith(GUEST_OS_ID_STR_PARTIAL("Windows2016"))
+           || strGuestOSTypeId.startsWith(GUEST_OS_ID_STR_PARTIAL("Windows2019"));
 }
 #endif /* VBOX_WITH_3D_ACCELERATION */

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

@@ -651 +651 @@
         /* Assign fallback icon if we do NOT have that 'guest OS type' registered: */
         else if (!strOSTypeID.isNull())
-            m_guestOSTypeIcons[strOSTypeID] = iconSet(m_guestOSTypeIconNames["Other"]);
+            m_guestOSTypeIcons[strOSTypeID] = iconSet(m_guestOSTypeIconNames[GUEST_OS_ID_STR_X86("Other")]);
         /* Assign fallback icon if we do NOT have that 'guest OS type' known: */
         else

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualMachineItemCloud.cpp

@@ -44 +44 @@
 #include "CProgress.h"
 #include "CVirtualBoxErrorInfo.h"
+#include <VBox/com/VirtualBox.h> /* For GUEST_OS_ID_STR_X86. */
 
 
@@ -207 +208 @@
 
             /* Determine VM OS type: */
-            m_strOSTypeId = "Other";
+            m_strOSTypeId = GUEST_OS_ID_STR_X86("Other");
 
             /* Determine VM states: */
@@ -245 +246 @@
 
             /* Determine VM OS type: */
-            m_strOSTypeId = m_fAccessible ? m_comCloudMachine.GetOSTypeId() : "Other";
+            m_strOSTypeId = m_fAccessible ? m_comCloudMachine.GetOSTypeId() : GUEST_OS_ID_STR_X86("Other");
 
             /* Determine VM states: */

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

@@ -54 +54 @@
 #include "CRecordingSettings.h"
 #include "CVRDEServer.h"
+#include <VBox/com/VirtualBox.h> /* For GUEST_OS_ID_STR_X86 and friends. */
 
 
@@ -1021 +1022 @@
 bool UIMachineSettingsDisplay::shouldWeWarnAboutLowVRAM()
 {
-    QStringList excludingOSList = QStringList()
-        << "Other" << "DOS" << "Netware" << "L4" << "QNX" << "JRockitVE";
-    return !excludingOSList.contains(m_strGuestOSTypeId);
+    static const char *s_apszExcludes[] =
+    {
+        GUEST_OS_ID_STR_X86("Other"),
+        GUEST_OS_ID_STR_X64("Other"),
+        GUEST_OS_ID_STR_A64("Other"),
+        GUEST_OS_ID_STR_X64("VBoxBS"),
+        GUEST_OS_ID_STR_X86("DOS"),
+        GUEST_OS_ID_STR_X86("Netware"),
+        GUEST_OS_ID_STR_X86("L4"),
+        GUEST_OS_ID_STR_X86("QNX"),
+        GUEST_OS_ID_STR_X86("JRockitVE"),
+    };
+    for (size_t idx = 0; idx < RT_ELEMENTS(s_apszExcludes); idx++)
+        if (m_strGuestOSTypeId == s_apszExcludes[idx])
+            return false;
+    return true;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp

@@ -57 +57 @@
 {
     /* DOS: */
-    { QRegularExpression("DOS", QRegularExpression::CaseInsensitiveOption), "DOS" },
+    { QRegularExpression("DOS", QRegularExpression::CaseInsensitiveOption), GUEST_OS_ID_STR_X86("DOS") },
 
     /* Windows: */
@@ -308 +308 @@
         if (!pNameAndSystemEditor->setGuestOSTypeByTypeId(strDetectedOSType))
         {
-            pNameAndSystemEditor->setGuestOSTypeByTypeId("Other");
+            pNameAndSystemEditor->setGuestOSTypeByTypeId(GUEST_OS_ID_STR_X86("Other"));
             /* Return false to allow OS type guessing from name. See caller code: */
             return false;
@@ -314 +314 @@
         return true;
     }
-    pNameAndSystemEditor->setGuestOSTypeByTypeId("Other");
+    pNameAndSystemEditor->setGuestOSTypeByTypeId(GUEST_OS_ID_STR_X86("Other"));
     return false;
 }