Changeset 105260 in vbox

Timestamp:

Jul 10, 2024 2:01:29 PM (5 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10707. Checking virtual media file location during wizard sanity checks.

Location:

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

Files:

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

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

@@ -182 +182 @@
 bool UIWizardCloneVDExpertPage::isComplete() const
 {
-    bool fResult = true;
-
-    if (m_pFormatComboBox)
-        fResult = m_pFormatComboBox->mediumFormat().isNull();
-    if (m_pVariantWidget)
-        fResult = m_pVariantWidget->isComplete();
-    if (m_pMediumSizePathGroupBox)
-        fResult =  m_pMediumSizePathGroupBox->isComplete();
-
-    return fResult;
+    AssertReturn(m_pFormatComboBox, false);
+    AssertReturn(m_pVariantWidget, false);
+    AssertReturn(m_pMediumSizePathGroupBox, false);
+
+    if (m_pFormatComboBox->mediumFormat().isNull())
+        return false;
+
+    if (!m_pVariantWidget->isComplete())
+        return false;
+
+    if (!m_pMediumSizePathGroupBox->pathExists())
+        return false;
+    if (!m_pMediumSizePathGroupBox->filePathUnique())
+        return false;
+
+    return true;
 }
 

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

@@ -100 +100 @@
 {
     AssertReturn(m_pMediumSizePathGroupBox, false);
-    return m_pMediumSizePathGroupBox->isComplete();
+    if (!m_pMediumSizePathGroupBox->pathExists())
+        return false;
+    if (!m_pMediumSizePathGroupBox->filePathUnique())
+        return false;
+    return true;
 }
 

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

@@ -332 +332 @@
 }
 
-bool UIMediumSizeAndPathGroupBox::isComplete() const
-{
+bool UIMediumSizeAndPathGroupBox::pathExists() const
+{
+    /* Check if the path upto file name exists: */
+    if (!QFileInfo(mediumPath()).exists())
+    {
+        m_pLocationEditor->mark(true, tr("Disk file path does not exists"), tr("Disk file path is valid"));
+        return false;
+    }
+    m_pLocationEditor->mark(false, tr("Disk file path does not exists"), tr("Disk file path is valid"));
+    return true;
+}
+
+bool UIMediumSizeAndPathGroupBox::filePathUnique() const
+{
+    /* Check if there is not such file already: */
     if (QFileInfo(mediumFilePath()).exists())
     {
@@ -340 +353 @@
     }
     m_pLocationEditor->mark(false, tr("Disk file name is not unique"), tr("Disk file name is valid"));
-
     return true;
 }

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

@@ -137 +137 @@
     void setMediumSize(qulonglong uSize);
 
-    bool isComplete() const;
+    bool filePathUnique() const;
+    bool pathExists() const;
 
 private slots:

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

@@ -196 +196 @@
     if (pWizard->mediumSize() > m_uMediumSizeMax || pWizard->mediumSize() < m_uMediumSizeMin)
         return false;
+    if (!m_pSizeAndPathGroup->filePathUnique() || !m_pSizeAndPathGroup->pathExists())
+        return false;
     return true;
 }

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

@@ -646 +646 @@
             fIsComplete = false;
         }
+        /* Check only the uniqueness of the file and not path existence since the vm folder (default medium path)
+         * has not been created yet: */
+        if (!m_pSizeAndLocationGroup->filePathUnique())
+            fIsComplete = false;
     }
     return fIsComplete;