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

Timestamp:

Aug 1, 2024 11:10:28 AM (4 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10736. Switching to new vd wizard for clonning as well.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• manager/UIVirtualBoxManager.cpp (modified) (1 diff)
• wizards/newvd/UIWizardNewVD.cpp (modified) (1 diff)
• wizards/newvd/UIWizardNewVDExpertPage.cpp (modified) (1 diff)
• wizards/newvd/UIWizardNewVDSizeLocationPage.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -1278 +1278 @@
             }
             case WizardType_CloneVD:
-                m_wizards[enmType] = new UIWizardCloneVD(this, m_uMediumId);
+                m_wizards[enmType] = new UIWizardNewVD(this, m_uMediumId);
                 break;
             default:

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

@@ -81 +81 @@
 
     m_strDefaultPath = QDir::toNativeSeparators(QFileInfo(m_comSourceVirtualDisk.GetLocation()).absolutePath());
-    m_strDefaultName = QString("%1_%2").arg(m_comSourceVirtualDisk.GetName()).arg(UIWizardNewVD::tr("copy"));
+    m_strDefaultName = QString("%1_%2").arg(QFileInfo(m_comSourceVirtualDisk.GetName()).baseName()).arg(UIWizardNewVD::tr("copy"));
     m_uDefaultSize = m_comSourceVirtualDisk.GetLogicalSize();
     m_enmDeviceType = m_comSourceVirtualDisk.GetDeviceType();

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

@@ -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);

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

@@ -52 +52 @@
     QVBoxLayout *pMainLayout = new QVBoxLayout(this);
     AssertReturnVoid(pMainLayout);
-    m_pMediumSizePathGroup = new UIMediumSizeAndPathGroupBox(false /* fExpertMode */, 0 /* parent */, _4M /* minimum size */);
+    m_pMediumSizePathGroup = new UIMediumSizeAndPathGroupBox(false /* fExpertMode */, 0 /* parent */, m_uMediumSizeMin);
     connect(m_pMediumSizePathGroup, &UIMediumSizeAndPathGroupBox::sigMediumSizeChanged,
             this, &UIWizardNewVDSizeLocationPage::sltMediumSizeChanged);
@@ -150 +150 @@
     if (pWizard->mediumSize() > m_uMediumSizeMax || pWizard->mediumSize() < m_uMediumSizeMin)
         return false;
+    if (!m_pMediumSizePathGroup->filePathUnique() || !m_pMediumSizePathGroup->pathExists())
+        return false;
     return true;
 }