Changeset 87874 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Feb 25, 2021 1:05:21 PM (4 years ago)

Author:

vboxsync

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

142947

Message:

FE/Qt: bugref:9550. Adding and registering fields to page 5

Location:

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

Files:

• newvd/UIWizardNewVDPageBasic3.cpp (modified) (1 diff)
• newvd/UIWizardNewVDPageBasic3.h (modified) (1 diff)
• newvm/UIWizardNewVM.cpp (modified) (1 diff)
• newvm/UIWizardNewVMPageBasic5.cpp (modified) (1 diff)
• newvm/UIWizardNewVMPageBasic5.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic3.cpp

@@ -55 +55 @@
     , m_pLocationOpenButton(0)
     , m_pEditorSize(0)
-
+{
+}
+
+UIWizardNewVDPage3::UIWizardNewVDPage3()
+    : m_uMediumSizeMin(_4M)
+    , m_uMediumSizeMax(uiCommon().virtualBox().GetSystemProperties().GetInfoVDSize())
+    , m_pLocationEditor(0)
+    , m_pLocationOpenButton(0)
+    , m_pEditorSize(0)
 {
 }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic3.h

@@ -45 +45 @@
     /* Constructor: */
     UIWizardNewVDPage3(const QString &strDefaultName, const QString &strDefaultPath);
+    UIWizardNewVDPage3();
 
     /* Handlers: */

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

@@ -83 +83 @@
         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(Page5, new UIWizardNewVMPageBasic5);
             setPage(Page8, new UIWizardNewVMPageBasic8);
 

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

@@ -32 +32 @@
 #include "CGuestOSType.h"
 
-UIWizardNewVMPageBasic5::UIWizardNewVMPageBasic5(const QString &strDefaultName,
-                                                 const QString &strDefaultPath,
-                                                 qulonglong uDefaultSize)
-    : UIWizardNewVDPage3(strDefaultName, strDefaultPath)
-    , m_pLabel(0)
+UIWizardNewVMPageBasic5::UIWizardNewVMPageBasic5()
+    : m_pLabel(0)
 {
-    Q_UNUSED(uDefaultSize);
     prepare();
     qRegisterMetaType<CMedium>();
-    // registerField("baseMemory", this, "baseMemory");
-    // registerField("VCPUCount", this, "VCPUCount");
-    // registerField("EFIEnabled", this, "EFIEnabled");
+    registerField("mediumFormat", this, "mediumFormat");
+    registerField("mediumVariant", this, "mediumVariant");
+    registerField("mediumPath", this, "mediumPath");
+    registerField("mediumSize", this, "mediumSize");
+
+    // fieldImp("machineBaseName").toString(),
+    //     fieldImp("machineFolder").toString(),
+    //     fieldImp("type").value<CGuestOSType>().GetRecommendedHDD(),
+    QString strDefaultName = fieldImp("machineBaseName").toString();
+    m_strDefaultName = strDefaultName.isEmpty() ? QString("NewVirtualDisk1") : strDefaultName;
+    m_strDefaultPath = fieldImp("machineFolder").toString();
+
 }
 

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

@@ -48 +48 @@
 {
     Q_OBJECT;
-    // Q_PROPERTY(int baseMemory READ baseMemory);
-    // Q_PROPERTY(int VCPUCount READ VCPUCount);
-    // Q_PROPERTY(bool EFIEnabled READ EFIEnabled);
+    Q_PROPERTY(CMediumFormat mediumFormat READ mediumFormat WRITE setMediumFormat);
+    Q_PROPERTY(qulonglong mediumVariant READ mediumVariant WRITE setMediumVariant);
+    Q_PROPERTY(QString mediumPath READ mediumPath);
+    Q_PROPERTY(qulonglong mediumSize READ mediumSize WRITE setMediumSize);
 
 public:
 
     /** Constructor. */
-    UIWizardNewVMPageBasic5(const QString &strDefaultName, const QString &strDefaultPath, qulonglong uDefaultSize);
+    UIWizardNewVMPageBasic5();
 
 protected: