Changeset 90567 in vbox

Timestamp:

Aug 7, 2021 11:50:28 AM (4 years ago)

Author:

vboxsync

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

146173

Message:

FE/Qt: bugref:10067: Create UINotificationCenter for Runtime UI; Enable it for Normal, Full-screen and Scaled visual states for now.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineWindow.cpp (modified) (4 diffs)
• UIMachineWindow.h (modified) (2 diffs)
• UISession.cpp (modified) (5 diffs)
• UISession.h (modified) (2 diffs)
• fullscreen/UIMachineWindowFullscreen.cpp (modified) (3 diffs)
• fullscreen/UIMachineWindowFullscreen.h (modified) (2 diffs)
• normal/UIMachineWindowNormal.cpp (modified) (3 diffs)
• normal/UIMachineWindowNormal.h (modified) (2 diffs)
• scale/UIMachineWindowScale.cpp (modified) (3 diffs)
• scale/UIMachineWindowScale.h (modified) (2 diffs)

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

@@ -112 +112 @@
     prepareMachineView();
 
+    /* Prepare notification-center: */
+    prepareNotificationCenter();
+
     /* Prepare handlers: */
     prepareHandlers();
@@ -151 +154 @@
     /* Cleanup visual-state: */
     cleanupVisualState();
+
+    /* Cleanup notification-center: */
+    cleanupNotificationCenter();
 
     /* Cleanup machine-view: */
@@ -519 +525 @@
 }
 
+void UIMachineWindow::prepareNotificationCenter()
+{
+    // for now it will be added from within particular visual mode windows ..
+}
+
 void UIMachineWindow::prepareHandlers()
 {
@@ -535 +546 @@
     /* Unregister keyboard-handler: */
     machineLogic()->keyboardHandler()->cleanupListener(m_uScreenId);
+}
+
+void UIMachineWindow::cleanupNotificationCenter()
+{
+    // for now it will be removed from within particular visual mode windows ..
 }
 

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

@@ -164 +164 @@
     virtual void prepareStatusBar() {}
     virtual void prepareMachineView();
+    virtual void prepareNotificationCenter();
     virtual void prepareVisualState() {}
     virtual void prepareHandlers();
@@ -172 +173 @@
     virtual void cleanupHandlers();
     virtual void cleanupVisualState() {}
+    virtual void cleanupNotificationCenter();
     virtual void cleanupMachineView();
     virtual void cleanupStatusBar() {}

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

@@ -45 +45 @@
 #include "UIMessageCenter.h"
 #include "UIMousePointerShapeData.h"
+#include "UINotificationCenter.h"
 #include "UIPopupCenter.h"
 #include "UIWizardFirstRun.h"
@@ -526 +527 @@
     cleanupFramebuffers();
     cleanupConsoleEventHandlers();
+    cleanupNotificationCenter();
     cleanupSession();
 }
@@ -939 +941 @@
     if (!prepareSession())
         return false;
+    prepareNotificationCenter();
     prepareConsoleEventHandlers();
     prepareFramebuffers();
@@ -1009 +1012 @@
     /* True by default: */
     return true;
+}
+
+void UISession::prepareNotificationCenter()
+{
+    UINotificationCenter::create();
 }
 
@@ -1354 +1362 @@
 }
 
+void UISession::cleanupNotificationCenter()
+{
+    UINotificationCenter::destroy();
+}
+
 void UISession::cleanupSession()
 {

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

@@ -395 +395 @@
     bool prepare();
     bool prepareSession();
+    void prepareNotificationCenter();
     void prepareConsoleEventHandlers();
     void prepareFramebuffers();
@@ -414 +415 @@
     void cleanupFramebuffers();
     void cleanupConsoleEventHandlers();
+    void cleanupNotificationCenter();
     void cleanupSession();
     void cleanup();

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp

@@ -32 +32 @@
 #include "UIMachineWindowFullscreen.h"
 #include "UIMachineView.h"
+#include "UINotificationCenter.h"
 #if   defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
 # include "UIMachineDefs.h"
@@ -216 +217 @@
 
     showMinimized();
+}
+
+void UIMachineWindowFullscreen::prepareNotificationCenter()
+{
+    if (gpNotificationCenter && (m_uScreenId == 0))
+        gpNotificationCenter->setParent(centralWidget());
 }
 
