Changeset 90688 in vbox

Timestamp:

Aug 15, 2021 2:36:44 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: A possibility to dismiss shown UINotificationObject via button in UINotificationObjectItem.

Location:

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

Files:

• UINotificationModel.cpp (modified) (2 diffs)
• UINotificationModel.h (modified) (1 diff)
• UINotificationObject.cpp (modified) (5 diffs)
• UINotificationObject.h (modified) (7 diffs)
• UINotificationObjectItem.cpp (modified) (3 diffs)
• UINotificationObjectItem.h (modified) (1 diff)

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

@@ -16 +16 @@
  */
 
+/* Qt includes: */
+#include <QSet>
+
 /* GUI includes: */
 #include "UICommon.h"
+#include "UIExtraDataManager.h"
 #include "UINotificationModel.h"
 #include "UINotificationObject.h"
@@ -75 +79 @@
 }
 
-void UINotificationModel::sltHandleAboutToClose()
+void UINotificationModel::sltHandleAboutToClose(bool fDismiss)
 {
     /* Determine sender: */
     UINotificationObject *pSender = qobject_cast<UINotificationObject*>(sender());
     AssertPtrReturnVoid(pSender);
+
+    /* Dismiss message if requested: */
+    if (fDismiss && !pSender->internalName().isEmpty())
+    {
+        QSet<QString> suppressedMessages = gEDataManager->suppressedMessages().toSet();
+        suppressedMessages << pSender->internalName();
+        gEDataManager->setSuppressedMessages(suppressedMessages.toList());
+    }
+
     /* Revoke it from internal storage: */
     const QUuid uId = m_objects.key(pSender);

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

@@ -63 +63 @@
 private slots:
 
-    /** Handles request about to close sender() notification object. */
-    void sltHandleAboutToClose();
+    /** Handles request about to close sender() notification object.
+      * @param  fDismiss  Brings whether message closed as dismissed. */
+    void sltHandleAboutToClose(bool fDismiss);
 
     /** Handles broadcast request to detach COM stuff. */

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

@@ -34 +34 @@
 }
 
+void UINotificationObject::dismiss()
+{
+    emit sigAboutToClose(true);
+}
+
 void UINotificationObject::close()
 {
-    emit sigAboutToClose();
+    emit sigAboutToClose(false);
 }
 
@@ -70 +75 @@
 }
 
+QString UINotificationSimple::internalName() const
+{
+    return m_strInternalName;
+}
+
 void UINotificationSimple::handle()
 {
@@ -122 +132 @@
 {
     return true;
+}
+
+QString UINotificationProgress::internalName() const
+{
+    return QString();
 }
 
@@ -195 +210 @@
 {
     return true;
+}
+
+QString UINotificationDownloader::internalName() const
+{
+    return QString();
 }
 
@@ -292 +312 @@
 }
 
+QString UINotificationNewVersionChecker::internalName() const
+{
+    return QString();
+}
+
 void UINotificationNewVersionChecker::handle()
 {

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

@@ -45 +45 @@
 signals:
 
-    /** Notifies model about closing. */
-    void sigAboutToClose();
+    /** Notifies model about closing.
+      * @param  fDismiss  Brings whether message closed as dismissed. */
+    void sigAboutToClose(bool fDismiss);
 
 public:
@@ -59 +60 @@
     /** Returns object details. */
     virtual QString details() const = 0;
+    /** Returns object internal name. */
+    virtual QString internalName() const = 0;
     /** Handles notification-object being added. */
     virtual void handle() = 0;
@@ -64 +67 @@
 public slots:
 
+    /** Notifies model about dismissing. */
+    virtual void dismiss();
     /** Notifies model about closing. */
     virtual void close();
@@ -91 +96 @@
     /** Returns object details. */
     virtual QString details() const /* override final */;
+    /** Returns object internal name. */
+    virtual QString internalName() const /* override final */;
     /** Handles notification-object being added. */
     virtual void handle() /* override final */;
@@ -143 +150 @@
     /** Returns whether object is critical. */
     virtual bool isCritical() const /* override */;
+    /** Returns object internal name. */
+    virtual QString internalName() const /* override final */;
     /** Handles notification-object being added. */
     virtual void handle() /* override final */;
@@ -205 +214 @@
     /** Returns whether object is critical. */
     virtual bool isCritical() const /* override */;
+    /** Returns object internal name. */
+    virtual QString internalName() const /* override final */;
     /** Handles notification-object being added. */
     virtual void handle() /* override final */;
@@ -268 +279 @@
     /** Returns whether object is critical. */
     virtual bool isCritical() const /* override */;
+    /** Returns object internal name. */
+    virtual QString internalName() const /* override final */;
     /** Handles notification-object being added. */
     virtual void handle() /* override final */;

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

@@ -44 +44 @@
     , m_pLayoutUpper(0)
     , m_pLabelName(0)
+    , m_pButtonForget(0)
     , m_pButtonClose(0)
     , m_pLabelDetails(0)
@@ -66 +67 @@
                 m_pLabelName->setText(m_pObject->name());
                 m_pLayoutUpper->addWidget(m_pLabelName);
+            }
+
+            /* Prepare forget button: */
+            if (!m_pObject->internalName().isEmpty())
+                m_pButtonForget = new QIToolButton(this);
+            if (m_pButtonForget)
+            {
+                m_pButtonForget->setIcon(UIIconPool::iconSet(":/close_popup_16px.png"));
+                m_pButtonForget->setIconSize(QSize(10, 10));
+                connect(m_pButtonForget, &QIToolButton::clicked,
+                        m_pObject, &UINotificationObject::dismiss);
+
+                m_pLayoutUpper->addWidget(m_pButtonForget);
             }
 
@@ -92 +106 @@
             m_pLabelDetails->setBrowserFont(myFont);
             m_pLabelDetails->setVisible(false);
-            const int iHint = m_pLabelName->minimumSizeHint().width()
-                            + m_pLayoutUpper->spacing()
-                            + m_pButtonClose->minimumSizeHint().width();
+            int iHint = m_pLabelName->minimumSizeHint().width();
+            if (m_pButtonForget)
+                iHint += m_pLayoutUpper->spacing() + m_pButtonForget->minimumSizeHint().width();
+            if (m_pButtonClose)
+                iHint += m_pLayoutUpper->spacing() + m_pButtonClose->minimumSizeHint().width();
             m_pLabelDetails->setMinimumTextWidth(iHint);
             m_pLabelDetails->setText(m_pObject->details());

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

@@ -67 +67 @@
     /** Holds the name label instance. */
     QLabel          *m_pLabelName;
+    /** Holds the forget button instance. */
+    QIToolButton    *m_pButtonForget;
     /** Holds the close button instance. */
     QIToolButton    *m_pButtonClose;