Changeset 98903 in vbox

Timestamp:

Mar 10, 2023 3:17:47 PM (21 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10322: Runtime UI: Moving notification-center init/deinit from UISession to UIMachine as we are planning to handle notifications for stuff before COM init as well; This also requires COM detach handler in notification-center itself.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• notificationcenter/UINotificationCenter.cpp (modified) (2 diffs)
• notificationcenter/UINotificationCenter.h (modified) (1 diff)
• runtime/UIMachine.cpp (modified) (4 diffs)
• runtime/UIMachine.h (modified) (2 diffs)
• runtime/UISession.cpp (modified) (6 diffs)
• runtime/UISession.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationCenter.cpp

@@ -514 +514 @@
 }
 
+void UINotificationCenter::sltDetachCOM()
+{
+    cleanup();
+}
+
 void UINotificationCenter::prepare()
 {
@@ -537 +542 @@
     prepareStateMachineSliding();
     prepareOpenTimer();
+
+    /* COM related connections: */
+    connect(&uiCommon(), &UICommon::sigAskToDetachCOM,
+            this, &UINotificationCenter::sltDetachCOM);
 
     /* Apply language settings: */

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationCenter.h

@@ -140 +140 @@
       * @note Breaks blocking handleNow() call. */
     void sltHandleProgressFinished();
+
+    /** Handles request to detach COM. */
+    void sltDetachCOM();
 
 private:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp

@@ -1466 +1466 @@
 
     /* Prepare stuff: */
+    prepareNotificationCenter();
     prepareBranding();
     prepareSessionConnections();
@@ -1489 +1490 @@
     /* True by default: */
     return true;
+}
+
+void UIMachine::prepareNotificationCenter()
+{
+    UINotificationCenter::create();
 }
 
@@ -1821 +1827 @@
 }
 
+void UIMachine::cleanupNotificationCenter()
+{
+    UINotificationCenter::destroy();
+}
+
 void UIMachine::cleanup()
 {
@@ -1831 +1842 @@
     cleanupActions();
     cleanupBranding();
+    cleanupNotificationCenter();
 
     /* Cleanup session UI: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.h

@@ -838 +838 @@
     /** Prepare routine. */
     bool prepare();
+    /** Prepares notification-center. */
+    void prepareNotificationCenter();
     /** Prepare routine: Branding. */
     void prepareBranding();
@@ -863 +865 @@
     /** Cleanup routine: Session stuff. */
     void cleanupSession();
+    /** Cleanups notification-center. */
+    void cleanupNotificationCenter();
     /** Cleanup routine. */
     void cleanup();

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -128 +128 @@
 {
     /* Prepare COM stuff: */
-    if (!prepareSession())
+    if (!prepareCOMStuff())
         return false;
 
@@ -136 +136 @@
 
     /* Prepare GUI stuff: */
-    prepareNotificationCenter();
     prepareConsoleEventHandlers();
     prepareFramebuffers();
@@ -2238 +2237 @@
     cleanupFramebuffers();
     cleanupConsoleEventHandlers();
-    cleanupNotificationCenter();
     cleanupCOMStuff();
 }
@@ -2331 +2329 @@
 }
 
-bool UISession::prepareSession()
+bool UISession::prepareCOMStuff()
 {
     /* Open session: */
@@ -2385 +2383 @@
     /* True by default: */
     return true;
-}
-
-void UISession::prepareNotificationCenter()
-{
-    UINotificationCenter::create();
 }
 
@@ -2504 +2497 @@
 }
 
-void UISession::cleanupNotificationCenter()
-{
-    UINotificationCenter::destroy();
-}
-
 void UISession::cleanupCOMStuff()
 {

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h

@@ -648 +648 @@
     /** @name Prepare/cleanup cascade.
      ** @{ */
-        /** Prepares COM session. */
-        bool prepareSession();
-        /** Prepares notification-center. */
-        void prepareNotificationCenter();
+        /** Prepares COM stuff. */
+        bool prepareCOMStuff();
         /** Prepares console event-handler. */
         void prepareConsoleEventHandlers();
@@ -665 +663 @@
         /** Cleanups console event-handler. */
         void cleanupConsoleEventHandlers();
-        /** Cleanups notification-center. */
-        void cleanupNotificationCenter();
         /** Cleanups COM stuff. */
         void cleanupCOMStuff();