diff --git a/VirtualBox/include/VBox/ostypes.h b/VirtualBox/include/VBox/ostypes.h index 4af0a4a..a9a7af6 100644 --- a/VirtualBox/include/VBox/ostypes.h +++ b/VirtualBox/include/VBox/ostypes.h @@ -96,6 +96,8 @@ typedef enum VBOXOSTYPE VBOXOSTYPE_Ubuntu_x64 = 0x5B100, VBOXOSTYPE_Xandros = 0x5C000, VBOXOSTYPE_Xandros_x64 = 0x5C100, + VBOXOSTYPE_ALTLinux = 0x5D000, + VBOXOSTYPE_ALTLinux_x64 = 0x5D100, VBOXOSTYPE_FreeBSD = 0x60000, VBOXOSTYPE_FreeBSD_x64 = 0x60100, VBOXOSTYPE_OpenBSD = 0x61000, diff --git a/VirtualBox/src/VBox/Frontends/VirtualBox/VBoxUI.pro b/VirtualBox/src/VBox/Frontends/VirtualBox/VBoxUI.pro index 52c6e9f..863e12f 100644 --- a/VirtualBox/src/VBox/Frontends/VirtualBox/VBoxUI.pro +++ b/VirtualBox/src/VBox/Frontends/VirtualBox/VBoxUI.pro @@ -62,6 +62,7 @@ IMAGES = images/tpixel.png \ images/vm_show_logs_disabled_32px.png \ images/vm_start_32px.png \ images/vm_start_disabled_32px.png \ + images/os_altlinux.png \ images/os_archlinux.png \ images/os_debian.png \ images/os_dos.png \ diff --git a/VirtualBox/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp b/VirtualBox/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp index d335b33..75f43cf 100644 --- a/VirtualBox/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp +++ b/VirtualBox/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp @@ -4720,6 +4722,8 @@ void VBoxGlobal::init() {"Linux24_64", "os_linux24_64.png"}, {"Linux26", "os_linux26.png"}, {"Linux26_64", "os_linux26_64.png"}, + {"ALTLinux", "os_altlinux.png"}, + {"ALTLinux_64", "os_altlinux_64.png"}, {"ArchLinux", "os_archlinux.png"}, {"ArchLinux_64", "os_archlinux_64.png"}, {"Debian", "os_debian.png"}, diff --git a/VirtualBox/src/VBox/Frontends/VirtualBox4/VirtualBox.qrc b/VirtualBox/src/VBox/Frontends/VirtualBox4/VirtualBox.qrc index 3fd176a..f1ad4cc 100644 --- a/VirtualBox/src/VBox/Frontends/VirtualBox4/VirtualBox.qrc +++ b/VirtualBox/src/VBox/Frontends/VirtualBox4/VirtualBox.qrc @@ -16,6 +16,8 @@ images/vm_show_logs_disabled_32px.png images/vm_start_32px.png images/vm_start_disabled_32px.png + images/os_altlinux.png + images/os_altlinux_64.png images/os_archlinux.png images/os_archlinux_64.png images/os_debian.png diff --git a/VirtualBox/src/VBox/Frontends/VirtualBox4/src/VBoxGlobal.cpp b/VirtualBox/src/VBox/Frontends/VirtualBox4/src/VBoxGlobal.cpp index 7ef4db7..e276bcf 100644 --- a/VirtualBox/src/VBox/Frontends/VirtualBox4/src/VBoxGlobal.cpp +++ b/VirtualBox/src/VBox/Frontends/VirtualBox4/src/VBoxGlobal.cpp @@ -5451,6 +5451,8 @@ void VBoxGlobal::init() {"Linux24_64", ":/os_linux24_64.png"}, {"Linux26", ":/os_linux26.png"}, {"Linux26_64", ":/os_linux26_64.png"}, + {"ALTLinux", ":/os_altlinux.png"}, + {"ALTLinux_64", ":/os_altlinux_64.png"}, {"ArchLinux", ":/os_archlinux.png"}, {"ArchLinux_64", ":/os_archlinux_64.png"}, {"Debian", ":/os_debian.png"}, diff --git a/VirtualBox/src/VBox/Frontends/VirtualBox4/src/VBoxOSTypeSelectorWidget.cpp b/VirtualBox/src/VBox/Frontends/VirtualBox4/src/VBoxOSTypeSelectorWidget.cpp index 9e965c2..ae9e2f6 100644 --- a/VirtualBox/src/VBox/Frontends/VirtualBox4/src/VBoxOSTypeSelectorWidget.cpp +++ b/VirtualBox/src/VBox/Frontends/VirtualBox4/src/VBoxOSTypeSelectorWidget.cpp @@ -185,10 +185,10 @@ void VBoxOSTypeSelectorWidget::onFamilyChanged (int aIndex) if (xpIndex != -1) mCbType->setCurrentIndex (xpIndex); } - /* Or select Ubuntu item for Linux family as default */ + /* Or select AltLinux item for Linux family as default */ else if (familyId == "Linux") { - int ubIndex = mCbType->findData ("Ubuntu", RoleTypeID); + int ubIndex = mCbType->findData ("ALTLinux", RoleTypeID); if (ubIndex != -1) mCbType->setCurrentIndex (ubIndex); } diff --git a/VirtualBox/src/VBox/Main/Global.cpp b/VirtualBox/src/VBox/Main/Global.cpp index cf1edca..e26662d 100644 --- a/VirtualBox/src/VBox/Main/Global.cpp +++ b/VirtualBox/src/VBox/Main/Global.cpp @@ -79,6 +79,10 @@ const Global::OSType Global::sOSTypes [SchemaDefs::OSTypeId_COUNT] = VBOXOSTYPE_Linux26, VBOXOSHINT_NONE, 256, 4, 8 * _1K, NetworkAdapterType_Am79C973 }, { "Linux", "Linux", SchemaDefs_OSTypeId_Linux26_64, "Linux 2.6 (64 bit)", VBOXOSTYPE_Linux26_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 256, 4, 8 * _1K, NetworkAdapterType_I82540EM }, + { "Linux", "Linux", SchemaDefs_OSTypeId_ALTLinux, "ALT Linux", + VBOXOSTYPE_ALTLinux, VBOXOSHINT_NONE, 256, 12, 8 * _1K, NetworkAdapterType_Am79C973 }, + { "Linux", "Linux", SchemaDefs_OSTypeId_ALTLinux_64, "ALT Linux (64 bit)", + VBOXOSTYPE_ALTLinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 256, 12, 8 * _1K, NetworkAdapterType_I82540EM }, { "Linux", "Linux", SchemaDefs_OSTypeId_ArchLinux, "Arch Linux", VBOXOSTYPE_ArchLinux, VBOXOSHINT_NONE, 256, 12, 8 * _1K, NetworkAdapterType_Am79C973 }, { "Linux", "Linux", SchemaDefs_OSTypeId_ArchLinux_64, "Arch Linux (64 bit)", diff --git a/VirtualBox/src/VBox/Main/xml/SettingsConverter.xsl b/VirtualBox/src/VBox/Main/xml/SettingsConverter.xsl index ff3d785..a1c7872 100644 --- a/VirtualBox/src/VBox/Main/xml/SettingsConverter.xsl +++ b/VirtualBox/src/VBox/Main/xml/SettingsConverter.xsl @@ -736,6 +736,7 @@ Value '' of 'HardDisk::type' attribute is invalid. Linux22 Linux24 Linux26 + ALTLinux ArchLinux Debian OpenSUSE diff --git a/VirtualBox/src/VBox/Main/xml/VirtualBox-settings-common.xsd b/VirtualBox/src/VBox/Main/xml/VirtualBox-settings-common.xsd index c6b840b..a821483 100644 --- a/VirtualBox/src/VBox/Main/xml/VirtualBox-settings-common.xsd +++ b/VirtualBox/src/VBox/Main/xml/VirtualBox-settings-common.xsd @@ -165,6 +165,8 @@ + +