Changeset 100640 in vbox for trunk

Timestamp:

Jul 19, 2023 6:59:39 AM (19 months ago)

Author:

vboxsync

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

158477

Message:

FE/Qt: bugref:9080:

• Save As now really can save VISO file,
• VISO creation does not return QUuid any more,
• Settings dialog can be dismissed with escape.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICommon.cpp (modified) (3 diffs)
• medium/viso/UIVisoCreator.cpp (modified) (8 diffs)
• medium/viso/UIVisoCreator.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp

@@ -1675 +1675 @@
             break;
         case UIMediumDeviceType_DVD:
-            uMediumId = UIVisoCreatorDialog::createViso(pActionPool, pParent, strDefaultFolder, strMachineName);
+            UIVisoCreatorDialog::createViso(pActionPool, pParent, strDefaultFolder, strMachineName);
             break;
         case UIMediumDeviceType_Floppy:
@@ -1686 +1686 @@
         return QUuid();
 
-    /* Update the recent medium list only if the medium type is DVD or floppy: */
-    if (enmMediumType == UIMediumDeviceType_DVD || enmMediumType == UIMediumDeviceType_Floppy)
+    /* Update the recent medium list only if the medium type is floppy since updating when a VISO is created is not optimal: */
+    if (enmMediumType == UIMediumDeviceType_Floppy)
         updateRecentlyUsedMediumListAndFolder(enmMediumType, medium(uMediumId).location());
     return uMediumId;
@@ -1908 +1908 @@
                 }
                 else if(target.type == UIMediumTarget::UIMediumTargetType_CreateAdHocVISO)
-                    uMediumID = UIVisoCreatorDialog::createViso(pActionPool, windowManager().mainWindowShown(),
-                                                                strMachineFolder, comConstMachine.GetName());
+                    UIVisoCreatorDialog::createViso(pActionPool, windowManager().mainWindowShown(),
+                                                    strMachineFolder, comConstMachine.GetName());
 
                 else if(target.type == UIMediumTarget::UIMediumTargetType_CreateFloppyDisk)

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.cpp

@@ -184 +184 @@
     m_pButtonBox->setDoNotPickDefaultButton(true);
     m_pButtonBox->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
+    m_pButtonBox->button(QDialogButtonBox::Cancel)->setShortcut(QKeySequence(Qt::Key_Escape));
     pMainLayout->addWidget(m_pButtonBox);
 
@@ -225 +226 @@
     emit sigClosed(false);
 }
-
 
 void UIVisoSettingWidget::setSettings(const UIVisoCreatorWidget::Settings &settings)
@@ -445 +445 @@
         setVisoName(fileInfo.completeBaseName());
     }
+    emit sigSave();
 }
 
@@ -810 +811 @@
         connect(m_pVisoCreatorWidget, &UIVisoCreatorWidget::sigSettingDialogToggle,
                 this, &UIVisoCreatorDialog::sltSettingDialogToggle);
+        connect(m_pVisoCreatorWidget, &UIVisoCreatorWidget::sigSave,
+                this, &UIVisoCreatorDialog::sltSave);
     }
 
@@ -891 +894 @@
 }
 
