Changeset 101711 in vbox

Timestamp:

Nov 2, 2023 9:42:03 AM (15 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10543: UINameAndSystemEditor cleanup: Renaming subtype to distribution as it's more suitable since the lowest grade called type.

Location:

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

Files:

• UINameAndSystemEditor.cpp (modified) (10 diffs)
• UINameAndSystemEditor.h (modified) (3 diffs)

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

@@ -71 +71 @@
     , m_pLabelEdition(0)
     , m_pComboEdition(0)
-    // widgets/ family, subtype, type
+    // widgets/ family, distribution, type
     , m_pLabelFamily(0)
     , m_pComboFamily(0)
-    , m_pLabelSubtype(0)
-    , m_pComboSubtype(0)
+    , m_pLabelDistribution(0)
+    , m_pComboDistribution(0)
     , m_pLabelType(0)
     , m_pComboType(0)
@@ -192 +192 @@
     if (iFamilyComboIndex == -1)
         return false;
-    /* Set the family combo's index. This will cause subtype combo to be populated accordingly: */
+    /* Set the family combo's index. This will cause distribution combo to be populated accordingly: */
     m_pComboFamily->setCurrentIndex(iFamilyComboIndex);
 
-    /* If subtype is not empty then try to select correct index. This will populate type combo: */
-    QString strSubtype = uiCommon().guestOSTypeManager().getSubtype(strTypeId);
-    if (!strSubtype.isEmpty())
+    /* If distribution is not empty then try to select correct index. This will populate type combo: */
+    QString strDistribution = uiCommon().guestOSTypeManager().getSubtype(strTypeId);
+    if (!strDistribution.isEmpty())
     {
         int index = -1;
-        for (int i = 0; i < m_pComboSubtype->count() && index == -1; ++i)
-        {
-            if (strSubtype == m_pComboSubtype->itemText(i))
+        for (int i = 0; i < m_pComboDistribution->count() && index == -1; ++i)
+        {
+            if (strDistribution == m_pComboDistribution->itemText(i))
                 index = i;
         }
         if (index != -1)
-            m_pComboSubtype->setCurrentIndex(index);
+            m_pComboDistribution->setCurrentIndex(index);
         else
             return false;
@@ -273 +273 @@
     if (m_pLabelFamily)
         m_pLabelFamily->setText(tr("&Type:"));
-    if (m_pLabelSubtype)
-        m_pLabelSubtype->setText(tr("&Subtype:"));
+    if (m_pLabelDistribution)
+        m_pLabelDistribution->setText(tr("&Subtype:"));
     if (m_pLabelType)
         m_pLabelType->setText(tr("&Version:"));
@@ -303 +303 @@
     /* Sanity check: */
     AssertPtrReturnVoid(m_pComboFamily);
-    AssertPtrReturnVoid(m_pComboSubtype);
+    AssertPtrReturnVoid(m_pComboDistribution);
 
     /* Acquire new family ID: */
@@ -309 +309 @@
     AssertReturnVoid(!m_strFamilyId.isEmpty());
 
-    m_pComboSubtype->blockSignals(true);
-    m_pLabelSubtype->setEnabled(true);
-
-    m_pComboSubtype->setEnabled(true);
-    m_pComboSubtype->clear();
-
-    const QStringList subtypeList = uiCommon().guestOSTypeManager().getSubtypeListForFamilyId(m_strFamilyId);
-
-    if (subtypeList.isEmpty())
-    {
-        m_pComboSubtype->setEnabled(false);
-        m_pLabelSubtype->setEnabled(false);
+    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));
@@ -326 +326 @@
     else
     {
-        /* Populate subtype combo: */
+        /* Populate distribution combo: */
         /* If family is Linux then select Oracle Linux as subtype: */
         int iOracleIndex = -1;
-        foreach (const QString &strSubtype, subtypeList)
-        {
-            m_pComboSubtype->addItem(strSubtype);
-            if (strSubtype.contains(QRegularExpression("Oracle.*Linux")))
-                iOracleIndex = m_pComboSubtype->count() - 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_pComboSubtype->setCurrentIndex(iOracleIndex);
-
-        populateTypeCombo(uiCommon().guestOSTypeManager().getTypeListForSubtype(m_pComboSubtype->currentText()));
-    }
-    m_pComboSubtype->blockSignals(false);
+            m_pComboDistribution->setCurrentIndex(iOracleIndex);
+
+        populateTypeCombo(uiCommon().guestOSTypeManager().getTypeListForSubtype(m_pComboDistribution->currentText()));
+    }
+    m_pComboDistribution->blockSignals(false);
 
     /* Notify listeners about this change: */
@@ -346 +346 @@
 }
 
-void UINameAndSystemEditor::sltSubtypeChanged(const QString &strSubtype)
-{
-    /* Save new subtype: */
-    m_strSubtype = strSubtype;
+void UINameAndSystemEditor::sltDistributionChanged(const QString &strDistribution)
+{
+    /* Save new distribution: */
+    m_strDistribution = strDistribution;
 
     /* Populate type combo: */
-    populateTypeCombo(uiCommon().guestOSTypeManager().getTypeListForSubtype(strSubtype));
+    populateTypeCombo(uiCommon().guestOSTypeManager().getTypeListForSubtype(strDistribution));
 }
 
@@ -502 +502 @@
             ++iRow;
 
-            /* Prepare VM OS subtype label: */
-            m_pLabelSubtype = new QLabel(this);
-            if (m_pLabelSubtype)
-            {
-                m_pLabelSubtype->setAlignment(Qt::AlignRight);
-                m_pLabelSubtype->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-                m_pLayout->addWidget(m_pLabelSubtype, iRow, 0);
-            }
-            /* Prepare VM OS subtype combo: */
-            m_pComboSubtype = new QComboBox(this);
-            if (m_pComboSubtype)
-            {
-                m_pLabelSubtype->setBuddy(m_pComboSubtype);
-                m_pLayout->addWidget(m_pComboSubtype, iRow, 1);
+            /* Prepare VM OS distribution label: */
+            m_pLabelDistribution = new QLabel(this);
+            if (m_pLabelDistribution)
+            {
+                m_pLabelDistribution->setAlignment(Qt::AlignRight);
+                m_pLabelDistribution->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
+                m_pLayout->addWidget(m_pLabelDistribution, iRow, 0);
+            }
+            /* Prepare VM OS distribution combo: */
+            m_pComboDistribution = new QComboBox(this);
+            if (m_pComboDistribution)
+            {
+                m_pLabelDistribution->setBuddy(m_pComboDistribution);
+                m_pLayout->addWidget(m_pComboDistribution, iRow, 1);
             }
             ++iRow;
@@ -589 +589 @@
         connect(m_pComboFamily, &QComboBox::currentIndexChanged,
                 this, &UINameAndSystemEditor::sltFamilyChanged);
-    if (m_pComboSubtype)
-        connect(m_pComboSubtype, &QComboBox::currentTextChanged,
-                this, &UINameAndSystemEditor::sltSubtypeChanged);
+    if (m_pComboDistribution)
+        connect(m_pComboDistribution, &QComboBox::currentTextChanged,
+                this, &UINameAndSystemEditor::sltDistributionChanged);
     if (m_pComboType)
         connect(m_pComboType, &QComboBox::currentIndexChanged,
@@ -667 +667 @@
         }
     }
-    /* Oracle Linux for Oracle subtype: */
-    else if (m_strSubtype == "Oracle")
+    /* Oracle Linux for Oracle distribution: */
+    else if (m_strDistribution == "Oracle")
     {
         const QString strDefaultID = GUEST_OS_ID_STR_X64("Oracle");

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

@@ -150 +150 @@
     /** Handles VM OS family @a iIndex change. */
     void sltFamilyChanged(int iIndex);
-    /** Handles VM OS @a strSubtype change. */
-    void sltSubtypeChanged(const QString &strSubtype);
+    /** Handles VM OS @a strDistribution change. */
+    void sltDistributionChanged(const QString &strDistribution);
     /** Handles VM OS type @a iIndex change. */
     void sltTypeChanged(int iIndex);
@@ -194 +194 @@
         /** Holds the VM OS family ID. */
         QString  m_strFamilyId;
-        /** Holds the VM OS subtype. */
-        QString  m_strSubtype;
+        /** Holds the VM OS distribution. */
+        QString  m_strDistribution;
         /** Holds the VM OS type ID. */
         QString  m_strTypeId;
@@ -232 +232 @@
         /** Holds the VM OS family combo instance. */
         QComboBox *m_pComboFamily;
-        /** Holds the VM OS subtype label instance. */
-        QLabel    *m_pLabelSubtype;
-        /** Holds the VM OS subtype combo instance. */
-        QComboBox *m_pComboSubtype;
+        /** Holds the VM OS distribution label instance. */
+        QLabel    *m_pLabelDistribution;
+        /** Holds the VM OS distribution combo instance. */
+        QComboBox *m_pComboDistribution;
         /** Holds the VM OS type label instance. */
         QLabel    *m_pLabelType;