Changeset 90388 in vbox for trunk/src

Timestamp:

Jul 29, 2021 7:57:29 AM (4 years ago)

Author:

vboxsync

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

145974

Message:

FE/Qt: bugref:10067: UINotificationObjectItem: Moving common code related to details update to separate method; Also show details on error happened.

Location:

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

Files:

• UINotificationObjectItem.cpp (modified) (3 diffs)
• UINotificationObjectItem.h (modified) (1 diff)

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

@@ -189 +189 @@
         if (m_pLabelDetails)
         {
-            m_pLabelDetails->setText(progress()->details());
             int iHint = m_pLabelName->minimumSizeHint().width()
                       + m_pLayoutUpper->spacing()
                       + m_pButtonClose->minimumSizeHint().width();
             m_pLabelDetails->setMinimumTextWidth(iHint);
+            updateDetails();
         }
 
@@ -244 +244 @@
     /* Update details with error text if any: */
     if (m_pLabelDetails)
-    {
-        const QString strDetails = progress()->details();
-        const QString strError = progress()->error();
-        const QString strFullDetails = strError.isNull()
-                                     ? strDetails
-                                     : QString("%1<br>%2").arg(strDetails, strError);
-        m_pLabelDetails->setText(strFullDetails);
-    }
+        updateDetails();
 }
 
@@ -257 +250 @@
 {
     return qobject_cast<UINotificationProgress*>(m_pObject);
+}
+
+void UINotificationProgressItem::updateDetails()
+{
+    AssertPtrReturnVoid(m_pLabelDetails);
+    const QString strDetails = progress()->details();
+    const QString strError = progress()->error();
+    const QString strFullDetails = strError.isNull()
+                                 ? strDetails
+                                 : QString("%1<br>%2").arg(strDetails, strError);
+    m_pLabelDetails->setText(strFullDetails);
+    if (!strError.isEmpty())
+    {
+        m_fToggled = true;
+        m_pLabelDetails->setVisible(m_fToggled);
+    }
 }
 

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

@@ -104 +104 @@
     /** Holds the notification-progress this item created for. */
     UINotificationProgress *progress() const;
+
+    /** Updates details. */
+    void updateDetails();
 };