mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-26 15:06:08 +03:00
Code Issues Projects Releases Packages Wiki Activity

Notifications: Do a GUI tray notification if new notifciations arrive.

Browse source 
Show a GUI notification once an hour if no new notifications arrive
to not annoy users.
This commit is contained in:
Klaas Freitag 2016-03-10 14:49:31 +01:00
parent 8a0ce463da
commit 903e79a7c4
2 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/gui/activitywidget.cpp
View file

@ -478,6 +478,7 @@ void ActivityWidget::slotNotificationsReceived(const QVariantMap& json, int stat
qDebug() << "Notifications for " << ai->account()->displayName() << notifies; qDebug() << "Notifications for " << ai->account()->displayName() << notifies;
ActivityList list; ActivityList list;
int newGuiLogs = 0;
foreach( auto element, notifies ) { foreach( auto element, notifies ) {
Activity a; Activity a;
@ -506,10 +507,31 @@ void ActivityWidget::slotNotificationsReceived(const QVariantMap& json, int stat
a._links.append(al); a._links.append(al);
} }
// handle gui logs. In order to NOT annoy the user with every fetching of the
// notifications the notification id is stored in a Set. Only if an id
// is not in the set, it qualifies for guiLog.
// Important: The _guiLoggedNotifications set must be wiped regularly which
// will repeat the gui log.
// after one hour, clear the gui log notification store
if( _guiLogTimer.elapsed() > 60*1000 ) {
_guiLoggedNotifications.clear();
}
if( !_guiLoggedNotifications.contains(a._id)) {
newGuiLogs++;
_guiLoggedNotifications.insert(a._id);
}
list.append(a); list.append(a);
} }
emit newNotificationList( list ); emit newNotificationList( list );
if( newGuiLogs > 0 ) {
// restart the gui log timer now that we show a notification
_guiLogTimer.restart();
emit guiLog(tr("Notifications - Action Required"),
tr("You received %n new notification(s) from the server!", "", newGuiLogs));
}
_notificationJob->deleteLater(); _notificationJob->deleteLater();
_notificationJob = 0; _notificationJob = 0;
} }
@ -615,6 +637,7 @@ ActivitySettings::ActivitySettings(QWidget *parent)
_activityTabId = _tab->insertTab(0, _activityWidget, Theme::instance()->applicationIcon(), tr("Server Activity")); _activityTabId = _tab->insertTab(0, _activityWidget, Theme::instance()->applicationIcon(), tr("Server Activity"));
connect(_activityWidget, SIGNAL(copyToClipboard()), this, SLOT(slotCopyToClipboard())); connect(_activityWidget, SIGNAL(copyToClipboard()), this, SLOT(slotCopyToClipboard()));
connect(_activityWidget, SIGNAL(hideAcitivityTab(bool)), this, SLOT(setActivityTabHidden(bool))); connect(_activityWidget, SIGNAL(hideAcitivityTab(bool)), this, SLOT(setActivityTabHidden(bool)));
connect(_activityWidget, SIGNAL(guiLog(QString,QString)), this, SIGNAL(guiLog(QString,QString)));
_protocolWidget = new ProtocolWidget(this); _protocolWidget = new ProtocolWidget(this);
_tab->insertTab(1, _protocolWidget, Theme::instance()->syncStateIcon(SyncResult::Success), tr("Sync Protocol")); _tab->insertTab(1, _protocolWidget, Theme::instance()->syncStateIcon(SyncResult::Success), tr("Sync Protocol"));

3
src/gui/activitywidget.h
View file

@ -199,6 +199,9 @@ private:
QPointer<JsonApiJob> _notificationJob; QPointer<JsonApiJob> _notificationJob;
ActivityListModel *_model; ActivityListModel *_model;
QVBoxLayout *_notificationsLayout; QVBoxLayout *_notificationsLayout;
QElapsedTimer _guiLogTimer;
QSet<int> _guiLoggedNotifications;
}; };