Changeset 90075 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 7, 2021 1:10:38 PM (4 years ago)

Author:

vboxsync

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

145572

Message:

FE/Qt: bugref:9996: Adding some parameters for disk attachment.

Location:

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

Files:

• UIWizardNewVM.cpp (modified) (1 diff)
• UIWizardNewVM.h (modified) (3 diffs)
• UIWizardNewVMDiskPageBasic.cpp (modified) (3 diffs)

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

@@ -807 +807 @@
 }
 
+
+KMediumVariant UIWizardNewVM::mediumVariant() const
+{
+    return m_enmMediumVariant;
+}
+
+void UIWizardNewVM::setMediumVariant(KMediumVariant enmMediumVariant)
+{
+    m_enmMediumVariant = enmMediumVariant;
+}
+
+const CMediumFormat &UIWizardNewVM::mediumFormat()
+{
+    return m_comMediumFormat;
+}
+
+void UIWizardNewVM::setMediumFormat(const CMediumFormat &mediumFormat)
+{
+    m_comMediumFormat = mediumFormat;
+}
+
+const QString &UIWizardNewVM::mediumPath() const
+{
+    return m_strMediumPath;
+}
+
+void UIWizardNewVM::setMediumPath(const QString &strMediumPath)
+{
+    m_strMediumPath = strMediumPath;
+}
+
+qulonglong UIWizardNewVM::mediumSize() const
+{
+    return m_uMediumSize;
+}
+
+void UIWizardNewVM::setMediumSize(qulonglong uMediumSize)
+{
+    m_uMediumSize = uMediumSize;
+}
+
 const UIUnattendedInstallData &UIWizardNewVM::unattendedInstallData() const
 {

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

@@ -29 +29 @@
 #include "CMachine.h"
 #include "CMedium.h"
+#include "CMediumFormat.h"
 #include "CGuestOSType.h"
 
@@ -140 +141 @@
     void setMemorySize(int iMemory);
 
+    KMediumVariant mediumVariant() const;
+    void setMediumVariant(KMediumVariant enmMediumVariant);
+
+    const CMediumFormat &mediumFormat();
+    void setMediumFormat(const CMediumFormat &mediumFormat);
+
+    const QString &mediumPath() const;
+    void setMediumPath(const QString &strMediumPath);
+
+    qulonglong mediumSize() const;
+    void setMediumSize(qulonglong mediumSize);
+
 protected:
 
@@ -214 +227 @@
     int m_iMemorySize;
     int m_iUnattendedInstallPageIndex;
+
+    KMediumVariant m_enmMediumVariant;
+    CMediumFormat m_comMediumFormat;
+    QString m_strMediumPath;
+    qulonglong m_uMediumSize;
 };
 

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

@@ -235 +235 @@
 void UIWizardNewVMDiskPageBasic::createConnections()
 {
-    // if (m_pDiskSourceButtonGroup)
-    //     connect(m_pDiskSourceButtonGroup, static_cast<void(QButtonGroup::*)(QAbstractButton *)>(&QButtonGroup::buttonClicked),
-    //             this, &UIWizardNewVMDiskPageBasic::sltSelectedDiskSourceChanged);
-    // if (m_pDiskSelector)
-    //     connect(m_pDiskSelector, static_cast<void(UIMediaComboBox::*)(int)>(&UIMediaComboBox::currentIndexChanged),
-    //             this, &UIWizardNewVMDiskPageBasic::sltMediaComboBoxIndexChanged);
-    // if (m_pDiskSelectionButton)
-    //     connect(m_pDiskSelectionButton, &QIToolButton::clicked,
-    //             this, &UIWizardNewVMDiskPageBasic::sltGetWithFileOpenDialog);
-    // if (m_pMediumSizeEditor)
-    // {
-    //     connect(m_pMediumSizeEditor, &UIMediumSizeEditor::sigSizeChanged,
-    //             this, &UIWizardNewVMDiskPageBasic::completeChanged);
-    //     connect(m_pMediumSizeEditor, &UIMediumSizeEditor::sigSizeChanged,
-    //             this, &UIWizardNewVMDiskPageBasic::sltHandleSizeEditorChange);
-    // }
+    if (m_pDiskSourceButtonGroup)
+        connect(m_pDiskSourceButtonGroup, static_cast<void(QButtonGroup::*)(QAbstractButton *)>(&QButtonGroup::buttonClicked),
+                this, &UIWizardNewVMDiskPageBasic::sltSelectedDiskSourceChanged);
+    if (m_pDiskSelector)
+        connect(m_pDiskSelector, static_cast<void(UIMediaComboBox::*)(int)>(&UIMediaComboBox::currentIndexChanged),
+                this, &UIWizardNewVMDiskPageBasic::sltMediaComboBoxIndexChanged);
+    if (m_pDiskSelectionButton)
+        connect(m_pDiskSelectionButton, &QIToolButton::clicked,
+                this, &UIWizardNewVMDiskPageBasic::sltGetWithFileOpenDialog);
+    if (m_pMediumSizeEditor)
+    {
+        connect(m_pMediumSizeEditor, &UIMediumSizeEditor::sigSizeChanged,
+                this, &UIWizardNewVMDiskPageBasic::completeChanged);
+        connect(m_pMediumSizeEditor, &UIMediumSizeEditor::sigSizeChanged,
+                this, &UIWizardNewVMDiskPageBasic::sltHandleSizeEditorChange);
+    }
 }
 
