Changeset 57340 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Aug 14, 2015 7:56:57 AM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: New VM wizard:

• Changed guessed OS type for "Win .." from Windows XP to Windows 7.
• Always use Windows XP 32-bit as default for XP, even on 64-bit hosts. See comment for details.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• widgets/UINameAndSystemEditor.cpp (modified) (2 diffs)
• wizards/newvm/UIWizardNewVMPageBasic1.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp

@@ -205 +205 @@
         if (ARCH_BITS == 64 && m_fSupportsHWVirtEx && m_fSupportsLongMode)
             strDefaultID += "_64";
-        int iIndexWinXP = m_pTypeCombo->findData(strDefaultID, TypeID);
-        if (iIndexWinXP != -1)
-            m_pTypeCombo->setCurrentIndex(iIndexWinXP);
+        int iIndexWin7 = m_pTypeCombo->findData(strDefaultID, TypeID);
+        if (iIndexWin7 != -1)
+            m_pTypeCombo->setCurrentIndex(iIndexWin7);
     }
     /* Or select Ubuntu item for Linux family as default: */
@@ -226 +226 @@
 
     /* Unlock the signals of m_pTypeCombo: */
-    m_pTypeCombo->blockSignals (false);
+    m_pTypeCombo->blockSignals(false);
 }
 

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

@@ -58 +58 @@
     { QRegExp(  "Wi.*Me",                         Qt::CaseInsensitive), "WindowsMe" },
     { QRegExp( "(Wi.*NT)|(NT4)",                  Qt::CaseInsensitive), "WindowsNT4" },
-    { QRegExp("((Wi.*XP)|(\\bXP\\b)).*64",        Qt::CaseInsensitive), "WindowsXP_64" },
-    { QRegExp("((Wi.*XP)|(\\bXP\\b)).*32",        Qt::CaseInsensitive), "WindowsXP" },
+    /* Note: Do not automatically set WindowsXP_64 on 64-bit hosts, as Windows XP 64-bit
+     *       is extremely rare -- most users never heard of it even. So always default to 32-bit. */
+    { QRegExp("((Wi.*XP)|(XP)).*",                Qt::CaseInsensitive), "WindowsXP" },
     { QRegExp("((Wi.*2003)|(W2K3)|(Win2K3)).*64", Qt::CaseInsensitive), "Windows2003_64" },
     { QRegExp("((Wi.*2003)|(W2K3)|(Win2K3)).*32", Qt::CaseInsensitive), "Windows2003" },
@@ -77 +78 @@
     { QRegExp( "(Wi.*10.*32)|(W10.*32)",          Qt::CaseInsensitive), "Windows10" },
     { QRegExp(  "Wi.*3.*1",                       Qt::CaseInsensitive), "Windows31" },
-    { QRegExp(  "Wi.*64",                         Qt::CaseInsensitive), "WindowsXP_64" },
-    { QRegExp(  "Wi.*32",                         Qt::CaseInsensitive), "WindowsXP" },
+    /* Set Windows 7 as default for "Windows". */
+    { QRegExp(  "Wi.*64",                         Qt::CaseInsensitive), "Windows7_64" },
+    { QRegExp(  "Wi.*32",                         Qt::CaseInsensitive), "Windows7" },
 
     /* Solaris: */