@@ -325 +332 @@
     /* Call to base-class: */
     UIMachineWindow::cleanupVisualState();
+}
+
+void UIMachineWindowFullscreen::cleanupNotificationCenter()
+{
+    if (gpNotificationCenter && (gpNotificationCenter->parent() == centralWidget()))
+        gpNotificationCenter->setParent(0);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.h

@@ -88 +88 @@
 private:
 
+    /** Prepare notification-center routine. */
+    void prepareNotificationCenter();
     /** Prepare visual-state routine. */
     void prepareVisualState();
@@ -101 +103 @@
     /** Cleanup visual-state routine. */
     void cleanupVisualState();
+    /** Cleanup notification-center routine. */
+    void cleanupNotificationCenter();
 
     /** Updates geometry according to visual-state. */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

@@ -37 +37 @@
 #include "UIMachineLogic.h"
 #include "UIMachineView.h"
+#include "UINotificationCenter.h"
 #include "UIIconPool.h"
 #include "UISession.h"
@@ -319 +320 @@
 }
 
+void UIMachineWindowNormal::prepareNotificationCenter()
+{
+    if (gpNotificationCenter && (m_uScreenId == 0))
+        gpNotificationCenter->setParent(centralWidget());
+}
+
 void UIMachineWindowNormal::prepareVisualState()
 {
@@ -422 +429 @@
         UICocoaApplication::instance()->unregisterCallbackForStandardWindowButton(this, StandardWindowButtonType_Zoom);
 #endif /* VBOX_WS_MAC */
+}
+
+void UIMachineWindowNormal::cleanupNotificationCenter()
+{
+    if (gpNotificationCenter && (gpNotificationCenter->parent() == centralWidget()))
+        gpNotificationCenter->setParent(0);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.h

@@ -98 +98 @@
     /** Prepare status-bar routine. */
     void prepareStatusBar();
+    /** Prepare notification-center routine. */
+    void prepareNotificationCenter();
     /** Prepare visual-state routine. */
     void prepareVisualState();
@@ -105 +107 @@
     /** Cleanup visual-state routine. */
     void cleanupVisualState();
+    /** Cleanup notification-center routine. */
+    void cleanupNotificationCenter();
     /** Cleanup session connections routine. */
     void cleanupSessionConnections();

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.cpp

@@ -33 +33 @@
 #include "UIMachineWindowScale.h"
 #include "UIMachineView.h"
+#include "UINotificationCenter.h"
 #ifdef VBOX_WS_MAC
 # include "VBoxUtils.h"
@@ -56 +57 @@
     m_pLeftSpacer->changeSize(0, 0, QSizePolicy::Fixed, QSizePolicy::Fixed);
     m_pRightSpacer->changeSize(0, 0, QSizePolicy::Fixed, QSizePolicy::Fixed);
+}
+
+void UIMachineWindowScale::prepareNotificationCenter()
+{
+    if (gpNotificationCenter && (m_uScreenId == 0))
+        gpNotificationCenter->setParent(centralWidget());
 }
 
@@ -139 +146 @@
 }
 #endif /* VBOX_WS_MAC */
+
+void UIMachineWindowScale::cleanupNotificationCenter()
+{
+    if (gpNotificationCenter && (gpNotificationCenter->parent() == centralWidget()))
+        gpNotificationCenter->setParent(0);
+}
 
 void UIMachineWindowScale::showInNecessaryMode()

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.h

@@ -40 +40 @@
     /** Prepare main-layout routine. */
     void prepareMainLayout();
+    /** Prepare notification-center routine. */
+    void prepareNotificationCenter();
 #ifdef VBOX_WS_MAC
     /** Prepare visual-state routine. */
@@ -51 +53 @@
     void cleanupVisualState();
 #endif /* VBOX_WS_MAC */
+    /** Cleanup notification-center routine. */
+    void cleanupNotificationCenter();
 
     /** Updates visibility according to visual-state. */