1
0
forked from jengelh/virtualbox

Accepting request 224474 from home:saschpe:branches:Virtualization

Please accept only after pkg has built

OBS-URL: https://build.opensuse.org/request/show/224474
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=154
This commit is contained in:
Sascha Peilicke
2014-03-04 11:09:44 +00:00
committed by Git OBS Bridge
parent d684c332ca
commit 09fde748e6
9 changed files with 84 additions and 58 deletions

View File

@@ -1,21 +1,23 @@
Index: src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
===================================================================
--- src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp.orig
+++ src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
@@ -198,14 +198,14 @@ void UINameAndSystemEditor::sltFamilyCha
{
int iIndexWinXP = m_pTypeCombo->findData("WindowsXP", TypeID);
--- a/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp 2014-02-25 18:08:58.000000000 +0100
+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp 2014-03-03 15:18:07.298245235 +0100
@@ -203,15 +203,15 @@
if (iIndexWinXP != -1)
m_pTypeCombo->setCurrentIndex(iIndexWinXP);
}
- /* Or select Ubuntu item for Linux family as default: */
+ /* Or select OpenSUSE item for Linux family as default: */
+ /* Or select openSUSE item for Linux family as default: */
else if (strFamilyId == "Linux")
{
- int iIndexUbuntu = m_pTypeCombo->findData("Ubuntu", TypeID);
+ int iIndexUbuntu = m_pTypeCombo->findData("OpenSUSE", TypeID);
if (iIndexUbuntu != -1)
m_pTypeCombo->setCurrentIndex(iIndexUbuntu);
- QString strDefaultID = "Ubuntu";
+ QString strDefaultID = "openSUSE";
if (ARCH_BITS == 64 && m_fSupportsHWVirtEx && m_fSupportsLongMode)
strDefaultID += "_64";
- int iIndexUbuntu = m_pTypeCombo->findData(strDefaultID, TypeID);
- if (iIndexUbuntu != -1)
- m_pTypeCombo->setCurrentIndex(iIndexUbuntu);
+ int iIndexopenSUSE = m_pTypeCombo->findData(strDefaultID, TypeID);
+ if (iIndexopenSUSE != -1)
+ m_pTypeCombo->setCurrentIndex(iIndexopenSUSE);
}
/* Else simply select the first one present: */
else m_pTypeCombo->setCurrentIndex(0);