* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
+#include "systraynotificationbackend.h"
+
#include <QApplication>
#include <QCheckBox>
#include <QGroupBox>
-#include <QIcon>
#include <QHBoxLayout>
-#include "systraynotificationbackend.h"
-
#include "client.h"
#include "clientsettings.h"
+#include "icon.h"
#include "mainwin.h"
#include "networkmodel.h"
#include "qtui.h"
#include "systemtray.h"
SystrayNotificationBackend::SystrayNotificationBackend(QObject *parent)
- : AbstractNotificationBackend(parent),
- _blockActivation(false)
+ : AbstractNotificationBackend(parent)
{
NotificationSettings notificationSettings;
- notificationSettings.initAndNotify("Systray/ShowBubble", this, SLOT(showBubbleChanged(QVariant)), true);
+ notificationSettings.initAndNotify("Systray/ShowBubble", this, &SystrayNotificationBackend::showBubbleChanged, true);
- connect(QtUi::mainWindow()->systemTray(), SIGNAL(messageClicked(uint)), SLOT(notificationActivated(uint)));
- connect(QtUi::mainWindow()->systemTray(), SIGNAL(activated(SystemTray::ActivationReason)),
- SLOT(notificationActivated(SystemTray::ActivationReason)));
+ connect(QtUi::mainWindow()->systemTray(), &SystemTray::messageClicked,
+ this, selectOverload<uint>(&SystrayNotificationBackend::onNotificationActivated));
+ connect(QtUi::mainWindow()->systemTray(), &SystemTray::activated,
+ this, selectOverload<SystemTray::ActivationReason>(&SystrayNotificationBackend::onNotificationActivated));
QApplication::instance()->installEventFilter(this);
}
-void SystrayNotificationBackend::notificationActivated(uint notificationId)
+void SystrayNotificationBackend::onNotificationActivated(uint notificationId)
{
if (!_blockActivation) {
QList<Notification>::iterator i = _notifications.begin();
}
-void SystrayNotificationBackend::notificationActivated(SystemTray::ActivationReason reason)
+void SystrayNotificationBackend::onNotificationActivated(SystemTray::ActivationReason reason)
{
if (reason == SystemTray::Trigger) {
- if (_notifications.count())
- notificationActivated(_notifications.last().notificationId);
- else
+ if (_notifications.count()) {
+ onNotificationActivated(_notifications.last().notificationId);
+ }
+ else {
GraphicalUi::toggleMainWidget();
+ }
}
}
SystrayNotificationBackend::ConfigWidget::ConfigWidget(QWidget *parent) : SettingsPage("Internal", "SystrayNotification", parent)
{
_showBubbleBox = new QCheckBox(tr("Show a message in a popup"));
- _showBubbleBox->setIcon(QIcon::fromTheme("dialog-information"));
- connect(_showBubbleBox, SIGNAL(toggled(bool)), this, SLOT(widgetChanged()));
- QHBoxLayout *layout = new QHBoxLayout(this);
+ _showBubbleBox->setIcon(icon::get("dialog-information"));
+ connect(_showBubbleBox, &QAbstractButton::toggled, this, &ConfigWidget::widgetChanged);
+ auto *layout = new QHBoxLayout(this);
layout->addWidget(_showBubbleBox);
}