Changeset 92429 in vbox

Timestamp:

Nov 15, 2021 2:25:27 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: A bit of cleanup for UINotificationCenter.

Location:

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

Files:

• UINotificationCenter.cpp (modified) (11 diffs)
• UINotificationCenter.h (modified) (1 diff)

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

@@ -151 +151 @@
     , m_pLayoutMain(0)
     , m_pLayoutButtons(0)
-    , m_pOpenButton(0)
-    , m_pKeepButton(0)
-    , m_pRemoveFinishedButton(0)
+    , m_pButtonOpen(0)
+    , m_pButtonKeepFinished(0)
+    , m_pButtonRemoveFinished(0)
     , m_pLayoutItems(0)
     , m_pStateMachineSliding(0)
@@ -192 +192 @@
 {
     /* Open if center isn't opened yet: */
-    if (!m_pOpenButton->isChecked())
-        m_pOpenButton->animateClick();
+    if (!m_pButtonOpen->isChecked())
+        m_pButtonOpen->animateClick();
 }
 
@@ -212 +212 @@
 
     /* If object is critical and center isn't opened yet: */
-    if (!m_pOpenButton->isChecked() && fCritical)
+    if (!m_pButtonOpen->isChecked() && fCritical)
     {
         /* We should delay progresses for a bit: */
@@ -277 +277 @@
 void UINotificationCenter::retranslateUi()
 {
-    if (m_pOpenButton)
-        m_pOpenButton->setToolTip(tr("Open notification center"));
-    if (m_pKeepButton)
-        m_pKeepButton->setToolTip(tr("Keep finished progresses"));
-    if (m_pRemoveFinishedButton)
-        m_pRemoveFinishedButton->setToolTip(tr("Delete finished notifications"));
+    if (m_pButtonOpen)
+        m_pButtonOpen->setToolTip(tr("Open notification center"));
+    if (m_pButtonKeepFinished)
+        m_pButtonKeepFinished->setToolTip(tr("Keep finished progresses"));
+    if (m_pButtonRemoveFinished)
+        m_pButtonRemoveFinished->setToolTip(tr("Delete finished notifications"));
 }
 
@@ -388 +388 @@
 
     /* Check whether we really closed: */
-    if (m_pOpenButton->isChecked())
+    if (m_pButtonOpen->isChecked())
         return;
 
@@ -395 +395 @@
         return;
 
-    /* Toggle open-button: */
-    m_pOpenButton->animateClick();
+    /* Toggle open button: */
+    m_pButtonOpen->animateClick();
 }
 
@@ -423 +423 @@
     /* Hide and slide away if there are no notifications to show: */
     setHidden(m_pModel->ids().isEmpty());
-    if (m_pModel->ids().isEmpty() && m_pOpenButton->isChecked())
-        m_pOpenButton->toggle();
+    if (m_pModel->ids().isEmpty() && m_pButtonOpen->isChecked())
+        m_pButtonOpen->toggle();
 }
 
@@ -485 +485 @@
             m_pLayoutButtons->setContentsMargins(0, 0, 0, 0);
 
-            /* Prepare open-button: */
-            m_pOpenButton = new QIToolButton(this);
-            if (m_pOpenButton)
+            /* Prepare open button: */
+            m_pButtonOpen = new QIToolButton(this);
+            if (m_pButtonOpen)
             {
-                m_pOpenButton->setIcon(UIIconPool::iconSet(":/reset_warnings_16px.png"));
-                m_pOpenButton->setCheckable(true);
-                connect(m_pOpenButton, &QIToolButton::toggled, this, &UINotificationCenter::sltHandleOpenButtonToggled);
-                m_pLayoutButtons->addWidget(m_pOpenButton);
+                m_pButtonOpen->setIcon(UIIconPool::iconSet(":/reset_warnings_16px.png"));
+                m_pButtonOpen->setCheckable(true);
+                connect(m_pButtonOpen, &QIToolButton::toggled, this, &UINotificationCenter::sltHandleOpenButtonToggled);
+                m_pLayoutButtons->addWidget(m_pButtonOpen);
             }
 
