Changeset 91267 in vbox

Timestamp:

Sep 16, 2021 6:01:20 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996. Fixing medium path update logic in the guided new vd wizard.

Location:

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

Files:

• clonevd/UIWizardCloneVDExpertPage.cpp (modified) (3 diffs)
• clonevd/UIWizardCloneVDPathSizePage.cpp (modified) (2 diffs)
• editors/UIWizardDiskEditors.cpp (modified) (3 diffs)
• editors/UIWizardDiskEditors.h (modified) (1 diff)
• newvd/UIWizardNewVDExpertPage.cpp (modified) (2 diffs)
• newvd/UIWizardNewVDSizeLocationPage.cpp (modified) (2 diffs)
• newvm/UIWizardNewVMExpertPage.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDExpertPage.cpp

@@ -95 +95 @@
                                               UIDiskEditorGroupBox::defaultExtension(pWizard->mediumFormat(), pWizard->deviceType()));
     QFileInfo mediumPath(strMediumPath);
-    m_pMediumSizePathGroupBox->setMediumPath(QDir::toNativeSeparators(mediumPath.absoluteFilePath()));
+    m_pMediumSizePathGroupBox->setMediumFilePath(QDir::toNativeSeparators(mediumPath.absoluteFilePath()));
 }
 
@@ -148 +148 @@
         UIDiskEditorGroupBox::constructMediumFilePath(UIDiskVariantGroupBox::appendExtension(strDiskName,
                                                                                              strExtension), strSourceDiskPath);
-    m_pMediumSizePathGroupBox->setMediumPath(strMediumFilePath);
+    m_pMediumSizePathGroupBox->setMediumFilePath(strMediumFilePath);
     pWizard->setMediumPath(strMediumFilePath);
     m_pMediumSizePathGroupBox->blockSignals(false);
@@ -200 +200 @@
     m_pMediumSizePathGroupBox->blockSignals(false);
     /* Update the wizard parameters explicitly since we blocked th signals: */
-    pWizard->setMediumPath(m_pMediumSizePathGroupBox->mediumPath());
+    pWizard->setMediumPath(m_pMediumSizePathGroupBox->mediumFilePath());
     pWizard->setMediumVariant(m_pVariantGroupBox->mediumVariant());
 }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPathSizePage.cpp

@@ -81 +81 @@
             UIDiskEditorGroupBox::constructMediumFilePath(UIDiskVariantGroupBox::appendExtension(strDiskName,
                                                                                                  strExtension), strSourceDiskPath);
-        m_pMediumSizePathGroupBox->setMediumPath(strMediumFilePath);
+        m_pMediumSizePathGroupBox->setMediumFilePath(strMediumFilePath);
         pWizard->setMediumPath(strMediumFilePath);
     }
@@ -121 +121 @@
                                               UIDiskEditorGroupBox::defaultExtension(pWizard->mediumFormat(), pWizard->deviceType()));
     QFileInfo mediumPath(strMediumPath);
-    m_pMediumSizePathGroupBox->setMediumPath(QDir::toNativeSeparators(mediumPath.absoluteFilePath()));
+    m_pMediumSizePathGroupBox->setMediumFilePath(QDir::toNativeSeparators(mediumPath.absoluteFilePath()));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardDiskEditors.cpp

@@ -317 +317 @@
 bool UIMediumSizeAndPathGroupBox::isComplete() const
 {
-    if (QFileInfo(mediumPath()).exists())
+    if (QFileInfo(mediumFilePath()).exists())
     {
         m_pLocationEditor->mark(true, tr("Disk file name is not unique"));
@@ -388 +388 @@
 }
 
-QString UIMediumSizeAndPathGroupBox::mediumPath() const
-{
-    if (m_pLocationEditor)
-        return m_pLocationEditor->text();
-    return QString();
-}
-
-void UIMediumSizeAndPathGroupBox::setMediumPath(const QString &strMediumPath)
+QString UIMediumSizeAndPathGroupBox::mediumName() const
+{
+    if (!m_pLocationEditor)
+        return QString();
+    return QFileInfo(m_pLocationEditor->text()).completeBaseName();
+}
+
+QString UIMediumSizeAndPathGroupBox::mediumFilePath() const
+{
+    if (!m_pLocationEditor)
+        return QString();
+    return m_pLocationEditor->text();
+}
+
+void UIMediumSizeAndPathGroupBox::setMediumFilePath(const QString &strMediumPath)
 {
     if (!m_pLocationEditor)
@@ -417 +424 @@
                                   arg(stripFormatExtension(fileInfo.fileName(), formatExtensions)).
                                   arg(strDefaultExtension));
-            setMediumPath(newFileInfo.absoluteFilePath());
+            setMediumFilePath(newFileInfo.absoluteFilePath());
         }
     }
+}
+
+QString UIMediumSizeAndPathGroupBox::mediumPath() const
+{
+    if (!m_pLocationEditor)
+        return QString();
+    return QDir::toNativeSeparators(QFileInfo(m_pLocationEditor->text()).absolutePath());
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardDiskEditors.h

@@ -127 +127 @@
 
     UIMediumSizeAndPathGroupBox(bool fExpertMode, QWidget *pParent, qulonglong uMinimumMediumSize);
+    /** Returns name of the medium file without extension and path. */
+    QString mediumName() const;
+    /** Returns the file pat of the medium file including file name and extension. */
+    QString mediumFilePath() const;
+    void setMediumFilePath(const QString &strMediumPath);
+    /** Returns path of the medium file without the file name. */
     QString mediumPath() const;
-    void setMediumPath(const QString &strMediumPath);
     /** Checks if the file extension is correct. Fixs it if necessary. */
     void updateMediumPath(const CMediumFormat &mediumFormat, const QStringList &formatExtensions, KDeviceType enmDeviceType);

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

@@ -117 +117 @@
                                               UIDiskEditorGroupBox::defaultExtension(pWizard->mediumFormat(), KDeviceType_HardDisk));
     QFileInfo mediumPath(strMediumPath);
