diff --git a/src/gui/notificationwidget.cpp b/src/gui/notificationwidget.cpp index ac65aaaf7a..1ef0f8c48d 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 @@ -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(); } diff --git a/src/gui/notificationwidget.ui b/src/gui/notificationwidget.ui index 886777278d..c8d34017d9 100644 --- a/src/gui/notificationwidget.ui +++ b/src/gui/notificationwidget.ui @@ -15,7 +15,7 @@ - + @@ -28,7 +28,7 @@ - ../../resources/bell.png + ../../../../resources/bell.png @@ -58,11 +58,30 @@ - - - QDialogButtonBox::Ok - - + + + + + + 8 + + + + TextLabel + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + QDialogButtonBox::Ok + + + +