@@ -498 +498 @@
             m_pLayoutButtons->addStretch(1);
 
-            /* Prepare keep-button: */
-            m_pKeepButton = new QIToolButton(this);
-            if (m_pKeepButton)
+            /* Prepare keep-finished button: */
+            m_pButtonKeepFinished = new QIToolButton(this);
+            if (m_pButtonKeepFinished)
             {
-                m_pKeepButton->setIcon(UIIconPool::iconSet(":/pin_16px.png"));
-                m_pKeepButton->setCheckable(true);
-                m_pKeepButton->setChecked(gEDataManager->keepSuccessfullNotificationProgresses());
-                connect(m_pKeepButton, &QIToolButton::toggled, this, &UINotificationCenter::sltHandleKeepButtonToggled);
-                m_pLayoutButtons->addWidget(m_pKeepButton);
+                m_pButtonKeepFinished->setIcon(UIIconPool::iconSet(":/pin_16px.png"));
+                m_pButtonKeepFinished->setCheckable(true);
+                m_pButtonKeepFinished->setChecked(gEDataManager->keepSuccessfullNotificationProgresses());
+                connect(m_pButtonKeepFinished, &QIToolButton::toggled, this, &UINotificationCenter::sltHandleKeepButtonToggled);
+                m_pLayoutButtons->addWidget(m_pButtonKeepFinished);
             }
 
-            /* Prepare remove-finished-button: */
-            m_pRemoveFinishedButton = new QIToolButton(this);
-            if (m_pRemoveFinishedButton)
+            /* Prepare remove-finished button: */
+            m_pButtonRemoveFinished = new QIToolButton(this);
+            if (m_pButtonRemoveFinished)
             {
-                m_pRemoveFinishedButton->setIcon(UIIconPool::iconSet(":/edata_remove_16px_x3.png"));
-                connect(m_pRemoveFinishedButton, &QIToolButton::clicked, this, &UINotificationCenter::sltHandleRemoveFinishedButtonClicked);
-                m_pLayoutButtons->addWidget(m_pRemoveFinishedButton);
+                m_pButtonRemoveFinished->setIcon(UIIconPool::iconSet(":/edata_remove_16px_x3.png"));
+                connect(m_pButtonRemoveFinished, &QIToolButton::clicked, this, &UINotificationCenter::sltHandleRemoveFinishedButtonClicked);
+                m_pLayoutButtons->addWidget(m_pButtonRemoveFinished);
             }
 
@@ -729 +729 @@
     int iL, iT, iR, iB;
     m_pLayoutMain->getContentsMargins(&iL, &iT, &iR, &iB);
-    const int iMinimumButtonWidth = m_pOpenButton->minimumSizeHint().width() + iL + iR;
+    const int iMinimumButtonWidth = m_pButtonOpen->minimumSizeHint().width() + iL + iR;
 
     /* Make sure we have some default width if there is no contents: */
@@ -744 +744 @@
     QRegion region;
     if (!m_iAnimatedValue)
-        region += QRect(m_pOpenButton->mapToParent(QPoint(0, 0)), m_pOpenButton->size());
+        region += QRect(m_pButtonOpen->mapToParent(QPoint(0, 0)), m_pButtonOpen->size());
     setMask(region);
 }

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

@@ -162 +162 @@
     /** Holds the buttons layout instance. */
     QHBoxLayout  *m_pLayoutButtons;
-    /** Holds the open-button instance. */
-    QIToolButton *m_pOpenButton;
-    /** Holds the keep-button instance. */
-    QIToolButton *m_pKeepButton;
-    /** Holds the remove-finished-button instance. */
-    QIToolButton *m_pRemoveFinishedButton;
+    /** Holds the open button instance. */
+    QIToolButton *m_pButtonOpen;
+    /** Holds the keep-finished button instance. */
+    QIToolButton *m_pButtonKeepFinished;
+    /** Holds the remove-finished button instance. */
+    QIToolButton *m_pButtonRemoveFinished;
     /** Holds the items layout instance. */
     QVBoxLayout  *m_pLayoutItems;