Changeset 105539 in vbox

Timestamp:

Jul 30, 2024 10:50:44 AM (4 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10736. Some preparation for merging.

Location:

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

Files:

• UIWizardNewVD.cpp (modified) (3 diffs)
• UIWizardNewVD.h (modified) (3 diffs)
• UIWizardNewVDExpertPage.cpp (modified) (4 diffs)
• UIWizardNewVDExpertPage.h (modified) (3 diffs)
• UIWizardNewVDSizeLocationPage.cpp (modified) (3 diffs)
• UIWizardNewVDSizeLocationPage.h (modified) (2 diffs)

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

@@ -108 +108 @@
 }
 
+const QString &UIWizardNewVD::defaultPath() const
+{
+    return m_strDefaultPath;
+}
+
+const QString &UIWizardNewVD::defaultName() const
+{
+    return m_strDefaultName;
+}
+
+qulonglong UIWizardNewVD::defaultSize() const
+{
+    return m_uDefaultSize;
+}
+
 void UIWizardNewVD::populatePages()
 {
@@ -116 +131 @@
             addPage(new UIWizardNewVDFileTypePage);
             m_iMediumVariantPageIndex = addPage(new UIWizardNewVDVariantPage);
-            addPage(new UIWizardNewVDSizeLocationPage(m_strDefaultName, m_strDefaultPath, m_uDefaultSize));
+            addPage(new UIWizardNewVDSizeLocationPage(diskMinimumSize()));
             break;
         }
         case WizardMode_Expert:
         {
-            addPage(new UIWizardNewVDExpertPage(m_strDefaultName, m_strDefaultPath, m_uDefaultSize));
+            addPage(new UIWizardNewVDExpertPage(diskMinimumSize()));
             break;
         }
@@ -234 +249 @@
     setPageVisible(m_iMediumVariantPageIndex, cTest > 1);
 }
+
+qulonglong UIWizardNewVD::diskMinimumSize() const
+{
+    return sourceDiskLogicalSize();
+}
+
+qulonglong UIWizardNewVD::sourceDiskLogicalSize() const
+{
+    if (m_comSourceVirtualDisk.isNull())
+        return _4M;
+    return m_comSourceVirtualDisk.GetLogicalSize();
+}

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

@@ -81 +81 @@
     /** @} */
 
+       const QString &defaultPath() const;
+       const QString &defaultName() const;
+       qulonglong defaultSize() const;
+
 protected:
 
@@ -93 +97 @@
     /** Check medium capabilities and decide if medium variant page should be hidden. */
     void setMediumVariantPageVisibility();
+    qulonglong diskMinimumSize() const;
+    qulonglong sourceDiskLogicalSize() const;
     qulonglong m_uMediumVariant;
     CMediumFormat m_comMediumFormat;
@@ -102 +108 @@
     int m_iMediumVariantPageIndex;
     QUuid m_uMediumId;
+    /** Holds the source virtual disk wrapper. */
+    CMedium m_comSourceVirtualDisk;
 };
 

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

@@ -42 +42 @@
 #include "CSystemProperties.h"
 
-UIWizardNewVDExpertPage::UIWizardNewVDExpertPage(const QString &strDefaultName, const QString &strDefaultPath, qulonglong uDefaultSize)
+UIWizardNewVDExpertPage::UIWizardNewVDExpertPage(qulonglong uDiskMinimumSize)
     : UINativeWizardPage()
     , m_pSizeAndPathGroup(0)
@@ -48 +48 @@
     , m_pVariantWidget(0)
     , m_pFormatVariantGroupBox(0)
