Changeset 91225 in vbox

Timestamp:

Sep 14, 2021 10:32:37 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: Delay progress-notifications for a bit, similarly to what we have with modal progress-dialog.

Location:

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

Files:

• UINotificationCenter.cpp (modified) (6 diffs)
• UINotificationCenter.h (modified) (4 diffs)
• UINotificationModel.cpp (modified) (1 diff)
• UINotificationModel.h (modified) (1 diff)

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

@@ -27 +27 @@
 #include <QStateMachine>
 #include <QStyle>
+#include <QTimer>
 #include <QVBoxLayout>
 
@@ -176 +177 @@
     const QUuid uId = m_pModel->appendObject(pObject);
 
-    /* Open if object is critical and center isn't opened yet: */
+    /* If object is critical and center isn't opened yet: */
     if (!m_pOpenButton->isChecked() && pObject->isCritical())
-        m_pOpenButton->animateClick();
+    {
+        /* We should delay progresses for a bit: */
+        const int iDelay = pObject->inherits("UINotificationProgress") ? 2000 : 0;
+        /* We should issue an open request: */
+        AssertPtrReturn(m_pTimerOpen, uId);
+        m_uOpenObjectId = uId;
+        m_pTimerOpen->start(iDelay);
+    }
 
     return uId;
@@ -198 +206 @@
     , m_pStateMachineSliding(0)
     , m_iAnimatedValue(0)
+    , m_pTimerOpen(0)
 {
     s_pInstance = this;
@@ -284 +293 @@
 }
 
+void UINotificationCenter::sltHandleOpenTimerTimeout()
+{
+    /* Check whether we really closed: */
+    if (m_pOpenButton->isChecked())
+        return;
+
+    /* Check whether message with particular ID exists: */
+    if (!m_pModel->hasObject(m_uOpenObjectId))
+        return;
+
+    /* Toggle open-button: */
+    m_pOpenButton->animateClick();
+}
+
 void UINotificationCenter::sltModelChanged()
 {
@@ -320 +343 @@
     prepareWidgets();
     prepareStateMachineSliding();
+    prepareOpenTimer();
 }
 
@@ -456 +480 @@
 }
 
+void UINotificationCenter::prepareOpenTimer()
+{
+    m_pTimerOpen = new QTimer(this);
+    if (m_pTimerOpen)
+        connect(m_pTimerOpen, &QTimer::timeout,
+                this, &UINotificationCenter::sltHandleOpenTimerTimeout);
+}
+
 void UINotificationCenter::paintBackground(QPainter *pPainter)
 {

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

@@ -34 +34 @@
 class QPainter;
 class QStateMachine;
+class QTimer;
 class QVBoxLayout;
 class QIToolButton;
@@ -92 +93 @@
     /** Issues request to make open button @a fToggled. */
     void sltHandleOpenButtonToggled(bool fToggled);
+    /** Handles open-timer timeout. */
+    void sltHandleOpenTimerTimeout();
 
     /** Handles signal about model being updated. */
@@ -106 +109 @@
     /** Prepares sliding state-machine. */
     void prepareStateMachineSliding();
+    /** Prepares open-timer. */
+    void prepareOpenTimer();
 
     /** Paints background using pre-configured @a pPainter. */
@@ -141 +146 @@
     /** Holds the sliding animation current value. */
     int            m_iAnimatedValue;
+
+    /** Holds the open-timer instance. */
+    QTimer *m_pTimerOpen;
+    /** Holds the open-object ID. */
+    QUuid   m_uOpenObjectId;
 };
 

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

@@ -69 +69 @@
 }
 
+bool UINotificationModel::hasObject(const QUuid &uId) const
+{
+    return m_objects.contains(uId);
+}
+
 QList<QUuid> UINotificationModel::ids() const
 {

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

@@ -55 +55 @@
     /** Revokes a notification object referenced by @a uId from intenal storage. */
     void revokeObject(const QUuid &uId);
+    /** Returns whether there is a notification object referenced by @a uId. */
+    bool hasObject(const QUuid &uId) const;
 
     /** Returns a list of registered notification object IDs. */