Changeset 90076 in vbox for trunk

Timestamp:

Jul 7, 2021 2:18:28 PM (4 years ago)

Author:

vboxsync

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

145573

Message:

FE/Qt: bugref:9996. Some cleaning

Location:

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

Files:

• UIWizardNewVMDiskPageBasic.cpp (modified) (4 diffs)
• UIWizardNewVMDiskPageBasic.h (modified) (2 diffs)

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

@@ -167 +167 @@
 {
     return m_mediumFormat;
-}
-
-QString UIWizardNewVMDiskPageBasic::mediumPath() const
-{
-    return UIWizardNewVMDiskPage::absoluteFilePath(UIWizardNewVMDiskPage::toFileName(m_strDefaultName,
-                                                                                     m_strDefaultExtension), m_strDefaultPath);
 }
 
@@ -389 +383 @@
 
     /* We set the medium name and path according to machine name/path and do not allow user change these in the guided mode: */
-    const QString &strDefaultName = pWizard->machineBaseName();
-    m_strDefaultName = strDefaultName.isEmpty() ? QString("NewVirtualDisk1") : strDefaultName;
-    m_strDefaultPath = pWizard->machineFolder();
+    QString strDefaultName = pWizard->machineBaseName().isEmpty() ? QString("NewVirtualDisk1") : pWizard->machineBaseName();
+    const QString &strMachineFolder = pWizard->machineFolder();
+    QString strMediumPath = UIWizardNewVMDiskPage::absoluteFilePath(UIWizardNewVMDiskPage::toFileName(strDefaultName,
+                                                                                                      m_strDefaultExtension),
+                                                                    strMachineFolder);
+    newVMWizardPropertySet(MediumPath, strMediumPath);
+
     /* Set the recommended disk size if user has already not done so: */
     if (m_pMediumSizeEditor && !m_userModifiedParameters.contains("MediumSize"))
@@ -398 +396 @@
         m_pMediumSizeEditor->setMediumSize(iRecommendedSize);
         m_pMediumSizeEditor->blockSignals(false);
+        newVMWizardPropertySet(MediumSize, iRecommendedSize);
     }
 }
@@ -444 +443 @@
     {
         /* Check if the path we will be using for hard drive creation exists: */
-        const QString strMediumPath(mediumPath());
+        const QString &strMediumPath = pWizard->mediumPath();
         fResult = !QFileInfo(strMediumPath).exists();
         if (!fResult)

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

@@ -79 +79 @@
 
     UIWizardNewVMDiskPageBasic();
-    /** For the guide wizard mode medium path, name and extention is static and we have
-      * no UI element for this. thus override. */
-    virtual QString mediumPath() const /*override */;
     CMediumFormat mediumFormat() const;
 
@@ -136 +133 @@
     SelectedDiskSource m_enmSelectedDiskSource;
     bool m_fRecommendedNoDisk;
-    QString m_strDefaultName;
-    QString m_strDefaultPath;
+
     QString m_strDefaultExtension;
     QSet<QString> m_userModifiedParameters;