Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prevent notification about disconnect on startup

This commit is contained in:
Martchus 2016-12-11 19:19:14 +01:00
parent 2b75f1f3e5
commit 5b4a0ef51e
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tray/gui/trayicon.cpp
View File

@ -26,6 +26,7 @@ namespace QtGui {
*/
TrayIcon::TrayIcon(QObject *parent) :
QSystemTrayIcon(parent),
m_initialized(false),
m_size(QSize(128, 128)),
m_statusIconDisconnected(QIcon(renderSvgImage(QStringLiteral(":/icons/hicolor/scalable/status/syncthing-disconnected.svg")))),
m_statusIconIdling(QIcon(renderSvgImage(QStringLiteral(":/icons/hicolor/scalable/status/syncthing-ok.svg")))),
@ -74,6 +75,8 @@ TrayIcon::TrayIcon(QObject *parent) :
connect(connection, &SyncthingConnection::error, this, &TrayIcon::showInternalError);
connect(connection, &SyncthingConnection::newNotification, this, &TrayIcon::showSyncthingNotification);
connect(connection, &SyncthingConnection::statusChanged, this, &TrayIcon::updateStatusIconAndText);
m_initialized = true;
}
void TrayIcon::handleActivated(QSystemTrayIcon::ActivationReason reason)
@ -154,7 +157,7 @@ void TrayIcon::updateStatusIconAndText(SyncthingStatus status)
} else {
setToolTip(tr("Not connected to Syncthing"));
}
if(settings.notifyOn.disconnect) {
if(m_initialized && settings.notifyOn.disconnect) {
#ifdef QT_UTILITIES_SUPPORT_DBUS_NOTIFICATIONS
if(settings.dbusNotifications) {
m_disconnectedNotification.show();

1
tray/gui/trayicon.h
View File

@ -41,6 +41,7 @@ private slots:
private:
QPixmap renderSvgImage(const QString &path);
bool m_initialized;
const QSize m_size;
const QIcon m_statusIconDisconnected;
const QIcon m_statusIconIdling;