Changeset 103905 in vbox

Timestamp:

Mar 18, 2024 6:22:07 PM (13 months ago)

Author:

vboxsync

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

162278

Message:

FE/Qt: bugref:10384: UINameAndSystemEditor: Rework the way how guest OS type being set to the editor; This is more universal, safe and reusing existing code.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp (modified) (4 diffs)

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

@@ -183 +183 @@
 bool UINameAndSystemEditor::setGuestOSTypeByTypeId(const QString &strTypeId)
 {
-    /* Sanity check: */
+    /* Cache passed values locally, they will be required for the final result check: */
+    const QString strFamilyId = gpGlobalSession->guestOSTypeManager().getFamilyId(strTypeId);
+    const QString strDistribution = gpGlobalSession->guestOSTypeManager().getSubtype(strTypeId);
+
+    /* Save passed values, but they can be overridden
+     * in the below populateFamilyCombo() call: */
+    m_strFamilyId = strFamilyId;
+    if (!strDistribution.isEmpty())
+        m_familyToDistribution[familyId()] = strDistribution;
+    if (distribution().isEmpty())
+        m_familyToType[familyId()] = strTypeId;
+    else
+        m_distributionToType[distribution()] = strTypeId;
+
+    /* Repopulate VM OS family/distribution/type combo(s): */
+    populateFamilyCombo();
+
+    /* Family check: */
     AssertPtrReturn(m_pComboFamily, false);
-
-    int iFamilyComboIndex = -1;
-    /* We already have to have an item in the family combo box for this family id: */
-    for (int i = 0; i < m_pComboFamily->count() && iFamilyComboIndex == -1; ++i)
-    {
-        QString strComboFamilyId = m_pComboFamily->itemData(i).toString();
-        if (!strComboFamilyId.isEmpty() && strComboFamilyId == gpGlobalSession->guestOSTypeManager().getFamilyId(strTypeId))
-            iFamilyComboIndex = i;
-    }
-    /* Bail out if family combo has no such item: */
-    if (iFamilyComboIndex == -1)
+    if (m_pComboFamily->currentData().toString() != strFamilyId)
         return false;
-    /* Set the family combo's index. This will cause distribution combo to be populated accordingly: */
-    m_pComboFamily->setCurrentIndex(iFamilyComboIndex);
-
-    /* If distribution is not empty then try to select correct index. This will populate type combo: */
-    QString strDistribution = gpGlobalSession->guestOSTypeManager().getSubtype(strTypeId);
-    if (!strDistribution.isEmpty())
-    {
-        int index = -1;
-        for (int i = 0; i < m_pComboDistribution->count() && index == -1; ++i)
-        {
-            if (strDistribution == m_pComboDistribution->itemText(i))
-                index = i;
-        }
-        if (index != -1)
-            m_pComboDistribution->setCurrentIndex(index);
-        else
-            return false;
-    }
-
-    /* At this point type combo should include the type we want to select: */
-    int iTypeIndex = -1;
-    for (int i = 0; i < m_pComboType->count() && iTypeIndex == -1; ++i)
-    {
-        if (strTypeId == m_pComboType->itemData(i))
-            iTypeIndex = i;
-    }
-    if (iTypeIndex != -1)
-        m_pComboType->setCurrentIndex(iTypeIndex);
+    /* Distribution check: */
+    AssertPtrReturn(m_pComboDistribution, false);
+    if (m_pComboDistribution->currentText() != strDistribution)
+        return false;
+    /* Type check: */
+    AssertPtrReturn(m_pComboType, false);
+    if (m_pComboType->currentData().toString() != strTypeId)
+        return false;
+
+    /* Success by default: */
     return true;
 }
@@ -368 +357 @@
     const UIGuestOSTypeManager::UIGuestOSTypeInfo types
          = strDistribution.isEmpty()
-         ? gpGlobalSession->guestOSTypeManager().getTypesForFamilyId(familyId(), false /* including restricted? */, enmArch)
-         : gpGlobalSession->guestOSTypeManager().getTypesForSubtype(distribution(), false /* including restricted? */, enmArch);
+         ? gpGlobalSession->guestOSTypeManager().getTypesForFamilyId(familyId(),
+                                                                     false /* including restricted? */,
+                                                                     enmArch)
+         : gpGlobalSession->guestOSTypeManager().getTypesForSubtype(distribution(),
+                                                                    false /* including restricted? */,
+                                                                    enmArch);
 
     /* Populate type combo: */
@@ -649 +642 @@
     /* Acquire family IDs: */
     const UIGuestOSTypeManager::UIGuestOSFamilyInfo families
-        = gpGlobalSession->guestOSTypeManager().getFamilies(false /* including restricted? */, enmArch);
+        = gpGlobalSession->guestOSTypeManager().getFamilies(false /* including restricted? */,
+                                                            enmArch);
 
     /* Block signals initially and clear the combo: */
@@ -685 +679 @@
     /* Acquire a list of suitable distributions: */
     const UIGuestOSTypeManager::UIGuestOSSubtypeInfo distributions
-        = gpGlobalSession->guestOSTypeManager().getSubtypesForFamilyId(familyId(), false /* including restricted? */, enmArch);
+        = gpGlobalSession->guestOSTypeManager().getSubtypesForFamilyId(familyId(),
+                                                                       false /* including restricted? */,
+                                                                       enmArch);
     m_pLabelDistribution->setEnabled(!distributions.isEmpty());
     m_pComboDistribution->setEnabled(!distributions.isEmpty());