Changeset 101713 in vbox for trunk

Timestamp:

Nov 2, 2023 9:51:36 AM (18 months ago)

Author:

vboxsync

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

159807

Message:

FE/Qt: bugref:10543: UINameAndSystemEditor cleanup: Missing part of distribution handling, this one is really big; It's about proper combo population, chosing defaults, restoring previously selected items while switching between distributions and some stuff related to availability and NLS.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors

Files:

• UINameAndSystemEditor.cpp (modified) (9 diffs)
• UINameAndSystemEditor.h (modified) (2 diffs)

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

@@ -109 +109 @@
     if (m_pLabelFamily)
         m_pLabelFamily->setEnabled(fEnabled);
+    if (m_pLabelDistribution)
+        m_pLabelDistribution->setEnabled(fEnabled);
     if (m_pLabelType)
         m_pLabelType->setEnabled(fEnabled);
     if (m_pComboFamily)
         m_pComboFamily->setEnabled(fEnabled);
+    if (m_pComboDistribution)
+        m_pComboDistribution->setEnabled(fEnabled);
     if (m_pComboType)
         m_pComboType->setEnabled(fEnabled);
@@ -256 +260 @@
     if (m_pLabelFamily)
         iWidth = qMax(iWidth, m_pLabelFamily->width());
+    if (m_pLabelDistribution)
+        iWidth = qMax(iWidth, m_pLabelDistribution->width());
     if (m_pLabelType)
         iWidth = qMax(iWidth, m_pLabelType->width());
@@ -285 +291 @@
         m_pComboFamily->setToolTip(tr("Selects the operating system type that "
                                       "you plan to install into this virtual machine."));
+    if (m_pComboDistribution)
+        m_pComboDistribution->setToolTip(tr("Selects the operating system subtype that "
+                                            "you plan to install into this virtual machine."));
     if (m_pComboType)
         m_pComboType->setToolTip(tr("Selects the operating system version that "
@@ -303 +312 @@
     /* Sanity check: */
     AssertPtrReturnVoid(m_pComboFamily);
-    AssertPtrReturnVoid(m_pComboDistribution);
 
     /* Acquire new family ID: */
@@ -309 +317 @@
     AssertReturnVoid(!m_strFamilyId.isEmpty());
 
-    m_pComboDistribution->blockSignals(true);
-    m_pLabelDistribution->setEnabled(true);
-
-    m_pComboDistribution->setEnabled(true);
-    m_pComboDistribution->clear();
-
-    const QStringList distributionList = uiCommon().guestOSTypeManager().getSubtypeListForFamilyId(m_strFamilyId);
-
-    if (distributionList.isEmpty())
-    {
-        m_pComboDistribution->setEnabled(false);
-        m_pLabelDistribution->setEnabled(false);
-        /* If subtype list is empty the all the types of the family are added to typ selection combo: */
-        populateTypeCombo(uiCommon().guestOSTypeManager().getTypeListForFamilyId(m_strFamilyId));
-    }
-    else
-    {
-        /* Populate distribution combo: */
-        /* If family is Linux then select Oracle Linux as subtype: */
-        int iOracleIndex = -1;
-        foreach (const QString &strDistribution, distributionList)
-        {
-            m_pComboDistribution->addItem(strDistribution);
-            if (strDistribution.contains(QRegularExpression("Oracle.*Linux")))
-                iOracleIndex = m_pComboDistribution->count() - 1;
-        }
-        if (iOracleIndex != -1)
-            m_pComboDistribution->setCurrentIndex(iOracleIndex);
-
-        populateTypeCombo(uiCommon().guestOSTypeManager().getTypeListForSubtype(m_pComboDistribution->currentText()));
-    }
-    m_pComboDistribution->blockSignals(false);
-
     /* Notify listeners about this change: */
     emit sigOSFamilyChanged(m_strFamilyId);
+
+    /* Pupulate distribution combo: */
+    populateDistributionCombo();
 }
 
@@ -351 +329 @@
     m_strDistribution = strDistribution;
 
+    /* If distribution list is empty, all the types of the family are added to type combo: */
+    const UIGuestOSTypeManager::UIGuestOSTypeInfo types
+         = m_strDistribution.isEmpty()
+         ? uiCommon().guestOSTypeManager().getTypeListForFamilyId(m_strFamilyId)
+         : uiCommon().guestOSTypeManager().getTypeListForSubtype(m_strDistribution);
+
+    /* Save the most recently used item: */
+    m_familyToDistribution[m_strFamilyId] = m_strDistribution;
+
     /* Populate type combo: */
-    populateTypeCombo(uiCommon().guestOSTypeManager().getTypeListForSubtype(strDistribution));
+    populateTypeCombo(types);
 }
 
