Changeset 53012 in vbox for trunk/src/VBox/Frontends

Timestamp:

Oct 9, 2014 5:40:56 PM (10 years ago)

Author:

vboxsync

Message:

Main,Frontend: Windows 10 guest os type.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIIconPool.cpp (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (1 diff)
• wizards/newvm/UIWizardNewVMPageBasic1.cpp (modified) (1 diff)

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

@@ -287 +287 @@
     m_guestOSTypeIconNames.insert("Windows81_64",    ":/os_win8_64.png");
     m_guestOSTypeIconNames.insert("Windows2012_64",  ":/os_win2k12_64.png");
+    m_guestOSTypeIconNames.insert("Windows10",       ":/os_win_other.png");
+    m_guestOSTypeIconNames.insert("Windows10_64",    ":/os_win_other.png");
     m_guestOSTypeIconNames.insert("WindowsNT",       ":/os_win_other.png");
     m_guestOSTypeIconNames.insert("WindowsNT_64",    ":/os_win_other.png"); /// @todo os_win_other_64

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

@@ -3556 +3556 @@
            || strGuestOSTypeId.startsWith("Windows8")
            || strGuestOSTypeId.startsWith("Windows81")
+           || strGuestOSTypeId.startsWith("Windows10")
            || strGuestOSTypeId.startsWith("Windows2008")
            || strGuestOSTypeId.startsWith("Windows2012");

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

@@ -74 +74 @@
     { QRegExp( "(Wi.*8.*64)|(W8.*64)",            Qt::CaseInsensitive), "Windows8_64" },
     { QRegExp( "(Wi.*8.*32)|(W8.*32)",            Qt::CaseInsensitive), "Windows8" },
+    { QRegExp( "(Wi.*10.*64)|(W10.*64)",          Qt::CaseInsensitive), "Windows10_64" },
+    { QRegExp( "(Wi.*10.*32)|(W10.*32)",          Qt::CaseInsensitive), "Windows10" },
     { QRegExp(  "Wi.*3.*1",                       Qt::CaseInsensitive), "Windows31" },
     { QRegExp(  "Wi.*64",                         Qt::CaseInsensitive), "WindowsXP_64" },