Changeset 90208 in vbox for trunk/src/VBox

Timestamp:

Jul 15, 2021 9:51:10 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996. Adding UINewVMHardwareContainer

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards

Files:

• editors/UIWizardNewVMEditors.cpp (modified) (3 diffs)
• editors/UIWizardNewVMEditors.h (modified) (2 diffs)
• newvm/UIWizardNewVMHardwarePageBasic.cpp (modified) (8 diffs)
• newvm/UIWizardNewVMHardwarePageBasic.h (modified) (2 diffs)
• newvm/UIWizardNewVMPageExpert.cpp (modified) (2 diffs)
• newvm/UIWizardNewVMPageExpert.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardNewVMEditors.cpp

@@ -23 +23 @@
 /* GUI includes: */
 #include "QILineEdit.h"
+#include "UIBaseMemoryEditor.h"
 #include "UICommon.h"
 #include "UIHostnameDomainNameEditor.h"
@@ -29 +30 @@
 #include "UIWizardNewVM.h"
 #include "UIWizardNewVMEditors.h"
+#include "UIVirtualCPUEditor.h"
 
 /* Other VBox includes: */
@@ -313 +315 @@
         m_pProductKeyLineEdit->setEnabled(fEnabled);
 }
+
+/*********************************************************************************************************************************
+*   UINewVMHardwareContainer implementation.                                                                                *
+*********************************************************************************************************************************/
+
+UINewVMHardwareContainer::UINewVMHardwareContainer(QWidget *pParent /* = 0 */)
+    : QIWithRetranslateUI<QWidget>(pParent)
+    , m_pBaseMemoryEditor(0)
+    , m_pVirtualCPUEditor(0)
+    , m_pEFICheckBox(0)
+{
+    prepare();
+}
+
+void UINewVMHardwareContainer::setMemorySize(int iSize)
+{
+    if (m_pBaseMemoryEditor)
+        m_pBaseMemoryEditor->setValue(iSize);
+}
+
+void UINewVMHardwareContainer::setEFIEnabled(bool fEnabled)
+{
+    if (m_pEFICheckBox)
+        m_pEFICheckBox->setChecked(fEnabled);
+}
+
+void UINewVMHardwareContainer::prepare()
+{
+    QGridLayout *pHardwareLayout = new QGridLayout(this);
+    pHardwareLayout->setContentsMargins(0, 0, 0, 0);
+
+    m_pBaseMemoryEditor = new UIBaseMemoryEditor(0, true);
+    m_pVirtualCPUEditor = new UIVirtualCPUEditor(0, true);
+    m_pEFICheckBox      = new QCheckBox;
+    pHardwareLayout->addWidget(m_pBaseMemoryEditor, 0, 0, 1, 4);
+    pHardwareLayout->addWidget(m_pVirtualCPUEditor, 1, 0, 1, 4);
+    pHardwareLayout->addWidget(m_pEFICheckBox, 2, 0, 1, 1);
+
+
+    if (m_pBaseMemoryEditor)
+        connect(m_pBaseMemoryEditor, &UIBaseMemoryEditor::sigValueChanged,
+                this, &UINewVMHardwareContainer::sigMemorySizeChanged);
+    if (m_pVirtualCPUEditor)
+        connect(m_pVirtualCPUEditor, &UIVirtualCPUEditor::sigValueChanged,
+            this, &UINewVMHardwareContainer::sigCPUCountChanged);
+    if (m_pEFICheckBox)
+        connect(m_pEFICheckBox, &QCheckBox::toggled,
+                this, &UINewVMHardwareContainer::sigEFIEnabledChanged);
+
+
+    retranslateUi();
+}
+
+void UINewVMHardwareContainer::retranslateUi()
+{
+    if (m_pEFICheckBox)
+    {
+        m_pEFICheckBox->setText(UIWizardNewVM::tr("&Enable EFI (special OSes only)"));
+        m_pEFICheckBox->setToolTip(UIWizardNewVM::tr("<p>When checked, the guest will support the "
+                                                       "Extended Firmware Interface (EFI), which is required to boot certain "
+                                                       "guest OSes. Non-EFI aware OSes will not be able to boot if this option is activated.</p>"));
+    }
+}

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardNewVMEditors.h

@@ -34 +34 @@
 class QLabel;
 class QILineEdit;
+class UIBaseMemoryEditor;
 class UIFilePathSelector;
 class UIHostnameDomainNameEditor;
 class UIPasswordLineEdit;
 class UIUserNamePasswordEditor;
