Changeset 91341 in vbox for trunk/src

Timestamp:

Sep 23, 2021 7:18:29 AM (4 years ago)

Author:

vboxsync

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

147008

Message:

FE/Qt: bugref:9340. Make sure newly created VISO is selected even if UICommon::sigMediumCreated is not emitted.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICommon.cpp (modified) (5 diffs)
• globals/UICommon.h (modified) (2 diffs)
• medium/UIMediumSelector.cpp (modified) (2 diffs)
• wizards/newvd/UIWizardNewVD.cpp (modified) (2 diffs)
• wizards/newvd/UIWizardNewVD.h (modified) (2 diffs)

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

@@ -1713 +1713 @@
 
 
-void UICommon::openMediumCreatorDialog(QWidget *pParent, UIMediumDeviceType enmMediumType,
+QUuid UICommon::openMediumCreatorDialog(QWidget *pParent, UIMediumDeviceType enmMediumType,
                                        const QString &strDefaultFolder /* = QString() */,
                                        const QString &strMachineName /* = QString() */,
@@ -1723 +1723 @@
     {
         case UIMediumDeviceType_HardDisk:
-            createVDWithWizard(pParent, strDefaultFolder, strMachineName, strMachineGuestOSTypeId);
+            uMediumId = createVDWithWizard(pParent, strDefaultFolder, strMachineName, strMachineGuestOSTypeId);
             break;
         case UIMediumDeviceType_DVD:
@@ -1735 +1735 @@
     }
     if (uMediumId.isNull())
-        return;
+        return QUuid();
 
     /* Update the recent medium list only if the medium type is DVD or floppy: */
     if (enmMediumType == UIMediumDeviceType_DVD || enmMediumType == UIMediumDeviceType_Floppy)
         updateRecentlyUsedMediumListAndFolder(enmMediumType, medium(uMediumId).location());
+    return uMediumId;
 }
 
@@ -1889 +1890 @@
 }
 
-void UICommon::createVDWithWizard(QWidget *pParent,
-                                  const QString &strMachineFolder /* = QString() */,
-                                  const QString &strMachineName /* = QString() */,
-                                  const QString &strMachineGuestOSTypeId  /* = QString() */)
+QUuid UICommon::createVDWithWizard(QWidget *pParent,
+                                   const QString &strMachineFolder /* = QString() */,
+                                   const QString &strMachineName /* = QString() */,
+                                   const QString &strMachineGuestOSTypeId  /* = QString() */)
 {
     /* Initialize variables: */
@@ -1913 +1914 @@
                                                          comGuestOSType.GetRecommendedHDD());
     if (!pWizard)
-        return;
+        return QUuid();
     QWidget *pDialogParent = windowManager().realParentWindow(pParent);
     windowManager().registerNewParent(pWizard, pDialogParent);
+    QUuid mediumId = pWizard->mediumId();
     pWizard->exec();
     delete pWizard;
+    return mediumId;
 }
 

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

@@ -424 +424 @@
           * @param  strMachineFolder         Passes the machine folder,
           * @param  strMachineGuestOSTypeId  Passes the type ID of machine's guest os,
-          * @param  fEnableCreate            Passes whether to show/enable create action in the medium selector dialog. */
-        void openMediumCreatorDialog(QWidget *pParent, UIMediumDeviceType  enmMediumType,
-                                     const QString &strMachineFolder = QString(),
-                                     const QString &strMachineName = QString(),
-                                     const QString &strMachineGuestOSTypeId = QString());
+          * @param  fEnableCreate            Passes whether to show/enable create action in the medium selector dialog,
+          * returns QUuid of the new medium */
+        QUuid openMediumCreatorDialog(QWidget *pParent, UIMediumDeviceType  enmMediumType,
+                                      const QString &strMachineFolder = QString(),
+                                      const QString &strMachineName = QString(),
+                                      const QString &strMachineGuestOSTypeId = QString());
 
         /** Prepares storage menu according passed parameters.
@@ -622 +623 @@
           * @param  strMachineFolder          Passes the machine folder,
           * @param  strMachineName            Passes the name of the machine,
-          * @param  strMachineGuestOSTypeId   Passes the string of machine's guest OS type ID. */
-        void createVDWithWizard(QWidget *pParent,
-                                const QString &strMachineFolder = QString(),
-                                const QString &strMachineName = QString(),
-                                const QString &strMachineGuestOSTypeId = QString());
+          * @param  strMachineGuestOSTypeId   Passes the string of machine's guest OS type ID,
+          * returns QUuid of the created medium. */
+        QUuid createVDWithWizard(QWidget *pParent,
+                                 const QString &strMachineFolder = QString(),
+                                 const QString &strMachineName = QString(),
+                                 const QString &strMachineGuestOSTypeId = QString());
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp

@@ -449 +449 @@
 void UIMediumSelector::sltCreateMedium()
 {
-    uiCommon().openMediumCreatorDialog(this, m_enmMediumType, m_strMachineFolder,
-                                       m_strMachineName, m_strMachineGuestOSTypeId);
+    QUuid uMediumId = uiCommon().openMediumCreatorDialog(this, m_enmMediumType, m_strMachineFolder,
+                                                         m_strMachineName, m_strMachineGuestOSTypeId);
+    /* Make sure that the data structure is updated and newly created medium is selected and visible: */
+    sltHandleMediumCreated(uMediumId);
 }
 
@@ -468 +470 @@
 void UIMediumSelector::sltHandleMediumCreated(const QUuid &uMediumId)
 {
+    if (uMediumId.isNull())
+        return;
     /* Update the tree widget making sure we show the new item: */
     repopulateTreeWidget();

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

@@ -88 +88 @@
 }
 
+QUuid UIWizardNewVD::mediumId() const
+{
+    return m_uMediumId;
+}
+
 void UIWizardNewVD::populatePages()
 {
@@ -143 +148 @@
     connect(pNotification, &UINotificationProgressMediumCreate::sigMediumCreated,
             &uiCommon(), &UICommon::sltHandleMediumCreated);
+
+    m_uMediumId = comVirtualDisk.GetId();
+
     gpNotificationCenter->append(pNotification);
 

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

@@ -56 +56 @@
        qulonglong mediumSize() const;
        void setMediumSize(qulonglong mediumSize);
+
+       QUuid mediumId() const;
     /** @} */
 
@@ -75 +77 @@
     qulonglong  m_uDefaultSize;
     int m_iMediumVariantPageIndex;
+    QUuid m_uMediumId;
 };