Changeset 103871 in vbox

Timestamp:

Mar 15, 2024 3:58:13 PM (12 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

162242

Message:

FE/Qt: bugref:10384: UIGuestOSType: Filter out types acquired for particular family/subtype according to cached supported information; That is especially useful for New VM wizard and VM settings.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIGuestOSType.cpp (modified) (4 diffs)
• globals/UIGuestOSType.h (modified) (1 diff)
• settings/editors/UINameAndSystemEditor.cpp (modified) (1 diff)
• widgets/UIGuestOSTypeSelectionButton.cpp (modified) (1 diff)

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

@@ -171 +171 @@
 UIGuestOSTypeManager::UIGuestOSTypeInfo
 UIGuestOSTypeManager::getTypesForFamilyId(const QString &strFamilyId,
+                                          bool fListAll,
                                           KPlatformArchitecture enmArch /* = KPlatformArchitecture_None */) const
 {
@@ -178 +179 @@
     foreach (const UIGuestOSType &type, m_guestOSTypes)
     {
+        if (!fListAll && !type.isSupported())
+            continue;
         if (type.getFamilyId() != strFamilyId)
             continue;
@@ -192 +195 @@
 UIGuestOSTypeManager::UIGuestOSTypeInfo
 UIGuestOSTypeManager::getTypesForSubtype(const QString &strSubtype,
+                                         bool fListAll,
                                          KPlatformArchitecture enmArch /* = KPlatformArchitecture_None */) const
 {
@@ -199 +203 @@
     foreach (const UIGuestOSType &type, m_guestOSTypes)
     {
+        if (!fListAll && !type.isSupported())
+            continue;
         if (type.getSubtype() != strSubtype)
             continue;

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

@@ -201 +201 @@
     /** Returns a list of OS types for the @p strFamilyId. */
     UIGuestOSTypeInfo getTypesForFamilyId(const QString &strFamilyId,
+                                          bool fListAll,
                                           KPlatformArchitecture enmArch = KPlatformArchitecture_None) const;
     /** Returns a list of OS types for the @p strSubtype. */
     UIGuestOSTypeInfo getTypesForSubtype(const QString &strSubtype,
+                                         bool fListAll,
                                          KPlatformArchitecture enmArch = KPlatformArchitecture_None) const;
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp

@@ -343 +343 @@
     const UIGuestOSTypeManager::UIGuestOSTypeInfo types
          = m_strDistribution.isEmpty()
-         ? gpGlobalSession->guestOSTypeManager().getTypesForFamilyId(m_strFamilyId, enmArch)
-         : gpGlobalSession->guestOSTypeManager().getTypesForSubtype(m_strDistribution, enmArch);
+         ? gpGlobalSession->guestOSTypeManager().getTypesForFamilyId(m_strFamilyId, false, enmArch)
+         : gpGlobalSession->guestOSTypeManager().getTypesForSubtype(m_strDistribution, false, enmArch);
 
     /* Save the most recently used item: */

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

@@ -117 +117 @@
 
         if (distributions.isEmpty())
-            createOSTypeMenu(gpGlobalSession->guestOSTypeManager().getTypesForFamilyId(fi.m_strId), pSubMenu);
+            createOSTypeMenu(gpGlobalSession->guestOSTypeManager().getTypesForFamilyId(fi.m_strId, true), pSubMenu);
         else
         {
             foreach (const UISubtypeInfo &distribution, distributions)
-                createOSTypeMenu(gpGlobalSession->guestOSTypeManager().getTypesForSubtype(distribution.m_strName),
+                createOSTypeMenu(gpGlobalSession->guestOSTypeManager().getTypesForSubtype(distribution.m_strName, true),
                                  pSubMenu->addMenu(distribution.m_strName));
         }