Changeset 91236 in vbox for trunk/src/VBox/Frontends

Timestamp:

Sep 14, 2021 5:05:22 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

146894

Message:

FE/Qt: bugref:10067: UINotificationCenter: Togglable option to keep finished progresses alive.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataManager.cpp (modified) (1 diff)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• notificationcenter/UINotificationCenter.cpp (modified) (10 diffs)
• notificationcenter/UINotificationCenter.h (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -2345 +2345 @@
 }
 
+void UIExtraDataManager::setKeepSuccessfullNotificationProgresses(bool fKeep)
+{
+    /* 'True' if feature allowed, null-string otherwise: */
+    setExtraDataString(GUI_KeepSuccessfullNotificationProgresses, toFeatureAllowed(fKeep));
+}
+
 #if !defined(VBOX_BLEEDING_EDGE) && !defined(DEBUG)
 QString UIExtraDataManager::preventBetaBuildWarningForVersion()

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h

@@ -186 +186 @@
         /** Returns whether successfull notification-progresses should NOT close automatically. */
         bool keepSuccessfullNotificationProgresses();
+        /** Defines whether successfull notification-progresses should NOT close (@a fKeep) automatically. */
+        void setKeepSuccessfullNotificationProgresses(bool fKeep);
 
 #if !defined(VBOX_BLEEDING_EDGE) && !defined(DEBUG)

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

@@ -32 +32 @@
 /* GUI includes: */
 #include "QIToolButton.h"
+#include "UIExtraDataManager.h"
 #include "UIIconPool.h"
 #include "UINotificationCenter.h"
@@ -154 +155 @@
 
     /* Reparent: */
-    QWidget::setParent(pParent);
+    QIWithRetranslateUI<QWidget>::setParent(pParent);
 
     /* Install filter to new parent: */
@@ -198 +199 @@
 
 UINotificationCenter::UINotificationCenter(QWidget *pParent)
-    : QWidget(pParent)
+    : QIWithRetranslateUI<QWidget>(pParent)
     , m_pModel(0)
     , m_pLayoutMain(0)
-    , m_pLayoutOpenButton(0)
+    , m_pLayoutButtons(0)
     , m_pOpenButton(0)
+    , m_pKeepButton(0)
     , m_pLayoutItems(0)
     , m_pStateMachineSliding(0)
@@ -215 +217 @@
 {
     s_pInstance = 0;
+}
+
+void UINotificationCenter::retranslateUi()
+{
+    if (m_pOpenButton)
+        m_pOpenButton->setToolTip(tr("Open notification center"));
+    if (m_pKeepButton)
+        m_pKeepButton->setToolTip(tr("Keep finished progresses"));
 }
 
@@ -238 +248 @@
 
     /* Call to base-class: */
-    return QWidget::eventFilter(pObject, pEvent);
+    return QIWithRetranslateUI<QWidget>::eventFilter(pObject, pEvent);
 }
 
@@ -266 +276 @@
 
     /* Call to base-class: */
-    return QWidget::event(pEvent);
+    return QIWithRetranslateUI<QWidget>::event(pEvent);
 }
 
@@ -291 +301 @@
     else
         emit sigClose();
+}
+
+void UINotificationCenter::sltHandleKeepButtonToggled(bool fToggled)
+{
+    gEDataManager->setKeepSuccessfullNotificationProgresses(fToggled);
 }
 
@@ -352 +367 @@
     prepareStateMachineSliding();
     prepareOpenTimer();
+
+    /* Apply language settings: */
+    retranslateUi();
 }
 
@@ -368 +386 @@
     if (m_pLayoutMain)
     {
-        /* Prepare open-button layout: */
-        m_pLayoutOpenButton = new QHBoxLayout;
-        if (m_pLayoutOpenButton)
-        {
-            m_pLayoutOpenButton->setContentsMargins(0, 0, 0, 0);
+        /* Prepare buttons layout: */
+        m_pLayoutButtons = new QHBoxLayout;
+        if (m_pLayoutButtons)
+        {
+            m_pLayoutButtons->setContentsMargins(0, 0, 0, 0);
 
             /* Prepare open-button: */
@@ -381 +399 @@
                 m_pOpenButton->setCheckable(true);
                 connect(m_pOpenButton, &QIToolButton::toggled, this, &UINotificationCenter::sltHandleOpenButtonToggled);
-                m_pLayoutOpenButton->addWidget(m_pOpenButton);
+                m_pLayoutButtons->addWidget(m_pOpenButton);
             }
 
-            m_pLayoutOpenButton->addStretch();
+            /* Prepare keep-button: */
+            m_pKeepButton = new QIToolButton(this);
+            if (m_pKeepButton)
+            {
+                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_pLayoutButtons->addStretch();
 
             /* Add to layout: */
-            m_pLayoutMain->addLayout(m_pLayoutOpenButton);
+            m_pLayoutMain->addLayout(m_pLayoutButtons);
         }
 

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

@@ -27 +27 @@
 
 /* GUI includes: */
+#include "QIWithRetranslateUI.h"
 #include "UILibraryDefs.h"
 #include "UINotificationObjects.h"
@@ -41 +42 @@
 
 /** QWidget-based notification-center overlay. */
-class SHARED_LIBRARY_STUFF UINotificationCenter : public QWidget
+class SHARED_LIBRARY_STUFF UINotificationCenter : public QIWithRetranslateUI<QWidget>
 {
     Q_OBJECT;
@@ -80 +81 @@
     virtual ~UINotificationCenter() /* override final */;
 
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override final */;
+
     /** Preprocesses any Qt @a pEvent for passed @a pObject. */
     virtual bool eventFilter(QObject *pObject, QEvent *pEvent) /* override final */;
@@ -93 +97 @@
     /** Issues request to make open button @a fToggled. */
     void sltHandleOpenButtonToggled(bool fToggled);
+    /** Toggles notification-progresses keep approach. */
+    void sltHandleKeepButtonToggled(bool fToggled);
+
     /** Handles open-timer timeout. */
     void sltHandleOpenTimerTimeout();
@@ -135 +142 @@
     /** Holds the main layout instance. */
     QVBoxLayout  *m_pLayoutMain;
-    /** Holds the open button layout instance. */
-    QHBoxLayout  *m_pLayoutOpenButton;
+    /** 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 items layout instance. */
     QVBoxLayout  *m_pLayoutItems;