@@ -428 +428 @@
 {
     bool fResult = true;
-
-    // /* Make sure user really intents to creae a vm with no hard drive: */
-    // if (selectedDiskSource() == SelectedDiskSource_Empty)
-    // {
-    //     /* Ask user about disk-less machine unless that's the recommendation: */
-    //     if (!m_fRecommendedNoDisk)
-    //     {
-    //         if (!msgCenter().confirmHardDisklessMachine(thisImp()))
-    //             return false;
-    //     }
-    // }
-    // else if (selectedDiskSource() == SelectedDiskSource_New)
-    // {
-    //     /* Check if the path we will be using for hard drive creation exists: */
-    //     const QString strMediumPath(fieldImp("mediumPath").toString());
-    //     fResult = !QFileInfo(strMediumPath).exists();
-    //     if (!fResult)
-    //     {
-    //         msgCenter().cannotOverwriteHardDiskStorage(strMediumPath, this);
-    //         return fResult;
-    //     }
-    //     /* Check FAT size limitation of the host hard drive: */
-    //     fResult = UIWizardNewVDPageBaseSizeLocation::checkFATSizeLimitation(fieldImp("mediumVariant").toULongLong(),
-    //                                                          fieldImp("mediumPath").toString(),
-    //                                                          fieldImp("mediumSize").toULongLong());
-    //     if (!fResult)
-    //     {
-    //         msgCenter().cannotCreateHardDiskStorageInFAT(strMediumPath, this);
-    //         return fResult;
-    //     }
-    // }
+    UIWizardNewVM *pWizard = qobject_cast<UIWizardNewVM*>(wizard());
+    AssertReturn(pWizard, false);
+
+    /* Make sure user really intents to creae a vm with no hard drive: */
+    if (m_enmSelectedDiskSource == SelectedDiskSource_Empty)
+    {
+        /* Ask user about disk-less machine unless that's the recommendation: */
+        if (!m_fRecommendedNoDisk)
+        {
+            if (!msgCenter().confirmHardDisklessMachine(this))
+                return false;
+        }
+    }
+    else if (m_enmSelectedDiskSource == SelectedDiskSource_New)
+    {
+        /* Check if the path we will be using for hard drive creation exists: */
+        const QString strMediumPath(mediumPath());
+        fResult = !QFileInfo(strMediumPath).exists();
+        if (!fResult)
+        {
+            msgCenter().cannotOverwriteHardDiskStorage(strMediumPath, this);
+            return fResult;
+        }
+        /* Check FAT size limitation of the host hard drive: */
+        fResult = UIWizardNewVDPageBaseSizeLocation::checkFATSizeLimitation(pWizard->mediumVariant(),
+                                                                            pWizard->mediumPath(),
+                                                                            pWizard->mediumSize());
+        if (!fResult)
+        {
+            msgCenter().cannotCreateHardDiskStorageInFAT(strMediumPath, this);
+            return fResult;
+        }
+    }
 
     // startProcessing();
-    // UIWizardNewVM *pWizard = wizardImp();
-    // if (pWizard)
-    // {
+    if (pWizard)
+    {
     //     if (selectedDiskSource() == SelectedDiskSource_New)
     //     {
@@ -477 +478 @@
     //     if (!fResult)
     //         pWizard->deleteVirtualDisk();
-    // }
+    }
     // endProcessing();