Changeset 71369 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Mar 16, 2018 3:11:13 PM (7 years ago)

Author:

vboxsync

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

121321

Message:

FE/Qt: bugref:9049: Detach VBoxGlobal from UISession stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UIStarter.cpp (modified) (3 diffs)
• UIStarter.h (modified) (2 diffs)
• VBoxGlobal.cpp (modified) (2 diffs)
• VBoxGlobal.h (modified) (1 diff)

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

@@ -25 +25 @@
 #include "UIMessageCenter.h"
 #include "UISelectorWindow.h"
+#include "UISession.h"
 #include "UIStarter.h"
 
@@ -85 +86 @@
     connect(&vboxGlobal(), &VBoxGlobal::sigAskToOpenURLs,
             this, &UIStarter::sltOpenURLs);
+    connect(&vboxGlobal(), &VBoxGlobal::sigAskToCommitData,
+            this, &UIStarter::sltHandleCommitDataRequest);
 }
 
@@ -168 +171 @@
 }
 
+void UIStarter::sltHandleCommitDataRequest()
+{
+    /* Exit if VBoxGlobal is not valid: */
+    if (!vboxGlobal().isValid())
+        return;
+
+    /* For VM process: */
+    if (vboxGlobal().isVMConsoleProcess())
+    {
+        /* Temporary override the default close action to 'SaveState' if necessary: */
+        if (gpMachine->uisession()->defaultCloseAction() == MachineCloseAction_Invalid)
+            gpMachine->uisession()->setDefaultCloseAction(MachineCloseAction_SaveState);
+    }
+}
+

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

@@ -22 +22 @@
 #include <QObject>
 
-/** QObject subclass allowing to start GUI part
-  * of VirtualBox application in async mode. */
+/** QObject subclass allowing to control GUI part
+  * of VirtualBox application in sync/async modes. */
 class UIStarter : public QObject
 {
@@ -65 +65 @@
     void sltOpenURLs();
 
+    /** Handles commit data request. */
+    void sltHandleCommitDataRequest();
+
 private:
 

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

@@ -67 +67 @@
 # endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 # include "UIMachine.h"
-# include "UISession.h"
 # include "UIConverter.h"
 # include "UIMediumEnumerator.h"
@@ -4146 +4145 @@
     LogRel(("GUI: VBoxGlobal::sltHandleCommitDataRequest: Emergency shutdown initiated\n"));
 
-    /* For VM process: */
-    if (vboxGlobal().isVMConsoleProcess())
-    {
-        /* Temporary override the default close action to 'SaveState' if necessary: */
-        if (gpMachine->uisession()->defaultCloseAction() == MachineCloseAction_Invalid)
-            gpMachine->uisession()->setDefaultCloseAction(MachineCloseAction_SaveState);
-    }
+    /* Ask listener to commit data: */
+    emit sigAskToCommitData();
 
     /* Ask session manager to postpone shutdown until we done: */

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

@@ -452 +452 @@
     /** Asks listener to recreate UI. */
     void sigAskToRestartUI();
-    /** Ask listener to open URLs. */
+    /** Asks listener to open URLs. */
     void sigAskToOpenURLs();
+    /** Asks listener to commit data. */
+    void sigAskToCommitData();
 
     /** Notifies listeners about the VBoxSVC availability change. */