-    m_pSizeAndPathGroup->setMediumPath(QDir::toNativeSeparators(mediumPath.absoluteFilePath()));
+    m_pSizeAndPathGroup->setMediumFilePath(QDir::toNativeSeparators(mediumPath.absoluteFilePath()));
     emit completeChanged();
 }
@@ -140 +140 @@
                                                                                              strExtension), m_strDefaultPath);
     m_pSizeAndPathGroup->blockSignals(true);
-    m_pSizeAndPathGroup->setMediumPath(strMediumFilePath);
+    m_pSizeAndPathGroup->setMediumFilePath(strMediumFilePath);
     m_pSizeAndPathGroup->blockSignals(false);
-    pWizard->setMediumPath(m_pSizeAndPathGroup->mediumPath());
+    pWizard->setMediumPath(m_pSizeAndPathGroup->mediumFilePath());
 
     m_pSizeAndPathGroup->blockSignals(true);

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

@@ -72 +72 @@
                                               UIDiskEditorGroupBox::defaultExtension(pWizard->mediumFormat(), KDeviceType_HardDisk));
     QFileInfo mediumPath(strMediumPath);
-    m_pMediumSizePathGroup->setMediumPath(QDir::toNativeSeparators(mediumPath.absoluteFilePath()));
+    m_pMediumSizePathGroup->setMediumFilePath(QDir::toNativeSeparators(mediumPath.absoluteFilePath()));
 }
 
@@ -105 +105 @@
     AssertReturnVoid(pWizard && m_pMediumSizePathGroup);
 
+    QString strExtension = UIDiskEditorGroupBox::defaultExtension(pWizard->mediumFormat(), KDeviceType_HardDisk);
+    QString strMediumFilePath;
+    printf("%s %s\n", qPrintable(m_strDefaultPath), qPrintable(m_pMediumSizePathGroup->mediumPath()));
     if (!m_userModifiedParameters.contains("MediumPath"))
+        strMediumFilePath =
+            UIDiskEditorGroupBox::constructMediumFilePath(UIDiskVariantGroupBox::appendExtension(m_strDefaultName,
+                                                                                                 strExtension), m_strDefaultPath);
+    else
+        strMediumFilePath =
+            UIDiskEditorGroupBox::constructMediumFilePath(UIDiskVariantGroupBox::appendExtension(m_pMediumSizePathGroup->mediumName(),
+                                                                                                 strExtension), m_pMediumSizePathGroup->mediumPath());
+
+
     {
-        QString strExtension = UIDiskEditorGroupBox::defaultExtension(pWizard->mediumFormat(), KDeviceType_HardDisk);
-        QString strMediumFilePath =
-            UIDiskEditorGroupBox::constructMediumFilePath(UIDiskVariantGroupBox::appendExtension(m_strDefaultName,
-                                                                                                    strExtension), m_strDefaultPath);
+
         m_pMediumSizePathGroup->blockSignals(true);
-        m_pMediumSizePathGroup->setMediumPath(strMediumFilePath);
+        m_pMediumSizePathGroup->setMediumFilePath(strMediumFilePath);
         m_pMediumSizePathGroup->blockSignals(false);
-        pWizard->setMediumPath(m_pMediumSizePathGroup->mediumPath());
+        pWizard->setMediumPath(m_pMediumSizePathGroup->mediumFilePath());
     }
     if (!m_userModifiedParameters.contains("MediumSize"))

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

@@ -691 +691 @@
                                               UIDiskEditorGroupBox::defaultExtension(pWizard->mediumFormat(), KDeviceType_HardDisk));
     QFileInfo mediumPath(strMediumPath);
-    m_pSizeAndLocationGroup->setMediumPath(QDir::toNativeSeparators(mediumPath.absoluteFilePath()));
+    m_pSizeAndLocationGroup->setMediumFilePath(QDir::toNativeSeparators(mediumPath.absoluteFilePath()));
 }
 
@@ -814 +814 @@
                                                                                       strExtension), strMediumPath);
         m_pSizeAndLocationGroup->blockSignals(true);
-        m_pSizeAndLocationGroup->setMediumPath(strMediumFilePath);
+        m_pSizeAndLocationGroup->setMediumFilePath(strMediumFilePath);
         m_pSizeAndLocationGroup->blockSignals(false);
-        pWizard->setMediumPath(m_pSizeAndLocationGroup->mediumPath());
+        pWizard->setMediumPath(m_pSizeAndLocationGroup->mediumFilePath());
     }
 }
@@ -836 +836 @@
     m_pSizeAndLocationGroup->blockSignals(false);
     /* Update the wizard parameters explicitly since we blocked th signals: */
-    pWizard->setMediumPath(m_pSizeAndLocationGroup->mediumPath());
+    pWizard->setMediumPath(m_pSizeAndLocationGroup->mediumFilePath());
     pWizard->setMediumVariant(m_pDiskVariantGroupBox->mediumVariant());
 }