Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaas Freitag <freitag@owncloud.com>2016-03-18 10:21:54 +0300
committerKlaas Freitag <freitag@owncloud.com>2016-03-18 10:21:54 +0300
commit05de710b672f91cbc5bfe57d86ff429092b05487 (patch)
treeb7903ba8ec8cbb02fa06aeb3558b9596b2e89a64 /src/gui/notificationwidget.cpp
parentf71fdab997fffa2cbf832f46dbaf9b1a568062e4 (diff)
Notifications: Display timestamp of the notification in the widget
Diffstat (limited to 'src/gui/notificationwidget.cpp')
-rw-r--r--src/gui/notificationwidget.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/notificationwidget.cpp b/src/gui/notificationwidget.cpp
index ac65aaaf7..1ef0f8c48 100644
--- a/src/gui/notificationwidget.cpp
+++ b/src/gui/notificationwidget.cpp
@@ -13,6 +13,7 @@
#include "notificationwidget.h"
#include "QProgressIndicator.h"
+#include "utility.h"
#include <QPushButton>
@@ -30,6 +31,7 @@ NotificationWidget::NotificationWidget(QWidget *parent) : QWidget(parent)
void NotificationWidget::setActivity(const Activity& activity)
{
_myActivity = activity;
+ QLocale locale;
Q_ASSERT( !activity._accName.isEmpty() );
_accountName = activity._accName;
@@ -46,6 +48,9 @@ void NotificationWidget::setActivity(const Activity& activity)
_ui._notifIcon->setMinimumHeight(64);
_ui._notifIcon->show();
+ QString tText = tr("Created at %1").arg(Utility::timeAgoInWords(activity._dateTime));
+ _ui._timeLabel->setText(tText);
+
// always remove the buttons
foreach( auto button, _ui._buttonBox->buttons() ) {
_ui._buttonBox->removeButton(button);
@@ -96,7 +101,6 @@ void NotificationWidget::slotNotificationRequestFinished(int statusCode)
} else {
// the call to the ocs API succeeded.
_ui._buttonBox->hide();
-
}
_progressIndi->stopAnimation();
}