Changeset 83960 in vbox

Timestamp:

Apr 24, 2020 9:22:19 AM (5 years ago)

Author:

vboxsync

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

137525

Message:

FE/Qt: bugref:9653: VirtualBox Manager: A bit of macOS sheet adjustments for settings stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• manager/UIVirtualBoxManager.cpp (modified) (5 diffs)
• settings/UISettingsDialogSpecific.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -547 +547 @@
     updateActionsAppearance();
 
-    /* Create and execute global settings window: */
-    QPointer<UISettingsDialogGlobal> pDlg = new UISettingsDialogGlobal(this);
-    pDlg->execute();
-    delete pDlg;
+    /* Use the "safe way" to open stack of Mac OS X Sheets: */
+    QWidget *pDialogParent = windowManager().realParentWindow(this);
+    UISafePointerSettingsDialogGlobal pDialog = new UISettingsDialogGlobal(pDialogParent);
+    windowManager().registerNewParent(pDialog, pDialogParent);
+
+    /* Execute dialog: */
+    pDialog->execute();
+    delete pDialog;
 }
 
@@ -570 +574 @@
 
     /* Get first selected item: */
-    UIVirtualMachineItem *pItem = currentItems().value(0);
+    UIVirtualMachineItem *pItem = currentItem();
 
     /* For global item or local machine: */
@@ -598 +602 @@
                                                        const QUuid &uID /* = QString() */)
 {
-    /* Get current item: */
-    UIVirtualMachineItem *pItem = currentItem();
-    AssertMsgReturnVoid(pItem, ("Current item should be selected!\n"));
-
     /* Lock the action preventing cascade calls: */
     UIQObjectPropertySetter guardBlock(actionPool()->action(UIActionIndexST_M_Machine_S_Settings), "opened", true);
@@ -607 +607 @@
             this, &UIVirtualBoxManager::sltHandleUpdateActionAppearanceRequest);
     updateActionsAppearance();
+
+    /* Get current item: */
+    UIVirtualMachineItem *pItem = currentItem();
+    AssertMsgReturnVoid(pItem, ("Current item should be selected!\n"));
 
     /* Process href from VM details / description: */
@@ -630 +634 @@
         m_fFirstMediumEnumerationHandled = true;
 
-        /* Create and execute corresponding VM settings window: */
-        QPointer<UISettingsDialogMachine> pDlg = new UISettingsDialogMachine(this,
-                                                                             uID.isNull() ? pItem->id() : uID,
-                                                                             strCategory, strControl);
-        pDlg->execute();
-        delete pDlg;
+        /* Use the "safe way" to open stack of Mac OS X Sheets: */
+        QWidget *pDialogParent = windowManager().realParentWindow(this);
+        UISafePointerSettingsDialogMachine pDialog = new UISettingsDialogMachine(pDialogParent,
+                                                                                 uID.isNull() ? pItem->id() : uID,
+                                                                                 strCategory, strControl);
+        windowManager().registerNewParent(pDialog, pDialogParent);
+
+        /* Execute dialog: */
+        pDialog->execute();
+        delete pDialog;
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h

@@ -21 +21 @@
 # pragma once
 #endif
+
+/* Qt includes: */
+#include <QPointer>
 
 /* GUI includes: */
@@ -74 +77 @@
     QString  m_strControl;
 };
+
+/** Safe pointer to cloud machine settings dialog. */
+typedef QPointer<UISettingsDialogGlobal> UISafePointerSettingsDialogGlobal;
 
 
@@ -167 +173 @@
 };
 
+/** Safe pointer to cloud machine settings dialog. */
+typedef QPointer<UISettingsDialogMachine> UISafePointerSettingsDialogMachine;
+
 
 #endif /* !FEQT_INCLUDED_SRC_settings_UISettingsDialogSpecific_h */