Changeset 92414 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 14, 2021 2:12:13 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10141. Some more fixes related to the action pool.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UICommon.cpp (modified) (2 diffs)
• medium/UIMediumSelector.cpp (modified) (3 diffs)
• medium/UIMediumSelector.h (modified) (3 diffs)

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

@@ -1822 +1822 @@
                                        UIActionPool *pActionPool)
 {
-    Q_UNUSED(pActionPool);
     QUuid uMachineOrGlobalId = uMachineID == QUuid() ? gEDataManager->GlobalID : uMachineID;
 
@@ -1828 +1827 @@
     QPointer<UIMediumSelector> pSelector = new UIMediumSelector(uCurrentMediumId, enmMediumType, strMachineName,
                                                                 strMachineFolder, strMachineGuestOSTypeId,
-                                                                uMachineOrGlobalId, pDialogParent);
+                                                                uMachineOrGlobalId, pDialogParent, pActionPool);
 
     if (!pSelector)

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

@@ -55 +55 @@
 UIMediumSelector::UIMediumSelector(const QUuid &uCurrentMediumId, UIMediumDeviceType enmMediumType, const QString &machineName,
                                    const QString &machineSettingsFilePath, const QString &strMachineGuestOSTypeId,
-                                   const QUuid &uMachineID, QWidget *pParent)
+                                   const QUuid &uMachineID, QWidget *pParent, UIActionPool *pActionPool)
     :QIWithRetranslateUI<QIMainDialog>(pParent)
     , m_pCentralWidget(0)
@@ -79 +79 @@
     , m_strMachineGuestOSTypeId(strMachineGuestOSTypeId)
     , m_uMachineID(uMachineID)
+    , m_pActionPool(pActionPool)
 {
     /* Start full medium-enumeration (if necessary): */
@@ -452 +453 @@
 void UIMediumSelector::sltCreateMedium()
 {
-    QUuid uMediumId = uiCommon().openMediumCreatorDialog(0 /* action pool */, this, m_enmMediumType, m_strMachineFolder,
+    QUuid uMediumId = uiCommon().openMediumCreatorDialog(m_pActionPool, 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: */

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

@@ -36 +36 @@
 class QVBoxLayout;
 class QIDialogButtonBox;
+class QIToolBar;
+class UIActionPool;
 class UIMediumItem;
 class UIMediumSearchWidget;
-class QIToolBar;
 
 
@@ -53 +54 @@
     UIMediumSelector(const QUuid &uCurrentMediumId, UIMediumDeviceType enmMediumType, const QString &machineName,
                      const QString &machineSettingsFilePath, const QString &strMachineGuestOSTypeId,
-                     const QUuid &uMachineID, QWidget *pParent);
+                     const QUuid &uMachineID, QWidget *pParent, UIActionPool *pActionPool);
     /** Disables/enables the create action and controls its visibility. */
     void         setEnableCreateAction(bool fEnable);
@@ -154 +155 @@
     QUuid                 m_uMachineID;
     QUuid                 m_uCurrentMediumId;
+    UIActionPool         *m_pActionPool;
 };