-    , m_strDefaultName(strDefaultName)
-    , m_strDefaultPath(strDefaultPath)
-    , m_uDefaultSize(uDefaultSize)
     , m_uMediumSizeMin(_4M)
     , m_uMediumSizeMax(gpGlobalSession->virtualBox().GetSystemProperties().GetInfoVDSize())
 {
-    prepare();
-}
-
-void UIWizardNewVDExpertPage::prepare()
+    prepare(uDiskMinimumSize);
+}
+
+void UIWizardNewVDExpertPage::prepare(qulonglong uDiskMinimumSize)
 {
     QVBoxLayout *pMainLayout = new QVBoxLayout(this);
-    m_pSizeAndPathGroup = new UIMediumSizeAndPathGroupBox(true /* fExpertMode */, 0 /* parent */, _4M /* minimum size */);
+    m_pSizeAndPathGroup = new UIMediumSizeAndPathGroupBox(true /* fExpertMode */, 0 /* parent */,uDiskMinimumSize);
     m_pFormatComboBox = new UIDiskFormatsComboBox(true /* fExpertMode */, KDeviceType_HardDisk, 0);
     m_pVariantWidget = new UIDiskVariantWidget(0);
@@ -163 +160 @@
     QString strExtension = UIWizardDiskEditors::defaultExtension(comMediumFormat, KDeviceType_HardDisk);
     QString strMediumFilePath =
-        UIWizardDiskEditors::constructMediumFilePath(UIWizardDiskEditors::appendExtension(m_strDefaultName,
-                                                                                          strExtension), m_strDefaultPath);
+        UIWizardDiskEditors::constructMediumFilePath(UIWizardDiskEditors::appendExtension(pWizard->defaultName(),
+                                                                                          strExtension), pWizard->defaultPath());
     m_pSizeAndPathGroup->blockSignals(true);
     m_pSizeAndPathGroup->setMediumFilePath(strMediumFilePath);
@@ -171 +168 @@
 
     m_pSizeAndPathGroup->blockSignals(true);
-    m_pSizeAndPathGroup->setMediumSize(m_uDefaultSize > m_uMediumSizeMin && m_uDefaultSize < m_uMediumSizeMax ? m_uDefaultSize : m_uMediumSizeMin);
+    qulonglong uDefaultSize = pWizard->defaultSize();
+    m_pSizeAndPathGroup->setMediumSize(uDefaultSize > m_uMediumSizeMin && uDefaultSize < m_uMediumSizeMax ? uDefaultSize : m_uMediumSizeMin);
     m_pSizeAndPathGroup->blockSignals(false);
     pWizard->setMediumSize(m_pSizeAndPathGroup->mediumSize());

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

@@ -48 +48 @@
 public:
 
-    UIWizardNewVDExpertPage(const QString &strDefaultName, const QString &strDefaultPath, qulonglong uDefaultSize);
+    UIWizardNewVDExpertPage(qulonglong uDiskMinimumSize);
 
 private slots:
@@ -63 +63 @@
 
     /** Prepare stuff. */
-    void prepare();
+    void prepare(qulonglong uDiskMinimumSize);
     virtual void initializePage() RT_OVERRIDE RT_FINAL;
 
@@ -81 +81 @@
    /** @name Variable
      * @{ */
-       QString m_strDefaultName;
-       QString m_strDefaultPath;
-       qulonglong m_uDefaultSize;
        qulonglong m_uMediumSizeMin;
        qulonglong m_uMediumSizeMax;

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

@@ -40 +40 @@
 #include "CSystemProperties.h"
 
-UIWizardNewVDSizeLocationPage::UIWizardNewVDSizeLocationPage(const QString &strDefaultName,
-                                                             const QString &strDefaultPath, qulonglong uDefaultSize)
+UIWizardNewVDSizeLocationPage::UIWizardNewVDSizeLocationPage(qulonglong uDiskMinimumSize)
     : m_pMediumSizePathGroup(0)
-    , m_uMediumSizeMin(_4M)
+    , m_uMediumSizeMin(uDiskMinimumSize)
     , m_uMediumSizeMax(gpGlobalSession->virtualBox().GetSystemProperties().GetInfoVDSize())
-    , m_strDefaultName(strDefaultName.isEmpty() ? QString("NewVirtualDisk1") : strDefaultName)
-    , m_strDefaultPath(strDefaultPath)
-    , m_uDefaultSize(uDefaultSize)
 {
     prepare();
@@ -119 +115 @@
     /* Initialize the medium file path with default name and path if user has not exclusively modified them yet: */
     if (!m_userModifiedParameters.contains("MediumPath"))
+    {
         strMediumFilePath =
-            UIWizardDiskEditors::constructMediumFilePath(UIWizardDiskEditors::appendExtension(m_strDefaultName,
-                                                                                                strExtension), m_strDefaultPath);
+            UIWizardDiskEditors::constructMediumFilePath(UIWizardDiskEditors::appendExtension(pWizard->defaultName(),
+                                                                                              strExtension), pWizard->defaultPath());
+    }
     /* Initialize the medium file path with file path and file name from the location editor. This part is to update the
      * file extention correctly in case user has gone back and changed the file format after modifying medium file path: */
@@ -136 +134 @@
     {
         m_pMediumSizePathGroup->blockSignals(true);
-        m_pMediumSizePathGroup->setMediumSize(m_uDefaultSize > m_uMediumSizeMin && m_uDefaultSize < m_uMediumSizeMax ? m_uDefaultSize : m_uMediumSizeMin);
+        qulonglong uDefaultSize = pWizard->defaultSize();
+        m_pMediumSizePathGroup->setMediumSize(uDefaultSize > m_uMediumSizeMin && uDefaultSize < m_uMediumSizeMax ? uDefaultSize : m_uMediumSizeMin);
         m_pMediumSizePathGroup->blockSignals(false);
         pWizard->setMediumSize(m_pMediumSizePathGroup->mediumSize());

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

@@ -47 +47 @@
 public:
 
-    UIWizardNewVDSizeLocationPage(const QString &strDefaultName, const QString &strDefaultPath, qulonglong uDefaultSize);
+    UIWizardNewVDSizeLocationPage(qulonglong uDiskMinimumSize);
 
 private slots:
@@ -66 +66 @@
     qulonglong m_uMediumSizeMin;
     qulonglong m_uMediumSizeMax;
-    QString m_strDefaultName;
-    QString m_strDefaultPath;
-    qulonglong m_uDefaultSize;
     QSet<QString> m_userModifiedParameters;
 };