Changeset 101226 in vbox for trunk

Timestamp:

Sep 21, 2023 4:10:07 PM (17 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10523. Fixing 'guest os type detection from vm name' functionality.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIGuestOSTypeII.cpp (modified) (1 diff)
• globals/UIGuestOSTypeII.h (modified) (3 diffs)
• settings/editors/UINameAndSystemEditor.cpp (modified) (4 diffs)
• settings/editors/UINameAndSystemEditor.h (modified) (1 diff)
• wizards/newvm/UIWizardNewVMNameOSTypePage.cpp (modified) (3 diffs)

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

@@ -109 +109 @@
 }
 
+UIGuestOSTypeII UIGuestOSTypeManager::findGuestTypeById(const QString &strTypeId) const
+{
+    if (strTypeId.isEmpty())
+        return UIGuestOSTypeII();
+    foreach (const UIGuestOSTypeII &type, m_guestOSTypes)
+    {
+        if (type.getId() == strTypeId)
+            return type;
+    }
+    return UIGuestOSTypeII();
+}
+
+UIGuestOSTypeII::UIGuestOSTypeII()
+{
+}
 
 UIGuestOSTypeII::UIGuestOSTypeII(const CGuestOSType &comGuestOSType)
     : m_comGuestOSType(comGuestOSType)
 {
+}
+
+bool UIGuestOSTypeII::isOk() const
+{
+    return (!m_comGuestOSType.isNull() && m_comGuestOSType.isOk());
 }
 

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

@@ -61 +61 @@
     UIGuestOSTypeInfo getTypeListForVariant(const QString &strVariant) const;
 
+    UIGuestOSTypeII findGuestTypeById(const QString &strTypeId) const;
+
 private:
 
@@ -74 +76 @@
 class SHARED_LIBRARY_STUFF UIGuestOSTypeII
 {
+
 public:
 
 
     UIGuestOSTypeII(const CGuestOSType &comGuestOSType);
+    UIGuestOSTypeII();
 
     const QString &getFamilyId() const;
@@ -85 +89 @@
     const QString &getDescription() const;
 
+    bool isOk() const;
 
 private:

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

@@ -47 +47 @@
 enum
 {
-    TypeID = Qt::UserRole + 1
+    TypeID = Qt::UserRole + 1,
+    FamilyID = Qt::UserRole + 2
 };
 
@@ -250 +251 @@
 }
 
+void UINameAndSystemEditor::setGuestOSTypeByTypeId(const QString &strTypeId)
+{
+    AssertReturnVoid(m_pComboFamily);
+
+    const UIGuestOSTypeManager * const pGuestOSTypeManager = uiCommon().guestOSTypeManager();
+    AssertReturnVoid(pGuestOSTypeManager);
+    const UIGuestOSTypeII &type = pGuestOSTypeManager->findGuestTypeById(strTypeId);
+    if (!type.isOk())
+        return;
+
+    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, FamilyID).toString();
+        if (!strComboFamilyId.isEmpty() && strComboFamilyId == type.getFamilyId())
+            iFamilyComboIndex = i;
+    }
+    /* Bail out if family combo has no such item: */
+    if (iFamilyComboIndex == -1)
+        return;
+    /* Set the family combo's index. This will cause variant combo to be populated accordingly: */
+    m_pComboFamily->setCurrentIndex(iFamilyComboIndex);
+
+    /* If variant is not empty then try to select correct index. This will populate type combo: */
+    if (!type.getVariant().isEmpty())
+    {
+        int index = -1;
+        for (int i = 0; i < m_pComboVariant->count() && index == -1; ++i)
+        {
+            if (type.getVariant() == m_pComboVariant->itemText(i))
+                index = i;
+        }
+        if (index != -1)
+            m_pComboVariant->setCurrentIndex(index);
+        else
+            return;
+    }
+
+    /* 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, TypeID))
+            iTypeIndex = i;
+    }
+    if (iTypeIndex != -1)
+        m_pComboType->setCurrentIndex(iTypeIndex);
+}
+
 QString UINameAndSystemEditor::typeId() const
 {
@@ -375 +426 @@
     AssertReturnVoid(pGuestOSTypeManager);
 
-    QString strFamilyId = m_pComboFamily->itemData(index).toString();
+    QString strFamilyId = m_pComboFamily->itemData(index, FamilyID).toString();
 
     AssertReturnVoid(!strFamilyId.isEmpty());
@@ -742 +793 @@
 
         m_pComboFamily->addItem(families[i].second);
-        m_pComboFamily->setItemData(i, families[i].first);
+        m_pComboFamily->setItemData(i, families[i].first, FamilyID);
 
         /* Fill in the type cache: */

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

