Changeset 101232 in vbox for trunk/src

Timestamp:

Sep 22, 2023 5:39:44 AM (15 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10523. More fixes in os type detection stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -251 +251 @@
 }
 
-void UINameAndSystemEditor::setGuestOSTypeByTypeId(const QString &strTypeId)
-{
-    AssertReturnVoid(m_pComboFamily);
+bool UINameAndSystemEditor::setGuestOSTypeByTypeId(const QString &strTypeId)
+{
+    AssertReturn(m_pComboFamily, false);
 
     const UIGuestOSTypeManager * const pGuestOSTypeManager = uiCommon().guestOSTypeManager();
-    AssertReturnVoid(pGuestOSTypeManager);
+    AssertReturn(pGuestOSTypeManager, false);
     const UIGuestOSTypeII &type = pGuestOSTypeManager->findGuestTypeById(strTypeId);
     if (!type.isOk())
-        return;
+        return false;
 
     int iFamilyComboIndex = -1;
@@ -271 +271 @@
     /* Bail out if family combo has no such item: */
     if (iFamilyComboIndex == -1)
-        return;
+        return false;
     /* Set the family combo's index. This will cause variant combo to be populated accordingly: */
     m_pComboFamily->setCurrentIndex(iFamilyComboIndex);
@@ -287 +287 @@
             m_pComboVariant->setCurrentIndex(index);
         else
-            return;
+            return false;
     }
 
@@ -299 +299 @@
     if (iTypeIndex != -1)
         m_pComboType->setCurrentIndex(iTypeIndex);
+    return true;
 }
 

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

@@ -122 +122 @@
 
     /* strTypeId should be one of the type ids defined in Global.cpp and returned by IGuestOSType::getId(). */
-    void setGuestOSTypeByTypeId(const QString &strTypeId);
+    bool 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

@@ -179 +179 @@
     { QRegularExpression("sarge.*32",                         QRegularExpression::CaseInsensitiveOption), "Debian31" },
     { QRegularExpression("^etch.*64",                         QRegularExpression::CaseInsensitiveOption), "Debian4_x64" },
+    { QRegularExpression("debian.*4.*64",                     QRegularExpression::CaseInsensitiveOption), "Debian4_x64" },
     { QRegularExpression("^etch.*32",                         QRegularExpression::CaseInsensitiveOption), "Debian4" },
+    { QRegularExpression("debian.*4.*32",                     QRegularExpression::CaseInsensitiveOption), "Debian4" },
     { QRegularExpression("lenny.*64",                         QRegularExpression::CaseInsensitiveOption), "Debian5_x64" },
     { QRegularExpression("lenny.*32",                         QRegularExpression::CaseInsensitiveOption), "Debian5" },
     { QRegularExpression("squeeze.*64",                       QRegularExpression::CaseInsensitiveOption), "Debian6_x64" },
+    { QRegularExpression("debian.*6.*64",                     QRegularExpression::CaseInsensitiveOption), "Debian6_x64" },
     { QRegularExpression("squeeze.*32",                       QRegularExpression::CaseInsensitiveOption), "Debian6" },
+    { QRegularExpression("debian.*6.*32",                     QRegularExpression::CaseInsensitiveOption), "Debian6" },
     { QRegularExpression("wheezy.*64",                        QRegularExpression::CaseInsensitiveOption), "Debian7_x64" },
+    { QRegularExpression("debian.*7.*64",                     QRegularExpression::CaseInsensitiveOption), "Debian7_x64" },
     { QRegularExpression("wheezy.*32",                        QRegularExpression::CaseInsensitiveOption), "Debian7" },
+    { QRegularExpression("debian.*7.*32",                     QRegularExpression::CaseInsensitiveOption), "Debian7" },
     { QRegularExpression("jessie.*64",                        QRegularExpression::CaseInsensitiveOption), "Debian8_x64" },
+    { QRegularExpression("debian.*8.*64",                     QRegularExpression::CaseInsensitiveOption), "Debian8_x64" },
     { QRegularExpression("jessie.*32",                        QRegularExpression::CaseInsensitiveOption), "Debian8" },
+    { QRegularExpression("debian.*8*32",                      QRegularExpression::CaseInsensitiveOption), "Debian8" },
     { QRegularExpression("stretch.*64",                       QRegularExpression::CaseInsensitiveOption), "Debian9_x64" },
     { QRegularExpression("debian.*9.*64",                     QRegularExpression::CaseInsensitiveOption), "Debian9_x64" },
@@ -287 +295 @@
     {
         if (strNewName.contains(gs_OSTypePattern[i].pattern))
+            return pNameAndSystemEditor->setGuestOSTypeByTypeId(gs_OSTypePattern[i].pcstId);
+    }
+    return false;
+}
+
+bool UIWizardNewVMNameOSTypeCommon::guessOSTypeDetectedOSTypeString(UINameAndSystemEditor *pNameAndSystemEditor, QString strDetectedOSType)
+{
+    AssertReturn(pNameAndSystemEditor, false);
+    if (!strDetectedOSType.isEmpty())
+    {
+        if (!pNameAndSystemEditor->setGuestOSTypeByTypeId(strDetectedOSType))
         {
-            pNameAndSystemEditor->setGuestOSTypeByTypeId(gs_OSTypePattern[i].pcstId);
-            return true;
+            pNameAndSystemEditor->setGuestOSTypeByTypeId("Other");
+            /* Return false to allow OS type guessing from name. See caller code: */
+            return false;
         }
-    }
-    return false;
-}
-
-bool UIWizardNewVMNameOSTypeCommon::guessOSTypeDetectedOSTypeString(UINameAndSystemEditor *pNameAndSystemEditor, QString strDetectedOSType)
-{
-    AssertReturn(pNameAndSystemEditor, false);
-
-    if (!strDetectedOSType.isEmpty())
-    {
-        CGuestOSType const osType = uiCommon().vmGuestOSType(strDetectedOSType);
-        if (!osType.isNull())
-        {
-            pNameAndSystemEditor->setType(osType);
-            return true;
-        }
-        /* The detectedOSType shall be a valid OS type ID. So, unless the UI is
-           out of sync with the types in main this shouldn't ever happen. */
-        AssertFailed();
-    }
-    pNameAndSystemEditor->setType(uiCommon().vmGuestOSType("Other"));
-    /* Return false to allow OS type guessing from name. See caller code: */
+        return true;
+    }
+    pNameAndSystemEditor->setGuestOSTypeByTypeId("Other");
     return false;
 }