@@ -368 +355 @@
 
     /* Save the most recently used item: */
-    m_currentIds[m_strFamilyId] = m_strTypeId;
-
-    /* Notifies listeners about OS type change: */
+    if (m_strDistribution.isEmpty())
+        m_familyToType[m_strFamilyId] = m_strTypeId;
+    else
+        m_distributionToType[m_strDistribution] = m_strTypeId;
+
+    /* Notifies listeners about this change: */
     emit sigOsTypeChanged();
 }
@@ -634 +624 @@
 }
 
+void UINameAndSystemEditor::populateDistributionCombo()
+{
+    /* Sanity check: */
+    AssertPtrReturnVoid(m_pComboDistribution);
+
+    /* Acquire a list of suitable sub-types: */
+    const QStringList distributions = uiCommon().guestOSTypeManager().getSubtypeListForFamilyId(m_strFamilyId);
+    m_pLabelDistribution->setEnabled(!distributions.isEmpty());
+    m_pComboDistribution->setEnabled(!distributions.isEmpty());
+
+    /* Block signals initially and clear the combo: */
+    m_pComboDistribution->blockSignals(true);
+    m_pComboDistribution->clear();
+
+    /* Populate distribution combo: */
+    m_pComboDistribution->addItems(distributions);
+
+    /* Unblock signals finally: */
+    m_pComboDistribution->blockSignals(false);
+
+    /* Select preferred OS distribution: */
+    selectPreferredDistribution();
+
+    /* Trigger distribution change handler manually: */
+    sltDistributionChanged(m_pComboDistribution->currentText());
+}
+
 void UINameAndSystemEditor::populateTypeCombo(const UIGuestOSTypeManager::UIGuestOSTypeInfo &types)
 {
@@ -661 +678 @@
 }
 
+void UINameAndSystemEditor::selectPreferredDistribution()
+{
+    /* Try to restore current distribution if possible: */
+    if (m_familyToDistribution.contains(m_strFamilyId))
+        m_pComboDistribution->setCurrentText(m_familyToDistribution.value(m_strFamilyId));
+    /* Oracle Linux for Linux family: */
+    else if (m_strFamilyId == "Linux")
+    {
+        const int iOracleIndex = m_pComboDistribution->findText("Oracle", Qt::MatchContains);
+        if (iOracleIndex != -1)
+            m_pComboDistribution->setCurrentIndex(iOracleIndex);
+    }
+}
+
 void UINameAndSystemEditor::selectPreferredType()
 {
+    /* Try to restore current type if possible: */
+    if (   m_familyToType.contains(m_strFamilyId)
+        || m_distributionToType.contains(m_strDistribution))
+    {
+        const QString strCurrentType = m_familyToType.contains(m_strFamilyId)
+                                     ? m_familyToType.value(m_strFamilyId)
+                                     : m_distributionToType.contains(m_strDistribution)
+                                     ? m_distributionToType.value(m_strDistribution)
+                                     : QString();
+        const int iCurrentIndex = m_pComboType->findData(strCurrentType);
+        if (iCurrentIndex != -1)
+            m_pComboType->setCurrentIndex(iCurrentIndex);
+    }
     /* Windows 11 for Windows family: */
-    if (m_strFamilyId == "Windows")
+    else if (m_strFamilyId == "Windows")
     {
         const QString strDefaultID = GUEST_OS_ID_STR_X64("Windows11");

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

@@ -169 +169 @@
     /** Pupulates VM OS family combo. */
     void populateFamilyCombo();
+    /** Pupulates VM OS distribution combo. */
+    void populateDistributionCombo();
     /** Pupulates VM OS type combo.
       * @param  types  Brings the list of type pairs. */
     void populateTypeCombo(const QList<QPair<QString, QString> > &types);
 
+    /** Selects preferred distribution. */
+    void selectPreferredDistribution();
     /** Selects preferred type. */
     void selectPreferredType();
@@ -199 +203 @@
         QString  m_strTypeId;
 
+        /** Holds the currently chosen OS distributions on per-family basis. */
+        QMap<QString, QString>  m_familyToDistribution;
         /** Holds the currently chosen OS type IDs on per-family basis. */
-        QMap<QString, QString>  m_currentIds;
+        QMap<QString, QString>  m_familyToType;
+        /** Holds the currently chosen OS type IDs on per-distribution basis. */
+        QMap<QString, QString>  m_distributionToType;
     /** @} */