@@ -121 +121 @@
     void setISOImagePath(const QString &strPath);
 
+    /* strTypeId should be one of the type ids defined in Global.cpp and returned by IGuestOSType::getId(). */
+    void setGuestOSTypeByTypeId(const QString &strTypeId);
     /** Defines the VM OS @a strTypeId and @a strFamilyId if passed. */
     void setTypeId(QString strTypeId, QString strFamilyId = QString());

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp

@@ -189 +189 @@
     { QRegularExpression("jessie.*32",                        QRegularExpression::CaseInsensitiveOption), "Debian8" },
     { QRegularExpression("stretch.*64",                       QRegularExpression::CaseInsensitiveOption), "Debian9_x64" },
+    { QRegularExpression("debian.*9.*64",                     QRegularExpression::CaseInsensitiveOption), "Debian9_x64" },
+    { QRegularExpression("debian.*9.*32",                     QRegularExpression::CaseInsensitiveOption), "Debian9" },
     { QRegularExpression("stretch.*32",                       QRegularExpression::CaseInsensitiveOption), "Debian9" },
     { QRegularExpression("buster.*64",                        QRegularExpression::CaseInsensitiveOption), "Debian10_x64" },
+    { QRegularExpression("debian.*10.*64",                    QRegularExpression::CaseInsensitiveOption), "Debian10_x64" },
     { QRegularExpression("buster.*32",                        QRegularExpression::CaseInsensitiveOption), "Debian10" },
+    { QRegularExpression("debian.*10.*32",                    QRegularExpression::CaseInsensitiveOption), "Debian10" },
     { QRegularExpression("bullseye.*64",                      QRegularExpression::CaseInsensitiveOption), "Debian11_x64" },
+    { QRegularExpression("debian.*11.*64",                    QRegularExpression::CaseInsensitiveOption), "Debian11_x64" },
     { QRegularExpression("bullseye.*32",                      QRegularExpression::CaseInsensitiveOption), "Debian11" },
+    { QRegularExpression("debian.*11.*32",                    QRegularExpression::CaseInsensitiveOption), "Debian11" },
     { QRegularExpression("bookworm.*64",                      QRegularExpression::CaseInsensitiveOption), "Debian12_x64" },
+    { QRegularExpression("debian.*12.*64",                    QRegularExpression::CaseInsensitiveOption), "Debian12_x64" },
+    { QRegularExpression("debian.*12",                        QRegularExpression::CaseInsensitiveOption), "Debian12" },
     { QRegularExpression("bookworm.*32",                      QRegularExpression::CaseInsensitiveOption), "Debian12" },
     { QRegularExpression("((trixie)|(sid)).*64",              QRegularExpression::CaseInsensitiveOption), "Debian_x64" },
@@ -280 +288 @@
         if (strNewName.contains(gs_OSTypePattern[i].pattern))
         {
-            pNameAndSystemEditor->setType(uiCommon().vmGuestOSType(gs_OSTypePattern[i].pcstId));
+            pNameAndSystemEditor->setGuestOSTypeByTypeId(gs_OSTypePattern[i].pcstId);
             return true;
         }
@@ -290 +298 @@
 {
     AssertReturn(pNameAndSystemEditor, false);
+
     if (!strDetectedOSType.isEmpty())
     {