Index: /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (revision 87870) +++ /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk (revision 87871) @@ -664,4 +664,5 @@ src/wizards/newvm/UIWizardNewVMPageBasic8.h \ src/wizards/newvm/UIWizardNewVMPageBasic4.h \ + src/wizards/newvm/UIWizardNewVMPageBasic5.h \ src/wizards/newvm/UIWizardNewVMPageExpert.h \ src/wizards/clonevm/UIWizardCloneVM.h \ @@ -1155,4 +1156,5 @@ src/wizards/newvm/UIWizardNewVMPageBasic8.cpp \ src/wizards/newvm/UIWizardNewVMPageBasic4.cpp \ + src/wizards/newvm/UIWizardNewVMPageBasic5.cpp \ src/wizards/newvm/UIWizardNewVMPageExpert.cpp \ src/wizards/clonevm/UIWizardCloneVM.cpp \ Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic2.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic2.cpp (revision 87870) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic2.cpp (revision 87871) @@ -29,5 +29,4 @@ /* COM includes: */ #include "CMediumFormat.h" - UIWizardNewVDPage2::UIWizardNewVDPage2() Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp (revision 87870) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp (revision 87871) @@ -25,4 +25,5 @@ #include "UIWizardNewVMPageBasic1.h" #include "UIWizardNewVMPageBasic2.h" +#include "UIWizardNewVMPageBasic5.h" #include "UIWizardNewVMPageBasic8.h" #include "UIWizardNewVMPageBasic4.h" @@ -81,7 +82,11 @@ case WizardMode_Basic: { + QString strDefaultDiskName; + QString strDefaultDiskPath; + qulonglong uDefaultSize = 0; setPage(Page1, new UIWizardNewVMPageBasic1(m_strGroup)); setPage(Page2, new UIWizardNewVMPageBasic2); setPage(Page4, new UIWizardNewVMPageBasic4); + setPage(Page5, new UIWizardNewVMPageBasic5(strDefaultDiskName, strDefaultDiskPath, uDefaultSize)); setPage(Page8, new UIWizardNewVMPageBasic8); Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic5.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic5.cpp (revision 87871) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic5.cpp (revision 87871) @@ -0,0 +1,100 @@ +/* $Id$ */ +/** @file + * VBox Qt GUI - UIWizardNewVMPageBasic5 class implementation. + */ + +/* + * Copyright (C) 2006-2020 Oracle Corporation + * + * 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. + */ + +/* Qt includes: */ +#include +#include +#include +#include + +/* GUI includes: */ +#include "QIRichTextLabel.h" +#include "UIBaseMemoryEditor.h" +#include "UIVirtualCPUEditor.h" +#include "UIWizardNewVM.h" +#include "UIWizardNewVMPageBasic5.h" + +/* COM includes: */ +#include "CGuestOSType.h" + +UIWizardNewVMPageBasic5::UIWizardNewVMPageBasic5(const QString &strDefaultName, + const QString &strDefaultPath, + qulonglong uDefaultSize) + : UIWizardNewVDPage3(strDefaultName, strDefaultPath) + , m_pLabel(0) +{ + Q_UNUSED(uDefaultSize); + prepare(); + qRegisterMetaType(); + // registerField("baseMemory", this, "baseMemory"); + // registerField("VCPUCount", this, "VCPUCount"); + // registerField("EFIEnabled", this, "EFIEnabled"); +} + +void UIWizardNewVMPageBasic5::prepare() +{ + QVBoxLayout *pMainLayout = new QVBoxLayout(this); + + m_pLabel = new QIRichTextLabel(this); + pMainLayout->addWidget(m_pLabel); + //pMainLayout->addWidget(createHardwareWidgets()); + + pMainLayout->addStretch(); + createConnections(); +} + +void UIWizardNewVMPageBasic5::createConnections() +{ +} + +void UIWizardNewVMPageBasic5::retranslateUi() +{ + setTitle(UIWizardNewVM::tr("Hardware")); + + if (m_pLabel) + m_pLabel->setText(UIWizardNewVM::tr("

You can modify virtual machine's hardware by changing amount of RAM and " + "virtual CPU count.

")); + + //retranslateWidgets(); +} + +void UIWizardNewVMPageBasic5::initializePage() +{ + retranslateUi(); + + // if (!field("type").canConvert()) + // return; + + // CGuestOSType type = field("type").value(); + // ULONG recommendedRam = type.GetRecommendedRAM(); + // if (m_pBaseMemoryEditor) + // m_pBaseMemoryEditor->setValue(recommendedRam); + + // KFirmwareType fwType = type.GetRecommendedFirmware(); + // if (m_pEFICheckBox) + // m_pEFICheckBox->setChecked(fwType != KFirmwareType_BIOS); +} + +void UIWizardNewVMPageBasic5::cleanupPage() +{ + UIWizardPage::cleanupPage(); +} + +bool UIWizardNewVMPageBasic5::isComplete() const +{ + return true; +} Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic5.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic5.h (revision 87871) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic5.h (revision 87871) @@ -0,0 +1,87 @@ +/* $Id$ */ +/** @file + * VBox Qt GUI - UIWizardNewVMPageBasic5 class declaration. + */ + +/* + * Copyright (C) 2006-2020 Oracle Corporation + * + * 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. + */ + +#ifndef FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic5_h +#define FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic5_h +#ifndef RT_WITHOUT_PRAGMA_ONCE +# pragma once +#endif + +/* Qt includes: */ +#include + +/* GUI includes: */ +#include "UIWizardPage.h" +#include "UIWizardNewVDPageBasic2.h" +#include "UIWizardNewVDPageBasic3.h" + +/* COM includes: */ +#include "COMEnums.h" +#include "CMedium.h" + +/* Forward declarations: */ +class QRadioButton; +class QCheckBox; +class QIRichTextLabel; +class UIBaseMemoryEditor; +class UIVirtualCPUEditor; + +class UIWizardNewVMPageBasic5 : public UIWizardPage, + public UIWizardNewVDPage2, + public UIWizardNewVDPage3 + +{ + Q_OBJECT; + // Q_PROPERTY(int baseMemory READ baseMemory); + // Q_PROPERTY(int VCPUCount READ VCPUCount); + // Q_PROPERTY(bool EFIEnabled READ EFIEnabled); + +public: + + /** Constructor. */ + UIWizardNewVMPageBasic5(const QString &strDefaultName, const QString &strDefaultPath, qulonglong uDefaultSize); + +protected: + + /** Wrapper to access 'wizard' from base part. */ + UIWizard *wizardImp() const { return wizard(); } + /** Wrapper to access 'this' from base part. */ + UIWizardPage* thisImp() { return this; } + /** Wrapper to access 'wizard-field' from base part. */ + QVariant fieldImp(const QString &strFieldName) const { return UIWizardPage::field(strFieldName); } + +private slots: + + +private: + + + /** Prepare stuff. */ + void prepare(); + void createConnections(); + void retranslateUi(); + void initializePage(); + void cleanupPage(); + + bool isComplete() const; + + + /** Widgets. */ + QIRichTextLabel *m_pLabel; +}; + +#endif /* !FEQT_INCLUDED_SRC_wizards_newvm_UIWizardNewVMPageBasic5_h */