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

Timestamp:

Feb 10, 2010 7:24:32 AM (15 years ago)

Author:

vboxsync

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

57495

Message:

UINewVMWzd.cpp: Regexp additions. A suggestion.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp (modified) (2 diffs)

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

@@ -61 +61 @@
     { QRegExp("Wi.*7.*64", Qt::CaseInsensitive), "Windows7_64" },
     { QRegExp("Wi.*7", Qt::CaseInsensitive), "Windows7" },
-    { QRegExp("Wi", Qt::CaseInsensitive), "WindowsXP" },
-    { QRegExp("OS2.*W.*4.?5", Qt::CaseInsensitive), "OS2Warp45" },
-    { QRegExp("OS2.*W.*4", Qt::CaseInsensitive), "OS2Warp4" },
-    { QRegExp("OS2.*W", Qt::CaseInsensitive), "OS2Warp3" },
-    { QRegExp("OS2.*e", Qt::CaseInsensitive), "OS2eCS" },
-    { QRegExp("OS2", Qt::CaseInsensitive), "OS2" },
+    { QRegExp("(Wi)|(XP)", Qt::CaseInsensitive), "WindowsXP" },
+    { QRegExp("OS[/|!-]{,1}2.*W.*4.?5", Qt::CaseInsensitive), "OS2Warp45" },
+    { QRegExp("OS[/|!-]{,1}2.*W.*4", Qt::CaseInsensitive), "OS2Warp4" },
+    { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "OS2Warp3" },
+    { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" },
+    { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" },
 
     /* Code names for Linux distributions */
@@ -218 +218 @@
     /* Search for a matching OS type based on the string the user typed
      * already. */
+    /** @todo Perhaps we shouldn't do this if the user has manually selected
+     *        anything in any of the the combo boxes. */
     for (size_t i=0; i < RT_ELEMENTS(gs_OSTypePattern); ++i)
         if (strNewText.contains(gs_OSTypePattern[i].pattern))