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

Initialize SyncthingNotifier correctly in Plasmoid

This commit is contained in:
Martchus 2018-05-15 22:27:54 +02:00
parent 43cd6fc2cc
commit e7d365f849
2 changed files with 49 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
connector/syncthingnotifier.h
View File

@ -52,16 +52,28 @@ class LIB_SYNCTHING_CONNECTOR_EXPORT SyncthingNotifier : public QObject {
Q_OBJECT
Q_PROPERTY(SyncthingHighLevelNotification enabledNotifications READ enabledNotifications WRITE setEnabledNotifications)
Q_PROPERTY(bool ignoreInavailabilityAfterStart READ ignoreInavailabilityAfterStart WRITE setIgnoreInavailabilityAfterStart)
#ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
Q_PROPERTY(const SyncthingService *service READ service WRITE setService)
#endif
Q_PROPERTY(const SyncthingProcess *process READ process WRITE setProcess)
public:
SyncthingNotifier(const SyncthingConnection &connection, QObject *parent = nullptr);
SyncthingHighLevelNotification enabledNotifications() const;
unsigned int ignoreInavailabilityAfterStart() const;
#ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
const SyncthingService *service() const;
#endif
const SyncthingProcess *process() const;
public Q_SLOTS:
void setEnabledNotifications(SyncthingHighLevelNotification enabledNotifications);
void setIgnoreInavailabilityAfterStart(unsigned int seconds);
#ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
void setService(const SyncthingService *service);
#endif
void setProcess(const SyncthingProcess *process);
Q_SIGNALS:
///! \brief Emitted when the connection status changes. Also provides the previous status.
@ -91,9 +103,9 @@ private:
const SyncthingConnection &m_connection;
#ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
const SyncthingService *const m_service;
const SyncthingService *m_service;
#endif
const SyncthingProcess *const m_process;
const SyncthingProcess *m_process;
SyncthingHighLevelNotification m_enabledNotifications;
SyncthingStatus m_previousStatus;
unsigned int m_ignoreInavailabilityAfterStart;
@ -132,6 +144,40 @@ inline void SyncthingNotifier::setIgnoreInavailabilityAfterStart(unsigned int se
m_ignoreInavailabilityAfterStart = seconds;
}
#ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
/*!
* \brief Returns the SyncthingService to be taken into account. Might be nullptr.
*/
inline const SyncthingService *SyncthingNotifier::service() const
{
return m_service;
}
/*!
* \brief Sets the SyncthingService to be taken into account. Might be nullptr.
*/
inline void SyncthingNotifier::setService(const SyncthingService *service)
{
m_service = service;
}
#endif
/*!
* \brief Returns the SyncthingProcess to be taken into account. Might be nullptr.
*/
inline const SyncthingProcess *SyncthingNotifier::process() const
{
return m_process;
}
/*!
* \brief Sets the SyncthingProcess to be taken into account. Might be nullptr.
*/
inline void SyncthingNotifier::setProcess(const SyncthingProcess *process)
{
m_process = process;
}
} // namespace Data
#endif // DATA_SYNCTHINGNOTIFIER_H

1
plasmoid/lib/syncthingapplet.cpp
View File

@ -58,6 +58,7 @@ SyncthingApplet::SyncthingApplet(QObject *parent, const QVariantList &data)
, m_currentConnectionConfig(-1)
, m_initialized(false)
{
m_notifier.setService(&m_service);
qmlRegisterUncreatableMetaObject(Data::staticMetaObject, "martchus.syncthingplasmoid", 0, 6, "Data", QStringLiteral("only enums"));
}