Changeset 90430 in vbox for trunk

Timestamp:

Jul 30, 2021 2:23:10 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996. More fixes on the expert page of new vd wizard.

Location:

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

Files:

• UIWizardNewVD.cpp (modified) (2 diffs)
• UIWizardNewVDPageExpert.cpp (modified) (4 diffs)
• UIWizardNewVDPageExpert.h (modified) (1 diff)
• UIWizardNewVDPageFileType.cpp (modified) (2 diffs)
• UIWizardNewVDPageSizeLocation.cpp (modified) (1 diff)

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

@@ -94 +94 @@
     {
         case WizardMode_Basic:
-        case WizardMode_Expert:
         {
             addPage(new UIWizardNewVDPageFileType);
@@ -101 +100 @@
             break;
         }
-
-        // {
-        //     //addPage(new UIWizardNewVDPageExpert);
-        //     break;
-        // }
+       case WizardMode_Expert:
+        {
+            addPage(new UIWizardNewVDPageExpert(m_strDefaultName, m_strDefaultPath, m_uDefaultSize));
+            break;
+        }
         default:
         {

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

@@ -74 +74 @@
     connect(m_pFormatGroup, &UIDiskFormatsGroupBox::sigMediumFormatChanged,
             this, &UIWizardNewVDPageExpert::sltMediumFormatChanged);
+    connect(m_pVariantGroup, &UIDiskVariantGroupBox::sigMediumVariantChanged,
+            this, &UIWizardNewVDPageExpert::sltMediumVariantChanged);
+
 //     connect(m_pFixedCheckBox, &QAbstractButton::toggled,
 //             this, &UIWizardNewVDPageExpert::completeChanged);
@@ -85 +88 @@
 //             this, &UIWizardNewVDPageExpert::completeChanged);
 
+    connect(m_pSizeAndPathGroup, &UIMediumSizeAndPathGroupBox::sigMediumSizeChanged,
+            this, &UIWizardNewVDPageExpert::sltMediumSizeChanged);
+
+    connect(m_pSizeAndPathGroup, &UIMediumSizeAndPathGroupBox::sigMediumPathChanged,
+            this, &UIWizardNewVDPageExpert::sltMediumPathChanged);
 
     retranslateUi();
 
+}
+
+void UIWizardNewVDPageExpert::sltMediumSizeChanged(qulonglong uSize)
+{
+    newVDWizardPropertySet(MediumSize, uSize);
+    emit completeChanged();
+}
+
+void UIWizardNewVDPageExpert::sltMediumPathChanged(const QString &strPath)
+{
+    newVDWizardPropertySet(MediumPath, strPath);
+    emit completeChanged();
+}
+
+void UIWizardNewVDPageExpert::sltMediumVariantChanged(qulonglong uVariant)
+{
+    newVDWizardPropertySet(MediumVariant, uVariant);
+    emit completeChanged();
 }
 
@@ -110 +136 @@
     QFileInfo mediumPath(strMediumPath);
     m_pSizeAndPathGroup->setMediumPath(QDir::toNativeSeparators(mediumPath.absoluteFilePath()));
+    emit completeChanged();
 }
 
