Changeset 90060 in vbox for trunk

Timestamp:

Jul 6, 2021 12:12:10 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

145555

Message:

FE/Qt: bugref:9996: Working on the 1st page's functionality.

Location:

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

Files:

• UIWizardNewVM.cpp (modified) (3 diffs)
• UIWizardNewVM.h (modified) (3 diffs)
• UIWizardNewVMHardwarePageBasic.cpp (modified) (4 diffs)
• UIWizardNewVMHardwarePageBasic.h (modified) (4 diffs)
• UIWizardNewVMNameOSTypePageBasic.cpp (modified) (6 diffs)
• UIWizardNewVMNameOSTypePageBasic.h (modified) (1 diff)
• UIWizardNewVMUnattendedPageBasic.cpp (modified) (9 diffs)
• UIWizardNewVMUnattendedPageBasic.h (modified) (2 diffs)

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

@@ -64 +64 @@
     , m_fStartHeadless(false)
     , m_fSkipUnattendedInstall(false)
+    , m_iCPUCount(1)
+    , m_iMemoryAmount(0)
+
 {
 #ifndef VBOX_WS_MAC
@@ -85 +88 @@
         {
             addPage(new UIWizardNewVMNameOSTypePageBasic);
-            addPage(new UIWizardNewVMUnattendedPageBasic);
-            addPage(new UIWizardNewVMHardwarePageBasic);
-            addPage(new UIWizardNewVMDiskPageBasic);
+            // addPage(new UIWizardNewVMUnattendedPageBasic);
+            // addPage(new UIWizardNewVMHardwarePageBasic);
+            // addPage(new UIWizardNewVMDiskPageBasic);
             break;
         }
@@ -758 +761 @@
 }
 
+int UIWizardNewVM::CPUCount() const
+{
+    return m_iCPUCount;
+}
+
+void UIWizardNewVM::setCPUCount(int iCPUCount)
+{
+    m_iCPUCount = iCPUCount;
+}
+
+int UIWizardNewVM::memoryAmount() const
+{
+    return m_iMemoryAmount;
+}
+
+void UIWizardNewVM::setMemoryCount(int iMemory)
+{
+    m_iMemoryAmount = iMemory;
+}
+
 const UIUnattendedInstallData &UIWizardNewVM::unattendedInstallData() const
 {

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

@@ -29 +29 @@
 #include "CMachine.h"
 #include "CMedium.h"
+
+#define parentWizardSet(functionName, value)                         \
+    UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard()); \
+    if (pWizard)                                                     \
+        pWizard->functionName(value);
 
 /** Container for unattended install related data. */
@@ -129 +134 @@
     void setProductKey(const QString &productKey);
 
+    int CPUCount() const;
+    void setCPUCount(int iCPUCount);
+
+    int memoryAmount() const;
+    void setMemoryCount(int iMemory);
+
 protected:
 
@@ -195 +206 @@
     QString m_strHostname;
     QString m_strProductKey;
+
+    int m_iCPUCount;
+    int m_iMemoryAmount;
 };
 

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

@@ -34 +34 @@
 #include "CGuestOSType.h"
 
-// UIWizardNewVMHardwarePage::UIWizardNewVMHardwarePage()
-// {
-// }
-
-// int UIWizardNewVMHardwarePage::baseMemory() const
-// {
-//     if (!m_pBaseMemoryEditor)
-//         return 0;
-//     return m_pBaseMemoryEditor->value();
-// }
-
-// int UIWizardNewVMHardwarePage::VCPUCount() const
-// {
-//     if (!m_pVirtualCPUEditor)
-//         return 1;
-//     return m_pVirtualCPUEditor->value();
-// }
-
-// bool UIWizardNewVMHardwarePage::EFIEnabled() const
-// {
-//     if (!m_pEFICheckBox)
-//         return false;
-//     return m_pEFICheckBox->isChecked();
-// }
-
-
 UIWizardNewVMHardwarePageBasic::UIWizardNewVMHardwarePageBasic()
     : m_pBaseMemoryEditor(0)
@@ -66 +40 @@
     , m_pLabel(0)
 {
+    m_pWizard = qobject_cast<UIWizardNewVM*>(wizard());
     prepare();
     qRegisterMetaType<CMedium>();
@@ -79 +54 @@
 
     pMainLayout->addStretch();
-    // createConnections();
+    createConnections();
 }
 
 void UIWizardNewVMHardwarePageBasic::createConnections()
 {
+    connect(m_pBaseMemoryEditor, &UIBaseMemoryEditor::sigValueChanged,
+            this, &UIWizardNewVMHardwarePageBasic::sltMemoryAmountChanged);
+
+
 }
 
