Changeset 103674 in vbox

Timestamp:

Mar 4, 2024 6:28:21 PM (7 months ago)

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -38 +38 @@
 void UIGuestOSTypeManager::reCacheGuestOSTypes()
 {
+    /* Acquire CVirtualBox: */
+    CVirtualBox comVBox = uiCommon().virtualBox();
+
+    /* Acquire a total list of guest OS types, supported or not: */
+    CGuestOSTypeVector guestOSTypes = comVBox.GetGuestOSTypes();
+
     /* Acquire a list of guest OS types supported by this host: */
-    CGuestOSTypeVector guestOSTypes;
-    CSystemProperties comSysProps = uiCommon().virtualBox().GetSystemProperties();
-    foreach (const KPlatformArchitecture &enmArch, comSysProps.GetSupportedPlatformArchitectures())
-    {
-        CPlatformProperties comPlatProps = uiCommon().virtualBox().GetPlatformProperties(enmArch);
-        guestOSTypes += comPlatProps.GetSupportedGuestOSTypes();
+    m_supportedGuestOSTypeIDs.clear();
+    CSystemProperties comSystemProps = comVBox.GetSystemProperties();
+    foreach (const KPlatformArchitecture &enmArch, comSystemProps.GetSupportedPlatformArchitectures())
+    {
+        CPlatformProperties comPlatformProps = comVBox.GetPlatformProperties(enmArch);
+        foreach (const CGuestOSType &comType, comPlatformProps.GetSupportedGuestOSTypes())
+            m_supportedGuestOSTypeIDs << comType.GetId();
     }
 
@@ -75 +82 @@
     /* Append guest OS type to a list of cached wrappers: */
     m_guestOSTypes.append(UIGuestOSType(comType));
-    m_typeIdIndexMap[m_guestOSTypes.last().getId()] = m_guestOSTypes.size() - 1;
 
     /* Acquire a bit of attributes: */
+    const QString strId = m_guestOSTypes.last().getId();
     const QString strFamilyId = m_guestOSTypes.last().getFamilyId();
     const QString strFamilyDesc = m_guestOSTypes.last().getFamilyDescription();
     const QString strSubtype = m_guestOSTypes.last().getSubtype();
     const KPlatformArchitecture enmArch = m_guestOSTypes.last().getPlatformArchitecture();
+    const bool fSupported = m_supportedGuestOSTypeIDs.contains(strId);
+
+    /* Remember guest OS type index as well: */
+    m_typeIdIndexMap[strId] = m_guestOSTypes.size() - 1;
 
     /* Cache or update family info: */
-    UIFamilyInfo fi(strFamilyId, strFamilyDesc, enmArch);
+    UIFamilyInfo fi(strFamilyId, strFamilyDesc, enmArch, fSupported);
     if (!m_guestOSFamilies.contains(fi))
         m_guestOSFamilies << fi;
@@ -93 +104 @@
         if (m_guestOSFamilies.at(iIndex).m_enmArch != enmArch)
             m_guestOSFamilies[iIndex].m_enmArch = KPlatformArchitecture_None; // means any
+        if (m_guestOSFamilies.at(iIndex).m_fSupported != fSupported)
+            m_guestOSFamilies[iIndex].m_fSupported = true; // cause at least one is supported
     }
 
@@ -103 +116 @@
 
 UIGuestOSTypeManager::UIGuestOSFamilyInfo
-UIGuestOSTypeManager::getFamilies(KPlatformArchitecture enmArch /* = KPlatformArchitecture_None */) const
+UIGuestOSTypeManager::getFamilies(bool fListAll, KPlatformArchitecture enmArch /* = KPlatformArchitecture_None */) const
 {
     /* Return all families by default: */
@@ -114 +127 @@
     {
         const KPlatformArchitecture enmCurrentArch = fi.m_enmArch;
-        if (   enmCurrentArch == enmArch
-            || enmCurrentArch == KPlatformArchitecture_None)
+        if (   (enmCurrentArch == enmArch || enmCurrentArch == KPlatformArchitecture_None)
+            && (fListAll || fi.m_fSupported))
             families << fi;
     }

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

@@ -47 +47 @@
     UIFamilyInfo()
         : m_enmArch(KPlatformArchitecture_None)
+        , m_fSupported(false)
     {}
 
@@ -52 +53 @@
       * @param  strId           Brings the family ID.
       * @param  strDescription  Brings the family description.
-      * @param  enmArch         Brings the family architecture. */
+      * @param  enmArch         Brings the family architecture.
+      * @param  fSupported      Brings whether family is supported. */
     UIFamilyInfo(const QString &strId,
                  const QString &strDescription,
-                 KPlatformArchitecture enmArch)
+                 KPlatformArchitecture enmArch,
+                 bool fSupported)
         : m_strId(strId)
         , m_strDescription(strDescription)
         , m_enmArch(enmArch)
+        , m_fSupported(fSupported)
     {}
 
@@ -73 +77 @@
     /** Holds family architecture. */
     KPlatformArchitecture  m_enmArch;
+    /** Holds whether family is supported. */
+    bool                   m_fSupported;
 };
 
@@ -145 +151 @@
 
     /** Returns a list of all families (id and description). */
-    UIGuestOSFamilyInfo getFamilies(KPlatformArchitecture enmArch = KPlatformArchitecture_None) const;
+    UIGuestOSFamilyInfo getFamilies(bool fListAll, KPlatformArchitecture enmArch = KPlatformArchitecture_None) const;
     /** Returns the list of subtypes for @p strFamilyId. This may be an empty list. */
     QStringList         getSubtypeListForFamilyId(const QString &strFamilyId,
@@ -185 +191 @@
     void addGuestOSType(const CGuestOSType &comType);
 
+    /** Holds the list of supported guest OS type IDs. */
+    QStringList  m_supportedGuestOSTypeIDs;
+
     /** The type list. Here it is a pointer to QVector to delay definition of UIGuestOSType. */
     QVector<UIGuestOSType> m_guestOSTypes;

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

@@ -616 +616 @@
 
     /* Acquire family IDs: */
-    const UIGuestOSTypeManager::UIGuestOSFamilyInfo families = uiCommon().guestOSTypeManager().getFamilies(enmArch);
+    const UIGuestOSTypeManager::UIGuestOSFamilyInfo families = uiCommon().guestOSTypeManager().getFamilies(false, enmArch);
 
     /* Block signals initially and clear the combo: */

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

@@ -108 +108 @@
     m_pMainMenu->clear();
 
-    UIGuestOSTypeManager::UIGuestOSFamilyInfo familyList = uiCommon().guestOSTypeManager().getFamilies();
+    UIGuestOSTypeManager::UIGuestOSFamilyInfo familyList = uiCommon().guestOSTypeManager().getFamilies(true);
 
     for (int i = 0; i < familyList.size(); ++i)