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

Timestamp:

Aug 1, 2024 8:07:26 AM (7 months ago)

Author:

vboxsync

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

164225

Message:

FE/Qt: bugref:10736. More fixes in the new vd wizard to accommodate clonning.

Location:

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

Files:

• UIWizardNewVD.cpp (modified) (4 diffs)
• UIWizardNewVD.h (modified) (1 diff)
• UIWizardNewVDExpertPage.cpp (modified) (4 diffs)
• UIWizardNewVDSizeLocationPage.cpp (modified) (4 diffs)

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

@@ -25 +25 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
+
+/* Qt includes: */
+#include <QDir>
 
 /* GUI includes: */
@@ -65 +68 @@
     : UINativeWizard(pParent, WizardType_CloneVD)
     , m_iMediumVariantPageIndex(-1)
-    , m_enmDeviceType(KDeviceType_Null)
 {
 #ifndef VBOX_WS_MAC
@@ -75 +77 @@
 #endif /* VBOX_WS_MAC */
 
-    /* Init medium to be cloned: */
     UIMedium uiMedium = gpMediumEnumerator->medium(uMediumId);
     m_comSourceVirtualDisk = uiMedium.medium();
 
-    /* Init device type: */
+    m_strDefaultPath = QDir::toNativeSeparators(QFileInfo(m_comSourceVirtualDisk.GetLocation()).absolutePath());
+    m_strDefaultName = QString("%1_%2").arg(m_comSourceVirtualDisk.GetName()).arg(UIWizardNewVD::tr("copy"));
+    m_uDefaultSize = m_comSourceVirtualDisk.GetLogicalSize();
     m_enmDeviceType = m_comSourceVirtualDisk.GetDeviceType();
 }
@@ -274 +277 @@
 qulonglong UIWizardNewVD::diskMinimumSize() const
 {
-    return sourceDiskLogicalSize();
-}
-
-qulonglong UIWizardNewVD::sourceDiskLogicalSize() const
-{
     if (m_comSourceVirtualDisk.isNull())
         return _4M;

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

@@ -102 +102 @@
     void setMediumVariantPageVisibility();
     qulonglong diskMinimumSize() const;
-    qulonglong sourceDiskLogicalSize() const;
+
     qulonglong m_uMediumVariant;
     CMediumFormat m_comMediumFormat;

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

@@ -103 +103 @@
     QString strMediumPath =
         UIWizardDiskEditors::appendExtension(strPath,
-                                             UIWizardDiskEditors::defaultExtension(pWizard->mediumFormat(), KDeviceType_HardDisk));
+                                             UIWizardDiskEditors::defaultExtension(pWizard->mediumFormat(), pWizard->deviceType()));
     pWizard->setMediumPath(strMediumPath);
     emit completeChanged();
@@ -131 +131 @@
     QString strSelectedPath =
         UIWizardDiskEditors::openFileDialogForDiskFile(pWizard->mediumPath(), comMediumFormat,
-                                                       KDeviceType_HardDisk, pWizard);
+                                                       pWizard->deviceType(), pWizard);
     if (strSelectedPath.isEmpty())
         return;
     QString strMediumPath =
         UIWizardDiskEditors::appendExtension(strSelectedPath,
-                                             UIWizardDiskEditors::defaultExtension(pWizard->mediumFormat(), KDeviceType_HardDisk));
+                                             UIWizardDiskEditors::defaultExtension(pWizard->mediumFormat(), pWizard->deviceType()));
     QFileInfo mediumPath(strMediumPath);
     m_pSizeAndPathGroup->setMediumFilePath(QDir::toNativeSeparators(mediumPath.absoluteFilePath()));
@@ -158 +158 @@
     pWizard->setMediumFormat(comMediumFormat);
 
+
     QString strExtension = UIWizardDiskEditors::defaultExtension(comMediumFormat, pWizard->deviceType());
     QString strMediumFilePath =
         UIWizardDiskEditors::constructMediumFilePath(UIWizardDiskEditors::appendExtension(pWizard->defaultName(),
                                                                                           strExtension), pWizard->defaultPath());
+
+
+
     m_pSizeAndPathGroup->blockSignals(true);
     m_pSizeAndPathGroup->setMediumFilePath(strMediumFilePath);
@@ -235 +239 @@
 
     m_pVariantWidget->updateMediumVariantWidgetsAfterFormatChange(comMediumFormat);
-    m_pSizeAndPathGroup->updateMediumPath(comMediumFormat, m_pFormatComboBox->formatExtensions(), KDeviceType_HardDisk);
-}
+    m_pSizeAndPathGroup->updateMediumPath(comMediumFormat, m_pFormatComboBox->formatExtensions(), pWizard->deviceType());
+}

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

@@ -70 +70 @@
     QString strSelectedPath =
         UIWizardDiskEditors::openFileDialogForDiskFile(pWizard->mediumPath(), pWizard->mediumFormat(),
-                                                                KDeviceType_HardDisk, pWizard);
+                                                                pWizard->deviceType(), pWizard);
 
     if (strSelectedPath.isEmpty())
@@ -76 +76 @@
     QString strMediumPath =
         UIWizardDiskEditors::appendExtension(strSelectedPath,
-                                              UIWizardDiskEditors::defaultExtension(pWizard->mediumFormat(), KDeviceType_HardDisk));
+                                              UIWizardDiskEditors::defaultExtension(pWizard->mediumFormat(), pWizard->deviceType()));
     QFileInfo mediumPath(strMediumPath);
     m_pMediumSizePathGroup->setMediumFilePath(QDir::toNativeSeparators(mediumPath.absoluteFilePath()));
@@ -96 +96 @@
     QString strMediumPath =
         UIWizardDiskEditors::appendExtension(strPath,
-                                              UIWizardDiskEditors::defaultExtension(pWizard->mediumFormat(), KDeviceType_HardDisk));
+                                              UIWizardDiskEditors::defaultExtension(pWizard->mediumFormat(), pWizard->deviceType()));
     pWizard->setMediumPath(strMediumPath);
     emit completeChanged();
@@ -111 +111 @@
     AssertReturnVoid(pWizard && m_pMediumSizePathGroup);
 
-    QString strExtension = UIWizardDiskEditors::defaultExtension(pWizard->mediumFormat(), KDeviceType_HardDisk);
+    QString strExtension = UIWizardDiskEditors::defaultExtension(pWizard->mediumFormat(), pWizard->deviceType());
     QString strMediumFilePath;
     /* Initialize the medium file path with default name and path if user has not exclusively modified them yet: */