* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
+#include "systemtray.h"
+
#include <QApplication>
#include <QMenu>
-#include "systemtray.h"
-
#include "action.h"
#include "actioncollection.h"
#include "client.h"
+#include "icon.h"
#include "qtui.h"
-#ifdef HAVE_KDE4
-# include <KMenu>
-# include <KWindowInfo>
-# include <KWindowSystem>
-#endif
-
SystemTray::SystemTray(QWidget *parent)
: QObject(parent),
_associatedWidget(parent)
ActionCollection *coll = QtUi::actionCollection("General");
_minimizeRestoreAction = new Action(tr("&Minimize"), this, this, SLOT(minimizeRestore()));
-#ifdef HAVE_KDE4
- KMenu *kmenu;
- _trayMenu = kmenu = new KMenu();
- kmenu->addTitle(QIcon::fromTheme(iconName(State::Active)), "Quassel IRC");
-#else
_trayMenu = new QMenu(associatedWidget());
-#endif
-
_trayMenu->setTitle("Quassel IRC");
-
-#ifndef HAVE_KDE4
_trayMenu->setAttribute(Qt::WA_Hover);
-#endif
_trayMenu->addAction(coll->action("ConnectCore"));
_trayMenu->addAction(coll->action("DisconnectCore"));
_trayMenu->addSeparator();
_trayMenu->addAction(_minimizeRestoreAction);
_trayMenu->addAction(coll->action("Quit"));
- connect(_trayMenu, SIGNAL(aboutToShow()), SLOT(trayMenuAboutToShow()));
+ connect(_trayMenu, &QMenu::aboutToShow, this, &SystemTray::trayMenuAboutToShow);
- connect(QtUi::instance(), SIGNAL(iconThemeRefreshed()), this, SIGNAL(iconsChanged()));
+ connect(QtUi::instance(), &QtUi::iconThemeRefreshed, this, &SystemTray::iconsChanged);
_blinkTimer.setInterval(1000);
_blinkTimer.setSingleShot(false);
- connect(&_blinkTimer, SIGNAL(timeout()), SLOT(onBlinkTimeout()));
+ connect(&_blinkTimer, &QTimer::timeout, this, &SystemTray::onBlinkTimeout);
}
{
if (mode != _mode) {
_mode = mode;
-#ifdef HAVE_KDE4
- if (_trayMenu) {
- if (mode == Mode::Legacy) {
- _trayMenu->setWindowFlags(Qt::Popup);
- }
- else {
- _trayMenu->setWindowFlags(Qt::Window);
- }
- }
-#endif
emit modeChanged(mode);
}
}