iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- Show/hide main window when KDE tray item clicked.

Browse Source 
- Add 'Show Window' to tray item menu.
BUG:137
This commit is contained in:
craig.p.drummond
2012-12-09 10:42:16 +00:00
parent 9bffe212dd
commit 3cb502dbb9
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -9,6 +9,8 @@
0.9.1
-----
1. Fix saving of 'Store covers in MPD dir' setting.
2. Show/hide main window when KDE tray item clicked.
3. Add 'Show Window' to tray item menu.
0.9.0
-----

26
gui/trayitem.cpp
View File

@@ -73,13 +73,12 @@ void TrayItem::setup()
trayItemMenu->addAction(mw->stopTrackAction);
trayItemMenu->addAction(mw->nextTrackAction);
trayItem->setContextMenu(trayItemMenu);
if (qgetenv("XDG_CURRENT_DESKTOP")=="Unity") {
trayItem->setStatus(KStatusNotifierItem::Active);
trayItemMenu->addSeparator();
trayItemMenu->addAction(mw->restoreAction);
}
trayItem->setStatus(KStatusNotifierItem::Active);
trayItemMenu->addSeparator();
trayItemMenu->addAction(mw->restoreAction);
connect(trayItem, SIGNAL(scrollRequested(int, Qt::Orientation)), this, SLOT(trayItemScrollRequested(int, Qt::Orientation)));
connect(trayItem, SIGNAL(secondaryActivateRequested(const QPoint &)), mw, SLOT(playPauseTrack()));
connect(trayItem, SIGNAL(activateRequested(bool, const QPoint &)), this, SLOT(clicked()));
#else
if (!QSystemTrayIcon::isSystemTrayAvailable()) {
trayItem = NULL;
@@ -93,12 +92,8 @@ void TrayItem::setup()
trayItemMenu->addAction(mw->playPauseTrackAction);
trayItemMenu->addAction(mw->stopTrackAction);
trayItemMenu->addAction(mw->nextTrackAction);
#if !defined Q_OS_WIN
if (qgetenv("XDG_CURRENT_DESKTOP")=="Unity") {
trayItemMenu->addSeparator();
trayItemMenu->addAction(mw->restoreAction);
}
#endif
trayItemMenu->addSeparator();
trayItemMenu->addAction(mw->restoreAction);
trayItemMenu->addSeparator();
trayItemMenu->addAction(mw->quitAction);
trayItem->setContextMenu(trayItemMenu);
@@ -110,6 +105,15 @@ void TrayItem::setup()
}
#ifdef ENABLE_KDE_SUPPORT
void TrayItem::clicked()
{
if (mw->isHidden()) {
mw->restoreWindow();
} else {
mw->hide();
}
}
void TrayItem::trayItemScrollRequested(int delta, Qt::Orientation orientation)
{
if (Qt::Vertical==orientation) {

1
gui/trayitem.h
View File

@@ -76,6 +76,7 @@ public:
private Q_SLOTS:
#ifdef ENABLE_KDE_SUPPORT
void clicked();
void trayItemScrollRequested(int delta, Qt::Orientation orientation);
void notificationClosed();
#else