@@ -173 +200 @@
 bool UIWizardNewVDPageExpert::isComplete() const
 {
-    /* Make sure medium format/variant is correct,
-     * current name is not empty and current size feats the bounds: */
-    // return !mediumFormat().isNull() &&
-    //        mediumVariant() != (qulonglong)KMediumVariant_Max &&
-    //        !m_pLocationEditor->text().trimmed().isEmpty() &&
-    //        mediumSize() >= m_uMediumSizeMin && mediumSize() <= m_uMediumSizeMax;
-    return false;
+    UIWizardNewVD *pWizard = qobject_cast<UIWizardNewVD*>(wizard());
+    AssertReturn(pWizard, false);
+    if (pWizard->mediumFormat().isNull())
+        return false;
+    if (pWizard->mediumVariant() == (qulonglong)KMediumVariant_Max)
+        return false;
+    if (pWizard->mediumPath().isEmpty())
+        return false;
+    if (pWizard->mediumSize() > m_uMediumSizeMax || pWizard->mediumSize() < m_uMediumSizeMin)
+        return false;
+    return true;
 }
 
 bool UIWizardNewVDPageExpert::validatePage()
 {
-    /* Initial result: */
     bool fResult = true;
-
-    // /* Make sure such file doesn't exist already: */
-    // const QString strMediumPath(mediumPath());
-    // fResult = !QFileInfo(strMediumPath).exists();
-    // if (!fResult)
-    // {
-    //     msgCenter().cannotOverwriteHardDiskStorage(strMediumPath, this);
-    //     return fResult;
-    // }
-
-    // /* Make sure we are passing FAT size limitation: */
-    // fResult = UIWizardNewVDPageBaseSizeLocation::checkFATSizeLimitation(fieldImp("mediumVariant").toULongLong(),
-    //                                                      fieldImp("mediumPath").toString(),
-    //                                                      fieldImp("mediumSize").toULongLong());
-    // if (!fResult)
-    // {
-    //     msgCenter().cannotCreateHardDiskStorageInFAT(strMediumPath, this);
-    //     return fResult;
-    // }
-
-    // /* Lock finish button: */
-    // startProcessing();
-    // /* Try to create virtual-disk: */
-    // fResult = qobject_cast<UIWizardNewVD*>(wizard())->createVirtualDisk();
-    // /* Unlock finish button: */
-    // endProcessing();
-
-    /* Return result: */
+    UIWizardNewVD *pWizard = qobject_cast<UIWizardNewVD*>(wizard());
+    AssertReturn(pWizard, false);
+    /* Make sure such file doesn't exist already: */
+    const QString strMediumPath(pWizard->mediumPath());
+    fResult = !QFileInfo(strMediumPath).exists();
+    if (!fResult)
+    {
+        msgCenter().cannotOverwriteHardDiskStorage(strMediumPath, this);
+        return fResult;
+    }
+
+    /* Make sure we are passing FAT size limitation: */
+    fResult = UIDiskEditorGroupBox::checkFATSizeLimitation(pWizard->mediumVariant(),
+                                     pWizard->mediumPath(),
+                                     pWizard->mediumSize());
+    if (!fResult)
+    {
+        msgCenter().cannotCreateHardDiskStorageInFAT(strMediumPath, this);
+        return fResult;
+    }
+
+    fResult = pWizard->createVirtualDisk();
     return fResult;
 }

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

@@ -47 +47 @@
     void sltMediumFormatChanged();
     void sltSelectLocationButtonClicked();
+    void sltMediumVariantChanged(qulonglong uVariant);
+    void sltMediumPathChanged(const QString &strPath);
+    void sltMediumSizeChanged(qulonglong uSize);
 
 private:

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

@@ -52 +52 @@
     AssertReturnVoid(m_pFormatButtonGroup);
     newVDWizardPropertySet(MediumFormat, m_pFormatButtonGroup->mediumFormat());
+    emit completeChanged();
 }
 
@@ -72 +73 @@
 bool UIWizardNewVDPageFileType::isComplete() const
 {
-    /* Make sure medium format is correct: */
-    //return !mediumFormat().isNull();
-    return true;
+    UIWizardNewVD *pWizard = qobject_cast<UIWizardNewVD*>(wizard());
+    if (pWizard && !pWizard->mediumFormat().isNull())
+        return true;
+    return false;
 }

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

@@ -100 +100 @@
 void UIWizardNewVDPageSizeLocation::sltSelectLocationButtonClicked()
 {
-
+    UIWizardNewVD *pWizard = qobject_cast<UIWizardNewVD*>(wizard());
+    AssertReturnVoid(pWizard);
+    QString strSelectedPath = UIWizardNewVDSizeLocation::selectNewMediumLocation(pWizard);
+    if (strSelectedPath.isEmpty())
+        return;
+    QString strMediumPath =
+        UIDiskEditorGroupBox::appendExtension(strSelectedPath,
+                                              UIDiskEditorGroupBox::defaultExtensionForMediumFormat(pWizard->mediumFormat()));
+    QFileInfo mediumPath(strMediumPath);
+    m_pMediumSizePathGroup->setMediumPath(QDir::toNativeSeparators(mediumPath.absoluteFilePath()));
 }
 
-void UIWizardNewVDPageSizeLocation::sltMediumSizeChanged(qulonglong /*uSize*/)
+void UIWizardNewVDPageSizeLocation::sltMediumSizeChanged(qulonglong uSize)
 {
-    AssertReturnVoid(m_pMediumSizePathGroup);
     m_userModifiedParameters << "MediumSize";
-    newVDWizardPropertySet(MediumSize, m_pMediumSizePathGroup->mediumSize());
+    newVDWizardPropertySet(MediumSize, uSize);
+    emit completeChanged();
 }
 
-void UIWizardNewVDPageSizeLocation::sltMediumPathChanged(const QString &/*strPath*/)
+void UIWizardNewVDPageSizeLocation::sltMediumPathChanged(const QString &strPath)
 {
-    AssertReturnVoid(m_pMediumSizePathGroup);
     m_userModifiedParameters << "MediumPath";
-    newVDWizardPropertySet(MediumPath, m_pMediumSizePathGroup->mediumPath());
+    newVDWizardPropertySet(MediumPath, strPath);
+    emit completeChanged();
 }