[Pkg-owncloud-commits] [owncloud-client] 264/470: NotificationWidget: Handle empty message and subject properly.

Sandro Knauß hefee-guest at moszumanska.debian.org
Thu May 12 16:25:11 UTC 2016


This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit bc6eebddf40fd21f076e17bfe722ac70188b34f1
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Mon Apr 4 12:45:39 2016 +0200

    NotificationWidget: Handle empty message and subject properly.
---
 src/gui/notificationwidget.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/gui/notificationwidget.cpp b/src/gui/notificationwidget.cpp
index 33961e5..e38619f 100644
--- a/src/gui/notificationwidget.cpp
+++ b/src/gui/notificationwidget.cpp
@@ -36,12 +36,12 @@ void NotificationWidget::setActivity(const Activity& activity)
     _accountName = activity._accName;
 
     // _ui._headerLabel->setText( );
+    _ui._subjectLabel->setVisible( !activity._subject.isEmpty() );
+    _ui._messageLabel->setVisible( !activity._message.isEmpty() );
+
     _ui._subjectLabel->setText(activity._subject);
-    if( activity._message.isEmpty()) {
-        _ui._messageLabel->hide();
-    } else {
-        _ui._messageLabel->setText(activity._message);
-    }
+    _ui._messageLabel->setText(activity._message);
+
     _ui._notifIcon->setPixmap(QPixmap(":/client/resources/bell.png"));
     _ui._notifIcon->setMinimumWidth(64);
     _ui._notifIcon->setMinimumHeight(64);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git



More information about the Pkg-owncloud-commits mailing list