@@ -145 +124 @@
     return pHardwareContainer;
 }
+
+void UIWizardNewVMHardwarePageBasic::sltMemoryAmountChanged(int iValue)
+{
+    Q_UNUSED(iValue);
+}
+
+void UIWizardNewVMHardwarePageBasic::sltCPUCountChanged(int iCount)
+{
+    Q_UNUSED(iCount);
+}

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

@@ -38 +38 @@
 class UIBaseMemoryEditor;
 class UIVirtualCPUEditor;
+class UIWizardNewVM;
 
-/** 3rd page of the New Virtual Machine wizard (base part). */
-// class UIWizardNewVMHardwarePage : public UIWizardPageBase
-// {
-
-// protected:
-
-//     /** Constructor. */
-//     UIWizardNewVMHardwarePage();
-
-
-//     /** @name Property getters/setters
-//      * @{ */
+namespace UIWizardNewVMHardwarePage
+{
+}
 //        int baseMemory() const;
 //        int VCPUCount() const;
 //        bool EFIEnabled() const;
-//     /** @} */
-
-//     QWidget *createHardwareWidgets();
-//     void retranslateWidgets();
 
 
-
-
-// };
-
-/** 3rd page of the New Virtual Machine wizard (basic extension). */
 class UIWizardNewVMHardwarePageBasic : public UINativeWizardPage
 {
@@ -71 +54 @@
 public:
 
-    /** Constructor. */
     UIWizardNewVMHardwarePageBasic();
 
@@ -79 +61 @@
 private slots:
 
+    void sltMemoryAmountChanged(int iValue);
+    void sltCPUCountChanged(int iCount);
 
 private:
-
 
     /** Prepare stuff. */
@@ -91 +74 @@
     QWidget *createHardwareWidgets();
     bool isComplete() const;
+
+    UIWizardNewVM *m_pWizard;
 
     /** @name Widgets

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

@@ -38 +38 @@
 #include "CSystemProperties.h"
 #include "CUnattended.h"
+
 
 /* Defines some patterns to guess the right OS type. Should be in sync with
@@ -344 +345 @@
     , m_pNameOSTypeLabel(0)
 {
-    m_pWizard = qobject_cast<UIWizardNewVM*>(wizard());
     prepare();
 }
@@ -400 +400 @@
 {
     UIWizardNewVMNameOSTypePage::onNameChanged(m_pNameAndSystemEditor, strNewName);
-    UIWizardNewVMNameOSTypePage::composeMachineFilePath(m_pNameAndSystemEditor, m_pWizard);
+    UIWizardNewVMNameOSTypePage::composeMachineFilePath(m_pNameAndSystemEditor, qobject_cast<UIWizardNewVM*>(wizard()));
+    emit completeChanged();
 }
 
@@ -406 +407 @@
 {
     Q_UNUSED(strNewPath);
-    UIWizardNewVMNameOSTypePage::composeMachineFilePath(m_pNameAndSystemEditor, m_pWizard);
+    UIWizardNewVMNameOSTypePage::composeMachineFilePath(m_pNameAndSystemEditor, qobject_cast<UIWizardNewVM*>(wizard()));
 }
 
@@ -457 +458 @@
 {
     /* Try to create machine folder: */
-    return UIWizardNewVMNameOSTypePage::createMachineFolder(m_pNameAndSystemEditor, this, m_pWizard);
+    return UIWizardNewVMNameOSTypePage::createMachineFolder(m_pNameAndSystemEditor, this, qobject_cast<UIWizardNewVM*>(wizard()));
 }
 
 void UIWizardNewVMNameOSTypePageBasic::sltISOPathChanged(const QString &strPath)
 {
-    UIWizardNewVMNameOSTypePage::determineOSType(strPath, m_pWizard);
-    if (m_pWizard)
-    {
-        if (!m_pWizard->detectedOSTypeId().isEmpty())
-            UIWizardNewVMNameOSTypePage::onNameChanged(m_pNameAndSystemEditor, m_pWizard->detectedOSTypeId());
-        m_pWizard->setISOFilePath(strPath);
+    UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(this->wizard());
+    UIWizardNewVMNameOSTypePage::determineOSType(strPath, pWizard);
+    if (pWizard)
+    {
+        if (!pWizard->detectedOSTypeId().isEmpty())
+            UIWizardNewVMNameOSTypePage::onNameChanged(m_pNameAndSystemEditor, pWizard->detectedOSTypeId());
+        pWizard->setISOFilePath(strPath);
     }
     /* Update the global recent ISO path: */
@@ -479 +481 @@
 void UIWizardNewVMNameOSTypePageBasic::sltGuestOSFamilChanged(const QString &strGuestOSFamilyId)
 {
-    if (m_pWizard)
-        m_pWizard->setGuestOSFamilyId(strGuestOSFamilyId);
+    parentWizardSet(setGuestOSFamilyId, strGuestOSFamilyId);
 }
 

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

@@ -101 +101 @@
     bool isUnattendedEnabled() const;
 
-    UIWizardNewVM *m_pWizard;
-
     /** @name Widgets
      * @{ */

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

@@ -68 +68 @@
     , m_pProductKeyLabel(0)
 {
-    m_pWizard = qobject_cast<UIWizardNewVM*>(wizard());
     prepare();
 }
@@ -159 +158 @@
 {
     markWidgets();
-    if (m_pWizard && m_pWizard->installGuestAdditions() &&
+    UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
+    if (pWizard && pWizard->installGuestAdditions() &&
         !UIWizardNewVMUnattendedPage::checkGAISOFile(m_pGAISOFilePathSelector))
         return false;
@@ -179 +179 @@
 {
     disableEnableGAWidgets(fEnabled);
-    if (m_pWizard)
-        m_pWizard->setInstallGuestAdditions(fEnabled);
+    parentWizardSet(setInstallGuestAdditions, fEnabled);
     emit completeChanged();
 }
@@ -186 +185 @@
 void UIWizardNewVMUnattendedPageBasic::sltGAISOPathChanged(const QString &strPath)
 {
-    if (m_pWizard)
-        m_pWizard->setGuestAdditionsISOPath(strPath);
+    parentWizardSet(setGuestAdditionsISOPath, strPath);
     emit completeChanged();
 }
@@ -193 +191 @@
 void UIWizardNewVMUnattendedPageBasic::sltPasswordChanged(const QString &strPassword)
 {
-    if (m_pWizard)
-        m_pWizard->setPassword(strPassword);
+    parentWizardSet(setPassword, strPassword);
     emit completeChanged();
 }
@@ -200 +197 @@
 void UIWizardNewVMUnattendedPageBasic::sltUserNameChanged(const QString &strUserName)
 {
-    if (m_pWizard)
-        m_pWizard->setUserName(strUserName);
+    parentWizardSet(setUserName, strUserName);
     emit completeChanged();
 }
@@ -207 +203 @@
 bool UIWizardNewVMUnattendedPageBasic::isProductKeyWidgetEnabled() const
 {
-    if (!m_pWizard || !m_pWizard->isUnattendedEnabled() || !m_pWizard->isGuestOSTypeWindows())
+    UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
+    if (!pWizard || !pWizard->isUnattendedEnabled() || !pWizard->isGuestOSTypeWindows())
         return false;
     return true;
@@ -214 +211 @@
 void UIWizardNewVMUnattendedPageBasic::sltHostnameChanged(const QString &strHostname)
 {
-    if (m_pWizard)
-        m_pWizard->setHostname(strHostname);
+    parentWizardSet(setHostname, strHostname);
 }
 
 void UIWizardNewVMUnattendedPageBasic::sltProductKeyChanged(const QString &strProductKey)
 {
-    if (m_pWizard)
-        m_pWizard->setProductKey(strProductKey);
+    parentWizardSet(setProductKey, strProductKey);
 }
 
 void UIWizardNewVMUnattendedPageBasic::sltStartHeadlessChanged(bool fStartHeadless)
 {
-    if (m_pWizard)
-        m_pWizard->setStartHeadless(fStartHeadless);
+    parentWizardSet(setStartHeadless, fStartHeadless);
 }
 
@@ -355 +349 @@
 void UIWizardNewVMUnattendedPageBasic::markWidgets() const
 {
-    if (m_pWizard && m_pWizard->installGuestAdditions())
+    UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
+    if (pWizard && pWizard->installGuestAdditions())
         m_pGAISOFilePathSelector->mark(!UIWizardNewVMUnattendedPage::checkGAISOFile(m_pGAISOFilePathSelector));
 }

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

@@ -35 +35 @@
 class UIFilePathSelector;
 class UIUserNamePasswordEditor;
-class UIWizardNewVM;
 struct UIUnattendedInstallData;
 
@@ -86 +85 @@
     void markWidgets() const;
 
-    UIWizardNewVM *m_pWizard;
-
     /** @name Widgets
       * @{ */