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

Timestamp:

Mar 6, 2024 2:33:12 PM (9 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10384: UIGuestOSType: Cache whether OS subtype is supported; That allows to exclude unwanted subtypes in OS type editor while still keeping them cached.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -109 +109 @@
 
     /* Cache or update subtype info: */
-    UISubtypeInfo si(strSubtype, enmArch);
+    UISubtypeInfo si(strSubtype, enmArch, fSupported);
     if (!m_guestOSSubtypes.contains(strFamilyId))
         m_guestOSSubtypes[strFamilyId] << si;
@@ -123 +123 @@
             if (subtypes.at(iIndex).m_enmArch != enmArch)
                 subtypes[iIndex].m_enmArch = KPlatformArchitecture_None; // means any
+            if (subtypes.at(iIndex).m_fSupported != fSupported)
+                subtypes[iIndex].m_fSupported = true; // cause at least one is supported
         }
     }
@@ -149 +151 @@
 UIGuestOSTypeManager::UIGuestOSSubtypeInfo
 UIGuestOSTypeManager::getSubtypesForFamilyId(const QString &strFamilyId,
+                                             bool fListAll,
                                              KPlatformArchitecture enmArch /* = KPlatformArchitecture_None */) const
 {
@@ -160 +163 @@
     {
         const KPlatformArchitecture enmCurrentArch = si.m_enmArch;
-        if (enmCurrentArch == enmArch || enmCurrentArch == KPlatformArchitecture_None)
+        if (   (enmCurrentArch == enmArch || enmCurrentArch == KPlatformArchitecture_None)
+            && (fListAll || si.m_fSupported))
             subtypes << si;
     }

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

@@ -87 +87 @@
     UISubtypeInfo()
         : m_enmArch(KPlatformArchitecture_None)
+        , m_fSupported(false)
     {}
 
     /** Constructs subtype info.
-      * @param  strName  Brings the name.
-      * @param  enmArch  Brings the architecture type. */
+      * @param  strName     Brings the name.
+      * @param  enmArch     Brings the architecture type.
+      * @param  fSupported  Brings whether subtype is supported. */
     UISubtypeInfo(const QString &strName,
-                  KPlatformArchitecture enmArch)
+                  KPlatformArchitecture enmArch,
+                  bool fSupported)
         : m_strName(strName)
         , m_enmArch(enmArch)
+        , m_fSupported(fSupported)
     {}
 
@@ -108 +112 @@
     /** Holds the architecture. */
     KPlatformArchitecture  m_enmArch;
+    /** Holds whether subtype is supported. */
+    bool                   m_fSupported;
 };
 
@@ -181 +187 @@
     void reCacheGuestOSTypes();
 
-    /** Returns a list of all families. */
+    /** Returns a list of all families.
+      * @param  fListAll  Brings whether a list of all families is requested, supported otherwise. */
     UIGuestOSFamilyInfo getFamilies(bool fListAll,
                                     KPlatformArchitecture enmArch = KPlatformArchitecture_None) const;
-    /** Returns the list of subtypes for @p strFamilyId. This may be an empty list. */
+    /** Returns the list of subtypes for @p strFamilyId. This may be an empty list.
+      * @param  fListAll  Brings whether a list of all subtypes is requested, supported otherwise. */
     UIGuestOSSubtypeInfo getSubtypesForFamilyId(const QString &strFamilyId,
+                                                bool fListAll,
                                                 KPlatformArchitecture enmArch = KPlatformArchitecture_None) const;
     /** Returns a list of OS types for the @p strFamilyId. */

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

@@ -653 +653 @@
     /* Acquire a list of suitable sub-types: */
     const UIGuestOSTypeManager::UIGuestOSSubtypeInfo distributions
-        = uiCommon().guestOSTypeManager().getSubtypesForFamilyId(m_strFamilyId, enmArch);
+        = uiCommon().guestOSTypeManager().getSubtypesForFamilyId(m_strFamilyId, false, enmArch);
     m_pLabelDistribution->setEnabled(!distributions.isEmpty());
     m_pComboDistribution->setEnabled(!distributions.isEmpty());

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

@@ -108 +108 @@
     m_pMainMenu->clear();
 
-    const UIGuestOSTypeManager::UIGuestOSFamilyInfo familyies = uiCommon().guestOSTypeManager().getFamilies(true);
+    const UIGuestOSTypeManager::UIGuestOSFamilyInfo families
+        = uiCommon().guestOSTypeManager().getFamilies(true);
 
-    for (int i = 0; i < familyies.size(); ++i)
+    for (int i = 0; i < families.size(); ++i)
     {
-        const UIFamilyInfo &fi = familyies.at(i);
+        const UIFamilyInfo &fi = families.at(i);
         QMenu *pSubMenu = m_pMainMenu->addMenu(fi.m_strDescription);
-        const UIGuestOSTypeManager::UIGuestOSSubtypeInfo distributions = uiCommon().guestOSTypeManager().getSubtypesForFamilyId(fi.m_strId);
+        const UIGuestOSTypeManager::UIGuestOSSubtypeInfo distributions
+            = uiCommon().guestOSTypeManager().getSubtypesForFamilyId(fi.m_strId, true);
 
         if (distributions.isEmpty())