Changeset 92295 in vbox for trunk

Timestamp:

Nov 9, 2021 2:32:19 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: UINotificationCenter: Adding a button for removing finished notifications, one to rule them all.

Location:

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

Files:

• UINotificationCenter.cpp (modified) (5 diffs)
• UINotificationCenter.h (modified) (2 diffs)
• UINotificationModel.cpp (modified) (1 diff)
• UINotificationModel.h (modified) (1 diff)

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

@@ -152 +152 @@
     , m_pOpenButton(0)
     , m_pKeepButton(0)
+    , m_pRemoveFinishedButton(0)
     , m_pLayoutItems(0)
     , m_pStateMachineSliding(0)
@@ -279 +280 @@
     if (m_pKeepButton)
         m_pKeepButton->setToolTip(tr("Keep finished progresses"));
+    if (m_pRemoveFinishedButton)
+        m_pRemoveFinishedButton->setToolTip(tr("Delete finished notifications"));
 }
 
@@ -362 +365 @@
 }
 
+void UINotificationCenter::sltHandleRemoveFinishedButtonClicked()
+{
+    m_pModel->revokeFinishedObjects();
+}
+
 void UINotificationCenter::sltHandleOpenTimerTimeout()
 {
@@ -469 +477 @@
                 m_pLayoutButtons->addWidget(m_pOpenButton);
             }
+
+            /* Add stretch: */
+            m_pLayoutButtons->addStretch(1);
 
             /* Prepare keep-button: */
@@ -481 +492 @@
             }
 
-            m_pLayoutButtons->addStretch();
+            /* Prepare remove-finished-button: */
+            m_pRemoveFinishedButton = new QIToolButton(this);
+            if (m_pRemoveFinishedButton)
+            {
+                m_pRemoveFinishedButton->setIcon(UIIconPool::iconSet(":/edata_remove_16px_x3.png"));
+                connect(m_pRemoveFinishedButton, &QIToolButton::clicked, this, &UINotificationCenter::sltHandleRemoveFinishedButtonClicked);
+                m_pLayoutButtons->addWidget(m_pRemoveFinishedButton);
+            }
 
             /* Add to layout: */

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

@@ -105 +105 @@
     /** Toggles notification-progresses keep approach. */
     void sltHandleKeepButtonToggled(bool fToggled);
+    /** Removes finished notifications. */
+    void sltHandleRemoveFinishedButtonClicked();
 
     /** Handles open-timer timeout. */
@@ -154 +156 @@
     /** Holds the buttons layout instance. */
     QHBoxLayout  *m_pLayoutButtons;
-    /** Holds the open button instance. */
+    /** Holds the open-button instance. */
     QIToolButton *m_pOpenButton;
-    /** Holds the keep button instance. */
+    /** Holds the keep-button instance. */
     QIToolButton *m_pKeepButton;
+    /** Holds the remove-finished-button instance. */
+    QIToolButton *m_pRemoveFinishedButton;
     /** Holds the items layout instance. */
     QVBoxLayout  *m_pLayoutItems;

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

@@ -74 +74 @@
 }
 
+void UINotificationModel::revokeFinishedObjects()
+{
+    /* Check whether there are done objects: */
+    bool fChanged = false;
+    foreach (const QUuid &uId, m_ids)
+    {
+        UINotificationObject *pObject = m_objects.value(uId);
+        AssertPtrReturnVoid(pObject);
+        if (pObject->isDone())
+        {
+            /* Remove ID and object: */
+            delete m_objects.take(uId);
+            m_ids.removeAll(uId);
+            fChanged = true;
+        }
+    }
+    /* Notify listeners: */
+    if (fChanged)
+        emit sigChanged();
+}
+
 QList<QUuid> UINotificationModel::ids() const
 {

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

@@ -57 +57 @@
     /** Returns whether there is a notification object referenced by @a uId. */
     bool hasObject(const QUuid &uId) const;
+    /** Revokes finished notification objects. */
+    void revokeFinishedObjects();
 
     /** Returns a list of registered notification object IDs. */