+void UIVisoCreatorDialog::sltSave()
+{
+    saveVISOFile();
+}
+
 void UIVisoCreatorDialog::loadSettings()
 {
@@ -928 +936 @@
 
 /* static */
-QUuid UIVisoCreatorDialog::createViso(UIActionPool *pActionPool, QWidget *pParent,
-                                      const QString &strDefaultFolder /* = QString() */,
-                                      const QString &strMachineName /* = QString() */)
+void UIVisoCreatorDialog::createViso(UIActionPool *pActionPool, QWidget *pParent,
+                                     const QString &strDefaultFolder /* = QString() */,
+                                     const QString &strMachineName /* = QString() */)
 {
     QString strVisoSaveFolder(strDefaultFolder);
@@ -939 +947 @@
     UIVisoCreatorDialog *pVisoCreator = new UIVisoCreatorDialog(pActionPool, pDialogParent,
                                                                 strVisoSaveFolder, strMachineName);
-    AssertPtrReturn(pVisoCreator, QUuid());
+    AssertPtrReturnVoid(pVisoCreator);
 
     windowManager().registerNewParent(pVisoCreator, pDialogParent);
@@ -946 +954 @@
     if (pVisoCreator->exec(false /* not application modal */))
     {
-        QStringList VisoEntryList = pVisoCreator->entryList();
-        QString strImportedISOPath = pVisoCreator->importedISOPath();
-        if ((VisoEntryList.empty() || VisoEntryList[0].isEmpty()) && strImportedISOPath.isEmpty())
+        if (pVisoCreator->saveVISOFile())
+            gEDataManager->setVISOCreatorRecentFolder(pVisoCreator->currentPath());
+    }
+
+    delete pVisoCreator;
+    return;
+}
+
+bool UIVisoCreatorDialog::saveVISOFile()
+{
+    QStringList VisoEntryList = entryList();
+    QString strImportedISOPath = importedISOPath();
+    if ((VisoEntryList.empty() || VisoEntryList[0].isEmpty()) && strImportedISOPath.isEmpty())
+        return false;
+
+    QFile file(visoFileFullPath());
+    if (file.open(QFile::WriteOnly | QFile::Truncate))
+    {
+        QString strVisoName = visoName();
+
+        QTextStream stream(&file);
+        stream << QString("%1 %2").arg("--iprt-iso-maker-file-marker-bourne-sh").arg(QUuid::createUuid().toString()) << "\n";
+        stream<< "--volume-id=" << strVisoName << "\n";
+        if (!strImportedISOPath.isEmpty())
+            stream << "--import-iso=" << strImportedISOPath << "\n";
+        stream << VisoEntryList.join("\n");
+        if (!customOptions().isEmpty())
         {
-            delete pVisoCreator;
-            return QUuid();
+            stream << "\n";
+            stream << customOptions().join("\n");
         }
-
-        QFile file(pVisoCreator->visoFileFullPath());
-        if (file.open(QFile::WriteOnly | QFile::Truncate))
-        {
-            QString strVisoName = pVisoCreator->visoName();
-            if (strVisoName.isEmpty())
-                strVisoName = strMachineName;
-
-            QTextStream stream(&file);
-            stream << QString("%1 %2").arg("--iprt-iso-maker-file-marker-bourne-sh").arg(QUuid::createUuid().toString()) << "\n";
-            stream<< "--volume-id=" << strVisoName << "\n";
-            if (!strImportedISOPath.isEmpty())
-                stream << "--import-iso=" << strImportedISOPath << "\n";
-            stream << VisoEntryList.join("\n");
-            if (!pVisoCreator->customOptions().isEmpty())
-            {
-                stream << "\n";
-                stream << pVisoCreator->customOptions().join("\n");
-            }
-            file.close();
-        }
-    } // if (pVisoCreator->exec(false /* not application modal */))
-    gEDataManager->setVISOCreatorRecentFolder(pVisoCreator->currentPath());
-
-    delete pVisoCreator;
-    return QUuid();
-}
-
+        file.close();
+    }
+    return true;
+}
 
 #include "UIVisoCreator.moc"

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.h

@@ -70 +70 @@
     void sigVisoFilePathChanged(const QString &strPath);
     void sigSettingDialogToggle(bool fDialogShown);
+    void sigSave();
 
 public:
@@ -192 +193 @@
       * @param  pParent           Passes the dialog parent.
       * @param  strDefaultFolder  Passes the folder to save the VISO file.
-      * @param  strMachineName    Passes the name of the machine,
-      * returns the UUID of the created medium or a null QUuid. */
-    static QUuid createViso(UIActionPool *pActionPool, QWidget *pParent,
-                            const QString &strDefaultFolder = QString(),
-                            const QString &strMachineName  = QString());
+      * @param  strMachineName    Passes the name of the machine. */
+    static void createViso(UIActionPool *pActionPool, QWidget *pParent,
+                           const QString &strDefaultFolder = QString(),
+                           const QString &strMachineName  = QString());
 
 protected:
@@ -208 +208 @@
     void sltVisoFilePathChanged(const QString &strPath);
     void sltSettingDialogToggle(bool fIsShown);
+    void sltSave();
 
 private:
+
+    bool saveVISOFile();
     void prepareWidgets(const QString& strVisoSavePath, const QString &strMachineName);
     virtual void retranslateUi() final override;