SystemTray::SystemTray(QWidget *parent)
: QObject(parent),
- _passiveIcon(QIcon::fromTheme("inactive-quassel", QIcon(":/icons/inactive-quassel.png"))),
- _activeIcon(QIcon::fromTheme("quassel", QIcon(":/icons/quassel.png"))),
- _needsAttentionIcon(QIcon::fromTheme("message-quassel", QIcon(":/icons/message-quassel.png"))),
_associatedWidget(parent)
{
Q_ASSERT(parent);
-}
-
-
-SystemTray::~SystemTray()
-{
- _trayMenu->deleteLater();
-}
+ NotificationSettings{}.initAndNotify("Systray/Animate", this, SLOT(enableAnimationChanged(QVariant)), true);
+ UiStyleSettings{}.initAndNotify("Icons/InvertTray", this, SLOT(invertTrayIconChanged(QVariant)), false);
-void SystemTray::init()
-{
ActionCollection *coll = QtUi::actionCollection("General");
_minimizeRestoreAction = new Action(tr("&Minimize"), this, this, SLOT(minimizeRestore()));
_trayMenu->addSeparator();
_trayMenu->addAction(_minimizeRestoreAction);
_trayMenu->addAction(coll->action("Quit"));
-
connect(_trayMenu, SIGNAL(aboutToShow()), SLOT(trayMenuAboutToShow()));
- NotificationSettings notificationSettings;
- notificationSettings.initAndNotify("Systray/Animate", this, SLOT(enableAnimationChanged(QVariant)), true);
+ connect(QtUi::instance(), SIGNAL(iconThemeRefreshed()), this, SIGNAL(iconsChanged()));
}
-QWidget *SystemTray::associatedWidget() const
+SystemTray::~SystemTray()
{
- return _associatedWidget;
+ _trayMenu->deleteLater();
}
-bool SystemTray::isSystemTrayAvailable() const
+QWidget *SystemTray::associatedWidget() const
{
- return false;
+ return _associatedWidget;
}
-bool SystemTray::isVisible() const
+bool SystemTray::isSystemTrayAvailable() const
{
return false;
}
-bool SystemTray::shouldBeVisible() const
+bool SystemTray::isVisible() const
{
- return _shouldBeVisible;
+ return _isVisible;
}
void SystemTray::setVisible(bool visible)
{
- _shouldBeVisible = visible;
+ if (visible != _isVisible) {
+ _isVisible = visible;
+ emit visibilityChanged(visible);
+ }
}
}
-void SystemTray::setMode(Mode mode_)
+void SystemTray::setMode(Mode mode)
{
- if (mode_ != _mode) {
- _mode = mode_;
+ if (mode != _mode) {
+ _mode = mode;
#ifdef HAVE_KDE4
if (_trayMenu) {
- if (_mode == Legacy) {
+ if (mode == Mode::Legacy) {
_trayMenu->setWindowFlags(Qt::Popup);
}
else {
}
}
#endif
+ emit modeChanged(mode);
}
}
{
if (_state != state) {
_state = state;
+ emit stateChanged(state);
}
}
-QIcon SystemTray::stateIcon() const
-{
- return stateIcon(state());
-}
-
-
-QIcon SystemTray::stateIcon(State state) const
+QString SystemTray::iconName(State state) const
{
+ QString name;
switch (state) {
- case Passive:
- return _passiveIcon;
- case Active:
- return _activeIcon;
- case NeedsAttention:
- return _needsAttentionIcon;
+ case State::Passive:
+ name = "inactive-quassel-tray";
+ break;
+ case State::Active:
+ name = "active-quassel-tray";
+ break;
+ case State::NeedsAttention:
+ name = "message-quassel-tray";
+ break;
+ }
+
+ if (_trayIconInverted) {
+ name += "-inverted";
}
- return QIcon();
+
+ return name;
}
}
+void SystemTray::invertTrayIconChanged(const QVariant &v)
+{
+ _trayIconInverted = v.toBool();
+ emit iconsChanged();
+}
+
+
QString SystemTray::toolTipTitle() const
{
return _toolTipTitle;