+class UIVirtualCPUEditor;
 
 class UIUserNamePasswordGroupBox : public QIWithRetranslateUI<QGroupBox>
@@ -141 +143 @@
 };
 
+
+class UINewVMHardwareContainer : public QIWithRetranslateUI<QWidget>
+{
+    Q_OBJECT;
+
+signals:
+
+    void sigMemorySizeChanged(int iSize);
+    void sigCPUCountChanged(int iCount);
+    void sigEFIEnabledChanged(bool fEnabled);
+
+public:
+
+    UINewVMHardwareContainer(QWidget *pParent = 0);
+
+    /** @name Wrappers for UIFilePathSelector
+      * @{ */
+        void setMemorySize(int size);
+        void setEFIEnabled(bool fEnabled);
+    /** @} */
+
+private:
+
+    void prepare();
+    virtual void retranslateUi() /* override final */;
+
+    UIBaseMemoryEditor *m_pBaseMemoryEditor;
+    UIVirtualCPUEditor *m_pVirtualCPUEditor;
+    QCheckBox *m_pEFICheckBox;
+};
+
 #endif /* !FEQT_INCLUDED_SRC_wizards_editors_UIWizardNewVMEditors_h */

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

@@ -28 +28 @@
 #include "UIVirtualCPUEditor.h"
 #include "UIWizardNewVM.h"
+#include "UIWizardNewVMEditors.h"
 #include "UIWizardNewVMHardwarePageBasic.h"
 #include "UIWizardNewVDPageSizeLocation.h"
@@ -35 +36 @@
 
 UIWizardNewVMHardwarePageBasic::UIWizardNewVMHardwarePageBasic()
