Changeset 102474 in vbox

Timestamp:

Dec 5, 2023 1:16:47 PM (15 months ago)

Author:

vboxsync

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

160617

Message:

FE/Qt: ​bugref:9080, bugref:10141 Open newly create viso to register it and return its QUuid.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICommon.cpp (modified) (1 diff)
• medium/viso/UIVisoCreator.cpp (modified) (2 diffs)
• medium/viso/UIVisoCreator.h (modified) (1 diff)

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

@@ -1640 +1640 @@
             break;
         case UIMediumDeviceType_DVD:
-            UIVisoCreatorDialog::createViso(pActionPool, pParent, strDefaultFolder, strMachineName);
+            uMediumId = UIVisoCreatorDialog::createViso(pActionPool, pParent, strDefaultFolder, strMachineName);
             break;
         case UIMediumDeviceType_Floppy:

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

@@ -878 +878 @@
 
 /* static */
-void UIVisoCreatorDialog::createViso(UIActionPool *pActionPool, QWidget *pParent,
-                                     const QString &strDefaultFolder /* = QString() */,
-                                     const QString &strMachineName /* = QString() */)
+QUuid UIVisoCreatorDialog::createViso(UIActionPool *pActionPool, QWidget *pParent,
+                                      const QString &strDefaultFolder /* = QString() */,
+                                      const QString &strMachineName /* = QString() */)
 {
     QString strVisoSaveFolder(strDefaultFolder);
@@ -889 +889 @@
     UIVisoCreatorDialog *pVisoCreator = new UIVisoCreatorDialog(pActionPool, pDialogParent,
                                                                 strVisoSaveFolder, strMachineName);
-    AssertPtrReturnVoid(pVisoCreator);
+    AssertPtrReturn(pVisoCreator, QUuid());
 
     windowManager().registerNewParent(pVisoCreator, pDialogParent);
     pVisoCreator->setCurrentPath(gEDataManager->visoCreatorRecentFolder());
-
+    QUuid mediumId;
     if (pVisoCreator->exec(false /* not application modal */))
     {
         if (pVisoCreator->saveVISOFile())
+        {
+            QString strFilePath = pVisoCreator->visoFileFullPath();
             gEDataManager->setVISOCreatorRecentFolder(pVisoCreator->currentPath());
+            mediumId = uiCommon().openMedium(UIMediumDeviceType_DVD, strFilePath);
+        }
     }
 
     delete pVisoCreator;
-    return;
+    return mediumId;
 }
 

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

@@ -188 +188 @@
       * @param  pParent           Passes the dialog parent.
       * @param  strDefaultFolder  Passes the folder to save the VISO file.
-      * @param  strMachineName    Passes the name of the machine. */
-    static void createViso(UIActionPool *pActionPool, QWidget *pParent,
-                           const QString &strDefaultFolder = QString(),
-                           const QString &strMachineName  = QString());
+      * @param  strMachineName    Passes the name of the machine.
+      * returns QUuid of the opened medium when successful. */
+    static QUuid createViso(UIActionPool *pActionPool, QWidget *pParent,
+                            const QString &strDefaultFolder = QString(),
+                            const QString &strMachineName  = QString());
 
 protected: