Index: /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (revision 19836) +++ /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (revision 19837) @@ -269,4 +269,5 @@ include/VBoxSettingsUtils.h \ include/VBoxVMSettingsGeneral.h \ + include/VBoxVMSettingsSystem.h \ include/VBoxVMSettingsDisplay.h \ include/VBoxVMSettingsHD.h \ @@ -357,4 +358,5 @@ src/VBoxVMLogViewer.cpp \ src/VBoxVMSettingsGeneral.cpp \ + src/VBoxVMSettingsSystem.cpp \ src/VBoxVMSettingsDisplay.cpp \ src/VBoxVMSettingsHD.cpp \ Index: /trunk/src/VBox/Frontends/VirtualBox/VBoxUI.pro =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/VBoxUI.pro (revision 19836) +++ /trunk/src/VBox/Frontends/VirtualBox/VBoxUI.pro (revision 19837) @@ -40,4 +40,5 @@ ui/VBoxVMLogViewer.ui \ ui/VBoxVMSettingsGeneral.ui \ + ui/VBoxVMSettingsSystem.ui \ ui/VBoxVMSettingsDisplay.ui \ ui/VBoxVMSettingsHD.ui \ Index: /trunk/src/VBox/Frontends/VirtualBox/VirtualBox.qrc =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/VirtualBox.qrc (revision 19836) +++ /trunk/src/VBox/Frontends/VirtualBox/VirtualBox.qrc (revision 19837) @@ -336,4 +336,6 @@ images/connect_16px.png images/disconnect_16px.png + images/chipset_16px.png + images/chipset_32px.png Index: /trunk/src/VBox/Frontends/VirtualBox/include/VBoxGlobal.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/include/VBoxGlobal.h (revision 19836) +++ /trunk/src/VBox/Frontends/VirtualBox/include/VBoxGlobal.h (revision 19837) @@ -928,6 +928,4 @@ QPixmap mWarningIcon, mErrorIcon; - mutable bool mDetailReportTemplatesReady; - friend VBoxGlobal &vboxGlobal(); friend class VBoxCallback; Index: /trunk/src/VBox/Frontends/VirtualBox/include/VBoxSettingsDialog.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/include/VBoxSettingsDialog.h (revision 19836) +++ /trunk/src/VBox/Frontends/VirtualBox/include/VBoxSettingsDialog.h (revision 19837) @@ -75,4 +75,6 @@ VBoxSettingsPage* aPrefPage = NULL, int aParentId = -1); + virtual bool correlate (QWidget *aPage, QString &aWarning); + VBoxSettingsSelector *mSelector; QStackedWidget *mStack; Index: /trunk/src/VBox/Frontends/VirtualBox/include/VBoxSettingsDialogSpecific.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/include/VBoxSettingsDialogSpecific.h (revision 19836) +++ /trunk/src/VBox/Frontends/VirtualBox/include/VBoxSettingsDialogSpecific.h (revision 19837) @@ -76,4 +76,5 @@ { GeneralId = 0, + SystemId, DisplayId, StorageId, @@ -102,4 +103,6 @@ QString dialogTitle() const; + bool correlate (QWidget *aPage, QString &aWarning); + private slots: Index: /trunk/src/VBox/Frontends/VirtualBox/include/VBoxVMSettingsGeneral.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/include/VBoxVMSettingsGeneral.h (revision 19836) +++ /trunk/src/VBox/Frontends/VirtualBox/include/VBoxVMSettingsGeneral.h (revision 19837) @@ -37,7 +37,5 @@ VBoxVMSettingsGeneral(); -signals: - - void tableChanged(); + bool is64BitOSTypeSelected() const; protected: @@ -47,5 +45,4 @@ void setValidator (QIWidgetValidator *aVal); - bool revalidate (QString &aWarning, QString &aTitle); void setOrderAfter (QWidget *aWidget); @@ -53,21 +50,6 @@ void retranslateUi(); -private slots: - - void valueChangedRAM (int aVal); - void textChangedRAM (const QString &aText); - - void moveBootItemUp(); - void moveBootItemDown(); - void onCurrentBootItemChanged (QTreeWidgetItem *aItem, - QTreeWidgetItem *aPrev = 0); - - void stateChangedVirt (int aState); - private: - void adjustBootOrderTWSize(); - - bool eventFilter (QObject *aObject, QEvent *aEvent); void showEvent (QShowEvent *aEvent); Index: /trunk/src/VBox/Frontends/VirtualBox/include/VBoxVMSettingsHD.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/include/VBoxVMSettingsHD.h (revision 19836) +++ /trunk/src/VBox/Frontends/VirtualBox/include/VBoxVMSettingsHD.h (revision 19837) @@ -385,5 +385,4 @@ QString getWithNewHDWizard(); int maxNameLength() const; - void prepareComboboxes(); void removeFocus(); KStorageControllerType currentControllerType() const Index: /trunk/src/VBox/Frontends/VirtualBox/include/VBoxVMSettingsSystem.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/include/VBoxVMSettingsSystem.h (revision 19837) +++ /trunk/src/VBox/Frontends/VirtualBox/include/VBoxVMSettingsSystem.h (revision 19837) @@ -0,0 +1,81 @@ +/** @file + * + * VBox frontends: Qt4 GUI ("VirtualBox"): + * VBoxVMSettingsSystem class declaration + */ + +/* + * Copyright (C) 2008-2009 Sun Microsystems, Inc. + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa + * Clara, CA 95054 USA or visit http://www.sun.com if you need + * additional information or have any questions. + */ + +#ifndef __VBoxVMSettingsSystem_h__ +#define __VBoxVMSettingsSystem_h__ + +#include "COMDefs.h" +#include "VBoxSettingsPage.h" +#include "VBoxVMSettingsSystem.gen.h" + +class VBoxVMSettingsSystem : public VBoxSettingsPage, + public Ui::VBoxVMSettingsSystem +{ + Q_OBJECT; + +public: + + VBoxVMSettingsSystem(); + + bool isHWVirtExEnabled() const; + +signals: + + void tableChanged(); + +protected: + + void getFrom (const CMachine &aMachine); + void putBackTo(); + + void setValidator (QIWidgetValidator *aVal); + bool revalidate (QString &aWarning, QString &aTitle); + + void setOrderAfter (QWidget *aWidget); + + void retranslateUi(); + +private slots: + + void valueChangedRAM (int aVal); + void textChangedRAM (const QString &aText); + + void moveBootItemUp(); + void moveBootItemDown(); + void onCurrentBootItemChanged (QTreeWidgetItem *aItem, + QTreeWidgetItem *aPrev = 0); + + void valueChangedCPU (int aVal); + void textChangedCPU (const QString &aText); + +private: + + bool eventFilter (QObject *aObject, QEvent *aEvent); + + void adjustBootOrderTWSize(); + + CMachine mMachine; + QIWidgetValidator *mValidator; +}; + +#endif // __VBoxVMSettingsSystem_h__ + Index: /trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp (revision 19836) +++ /trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp (revision 19837) @@ -759,5 +759,4 @@ , mMediaEnumThread (NULL) , mVerString ("1.0") - , mDetailReportTemplatesReady (false) { } @@ -1581,4 +1580,5 @@ QString VBoxGlobal::detailsReport (const CMachine &aMachine, bool aWithLinks) { + /* Details templates */ static const char *sTableTpl = "%1
"; @@ -1598,46 +1598,29 @@ "%1:%2"; - static QString sGeneralFullHrefTpl, sGeneralFullBoldTpl; - - /* Generate general template after every language change */ - if (!mDetailReportTemplatesReady) - { - mDetailReportTemplatesReady = true; - - QString generalItems - = QString (sSectionItemTpl2).arg (tr ("Name", "details report"), "%1") - + QString (sSectionItemTpl2).arg (tr ("OS Type", "details report"), "%2") - + QString (sSectionItemTpl2).arg (tr ("Base Memory", "details report"), - tr ("%3 MB", "details report")) - + QString (sSectionItemTpl2).arg (tr ("Boot Order", "details report"), "%4") - + QString (sSectionItemTpl2).arg (tr ("ACPI", "details report"), "%5") - + QString (sSectionItemTpl2).arg (tr ("IO APIC", "details report"), "%6") - + QString (sSectionItemTpl2).arg (tr ("VT-x/AMD-V", "details report"), "%7") - + QString (sSectionItemTpl2).arg (tr ("Nested Paging", "details report"), "%8") - + QString (sSectionItemTpl2).arg (tr ("PAE/NX", "details report"), "%9"); - - sGeneralFullHrefTpl = QString (sSectionHrefTpl) - .arg (2 + 9) /* rows */ - .arg (":/machine_16px.png", /* icon */ - "#general", /* link */ - tr ("General", "details report"), /* title */ - generalItems); /* items */ - sGeneralFullBoldTpl = QString (sSectionBoldTpl) - .arg (2 + 9) /* rows */ - .arg (":/machine_16px.png", /* icon */ - "#general", /* link */ - tr ("General", "details report"), /* title */ - generalItems); /* items */ - } + const QString §ionTpl = aWithLinks ? sSectionHrefTpl : sSectionBoldTpl; /* Compose details report */ - const QString §ionTpl = aWithLinks ? sSectionHrefTpl : sSectionBoldTpl; - const QString &generalFullTpl = aWithLinks ? sGeneralFullHrefTpl : sGeneralFullBoldTpl; - QString report; - QString item; /* General */ { + QString item = QString (sSectionItemTpl2).arg (tr ("Name", "details report"), + aMachine.GetName()) + + QString (sSectionItemTpl2).arg (tr ("OS Type", "details report"), + vmGuestOSTypeDescription (aMachine.GetOSTypeId())); + + report += sectionTpl + .arg (2 + 2) /* rows */ + .arg (":/machine_16px.png", /* icon */ + "#general", /* link */ + tr ("General", "details report"), /* title */ + item); /* items */ + } + + /* System */ + { + /* BIOS Settings holder */ + CBIOSSettings biosSettings = aMachine.GetBIOSSettings(); + /* Boot order */ QString bootOrder; @@ -1654,6 +1637,4 @@ bootOrder = toString (KDeviceType_Null); - CBIOSSettings biosSettings = aMachine.GetBIOSSettings(); - /* ACPI */ QString acpi = biosSettings.GetACPIEnabled() @@ -1666,4 +1647,9 @@ : tr ("Disabled", "details report (IO APIC)"); + /* PAE/NX */ + QString pae = aMachine.GetPAEEnabled() + ? tr ("Enabled", "details report (PAE/NX)") + : tr ("Disabled", "details report (PAE/NX)"); + /* VT-x/AMD-V */ QString virt = aMachine.GetHWVirtExEnabled() == KTSBool_True ? @@ -1676,28 +1662,29 @@ : tr ("Disabled", "details report (Nested Paging)"); - /* PAE/NX */ - QString pae = aMachine.GetPAEEnabled() - ? tr ("Enabled", "details report (PAE/NX)") - : tr ("Disabled", "details report (PAE/NX)"); - - /* General */ - report = generalFullTpl - .arg (aMachine.GetName()) - .arg (vmGuestOSTypeDescription (aMachine.GetOSTypeId())) - .arg (aMachine.GetMemorySize()) - .arg (bootOrder) - .arg (acpi) - .arg (ioapic) - .arg (virt) - .arg (nested) - .arg (pae); + QString item = QString (sSectionItemTpl2).arg (tr ("Base Memory", "details report"), + tr ("%1 MB", "details report")) + .arg (aMachine.GetMemorySize()) + + QString (sSectionItemTpl2).arg (tr ("CPU Count", "details report"), + tr ("%1", "details report")) + .arg (aMachine.GetCPUCount()) + + QString (sSectionItemTpl2).arg (tr ("Boot Order", "details report"), bootOrder) + + QString (sSectionItemTpl2).arg (tr ("ACPI", "details report"), acpi) + + QString (sSectionItemTpl2).arg (tr ("IO APIC", "details report"), ioapic) + + QString (sSectionItemTpl2).arg (tr ("PAE/NX", "details report"), pae) + + QString (sSectionItemTpl2).arg (tr ("VT-x/AMD-V", "details report"), virt) + + QString (sSectionItemTpl2).arg (tr ("Nested Paging", "details report"), nested); + + report += sectionTpl + .arg (2 + 8) /* rows */ + .arg (":/chipset_16px.png", /* icon */ + "#system", /* link */ + tr ("System", "details report"), /* title */ + item); /* items */ } /* Display */ { - /* Erase temp item */ - item = QString::null; - - int rows = 2; /* including section header and footer */ + /* Rows including section header and footer */ + int rows = 2; /* Video tab */ @@ -1706,11 +1693,10 @@ : tr ("Disabled", "details report (3D Acceleration)"); - item += QString (sSectionItemTpl2) - .arg (tr ("Video Memory", "details report"), - tr ("%1 MB", "details report")) - .arg (aMachine.GetVRAMSize()); - item += QString (sSectionItemTpl2) - .arg (tr ("3D Acceleration", "details report"), "%2") - .arg (acc3d); + QString item = QString (sSectionItemTpl2) + .arg (tr ("Video Memory", "details report"), + tr ("%1 MB", "details report")) + .arg (aMachine.GetVRAMSize()) + + QString (sSectionItemTpl2) + .arg (tr ("3D Acceleration", "details report"), acc3d); rows += 2; @@ -1731,5 +1717,4 @@ } - /* Full report */ report += sectionTpl .arg (rows) /* rows */ @@ -1742,8 +1727,8 @@ /* Hard Disks */ { - /* Erase temp item */ - item = QString::null; - - int rows = 2; /* including section header and footer */ + /* Rows including section header and footer */ + int rows = 2; + + QString item; CHardDiskAttachmentVector vec = aMachine.GetHardDiskAttachments(); @@ -1789,4 +1774,6 @@ /* DVD */ { + QString item; + CDVDDrive dvd = aMachine.GetDVDDrive(); switch (dvd.GetState()) @@ -1820,4 +1807,5 @@ AssertMsgFailed (("Invalid DVD state: %d", dvd.GetState())); } + report += sectionTpl .arg (2 + 1) /* rows */ @@ -1830,4 +1818,6 @@ /* Floppy */ { + QString item; + CFloppyDrive floppy = aMachine.GetFloppyDrive(); switch (floppy.GetState()) @@ -1861,4 +1851,5 @@ AssertMsgFailed (("Invalid floppy state: %d", floppy.GetState())); } + report += sectionTpl .arg (2 + 1) /* rows */ @@ -1871,4 +1862,6 @@ /* Audio */ { + QString item; + CAudioAdapter audio = aMachine.GetAudioAdapter(); int rows = audio.GetEnabled() ? 3 : 2; @@ -1894,6 +1887,5 @@ /* Network */ { - /* Erase temp item */ - item = QString::null; + QString item; ulong count = mVBox.GetSystemProperties().GetNetworkAdapterCount(); @@ -1946,6 +1938,5 @@ /* Serial Ports */ { - /* Erase temp item */ - item = QString::null; + QString item; ulong count = mVBox.GetSystemProperties().GetSerialPortCount(); @@ -1992,6 +1983,5 @@ /* Parallel Ports */ { - /* Erase temp item */ - item = QString::null; + QString item; ulong count = mVBox.GetSystemProperties().GetParallelPortCount(); @@ -2032,4 +2022,6 @@ /* USB */ { + QString item; + CUSBController ctl = aMachine.GetUSBController(); if (!ctl.isNull()) @@ -2065,4 +2057,6 @@ /* Shared Folders */ { + QString item; + ulong count = aMachine.GetSharedFolders().size(); if (count > 0) @@ -2969,6 +2963,4 @@ mErrorIcon = standardIcon (QStyle::SP_MessageBoxCritical, 0).pixmap (16, 16); Assert (!mErrorIcon.isNull()); - - mDetailReportTemplatesReady = false; /* refresh media properties since they contain some translations too */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/VBoxSettingsDialog.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/VBoxSettingsDialog.cpp (revision 19836) +++ /trunk/src/VBox/Frontends/VirtualBox/src/VBoxSettingsDialog.cpp (revision 19837) @@ -133,6 +133,8 @@ QString title = mSelector->itemTextByPage (page); bool valid = page->revalidate (warning, title); + if (valid && warning.isEmpty()) + valid = correlate (page, warning); warning = warning.isEmpty() ? QString::null : - tr ("On the %1 page, %2").arg (title, warning); + tr ("On the %1 page, %2").arg (title, warning); aWval->setLastWarning (warning); valid ? setWarning (warning) : setError (warning); @@ -272,4 +274,9 @@ if (aPrefPage) attachValidator (aPrefPage); +} + +bool VBoxSettingsDialog::correlate (QWidget*, QString&) +{ + return true; } Index: /trunk/src/VBox/Frontends/VirtualBox/src/VBoxSettingsDialogSpecific.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/VBoxSettingsDialogSpecific.cpp (revision 19836) +++ /trunk/src/VBox/Frontends/VirtualBox/src/VBoxSettingsDialogSpecific.cpp (revision 19837) @@ -36,4 +36,5 @@ #include "VBoxVMSettingsGeneral.h" +#include "VBoxVMSettingsSystem.h" #include "VBoxVMSettingsDisplay.h" #include "VBoxVMSettingsHD.h" @@ -243,8 +244,17 @@ { prefPage = new VBoxVMSettingsGeneral(); - connect (prefPage, SIGNAL (tableChanged()), this, SLOT (resetFirstRunFlag())); addItem (":/machine_32px.png", ":/machine_disabled_32px.png", ":/machine_16px.png", ":/machine_disabled_16px.png", GeneralId, "#general", prefPage); + } + + /* System page */ + if (isAvailable (SystemId)) + { + prefPage = new VBoxVMSettingsSystem(); + connect (prefPage, SIGNAL (tableChanged()), this, SLOT (resetFirstRunFlag())); + addItem (":/chipset_32px.png", ":/chipset_32px.png", + ":/chipset_16px.png", ":/chipset_16px.png", + SystemId, "#system", prefPage); } @@ -398,4 +408,5 @@ void VBoxVMSettingsDlg::getFrom() { + /* Load all the settings pages */ QList pages = mSelector->settingPages(); foreach (VBoxSettingsPage *page, pages) @@ -410,7 +421,17 @@ void VBoxVMSettingsDlg::putBackTo() { + /* Commit all the settings pages */ QList pages = mSelector->settingPages(); foreach (VBoxSettingsPage *page, pages) page->putBackTo(); + + /* Guest OS type & VT-x/AMD-V option correlation test */ + VBoxVMSettingsGeneral *generalPage = + qobject_cast (mSelector->idToPage (GeneralId)); + VBoxVMSettingsSystem *systemPage = + qobject_cast (mSelector->idToPage (SystemId)); + if (generalPage && systemPage && + generalPage->is64BitOSTypeSelected() && !systemPage->isHWVirtExEnabled()) + mMachine.SetHWVirtExEnabled (KTSBool_True); /* Clear the "GUI_FirstRun" extra data key in case if the boot order @@ -434,4 +455,7 @@ mSelector->setItemText (GeneralId, tr ("General")); + /* System page */ + mSelector->setItemText (SystemId, tr ("System")); + /* Display page */ mSelector->setItemText (DisplayId, tr ("Display")); @@ -497,4 +521,35 @@ } +bool VBoxVMSettingsDlg::correlate (QWidget *aPage, QString &aWarning) +{ + /* This method performs correlation option check between + * different pages of VM Settings dialog */ + + /* Guest OS type & VT-x/AMD-V option correlation test */ + if (aPage == mSelector->idToPage (GeneralId) || + aPage == mSelector->idToPage (SystemId)) + { + VBoxVMSettingsGeneral *generalPage = + qobject_cast (mSelector->idToPage (GeneralId)); + VBoxVMSettingsSystem *systemPage = + qobject_cast (mSelector->idToPage (SystemId)); + + if (generalPage && systemPage && + generalPage->is64BitOSTypeSelected() && !systemPage->isHWVirtExEnabled()) + { + aWarning = tr ( + "there is a 64 bits guest OS type assigned for this VM, which " + "requires virtualization feature (VT-x/AMD-V) to be enabled " + "too, else your guest will fail to detect a 64 bits CPU and " + "will not be able to boot, so this feature will be enabled " + "automatically when you'll accept VM Settings by pressing OK " + "button."); + return true; + } + } + + return true; +} + void VBoxVMSettingsDlg::onMediaEnumerationDone() { Index: /trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsGeneral.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsGeneral.cpp (revision 19836) +++ /trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsGeneral.cpp (revision 19837) @@ -25,30 +25,6 @@ #include "VBoxProblemReporter.h" #include "QIWidgetValidator.h" -#include -#include #include - -#define ITEM_TYPE_ROLE Qt::UserRole + 1 - -/** - * Calculates a suitable page step size for the given max value. The returned - * size is so that there will be no more than 32 pages. The minimum returned - * page size is 4. - */ -static int calcPageStep (int aMax) -{ - /* reasonable max. number of page steps is 32 */ - uint page = ((uint) aMax + 31) / 32; - /* make it a power of 2 */ - uint p = page, p2 = 0x1; - while ((p >>= 1)) - p2 <<= 1; - if (page != p2) - p2 <<= 1; - if (p2 < 4) - p2 = 4; - return (int) p2; -} VBoxVMSettingsGeneral::VBoxVMSettingsGeneral() @@ -58,54 +34,6 @@ Ui::VBoxVMSettingsGeneral::setupUi (this); - mOSTypeSelector->setLayoutPosition (1); - - /* Setup constants */ - CSystemProperties sys = vboxGlobal().virtualBox().GetSystemProperties(); - const uint MinRAM = sys.GetMinGuestRAM(); - const uint MaxRAM = sys.GetMaxGuestRAM(); - /* Setup validators */ mLeName->setValidator (new QRegExpValidator (QRegExp (".+"), this)); - mLeRam->setValidator (new QIntValidator (MinRAM, MaxRAM, this)); - - /* Setup connections */ - connect (mSlRam, SIGNAL (valueChanged (int)), - this, SLOT (valueChangedRAM (int))); - connect (mLeRam, SIGNAL (textChanged (const QString&)), - this, SLOT (textChangedRAM (const QString&))); - connect (mTbBootItemUp, SIGNAL (clicked()), - this, SLOT (moveBootItemUp())); - connect (mTbBootItemDown, SIGNAL (clicked()), - this, SLOT (moveBootItemDown())); - connect (mTwBootOrder, SIGNAL (moveItemUp()), - this, SLOT (moveBootItemUp())); - connect (mTwBootOrder, SIGNAL (moveItemDown()), - this, SLOT (moveBootItemDown())); - connect (mTwBootOrder, SIGNAL (itemToggled()), - this, SIGNAL (tableChanged())); - connect (mTwBootOrder, SIGNAL (currentItemChanged (QTreeWidgetItem*, - QTreeWidgetItem*)), - this, SLOT (onCurrentBootItemChanged (QTreeWidgetItem*, - QTreeWidgetItem*))); - connect (mCbVirt, SIGNAL (stateChanged (int)), - this, SLOT (stateChangedVirt (int))); - - /* Setup iconsets */ - mTbBootItemUp->setIcon (VBoxGlobal::iconSet (":/list_moveup_16px.png", - ":/list_moveup_disabled_16px.png")); - mTbBootItemDown->setIcon (VBoxGlobal::iconSet (":/list_movedown_16px.png", - ":/list_movedown_disabled_16px.png")); - - /* Setup initial values */ - mSlRam->setPageStep (calcPageStep (MaxRAM)); - mSlRam->setSingleStep (mSlRam->pageStep() / 4); - mSlRam->setTickInterval (mSlRam->pageStep()); - /* Setup the scale so that ticks are at page step boundaries */ - mSlRam->setMinimum ((MinRAM / mSlRam->pageStep()) * mSlRam->pageStep()); - mSlRam->setMaximum (MaxRAM); - /* Limit min/max. size of QLineEdit */ - mLeRam->setFixedWidthByText (QString().fill ('9', 5)); - /* Ensure mLeRam value and validation is updated */ - valueChangedRAM (mSlRam->value()); /* Shared Clipboard mode */ @@ -115,13 +43,11 @@ mCbClipboard->addItem (""); /* KClipboardMode_Bidirectional */ - /* IDE Controller Type */ - mCbIDEController->addItem (""); /* KIDEControllerType_PIIX3 */ - mCbIDEController->addItem (""); /* KIDEControllerType_PIIX4 */ - mCbIDEController->addItem (""); /* KIDEControllerType_ICH6 */ - - qApp->installEventFilter (this); - /* Applying language settings */ retranslateUi(); +} + +bool VBoxVMSettingsGeneral::is64BitOSTypeSelected() const +{ + return mOSTypeSelector->type().GetIs64Bit(); } @@ -129,5 +55,4 @@ { mMachine = aMachine; - CBIOSSettings biosSettings = mMachine.GetBIOSSettings(); /* Name */ @@ -137,66 +62,7 @@ mOSTypeSelector->setType (vboxGlobal().vmGuestOSType (aMachine.GetOSTypeId())); - /* RAM size */ - mSlRam->setValue (aMachine.GetMemorySize()); - - /* Boot-order */ - { - mTwBootOrder->clear(); - /* Load boot-items of current VM */ - QStringList uniqueList; - for (int i = 1; i <= 4; ++ i) - { - KDeviceType type = mMachine.GetBootOrder (i); - if (type != KDeviceType_Null) - { - QString name = vboxGlobal().toString (type); - QTreeWidgetItem *item = - new QTreeWidgetItem (mTwBootOrder, QStringList (name)); - QVariant vtype (type); - item->setData (0, ITEM_TYPE_ROLE, vtype); - item->setCheckState (0, Qt::Checked); - uniqueList << name; - } - } - /* Load other unique boot-items */ - for (int i = KDeviceType_Floppy; i < KDeviceType_USB; ++ i) - { - QString name = vboxGlobal().toString ((KDeviceType) i); - if (!uniqueList.contains (name)) - { - QTreeWidgetItem *item = - new QTreeWidgetItem (mTwBootOrder, QStringList (name)); - item->setData (0, ITEM_TYPE_ROLE, i); - item->setCheckState (0, Qt::Unchecked); - uniqueList << name; - } - } - adjustBootOrderTWSize(); - } - - /* ACPI */ - mCbAcpi->setChecked (biosSettings.GetACPIEnabled()); - - /* IO APIC */ - mCbApic->setChecked (biosSettings.GetIOAPICEnabled()); - - /* VT-x/AMD-V */ - bool fVTxAMDVSupported = vboxGlobal().virtualBox().GetHost() - .GetProcessorFeature (KProcessorFeature_HWVirtEx); - mCbVirt->setEnabled (fVTxAMDVSupported); - aMachine.GetHWVirtExEnabled() == KTSBool_True ? - mCbVirt->setCheckState (Qt::Checked) : - mCbVirt->setCheckState (Qt::Unchecked); - - /* Nested Paging */ - mCbNestedPaging->setEnabled ( fVTxAMDVSupported - && aMachine.GetHWVirtExEnabled() == KTSBool_True); - mCbNestedPaging->setChecked (aMachine.GetHWVirtExNestedPagingEnabled()); - - /* PAE/NX */ - bool fPAESupported = vboxGlobal().virtualBox().GetHost() - .GetProcessorFeature (KProcessorFeature_PAE); - mCbPae->setEnabled (fPAESupported); - mCbPae->setChecked (aMachine.GetPAEEnabled()); + /* Remember mediums mounted at runtime */ + QString saveRtimeImages = mMachine.GetExtraData (VBoxDefs::GUI_SaveMountedAtRuntime); + mCbSaveMounted->setChecked (saveRtimeImages != "no"); /* Snapshot folder */ @@ -204,19 +70,9 @@ mPsSnapshot->setHomeDir (QFileInfo (mMachine.GetSettingsFilePath()).absolutePath()); - /* Description */ - mTeDescription->setPlainText (aMachine.GetDescription()); - /* Shared clipboard mode */ mCbClipboard->setCurrentIndex (aMachine.GetClipboardMode()); - /* IDE controller type */ - const QString ideName = QString("IDE"); - CStorageController ideCtl = aMachine.GetStorageControllerByName(ideName); - mCbIDEController->setCurrentIndex (mCbIDEController-> - findText (vboxGlobal().toString (ideCtl.GetControllerType()))); - - /* Other features */ - QString saveRtimeImages = mMachine.GetExtraData (VBoxDefs::GUI_SaveMountedAtRuntime); - mCbSaveMounted->setChecked (saveRtimeImages != "no"); + /* Description */ + mTeDescription->setPlainText (aMachine.GetDescription()); if (mValidator) @@ -226,14 +82,4 @@ void VBoxVMSettingsGeneral::putBackTo() { - /* Make auto-attenuation for some settings in this chapter: */ - - /* Enable VT-x/AMD-V feature if the guest is of 64 bits */ - if (mOSTypeSelector->type().GetIs64Bit()) - mCbVirt->setChecked (true); - - /* Save user's predefined settings in this chapter: */ - - CBIOSSettings biosSettings = mMachine.GetBIOSSettings(); - /* Name */ mMachine.SetName (mLeName->text()); @@ -243,46 +89,7 @@ mMachine.SetOSTypeId (mOSTypeSelector->type().GetId()); - /* RAM size */ - mMachine.SetMemorySize (mSlRam->value()); - - /* boot order */ - { - /* Search for checked items */ - int index = 1; - - for (int i = 0; i < mTwBootOrder->topLevelItemCount(); ++ i) - { - QTreeWidgetItem *item = mTwBootOrder->topLevelItem (i); - if (item->checkState (0) == Qt::Checked) - { - KDeviceType type = vboxGlobal().toDeviceType (item->text (0)); - mMachine.SetBootOrder (index ++, type); - } - } - - /* Search for non-checked items */ - for (int i = 0; i < mTwBootOrder->topLevelItemCount(); ++ i) - { - QTreeWidgetItem *item = mTwBootOrder->topLevelItem (i); - if (item->checkState (0) != Qt::Checked) - mMachine.SetBootOrder (index ++, KDeviceType_Null); - } - } - - /* ACPI */ - biosSettings.SetACPIEnabled (mCbAcpi->isChecked()); - - /* IO APIC */ - biosSettings.SetIOAPICEnabled (mCbApic->isChecked()); - - /* VT-x/AMD-V */ - mMachine.SetHWVirtExEnabled ( - mCbVirt->checkState() == Qt::Checked ? KTSBool_True : KTSBool_False); - - /* Nested Paging */ - mMachine.SetHWVirtExNestedPagingEnabled (mCbNestedPaging->isChecked()); - - /* PAE/NX */ - mMachine.SetPAEEnabled (mCbPae->isChecked()); + /* Remember mediums mounted at runtime */ + mMachine.SetExtraData (VBoxDefs::GUI_SaveMountedAtRuntime, + mCbSaveMounted->isChecked() ? "yes" : "no"); /* Saved state folder */ @@ -295,20 +102,11 @@ } + /* Shared clipboard mode */ + mMachine.SetClipboardMode ((KClipboardMode) mCbClipboard->currentIndex()); + /* Description (set empty to null to avoid an empty node * in the settings file) */ mMachine.SetDescription (mTeDescription->toPlainText().isEmpty() ? QString::null : mTeDescription->toPlainText()); - - /* Shared clipboard mode */ - mMachine.SetClipboardMode ((KClipboardMode) mCbClipboard->currentIndex()); - - /* IDE controller type */ - const QString ideName = QString("IDE"); - CStorageController ideCtl = mMachine.GetStorageControllerByName(ideName); - ideCtl.SetControllerType (vboxGlobal().toIDEControllerType (mCbIDEController->currentText())); - - /* Other features */ - mMachine.SetExtraData (VBoxDefs::GUI_SaveMountedAtRuntime, - mCbSaveMounted->isChecked() ? "yes" : "no"); } @@ -316,116 +114,5 @@ { mValidator = aVal; - connect (mCbVirt, SIGNAL (stateChanged (int)), mValidator, SLOT (revalidate())); connect (mOSTypeSelector, SIGNAL (osTypeChanged()), mValidator, SLOT (revalidate())); -} - -bool VBoxVMSettingsGeneral::revalidate (QString &aWarning, QString & /* aTitle */) -{ - /* Come up with some nice round percent boundraries relative to - the system memory. A max of 75% on a 256GB config is ridiculous, - even on an 8GB rig reserving 2GB for the OS is way to conservative. - The max numbers can be estimated using the following program: - - double calcMaxPct(uint64_t cbRam) - { - double cbRamOverhead = cbRam * 0.0390625; // 160 bytes per page. - double cbRamForTheOS = RT_MAX(RT_MIN(_512M, cbRam * 0.25), _64M); - double OSPct = (cbRamOverhead + cbRamForTheOS) * 100.0 / cbRam; - double MaxPct = 100 - OSPct; - return MaxPct; - } - - int main() - { - uint64_t cbRam = _1G; - for (; !(cbRam >> 33); cbRam += _1G) - printf("%8lluGB %.1f%% %8lluKB\n", cbRam >> 30, calcMaxPct(cbRam), - (uint64_t)(cbRam * calcMaxPct(cbRam) / 100.0) >> 20); - for (; !(cbRam >> 51); cbRam <<= 1) - printf("%8lluGB %.1f%% %8lluKB\n", cbRam >> 30, calcMaxPct(cbRam), - (uint64_t)(cbRam * calcMaxPct(cbRam) / 100.0) >> 20); - return 0; - } - - Note. We might wanna put these calculations somewhere global later. */ - ulong fullSize = vboxGlobal().virtualBox().GetHost().GetMemorySize(); - double maxPct = 0.75; - double warnPct = 0.50; - if (fullSize < 3072) - /* done */; - else if (fullSize < 4096) /* 3GB */ - maxPct = 0.80; - else if (fullSize < 6144) /* 4-5GB */ - { - maxPct = 0.84; - warnPct = 0.60; - } - else if (fullSize < 8192) /* 6-7GB */ - { - maxPct = 0.88; - warnPct = 0.65; - } - else if (fullSize < 16384) /* 8-15GB */ - { - maxPct = 0.90; - warnPct = 0.70; - } - else if (fullSize < 32768) /* 16-31GB */ - { - maxPct = 0.93; - warnPct = 0.75; - } - else if (fullSize < 65536) /* 32-63GB */ - { - maxPct = 0.94; - warnPct = 0.80; - } - else if (fullSize < 131072) /* 64-127GB */ - { - maxPct = 0.95; - warnPct = 0.85; - } - else /* 128GB- */ - { - maxPct = 0.96; - warnPct = 0.90; - } - - /* System RAM amount test */ - if (mSlRam->value() > maxPct * fullSize) - { - aWarning = tr ( - "you have assigned more than %1% of your computer's memory " - "(%2) to the virtual machine. Not enough memory is left " - "for your host operating system. Please select a smaller amount.") - .arg ((unsigned)(maxPct * 100)) - .arg (vboxGlobal().formatSize ((uint64_t)fullSize * _1M)); - return false; - } - if (mSlRam->value() > warnPct * fullSize) - { - aWarning = tr ( - "you have assigned more than %1% of your computer's memory " - "(%2) to the virtual machine. Not enough memory might be " - "left for your host operating system. Continue at your own risk.") - .arg ((unsigned)(warnPct * 100)) - .arg (vboxGlobal().formatSize ((uint64_t)fullSize * _1M)); - return true; - } - - /* Guest OS type & VT-x/AMD-V option correlation test */ - if (mOSTypeSelector->type().GetIs64Bit() && !mCbVirt->isChecked()) - { - aWarning = tr ( - "there is a 64 bits guest OS type assigned for this VM, which " - "requires virtualization feature (VT-x/AMD-V) to be enabled " - "too, else your guest will fail to detect a 64 bits CPU and " - "will not be able to boot, so this feature will be enabled " - "automatically when you'll accept VM Settings by pressing OK " - "button."); - return true; - } - - return true; } @@ -433,25 +120,13 @@ { /* Setup Tab order */ - setTabOrder (aWidget, mTabGeneral->focusProxy()); - setTabOrder (mTabGeneral->focusProxy(), mLeName); + setTabOrder (aWidget, mTwGeneral->focusProxy()); + setTabOrder (mTwGeneral->focusProxy(), mLeName); setTabOrder (mLeName, mOSTypeSelector); - setTabOrder (mOSTypeSelector, mSlRam); - setTabOrder (mSlRam, mLeRam); - setTabOrder (mLeRam, mTwBootOrder); - setTabOrder (mTwBootOrder, mTbBootItemUp); - setTabOrder (mTbBootItemUp, mTbBootItemDown); - setTabOrder (mTbBootItemDown, mCbAcpi); - setTabOrder (mCbAcpi, mCbApic); - setTabOrder (mCbApic, mCbVirt); - setTabOrder (mCbVirt, mCbNestedPaging); - setTabOrder (mCbNestedPaging, mCbPae); - setTabOrder (mCbPae, mCbClipboard); - setTabOrder (mCbClipboard, mCbIDEController); - setTabOrder (mCbIDEController, mPsSnapshot); + setTabOrder (mOSTypeSelector, mPsSnapshot); + setTabOrder (mPsSnapshot, mCbClipboard); + setTabOrder (mCbClipboard, mCbSaveMounted); - setTabOrder (mPsSnapshot, mTeDescription); - - setTabOrder (mTeDescription, mCbSaveMounted); + setTabOrder (mCbSaveMounted, mTeDescription); } @@ -460,23 +135,10 @@ /* Translate uic generated strings */ Ui::VBoxVMSettingsGeneral::retranslateUi (this); - mTwBootOrder->header()->setResizeMode (QHeaderView::ResizeToContents); - mTwBootOrder->resizeColumnToContents (0); - mTwBootOrder->updateGeometry(); - CSystemProperties sys = vboxGlobal().virtualBox().GetSystemProperties(); - mLbRamMin->setText (tr ("%1 MB").arg (sys.GetMinGuestRAM())); - mLbRamMax->setText (tr ("%1 MB").arg (sys.GetMaxGuestRAM())); - - /* Retranslate the boot order items */ - QTreeWidgetItemIterator it (mTwBootOrder); - while (*it) - { - QTreeWidgetItem *item = (*it); - item->setText (0, vboxGlobal().toString ( - static_cast (item->data (0, ITEM_TYPE_ROLE).toInt()))); - ++it; - } - /* Readjust the tree widget size */ - adjustBootOrderTWSize(); + /* Path selector */ + mPsSnapshot->setWhatsThis (tr ("Displays the path where snapshots of this " + "virtual machine will be stored. Note that " + "snapshots can take quite a lot of disk " + "space.")); /* Shared Clipboard mode */ @@ -485,134 +147,4 @@ mCbClipboard->setItemText (2, vboxGlobal().toString (KClipboardMode_GuestToHost)); mCbClipboard->setItemText (3, vboxGlobal().toString (KClipboardMode_Bidirectional)); - - /* IDE Controller Type */ - mCbIDEController->setItemText (0, vboxGlobal().toString (KStorageControllerType_PIIX3)); - mCbIDEController->setItemText (1, vboxGlobal().toString (KStorageControllerType_PIIX4)); - mCbIDEController->setItemText (2, vboxGlobal().toString (KStorageControllerType_ICH6)); - - /* Path selector */ - mPsSnapshot->setWhatsThis (tr ("Displays the path where snapshots of this " - "virtual machine will be stored. Note that " - "snapshots can take quite a lot of disk " - "space.")); -} - - -void VBoxVMSettingsGeneral::valueChangedRAM (int aVal) -{ - mLeRam->setText (QString().setNum (aVal)); -} - -void VBoxVMSettingsGeneral::textChangedRAM (const QString &aText) -{ - mSlRam->setValue (aText.toInt()); -} - -void VBoxVMSettingsGeneral::moveBootItemUp() -{ - QTreeWidgetItem *item = mTwBootOrder->currentItem(); - Assert (item); - if (!mTwBootOrder->itemAbove (item)) - return; - - int index = mTwBootOrder->indexOfTopLevelItem (item); - QTreeWidgetItem *takenItem = mTwBootOrder->takeTopLevelItem (index); - Assert (takenItem == item); - - mTwBootOrder->insertTopLevelItem (index - 1, takenItem); - mTwBootOrder->setCurrentItem (item); - - emit tableChanged(); -} - -void VBoxVMSettingsGeneral::moveBootItemDown() -{ - QTreeWidgetItem *item = mTwBootOrder->currentItem(); - Assert (item); - if (!mTwBootOrder->itemBelow (item)) - return; - - int index = mTwBootOrder->indexOfTopLevelItem (item); - QTreeWidgetItem *takenItem = mTwBootOrder->takeTopLevelItem (index); - Assert (takenItem == item); - - mTwBootOrder->insertTopLevelItem (index + 1, takenItem); - mTwBootOrder->setCurrentItem (item); - - emit tableChanged(); -} - -void VBoxVMSettingsGeneral::onCurrentBootItemChanged (QTreeWidgetItem *aItem, - QTreeWidgetItem *) -{ - bool upEnabled = aItem && mTwBootOrder->itemAbove (aItem); - bool downEnabled = aItem && mTwBootOrder->itemBelow (aItem); - if ((mTbBootItemUp->hasFocus() && !upEnabled) || - (mTbBootItemDown->hasFocus() && !downEnabled)) - mTwBootOrder->setFocus(); - mTbBootItemUp->setEnabled (upEnabled); - mTbBootItemDown->setEnabled (downEnabled); -} - -void VBoxVMSettingsGeneral::stateChangedVirt (int /* aState */) -{ - mCbNestedPaging->setEnabled (mCbVirt->checkState()); -} - -void VBoxVMSettingsGeneral::adjustBootOrderTWSize() -{ - /* Calculate the optimal size of the tree widget & set it as fixed - * size. */ - mTwBootOrder->setFixedSize ( - static_cast (mTwBootOrder) - ->sizeHintForColumn (0) + 2 * mTwBootOrder->frameWidth(), - static_cast (mTwBootOrder) - ->sizeHintForRow (0) * mTwBootOrder->topLevelItemCount() + - 2 * mTwBootOrder->frameWidth()); - - /* Update the layout system */ - mWBootContainer->layout()->activate(); - mTabAdvanced->layout()->activate(); - mTabAdvanced->layout()->update(); -} - -bool VBoxVMSettingsGeneral::eventFilter (QObject *aObject, QEvent *aEvent) -{ - if (!aObject->isWidgetType()) - return QWidget::eventFilter (aObject, aEvent); - - QWidget *widget = static_cast (aObject); - if (widget->window() != window()) - return QWidget::eventFilter (aObject, aEvent); - - switch (aEvent->type()) - { - case QEvent::FocusIn: - { - /* Boot Table */ - if (widget == mTwBootOrder) - { - if (!mTwBootOrder->currentItem()) - mTwBootOrder->setCurrentItem (mTwBootOrder->topLevelItem (0)); - else - onCurrentBootItemChanged (mTwBootOrder->currentItem()); - mTwBootOrder->currentItem()->setSelected (true); - } - else if (widget != mTbBootItemUp && widget != mTbBootItemDown) - { - if (mTwBootOrder->currentItem()) - { - mTwBootOrder->currentItem()->setSelected (false); - mTbBootItemUp->setEnabled (false); - mTbBootItemDown->setEnabled (false); - } - } - break; - } - default: - break; - } - - return QWidget::eventFilter (aObject, aEvent); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsHD.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsHD.cpp (revision 19836) +++ /trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsHD.cpp (revision 19837) @@ -574,4 +574,5 @@ /* Setup table-view */ + mTwAts->setMinimumHeight (100); mTwAts->verticalHeader()->setDefaultSectionSize ( (int) (mTwAts->fontMetrics().height() * 1.30 /* 130% of font height */)); @@ -637,4 +638,15 @@ HDSettings::instance(), SLOT (update())); + /* IDE Controller Type */ + mCbIDEController->addItem (""); /* KIDEControllerType_PIIX3 */ + mCbIDEController->addItem (""); /* KIDEControllerType_PIIX4 */ + mCbIDEController->addItem (""); /* KIDEControllerType_ICH6 */ + + + /* Additional Controller Type */ + mCbControllerType->addItem ("", KStorageControllerType_IntelAhci); + mCbControllerType->addItem ("", KStorageControllerType_LsiLogic); + mCbControllerType->addItem ("", KStorageControllerType_BusLogic); + /* Install global event filter */ qApp->installEventFilter (this); @@ -648,4 +660,10 @@ mMachine = aMachine; HDSettings::instance()->setMachine (mMachine); + + /* IDE controller type */ + const QString ideName = QString ("IDE"); + CStorageController ideCtl = aMachine.GetStorageControllerByName (ideName); + mCbIDEController->setCurrentIndex (mCbIDEController-> + findText (vboxGlobal().toString (ideCtl.GetControllerType()))); /* For now we search for the first one which isn't IDE */ @@ -691,4 +709,9 @@ void VBoxVMSettingsHD::putBackTo() { + /* IDE controller type */ + const QString ideName = QString ("IDE"); + CStorageController ideCtl = mMachine.GetStorageControllerByName(ideName); + ideCtl.SetControllerType (vboxGlobal().toIDEControllerType (mCbIDEController->currentText())); + /* Detach all attached Hard Disks */ CHardDiskAttachmentVector vec = mMachine.GetHardDiskAttachments(); @@ -702,5 +725,5 @@ if (!mMachine.isOk()) { - CStorageController ctl = mMachine.GetStorageControllerByName(hda.GetController()); + CStorageController ctl = mMachine.GetStorageControllerByName (hda.GetController()); vboxProblem().cannotDetachHardDisk (this, mMachine, vboxGlobal().getMedium (CMedium (hda.GetHardDisk())).location(), @@ -709,8 +732,7 @@ } - /* Clear all storage controllers beside the IDE one */ CStorageController addController; - QVector scs = mMachine.GetStorageControllers(); + QVector scs = mMachine.GetStorageControllers(); foreach (const CStorageController &sc, scs) if (sc.GetBus() != KStorageBus_IDE) @@ -748,11 +770,11 @@ } - mMachine.AttachHardDisk(list [i].disk.id, - ctrlName, list [i].slot.channel, list [i].slot.device); + mMachine.AttachHardDisk (list [i].disk.id, + ctrlName, list [i].slot.channel, list [i].slot.device); /* [dsen] check this */ if (!mMachine.isOk()) vboxProblem().cannotAttachHardDisk (this, mMachine, vboxGlobal().getMedium (CMedium (vboxGlobal().virtualBox() - .GetHardDisk(list [i].disk.id))).location(), + .GetHardDisk (list [i].disk.id))).location(), list [i].slot.bus, list [i].slot.channel, list [i].slot.device); } @@ -804,6 +826,8 @@ void VBoxVMSettingsHD::setOrderAfter (QWidget *aWidget) { - setTabOrder (aWidget, mAddControllerCheck); - setTabOrder (mAddControllerCheck, mTwAts); + setTabOrder (aWidget, mCbIDEController); + setTabOrder (mCbIDEController, mAddControllerCheck); + setTabOrder (mAddControllerCheck, mCbControllerType); + setTabOrder (mCbControllerType, mTwAts); setTabOrder (mTwAts, mShowDiffsCheck); } @@ -814,4 +838,18 @@ Ui::VBoxVMSettingsHD::retranslateUi (this); + /* IDE Controller Type */ + mCbIDEController->setItemText (0, vboxGlobal().toString (KStorageControllerType_PIIX3)); + mCbIDEController->setItemText (1, vboxGlobal().toString (KStorageControllerType_PIIX4)); + mCbIDEController->setItemText (2, vboxGlobal().toString (KStorageControllerType_ICH6)); + + /* Additional Controller Type */ + mCbControllerType->setItemText (0, QString ("%1 (%2)").arg (vboxGlobal().toString (KStorageBus_SATA)) + .arg (vboxGlobal().toString (KStorageControllerType_IntelAhci))); + mCbControllerType->setItemText (1, QString ("%1 (%2)").arg (vboxGlobal().toString (KStorageBus_SCSI)) + .arg (vboxGlobal().toString (KStorageControllerType_LsiLogic))); + mCbControllerType->setItemText (2, QString ("%1 (%2)").arg (vboxGlobal().toString (KStorageBus_SCSI)) + .arg (vboxGlobal().toString (KStorageControllerType_BusLogic))); + + /* Attachments List */ mNewAction->setText (tr ("&Add Attachment")); mDelAction->setText (tr ("&Remove Attachment")); @@ -830,6 +868,4 @@ "a hard disk to attach to the currently " "highlighted slot.")); - - prepareComboboxes(); } @@ -1182,21 +1218,4 @@ } -void VBoxVMSettingsHD::prepareComboboxes() -{ - /* Save the current selected value */ - int current = mCbControllerType->currentIndex(); - if (current == -1) - current = 0; - /* Clear the driver box */ - mCbControllerType->clear(); - /* Refill them */ - mCbControllerType->addItem (QString ("%1 (%2)").arg (vboxGlobal().toString (KStorageBus_SATA)).arg (vboxGlobal().toString (KStorageControllerType_IntelAhci)), KStorageControllerType_IntelAhci); - mCbControllerType->addItem (QString ("%1 (%2)").arg (vboxGlobal().toString (KStorageBus_SCSI)).arg (vboxGlobal().toString (KStorageControllerType_LsiLogic)), KStorageControllerType_LsiLogic); - mCbControllerType->addItem (QString ("%1 (%2)").arg (vboxGlobal().toString (KStorageBus_SCSI)).arg (vboxGlobal().toString (KStorageControllerType_BusLogic)), KStorageControllerType_BusLogic); - - /* Set the old value */ - mCbControllerType->setCurrentIndex (current); -} - void VBoxVMSettingsHD::removeFocus() { Index: /trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsSystem.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsSystem.cpp (revision 19837) +++ /trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsSystem.cpp (revision 19837) @@ -0,0 +1,581 @@ +/** @file + * + * VBox frontends: Qt4 GUI ("VirtualBox"): + * VBoxVMSettingsSystem class implementation + */ + +/* + * Copyright (C) 2008-2009 Sun Microsystems, Inc. + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa + * Clara, CA 95054 USA or visit http://www.sun.com if you need + * additional information or have any questions. + */ + +#include "QIWidgetValidator.h" +#include "VBoxVMSettingsSystem.h" + +#define ITEM_TYPE_ROLE Qt::UserRole + 1 + +/** + * Calculates a suitable page step size for the given max value. The returned + * size is so that there will be no more than 32 pages. The minimum returned + * page size is 4. + */ +static int calcPageStep (int aMax) +{ + /* reasonable max. number of page steps is 32 */ + uint page = ((uint) aMax + 31) / 32; + /* make it a power of 2 */ + uint p = page, p2 = 0x1; + while ((p >>= 1)) + p2 <<= 1; + if (page != p2) + p2 <<= 1; + if (p2 < 4) + p2 = 4; + return (int) p2; +} + +VBoxVMSettingsSystem::VBoxVMSettingsSystem() +{ + /* Apply UI decorations */ + Ui::VBoxVMSettingsSystem::setupUi (this); + + /* Setup constants */ + CSystemProperties sys = vboxGlobal().virtualBox().GetSystemProperties(); + const uint MinRAM = sys.GetMinGuestRAM(); + const uint MaxRAM = sys.GetMaxGuestRAM(); + const uint MinCPU = sys.GetMinGuestCPUCount(); + const uint MaxCPU = sys.GetMaxGuestCPUCount(); + + /* Setup validators */ + mLeMemory->setValidator (new QIntValidator (MinRAM, MaxRAM, this)); + mLeCPU->setValidator (new QIntValidator (MinCPU, MaxCPU, this)); + + /* Setup connections */ + connect (mSlMemory, SIGNAL (valueChanged (int)), + this, SLOT (valueChangedRAM (int))); + connect (mLeMemory, SIGNAL (textChanged (const QString&)), + this, SLOT (textChangedRAM (const QString&))); + + connect (mTbBootItemUp, SIGNAL (clicked()), + this, SLOT (moveBootItemUp())); + connect (mTbBootItemDown, SIGNAL (clicked()), + this, SLOT (moveBootItemDown())); + connect (mTwBootOrder, SIGNAL (moveItemUp()), + this, SLOT (moveBootItemUp())); + connect (mTwBootOrder, SIGNAL (moveItemDown()), + this, SLOT (moveBootItemDown())); + connect (mTwBootOrder, SIGNAL (itemToggled()), + this, SIGNAL (tableChanged())); + connect (mTwBootOrder, SIGNAL (currentItemChanged (QTreeWidgetItem*, + QTreeWidgetItem*)), + this, SLOT (onCurrentBootItemChanged (QTreeWidgetItem*, + QTreeWidgetItem*))); + + connect (mSlCPU, SIGNAL (valueChanged (int)), + this, SLOT (valueChangedCPU (int))); + connect (mLeCPU, SIGNAL (textChanged (const QString&)), + this, SLOT (textChangedCPU (const QString&))); + + /* Setup iconsets */ + mTbBootItemUp->setIcon (VBoxGlobal::iconSet (":/list_moveup_16px.png", + ":/list_moveup_disabled_16px.png")); + mTbBootItemDown->setIcon (VBoxGlobal::iconSet (":/list_movedown_16px.png", + ":/list_movedown_disabled_16px.png")); + + /* Setup memory slider */ + mSlMemory->setPageStep (calcPageStep (MaxRAM)); + mSlMemory->setSingleStep (mSlMemory->pageStep() / 4); + mSlMemory->setTickInterval (mSlMemory->pageStep()); + /* Setup the scale so that ticks are at page step boundaries */ + mSlMemory->setMinimum ((MinRAM / mSlMemory->pageStep()) * mSlMemory->pageStep()); + mSlMemory->setMaximum (MaxRAM); + /* Limit min/max. size of QLineEdit */ + mLeMemory->setFixedWidthByText (QString().fill ('8', 5)); + /* Ensure mLeMemory value and validation is updated */ + valueChangedRAM (mSlMemory->value()); + + /* Setup cpu slider */ + mSlCPU->setPageStep (1); + mSlCPU->setSingleStep (1); + mSlCPU->setTickInterval (1); + /* Setup the scale so that ticks are at page step boundaries */ + mSlCPU->setMinimum (MinCPU); + mSlCPU->setMaximum (MaxCPU); + /* Limit min/max. size of QLineEdit */ + mLeCPU->setFixedWidthByText (QString().fill ('8', 3)); + /* Ensure mLeMemory value and validation is updated */ + valueChangedCPU (mSlCPU->value()); + + /* Install global event filter */ + qApp->installEventFilter (this); + + /* Applying language settings */ + retranslateUi(); +} + +bool VBoxVMSettingsSystem::isHWVirtExEnabled() const +{ + return mCbVirt->isChecked(); +} + +void VBoxVMSettingsSystem::getFrom (const CMachine &aMachine) +{ + mMachine = aMachine; + CBIOSSettings biosSettings = mMachine.GetBIOSSettings(); + + /* RAM size */ + mSlMemory->setValue (aMachine.GetMemorySize()); + + /* Boot-order */ + { + mTwBootOrder->clear(); + /* Load boot-items of current VM */ + QStringList uniqueList; + for (int i = 1; i <= 4; ++ i) + { + KDeviceType type = mMachine.GetBootOrder (i); + if (type != KDeviceType_Null) + { + QString name = vboxGlobal().toString (type); + QTreeWidgetItem *item = + new QTreeWidgetItem (mTwBootOrder, QStringList (name)); + QVariant vtype (type); + item->setData (0, ITEM_TYPE_ROLE, vtype); + item->setCheckState (0, Qt::Checked); + uniqueList << name; + } + } + /* Load other unique boot-items */ + for (int i = KDeviceType_Floppy; i < KDeviceType_USB; ++ i) + { + QString name = vboxGlobal().toString ((KDeviceType) i); + if (!uniqueList.contains (name)) + { + QTreeWidgetItem *item = + new QTreeWidgetItem (mTwBootOrder, QStringList (name)); + item->setData (0, ITEM_TYPE_ROLE, i); + item->setCheckState (0, Qt::Unchecked); + uniqueList << name; + } + } + adjustBootOrderTWSize(); + } + + /* ACPI */ + mCbAcpi->setChecked (biosSettings.GetACPIEnabled()); + + /* IO APIC */ + mCbApic->setChecked (biosSettings.GetIOAPICEnabled()); + + /* CPU count */ + bool fVTxAMDVSupported = vboxGlobal().virtualBox().GetHost() + .GetProcessorFeature (KProcessorFeature_HWVirtEx); + mSlCPU->setEnabled (fVTxAMDVSupported); + mLeCPU->setEnabled (fVTxAMDVSupported); + mSlCPU->setValue (fVTxAMDVSupported ? aMachine.GetCPUCount() : 1); + + /* PAE/NX */ + bool fPAESupported = vboxGlobal().virtualBox().GetHost() + .GetProcessorFeature (KProcessorFeature_PAE); + mCbPae->setEnabled (fPAESupported); + mCbPae->setChecked (aMachine.GetPAEEnabled()); + + /* VT-x/AMD-V */ + mCbVirt->setEnabled (fVTxAMDVSupported); + mCbVirt->setChecked (aMachine.GetHWVirtExEnabled() == KTSBool_True); + + /* Nested Paging */ + mCbNestedPaging->setEnabled (fVTxAMDVSupported && + aMachine.GetHWVirtExEnabled() == KTSBool_True); + mCbNestedPaging->setChecked (aMachine.GetHWVirtExNestedPagingEnabled()); + + if (mValidator) + mValidator->revalidate(); +} + +void VBoxVMSettingsSystem::putBackTo() +{ + CBIOSSettings biosSettings = mMachine.GetBIOSSettings(); + + /* RAM size */ + mMachine.SetMemorySize (mSlMemory->value()); + + /* Boot order */ + { + /* Search for checked items */ + int index = 1; + + for (int i = 0; i < mTwBootOrder->topLevelItemCount(); ++ i) + { + QTreeWidgetItem *item = mTwBootOrder->topLevelItem (i); + if (item->checkState (0) == Qt::Checked) + { + KDeviceType type = vboxGlobal().toDeviceType (item->text (0)); + mMachine.SetBootOrder (index ++, type); + } + } + + /* Search for non-checked items */ + for (int i = 0; i < mTwBootOrder->topLevelItemCount(); ++ i) + { + QTreeWidgetItem *item = mTwBootOrder->topLevelItem (i); + if (item->checkState (0) != Qt::Checked) + mMachine.SetBootOrder (index ++, KDeviceType_Null); + } + } + + /* ACPI */ + biosSettings.SetACPIEnabled (mCbAcpi->isChecked()); + + /* IO APIC */ + biosSettings.SetIOAPICEnabled (mCbApic->isChecked() || + mSlCPU->value() > 1); + + /* RAM size */ + mMachine.SetCPUCount (mSlCPU->value()); + + /* PAE/NX */ + mMachine.SetPAEEnabled (mCbPae->isChecked()); + + /* VT-x/AMD-V */ + mMachine.SetHWVirtExEnabled (mCbVirt->checkState() == Qt::Checked || + mSlCPU->value() > 1 ? + KTSBool_True : KTSBool_False); + + /* Nested Paging */ + mMachine.SetHWVirtExNestedPagingEnabled (mCbNestedPaging->isChecked()); +} + +void VBoxVMSettingsSystem::setValidator (QIWidgetValidator *aVal) +{ + mValidator = aVal; + connect (mCbApic, SIGNAL (stateChanged (int)), mValidator, SLOT (revalidate())); + connect (mCbVirt, SIGNAL (stateChanged (int)), mValidator, SLOT (revalidate())); +} + +bool VBoxVMSettingsSystem::revalidate (QString &aWarning, QString & /* aTitle */) +{ + /* Come up with some nice round percent boundraries relative to + * the system memory. A max of 75% on a 256GB config is ridiculous, + * even on an 8GB rig reserving 2GB for the OS is way to conservative. + * The max numbers can be estimated using the following program: + * + * double calcMaxPct(uint64_t cbRam) + * { + * double cbRamOverhead = cbRam * 0.0390625; // 160 bytes per page. + * double cbRamForTheOS = RT_MAX(RT_MIN(_512M, cbRam * 0.25), _64M); + * double OSPct = (cbRamOverhead + cbRamForTheOS) * 100.0 / cbRam; + * double MaxPct = 100 - OSPct; + * return MaxPct; + * } + * + * int main() + * { + * uint64_t cbRam = _1G; + * for (; !(cbRam >> 33); cbRam += _1G) + * printf("%8lluGB %.1f%% %8lluKB\n", cbRam >> 30, calcMaxPct(cbRam), + * (uint64_t)(cbRam * calcMaxPct(cbRam) / 100.0) >> 20); + * for (; !(cbRam >> 51); cbRam <<= 1) + * printf("%8lluGB %.1f%% %8lluKB\n", cbRam >> 30, calcMaxPct(cbRam), + * (uint64_t)(cbRam * calcMaxPct(cbRam) / 100.0) >> 20); + * return 0; + * } + * + * Note. We might wanna put these calculations somewhere global later. */ + + /* System RAM amount test */ + ulong fullSize = vboxGlobal().virtualBox().GetHost().GetMemorySize(); + double maxPct = 0.75; + double warnPct = 0.50; + if (fullSize < 3072) + /* done */; + else if (fullSize < 4096) /* 3GB */ + maxPct = 0.80; + else if (fullSize < 6144) /* 4-5GB */ + { + maxPct = 0.84; + warnPct = 0.60; + } + else if (fullSize < 8192) /* 6-7GB */ + { + maxPct = 0.88; + warnPct = 0.65; + } + else if (fullSize < 16384) /* 8-15GB */ + { + maxPct = 0.90; + warnPct = 0.70; + } + else if (fullSize < 32768) /* 16-31GB */ + { + maxPct = 0.93; + warnPct = 0.75; + } + else if (fullSize < 65536) /* 32-63GB */ + { + maxPct = 0.94; + warnPct = 0.80; + } + else if (fullSize < 131072) /* 64-127GB */ + { + maxPct = 0.95; + warnPct = 0.85; + } + else /* 128GB- */ + { + maxPct = 0.96; + warnPct = 0.90; + } + + if (mSlMemory->value() > maxPct * fullSize) + { + aWarning = tr ( + "you have assigned more than %1% of your computer's memory " + "(%2) to the virtual machine. Not enough memory is left " + "for your host operating system. Please select a smaller amount.") + .arg ((unsigned)(maxPct * 100)) + .arg (vboxGlobal().formatSize ((uint64_t)fullSize * _1M)); + return false; + } + if (mSlMemory->value() > warnPct * fullSize) + { + aWarning = tr ( + "you have assigned more than %1% of your computer's memory " + "(%2) to the virtual machine. Not enough memory might be " + "left for your host operating system. Continue at your own risk.") + .arg ((unsigned)(warnPct * 100)) + .arg (vboxGlobal().formatSize ((uint64_t)fullSize * _1M)); + return true; + } + + /* VCPU amount test */ + int totalCPUs = vboxGlobal().virtualBox().GetHost().GetProcessorOnlineCount(); + if (mSlCPU->value() > 2 * totalCPUs) + { + aWarning = tr ( + "for performance reasons, the number of virtual CPUs attached to the " + "virtual machine may not be more than twice the number of physical " + "CPUs on the host (%1). Please reduce the number of virtual CPUs.") + .arg (totalCPUs); + return false; + } + if (mSlCPU->value() > totalCPUs) + { + aWarning = tr ( + "you have assigned more virtual CPUs to the virtual machine than " + "the number of physical CPUs on your host system (%1). " + "This is likely to degrade the performance of your virtual machine. " + "Please consider reducing the number of virtual CPUs.") + .arg (totalCPUs); + return true; + } + + /* VCPU IO-APIC test */ + if (mSlCPU->value() > 1 && !mCbApic->isChecked()) + { + aWarning = tr ( + "there is more than one virtual CPU assigned for this VM, which " + "requires IO-APIC feature to be enabled too, else SMP will not be " + "able to work, so this feature will be enabled automatically when " + "you'll accept VM Settings by pressing OK button."); + return true; + } + + /* VCPU VT-x/AMD-V test */ + if (mSlCPU->value() > 1 && !mCbVirt->isChecked()) + { + aWarning = tr ( + "there is more than one virtual CPU assigned for this VM, which " + "requires virtualization feature (VT-x/AMD-V) to be enabled too, " + "else SMP will not be able to work, so this feature will be enabled " + "automatically when you'll accept VM Settings by pressing OK button."); + return true; + } + + return true; +} + +void VBoxVMSettingsSystem::setOrderAfter (QWidget *aWidget) +{ + setTabOrder (aWidget, mTwSystem->focusProxy()); + setTabOrder (mTwSystem->focusProxy(), mSlMemory); + setTabOrder (mSlMemory, mLeMemory); + setTabOrder (mLeMemory, mTwBootOrder); + setTabOrder (mTwBootOrder, mTbBootItemUp); + setTabOrder (mTbBootItemUp, mTbBootItemDown); + setTabOrder (mTbBootItemDown, mCbAcpi); + setTabOrder (mCbAcpi, mCbApic); + + setTabOrder (mCbApic, mSlCPU); + setTabOrder (mSlCPU, mLeCPU); + setTabOrder (mLeCPU, mCbPae); + + setTabOrder (mCbPae, mCbVirt); + setTabOrder (mCbVirt, mCbNestedPaging); +} + +void VBoxVMSettingsSystem::retranslateUi() +{ + /* Translate uic generated strings */ + Ui::VBoxVMSettingsSystem::retranslateUi (this); + + /* Adjust the boot order tree widget */ + mTwBootOrder->header()->setResizeMode (QHeaderView::ResizeToContents); + mTwBootOrder->resizeColumnToContents (0); + mTwBootOrder->updateGeometry(); + /* Retranslate the boot order items */ + QTreeWidgetItemIterator it (mTwBootOrder); + while (*it) + { + QTreeWidgetItem *item = (*it); + item->setText (0, vboxGlobal().toString ( + static_cast (item->data (0, ITEM_TYPE_ROLE).toInt()))); + ++ it; + } + /* Readjust the tree widget items size */ + adjustBootOrderTWSize(); + + CSystemProperties sys = vboxGlobal().virtualBox().GetSystemProperties(); + + /* Retranslate the memory slider legend */ + mLbMemoryMin->setText (tr ("%1 MB").arg (sys.GetMinGuestRAM())); + mLbMemoryMax->setText (tr ("%1 MB").arg (sys.GetMaxGuestRAM())); + + /* Retranslate the cpu slider legend */ + mLbCPUMin->setText (tr ("%1 CPU").arg (sys.GetMinGuestCPUCount())); + mLbCPUMax->setText (tr ("%1 CPU").arg (sys.GetMaxGuestCPUCount())); +} + +void VBoxVMSettingsSystem::valueChangedRAM (int aVal) +{ + mLeMemory->setText (QString().setNum (aVal)); +} + +void VBoxVMSettingsSystem::textChangedRAM (const QString &aText) +{ + mSlMemory->setValue (aText.toInt()); +} + +void VBoxVMSettingsSystem::moveBootItemUp() +{ + QTreeWidgetItem *item = mTwBootOrder->currentItem(); + Assert (item); + if (!mTwBootOrder->itemAbove (item)) + return; + + int index = mTwBootOrder->indexOfTopLevelItem (item); + QTreeWidgetItem *takenItem = mTwBootOrder->takeTopLevelItem (index); + Assert (takenItem == item); + + mTwBootOrder->insertTopLevelItem (index - 1, takenItem); + mTwBootOrder->setCurrentItem (item); + + emit tableChanged(); +} + +void VBoxVMSettingsSystem::moveBootItemDown() +{ + QTreeWidgetItem *item = mTwBootOrder->currentItem(); + Assert (item); + if (!mTwBootOrder->itemBelow (item)) + return; + + int index = mTwBootOrder->indexOfTopLevelItem (item); + QTreeWidgetItem *takenItem = mTwBootOrder->takeTopLevelItem (index); + Assert (takenItem == item); + + mTwBootOrder->insertTopLevelItem (index + 1, takenItem); + mTwBootOrder->setCurrentItem (item); + + emit tableChanged(); +} + +void VBoxVMSettingsSystem::onCurrentBootItemChanged (QTreeWidgetItem *aItem, + QTreeWidgetItem *) +{ + bool upEnabled = aItem && mTwBootOrder->itemAbove (aItem); + bool downEnabled = aItem && mTwBootOrder->itemBelow (aItem); + if ((mTbBootItemUp->hasFocus() && !upEnabled) || + (mTbBootItemDown->hasFocus() && !downEnabled)) + mTwBootOrder->setFocus(); + mTbBootItemUp->setEnabled (upEnabled); + mTbBootItemDown->setEnabled (downEnabled); +} + +void VBoxVMSettingsSystem::adjustBootOrderTWSize() +{ + /* Calculate the optimal size of the tree widget & set it as fixed + * size. */ + + QAbstractItemView *iv = qobject_cast (mTwBootOrder); + + mTwBootOrder->setFixedSize ( + iv->sizeHintForColumn (0) + 2 * mTwBootOrder->frameWidth() + 4, + iv->sizeHintForRow (0) * mTwBootOrder->topLevelItemCount() + 2 * mTwBootOrder->frameWidth()); + + /* Update the layout system */ + mLtBootOrder->activate(); + mLtBootOrder->update(); +} + +void VBoxVMSettingsSystem::valueChangedCPU (int aVal) +{ + mLeCPU->setText (QString().setNum (aVal)); +} + +void VBoxVMSettingsSystem::textChangedCPU (const QString &aText) +{ + mSlCPU->setValue (aText.toInt()); +} + +bool VBoxVMSettingsSystem::eventFilter (QObject *aObject, QEvent *aEvent) +{ + if (!aObject->isWidgetType()) + return QWidget::eventFilter (aObject, aEvent); + + QWidget *widget = static_cast (aObject); + if (widget->window() != window()) + return QWidget::eventFilter (aObject, aEvent); + + switch (aEvent->type()) + { + case QEvent::FocusIn: + { + /* Boot Table */ + if (widget == mTwBootOrder) + { + if (!mTwBootOrder->currentItem()) + mTwBootOrder->setCurrentItem (mTwBootOrder->topLevelItem (0)); + else + onCurrentBootItemChanged (mTwBootOrder->currentItem()); + mTwBootOrder->currentItem()->setSelected (true); + } + else if (widget != mTbBootItemUp && widget != mTbBootItemDown) + { + if (mTwBootOrder->currentItem()) + { + mTwBootOrder->currentItem()->setSelected (false); + mTbBootItemUp->setEnabled (false); + mTbBootItemDown->setEnabled (false); + } + } + break; + } + default: + break; + } + + return QWidget::eventFilter (aObject, aEvent); +} + Index: /trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsGeneral.ui =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsGeneral.ui (revision 19836) +++ /trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsGeneral.ui (revision 19837) @@ -23,11 +23,11 @@ 0 0 - 451 - 497 + 350 + 250 - + - + 0 @@ -37,18 +37,12 @@ &Basic - - - - - - 0 - - - 0 - - - 0 - - + + + 0 + + + + + 0 @@ -71,115 +65,8 @@ Displays the name of the virtual machine. - - - - - - Base &Memory: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - mLeRam - - - - - - - - - 0 - - - - - Controls the amount of memory provided to the virtual machine. If you assign too much, the machine might not start. - - - Qt::Horizontal - - - QSlider::TicksBelow - - - - - - - - - - 0 - 0 - - - - - - - - Qt::Horizontal - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - 4 - - - - - - 0 - 0 - - - - Controls the amount of memory provided to the virtual machine. If you assign too much, the machine might not start. - - - - - - - - 0 - 0 - - - - MB - - - - - - + + + + @@ -187,11 +74,11 @@ - + Qt::Vertical - + - 20 + 0 0 @@ -205,156 +92,103 @@ &Advanced - - - - - Boo&t Order: - - - Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing - - - mTwBootOrder - - - - - - - - 0 - 0 - - - - + + + 0 + + + + + 0 - - 0 - - - 0 - - - 0 - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - 0 - - - - - Defines the boot device order. Use checkboxes to the left to enable or disable individual boot devices. Move items up and down to change the device order. - - - Qt::ScrollBarAlwaysOff - - - Qt::ScrollBarAlwaysOff - - - true - - - false - - - true - - - - [device] - - - - - - - - - - 0 - - - - - false - - - Qt::StrongFocus - - - Move Up (Ctrl-Up) - - - Moves the selected boot device up. - - - - - - true - - - - - - - false - - - Qt::StrongFocus - - - Move Down (Ctrl-Down) - - - Moves the selected boot device down. - - - - - - true - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 4 - 0 - - - - - - - + + + + S&napshot Folder: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + mPsSnapshot + + + + + + + + 0 + 0 + + + + + + + + &Shared Clipboard: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + mCbClipboard + + + + + + + + 0 + 0 + + + + Defines the mode of sharing the clipboard between the guest and the host OS. Note that this feature requires Guest Additions to be installed in the guest OS. + + + + + + + Qt::Horizontal + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + If checked, any change to mounted CD/DVD or Floppy media performed during machine execution will be saved in the settings file in order to preserve the configuration of mounted media between runs. + + + &Remember Runtime Changes + + + true + + + + + + + Removable Media: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + @@ -362,229 +196,13 @@ - - - - Extended Features: - - - Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing - - - mCbAcpi - - - - - - - - - - 0 - 0 - - - - When checked, the virtual machine will support the Advanced Configuration and Power Management Interface (ACPI). <b>Note:</b> don't disable this feature after having installed a Windows guest operating system! - - - Enable A&CPI - - - - - - - - 0 - 0 - - - - When checked, the virtual machine will support the Input Output APIC (IO APIC), which may slightly decrease the VM performance. <b>Note:</b> don't disable this feature after having installed a Windows guest operating system! - - - Enable IO A&PIC - - - - - - - - 0 - 0 - - - - When checked, the virtual machine will try to make use of the host CPU's hardware virtualization extensions such as Intel VT-x and AMD-V. - - - Enable &VT-x/AMD-V - - - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 20 - 0 - - - - - - - - - 0 - 0 - - - - When checked, the virtual machine will try to make use of the nested paging extension of Intel VT-x and AMD-V. - - - Enable Nested Pa&ging - - - - - - - - - - 0 - 0 - - - - When checked, the Physical Address Extension (PAE) feature of the host CPU will be exposed to the virtual machine. - - - Enable PA&E/NX - - - - - - - - - &Shared Clipboard: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - mCbClipboard - - - - - - - - - - - - 0 - 0 - - - - Defines the mode of sharing the clipboard between the guest and the host OS. Note that this feature requires Guest Additions to be installed in the guest OS. - - - - - - - - 0 - 0 - - - - Defines the type of the virtual IDE controller. Depending on this value, VirtualBox will provide different virtual IDE hardware devices to the guest OS. - - - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 40 - 20 - - - - - - - - - - &IDE Controller Type: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - mCbIDEController - - - - - - - S&napshot Folder: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - mPsSnapshot - - - - - - - - 0 - 0 - - - - - - + + Qt::Vertical - + - 20 - 40 + 0 + 0 @@ -597,5 +215,8 @@ &Description - + + + 0 + @@ -607,79 +228,4 @@ - - - - - - &Other - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 60 - 20 - - - - - - - - Runtime: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - mCbSaveMounted - - - - - - - If checked, any change to mounted CD/DVD or Floppy media performed during machine execution will be saved in the settings file in order to preserve the configuration of mounted media between runs. - - - &Remember Mounted Media - - - true - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - @@ -701,19 +247,4 @@ 1 - - BootItemsTable - QTreeWidget -
VBoxSettingsUtils.h
- - - QILabelSeparator - QLabel -
QILabelSeparator.h
- - - QILineEdit - QLineEdit -
QILineEdit.h
- Index: /trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsHD.ui =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsHD.ui (revision 19836) +++ /trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsHD.ui (revision 19837) @@ -28,5 +28,54 @@ - + + + + + + 0 + 0 + + + + IDE &Controller Type + + + mCbIDEController + + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 20 + 0 + + + + + + + + + 0 + 0 + + + + Defines the type of the virtual IDE controller. Depending on this value, VirtualBox will provide different virtual IDE hardware devices to the guest OS. + + + + + @@ -40,7 +89,7 @@ - + - + Qt::Horizontal @@ -51,6 +100,6 @@ - 17 - 17 + 20 + 0 @@ -84,10 +133,4 @@ - - - 0 - 200 - - Index: /trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsSystem.ui =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsSystem.ui (revision 19837) +++ /trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsSystem.ui (revision 19837) @@ -0,0 +1,621 @@ + + + VBox frontends: Qt4 GUI ("VirtualBox"): + + Copyright (C) 2008 Sun Microsystems, Inc. + + This file is part of VirtualBox Open Source Edition (OSE), as + available from http://www.virtualbox.org. This file is free software; + you can redistribute it and/or modify it under the terms of the GNU + General Public License (GPL) as published by the Free Software + Foundation, in version 2 as it comes in the "COPYING" file of the + VirtualBox OSE distribution. VirtualBox OSE is distributed in the + hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + + Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa + Clara, CA 95054 USA or visit http://www.sun.com if you need + additional information or have any questions. + + VBoxVMSettingsSystem + + + + 0 + 0 + 429 + 360 + + + + + + + 0 + + + + &Motherboard + + + + + + + 0 + 0 + + + + Base &Memory: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + mLeMemory + + + + + + + 0 + + + + + Controls the amount of memory provided to the virtual machine. If you assign too much, the machine might not start. + + + 4096 + + + 200 + + + 512 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + + + + + 0 + + + + + + 0 + 0 + + + + + + + + Qt::Horizontal + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + + + + 0 + 0 + + + + Controls the amount of memory provided to the virtual machine. If you assign too much, the machine might not start. + + + + + + + + 0 + 0 + + + + MB + + + + + + + + + + 0 + 0 + + + + &Boot Order: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + mTwBootOrder + + + + + + + 1 + + + + + + 0 + 0 + + + + Defines the boot device order. Use checkboxes to the left to enable or disable individual boot devices. Move items up and down to change the device order. + + + Qt::ScrollBarAlwaysOff + + + Qt::ScrollBarAlwaysOff + + + true + + + false + + + true + + + true + + + + + + + + + + + + 0 + + + + + false + + + Qt::StrongFocus + + + Move Down (Ctrl-Down) + + + Moves the selected boot device down. + + + + + + + ../images/list_moveup_16px.png../images/list_moveup_16px.png + + + true + + + + + + + false + + + Qt::StrongFocus + + + Move Up (Ctrl-Up) + + + Moves the selected boot device up. + + + + + + + ../images/list_movedown_16px.png../images/list_movedown_16px.png + + + true + + + + + + + Qt::Vertical + + + + 0 + 0 + + + + + + + + + + Qt::Horizontal + + + + 0 + 0 + + + + + + + + + + + 0 + 0 + + + + Extended Features: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + When checked, the virtual machine will support the Advanced Configuration and Power Management Interface (ACPI). <b>Note:</b> don't disable this feature after having installed a Windows guest operating system! + + + Enable &ACPI + + + + + + + + 0 + 0 + + + + When checked, the virtual machine will support the Input Output APIC (IO APIC), which may slightly decrease the VM performance. <b>Note:</b> don't disable this feature after having installed a Windows guest operating system! + + + Enable &IO APIC + + + + + + + Qt::Vertical + + + + 0 + 0 + + + + + + + + + &Processor + + + + + + + 0 + 0 + + + + CPU &Count: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + mLeCPU + + + + + + + 0 + + + + + Controls the number of virtual CPUs in the virtual machine. + + + 4096 + + + 200 + + + 512 + + + Qt::Horizontal + + + QSlider::TicksBelow + + + + + + + 0 + + + + + + 0 + 0 + + + + + + + + Qt::Horizontal + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + + 0 + 0 + + + + Controls the number of virtual CPUs in the virtual machine. + + + + + + + Extended Features: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + When checked, the Physical Address Extension (PAE) feature of the host CPU will be exposed to the virtual machine. + + + Enable PA&E/NX + + + + + + + Qt::Vertical + + + + 0 + 0 + + + + + + + + + Acce&leration + + + + + + Hardware Virtualization: + + + + + + + + 0 + 0 + + + + When checked, the virtual machine will try to make use of the host CPU's hardware virtualization extensions such as Intel VT-x and AMD-V. + + + Enable &VT-x/AMD-V + + + true + + + + + + + + 0 + 0 + + + + When checked, the virtual machine will try to make use of the nested paging extension of Intel VT-x and AMD-V. + + + Enable Nested Pa&ging + + + true + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + BootItemsTable + QTreeWidget +
VBoxSettingsUtils.h
+ + + QILineEdit + QLineEdit +
QILineEdit.h
+ + + + + + mCbVirt + toggled(bool) + mCbNestedPaging + setEnabled(bool) + + + 195 + 50 + + + 196 + 72 + + + + +