-    : m_pBaseMemoryEditor(0)
-    , m_pVirtualCPUEditor(0)
-    , m_pEFICheckBox(0)
-    , m_pLabel(0)
+    : m_pLabel(0)
+    , m_pHardwareWidgetContainer(0)
 {
     prepare();
@@ -50 +49 @@
     m_pLabel = new QIRichTextLabel(this);
     pMainLayout->addWidget(m_pLabel);
-    pMainLayout->addWidget(createHardwareWidgets());
+    m_pHardwareWidgetContainer = new UINewVMHardwareContainer;
+    AssertReturnVoid(m_pHardwareWidgetContainer);
+    pMainLayout->addWidget(m_pHardwareWidgetContainer);
 
     pMainLayout->addStretch();
@@ -58 +59 @@
 void UIWizardNewVMHardwarePageBasic::createConnections()
 {
-    if (m_pBaseMemoryEditor)
-        connect(m_pBaseMemoryEditor, &UIBaseMemoryEditor::sigValueChanged,
+    if (m_pHardwareWidgetContainer)
+    {
+        connect(m_pHardwareWidgetContainer, &UINewVMHardwareContainer::sigMemorySizeChanged,
                 this, &UIWizardNewVMHardwarePageBasic::sltMemorySizeChanged);
-    if (m_pVirtualCPUEditor)
-        connect(m_pVirtualCPUEditor, &UIVirtualCPUEditor::sigValueChanged,
-            this, &UIWizardNewVMHardwarePageBasic::sltCPUCountChanged);
-    if (m_pEFICheckBox)
-        connect(m_pEFICheckBox, &QCheckBox::toggled,
+        connect(m_pHardwareWidgetContainer, &UINewVMHardwareContainer::sigCPUCountChanged,
+                this, &UIWizardNewVMHardwarePageBasic::sltCPUCountChanged);
+        connect(m_pHardwareWidgetContainer, &UINewVMHardwareContainer::sigEFIEnabledChanged,
                 this, &UIWizardNewVMHardwarePageBasic::sltEFIEnabledChanged);
-
+    }
 }
 
@@ -77 +77 @@
         m_pLabel->setText(UIWizardNewVM::tr("<p>You can modify virtual machine's hardware by changing amount of RAM and "
                                             "virtual CPU count. Enabling EFI is also possible.</p>"));
-
-    if (m_pEFICheckBox)
-    {
-        m_pEFICheckBox->setText(UIWizardNewVM::tr("&Enable EFI (special OSes only)"));
-        m_pEFICheckBox->setToolTip(UIWizardNewVM::tr("<p>When checked, the guest will support the "
-                                                       "Extended Firmware Interface (EFI), which is required to boot certain "
-                                                       "guest OSes. Non-EFI aware OSes will not be able to boot if this option is activated.</p>"));
-    }
 }
 
@@ -92 +84 @@
 
     UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
-    if (pWizard)
+    if (pWizard && m_pHardwareWidgetContainer)
     {
         CGuestOSType type = pWizard->guestOSType();
@@ -100 +92 @@
             {
                 ULONG recommendedRam = type.GetRecommendedRAM();
-                if (m_pBaseMemoryEditor)
-                    m_pBaseMemoryEditor->setValue(recommendedRam);
+                m_pHardwareWidgetContainer->setMemorySize(recommendedRam);
             }
             if (!m_userModifiedParameters.contains("EFIEnabled"))
             {
                 KFirmwareType fwType = type.GetRecommendedFirmware();
-                if (m_pEFICheckBox)
-                    m_pEFICheckBox->setChecked(fwType != KFirmwareType_BIOS);
+                m_pHardwareWidgetContainer->setEFIEnabled(fwType != KFirmwareType_BIOS);
             }
         }
@@ -121 +111 @@
 {
     return true;
-}
-
-QWidget *UIWizardNewVMHardwarePageBasic::createHardwareWidgets()
-{
-    QWidget *pHardwareContainer = new QWidget;
-    QGridLayout *pHardwareLayout = new QGridLayout(pHardwareContainer);
-    pHardwareLayout->setContentsMargins(0, 0, 0, 0);
-
-    m_pBaseMemoryEditor = new UIBaseMemoryEditor(0, true);
-    m_pVirtualCPUEditor = new UIVirtualCPUEditor(0, true);
-    m_pEFICheckBox      = new QCheckBox;
-    pHardwareLayout->addWidget(m_pBaseMemoryEditor, 0, 0, 1, 4);
-    pHardwareLayout->addWidget(m_pVirtualCPUEditor, 1, 0, 1, 4);
-    pHardwareLayout->addWidget(m_pEFICheckBox, 2, 0, 1, 1);
-
-    return pHardwareContainer;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMHardwarePageBasic.h

@@ -38 +38 @@
 class QIRichTextLabel;
 class UIBaseMemoryEditor;
+class UINewVMHardwareContainer;
 class UIVirtualCPUEditor;
 class UIWizardNewVM;
@@ -74 +75 @@
     void initializePage();
     void cleanupPage();
-    QWidget *createHardwareWidgets();
     bool isComplete() const;
 
     /** @name Widgets
      * @{ */
-       UIBaseMemoryEditor *m_pBaseMemoryEditor;
-       UIVirtualCPUEditor *m_pVirtualCPUEditor;
-       QCheckBox          *m_pEFICheckBox;
        QIRichTextLabel    *m_pLabel;
+       UINewVMHardwareContainer *m_pHardwareWidgetContainer;
     /** @} */
     /** This set is used to decide if we have to set wizard's parameters

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

@@ -58 +58 @@
     , m_pSkipUnattendedCheckBox(0)
     , m_pNameAndSystemLayout(0)
+    , m_pHardwareWidgetContainer(0)
     , m_pAdditionalOptionsContainer(0)
     , m_pGAInstallationISOContainer(0)
@@ -67 +68 @@
         m_pToolBox->insertPage(ExpertToolboxItems_NameAndOSType, createNameOSTypeWidgets(), "");
         m_pToolBox->insertPage(ExpertToolboxItems_Unattended, createUnattendedWidgets(), "");
-        //m_pToolBox->insertPage(ExpertToolboxItems_Hardware, createHardwareWidgets(), "");
+        m_pHardwareWidgetContainer = new UINewVMHardwareContainer;
+        m_pToolBox->insertPage(ExpertToolboxItems_Hardware, m_pHardwareWidgetContainer, "");
         m_pToolBox->insertPage(ExpertToolboxItems_Disk, createNewDiskWidgets(), "");
         m_pToolBox->setCurrentPage(ExpertToolboxItems_NameAndOSType);

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.h

@@ -47 +47 @@
 class UIMediumSizeEditor;
 class UINameAndSystemEditor;
+class UINewVMHardwareContainer;
 class UIToolBox;
 class UIUserNamePasswordGroupBox;
@@ -135 +136 @@
         QCheckBox *m_pSkipUnattendedCheckBox;
         QGridLayout *m_pNameAndSystemLayout;
+        UINewVMHardwareContainer *m_pHardwareWidgetContainer;
         UIAdditionalUnattendedOptions *m_pAdditionalOptionsContainer;
         UIGAInstallationGroupBox *m_pGAInstallationISOContainer;