projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename the icons for inactive and alerted to conform with icon naming spec
[quassel.git]
/
src
/
qtui
/
systemtray.cpp
diff --git
a/src/qtui/systemtray.cpp
b/src/qtui/systemtray.cpp
index
afa7964
..
0bafd5e
100644
(file)
--- a/
src/qtui/systemtray.cpp
+++ b/
src/qtui/systemtray.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
0
by the Quassel Project *
+ * Copyright (C) 2005-201
2
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-38,9
+38,10
@@
SystemTray::SystemTray(QWidget *parent)
: QObject(parent),
_mode(Invalid),
_state(Passive),
: QObject(parent),
_mode(Invalid),
_state(Passive),
- _passiveIcon(DesktopIcon("quassel_inactive")),
+ _shouldBeVisible(true),
+ _passiveIcon(DesktopIcon("quassel-inactive")),
_activeIcon(DesktopIcon("quassel")),
_activeIcon(DesktopIcon("quassel")),
- _needsAttentionIcon(DesktopIcon("quassel
_
message")),
+ _needsAttentionIcon(DesktopIcon("quassel
-
message")),
_trayMenu(0),
_associatedWidget(parent)
{
_trayMenu(0),
_associatedWidget(parent)
{
@@
-62,7
+63,7
@@
void SystemTray::init() {
#ifdef HAVE_KDE
KMenu *kmenu;
_trayMenu = kmenu = new KMenu();
#ifdef HAVE_KDE
KMenu *kmenu;
_trayMenu = kmenu = new KMenu();
- kmenu->addTitle(
qApp->windowIcon()
, "Quassel IRC");
+ kmenu->addTitle(
_activeIcon
, "Quassel IRC");
#else
_trayMenu = new QMenu(associatedWidget());
#endif
#else
_trayMenu = new QMenu(associatedWidget());
#endif
@@
-81,6
+82,9
@@
void SystemTray::init() {
_trayMenu->addAction(coll->action("Quit"));
connect(_trayMenu, SIGNAL(aboutToShow()), SLOT(trayMenuAboutToShow()));
_trayMenu->addAction(coll->action("Quit"));
connect(_trayMenu, SIGNAL(aboutToShow()), SLOT(trayMenuAboutToShow()));
+
+ NotificationSettings notificationSettings;
+ notificationSettings.initAndNotify("Systray/Animate", this, SLOT(enableAnimationChanged(QVariant)), true);
}
void SystemTray::trayMenuAboutToShow() {
}
void SystemTray::trayMenuAboutToShow() {
@@
-135,7
+139,7
@@
void SystemTray::setAlert(bool alerted) {
}
void SystemTray::setVisible(bool visible) {
}
void SystemTray::setVisible(bool visible) {
- Q_UNUSED(visible)
+ _shouldBeVisible = visible;
}
void SystemTray::setToolTip(const QString &title, const QString &subtitle) {
}
void SystemTray::setToolTip(const QString &title, const QString &subtitle) {
@@
-159,3
+163,8
@@
void SystemTray::activate(SystemTray::ActivationReason reason) {
void SystemTray::minimizeRestore() {
GraphicalUi::toggleMainWidget();
}
void SystemTray::minimizeRestore() {
GraphicalUi::toggleMainWidget();
}
+
+void SystemTray::enableAnimationChanged(const QVariant &v) {
+ _animationEnabled = v.toBool();
+ emit animationEnabledChanged(v.toBool());
+}