Changeset 91753 in vbox for trunk

Timestamp:

Oct 15, 2021 9:25:35 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: A possibility to create local UINotificationCenter objects additionally to main singleton.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter

Files:

• UINotificationCenter.cpp (modified) (5 diffs)
• UINotificationCenter.h (modified) (2 diffs)

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

@@ -128 +128 @@
 {
     AssertReturnVoid(!s_pInstance);
-    new UINotificationCenter(pParent);
+    s_pInstance = new UINotificationCenter(pParent);
 }
 
@@ -136 +136 @@
     AssertPtrReturnVoid(s_pInstance);
     delete s_pInstance;
+    s_pInstance = 0;
 }
 
@@ -142 +143 @@
 {
     return s_pInstance;
-}
-
-void UINotificationCenter::setParent(QWidget *pParent)
-{
-    /* Additionally hide if parent unset: */
-    if (!pParent)
-        setHidden(true);
-
-    /* Uninstall filter from previous parent: */
-    if (parent())
-        parent()->removeEventFilter(this);
-
-    /* Reparent: */
-    QIWithRetranslateUI<QWidget>::setParent(pParent);
-
-    /* Install filter to new parent: */
-    if (parent())
-        parent()->installEventFilter(this);
-
-    /* Show only if there is something to show: */
-    if (parent())
-        setHidden(m_pModel->ids().isEmpty());
-}
-
-void UINotificationCenter::invoke()
-{
-    /* Open if center isn't opened yet: */
-    if (!m_pOpenButton->isChecked())
-        m_pOpenButton->animateClick();
-}
-
-QUuid UINotificationCenter::append(UINotificationObject *pObject)
-{
-    /* Sanity check: */
-    AssertPtrReturn(m_pModel, QUuid());
-    AssertPtrReturn(pObject, QUuid());
-
-    /* Is object critical? */
-    const bool fCritical = pObject->isCritical();
-    /* Is object progress? */
-    const bool fProgress = pObject->inherits("UINotificationProgress");
-
-    /* Handle object. Be aware it can be deleted during handling! */
-    const QUuid uId = m_pModel->appendObject(pObject);
-
-    /* If object is critical and center isn't opened yet: */
-    if (!m_pOpenButton->isChecked() && fCritical)
-    {
-        /* We should delay progresses for a bit: */
-        const int iDelay = fProgress ? 2000 : 0;
-        /* We should issue an open request: */
-        AssertPtrReturn(m_pTimerOpen, uId);
-        m_uOpenObjectId = uId;
-        m_pTimerOpen->start(iDelay);
-    }
-
-    return uId;
-}
-
-void UINotificationCenter::revoke(const QUuid &uId)
-{
-    AssertReturnVoid(!uId.isNull());
-    return m_pModel->revokeObject(uId);
 }
 
@@ -219 +157 @@
     , m_pTimerOpen(0)
 {
-    s_pInstance = this;
     prepare();
 }
@@ -225 +162 @@
 UINotificationCenter::~UINotificationCenter()
 {
-    s_pInstance = 0;
+}
+
+void UINotificationCenter::setParent(QWidget *pParent)
+{
+    /* Additionally hide if parent unset: */
+    if (!pParent)
+        setHidden(true);
+
+    /* Uninstall filter from previous parent: */
+    if (parent())
+        parent()->removeEventFilter(this);
+
+    /* Reparent: */
+    QIWithRetranslateUI<QWidget>::setParent(pParent);
+
+    /* Install filter to new parent: */
+    if (parent())
+        parent()->installEventFilter(this);
+
+    /* Show only if there is something to show: */
+    if (parent())
+        setHidden(m_pModel->ids().isEmpty());
+}
+
+void UINotificationCenter::invoke()
+{
+    /* Open if center isn't opened yet: */
+    if (!m_pOpenButton->isChecked())
+        m_pOpenButton->animateClick();
+}
+
+QUuid UINotificationCenter::append(UINotificationObject *pObject)
+{
+    /* Sanity check: */
+    AssertPtrReturn(m_pModel, QUuid());
+    AssertPtrReturn(pObject, QUuid());
+
+    /* Is object critical? */
+    const bool fCritical = pObject->isCritical();
+    /* Is object progress? */
+    const bool fProgress = pObject->inherits("UINotificationProgress");
+
+    /* Handle object. Be aware it can be deleted during handling! */
+    const QUuid uId = m_pModel->appendObject(pObject);
+
+    /* If object is critical and center isn't opened yet: */
+    if (!m_pOpenButton->isChecked() && fCritical)
+    {
+        /* We should delay progresses for a bit: */
+        const int iDelay = fProgress ? 2000 : 0;
+        /* We should issue an open request: */
+        AssertPtrReturn(m_pTimerOpen, uId);
+        m_uOpenObjectId = uId;
+        m_pTimerOpen->start(iDelay);
+    }
+
+    return uId;
+}
+
+void UINotificationCenter::revoke(const QUuid &uId)
+{
+    AssertReturnVoid(!uId.isNull());
+    return m_pModel->revokeObject(uId);
 }
 

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

@@ -63 +63 @@
     static UINotificationCenter *instance();
 
+    /** Constructs notification-center passing @a pParent to the base-class. */
+    UINotificationCenter(QWidget *pParent);
+    /** Destructs notification-center. */
+    virtual ~UINotificationCenter() /* override final */;
+
     /** Defines notification-center @a pParent. */
     void setParent(QWidget *pParent);
@@ -75 +80 @@
 
 protected:
-
-    /** Constructs notification-center passing @a pParent to the base-class. */
-    UINotificationCenter(QWidget *pParent);
-    /** Destructs notification-center. */
-    virtual ~UINotificationCenter() /* override final */;
 
     /** Handles translation event. */