Skip to content

Improve tray icon behavior and KDE integration (patch p5) #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gbcox wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Improve tray icon behavior and KDE integration (patch p5) #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions gui/mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2149,6 +2149,14 @@ void MainWindow::updateStatus(MPDStatus* const status)
}
if (status->state() != lastState && (MPDState_Playing == status->state() || MPDState_Stopped == status->state())) {
startContextTimer();
// Queue finished (end of playlist or stop-after-current)
if (status->state() == MPDState_Stopped && status->nextSongId() == -1 && Settings::self()->showPopups()) {
auto* n = new KNotification(QStringLiteral("queueFinished"));
n->setTitle(tr("Queue finished"));
n->setText(QString());
n->setUrgency(KNotification::NormalUrgency);
n->sendEvent();
}
}

// Update status info
Expand Down
77 changes: 60 additions & 17 deletions gui/trayitem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,20 @@ void TrayItem::setup()
//if (!QSystemTrayIcon::isSystemTrayAvailable()) {
// return;
//}

// Create tray backend
#if defined(USE_KSNI)
trayItem = new KStatusNotifierItem(this);
trayItem->setCategory(KStatusNotifierItem::ApplicationStatus);
trayItem->setStatus(KStatusNotifierItem::Active);
trayItemMenu = new QMenu(nullptr);
trayItem->setContextMenu(trayItemMenu);
#else
trayItem = new QSystemTrayIcon(this);
trayItem->installEventFilter(new VolumeSliderEventHandler(this));
trayItemMenu = new QMenu(nullptr);
trayItem->setContextMenu(trayItemMenu);
#endif
// Populate common menu
trayItemMenu->addAction(StdActions::self()->prevTrackAction);
trayItemMenu->addAction(StdActions::self()->playPauseTrackAction);
trayItemMenu->addAction(StdActions::self()->stopPlaybackAction);
Expand Down Expand Up @@ -162,13 +172,34 @@ void TrayItem::setup()
icon.addFile(QLatin1String(ICON_INSTALL_PREFIX "/scalable/apps/" PROJECT_REV_ID ".svg"));
}
#endif

trayItem->setIcon(icon);
#if defined(USE_KSNI)
trayItem->setToolTip(QIcon::fromTheme(QStringLiteral(PROJECT_REV_ID)), tr("Cantata"), QString());
// KStatusNotifierItem does not need show() or QSystemTrayIcon connections
#else
trayItem->setToolTip(tr("Cantata"));
trayItem->show();
connect(trayItem, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(trayItemClicked(QSystemTrayIcon::ActivationReason)));
connect(trayItem, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
this, SLOT(trayItemClicked(QSystemTrayIcon::ActivationReason)));
#endif

#endif
}

#if defined(USE_KSNI)
void TrayItem::setOverlayPaused(bool paused)
{
if (!trayItem) return;
if (paused) {
trayItem->setOverlayIconByName(QStringLiteral("media-playback-pause"));
}
else {
trayItem->setOverlayIcon(QIcon());// clear overlay
}
}
#endif

void TrayItem::trayItemClicked(QSystemTrayIcon::ActivationReason reason)
{
#ifdef Q_OS_MAC
Expand All @@ -194,22 +225,34 @@ void TrayItem::trayItemClicked(QSystemTrayIcon::ActivationReason reason)

void TrayItem::songChanged(const Song& song, bool isPlaying)
{
if (Settings::self()->showPopups()) {
bool useable = song.isStandardStream()
? !song.title.isEmpty() && !song.name().isEmpty()
: !song.title.isEmpty() && !song.artist.isEmpty() && !song.album.isEmpty();
if (useable && isPlaying) {
if (songNotif == nullptr) {
songNotif = new KNotification("newSong");
songNotif->setAutoDelete(false);
}
songNotif->setTitle(song.mainText());
songNotif->setText(song.subText());
songNotif->setImage(CurrentCover::self()->image().scaledToHeight(512, Qt::SmoothTransformation));
songNotif->setUrgency(KNotification::LowUrgency);
songNotif->sendEvent();
}
bool useable = song.isStandardStream()
? !song.title.isEmpty() && !song.name().isEmpty()
: !song.title.isEmpty() && !song.artist.isEmpty() && !song.album.isEmpty();
if (useable && isPlaying) {
// Always emit a KDE notification: Plasma can suppress popups but still keep history.
auto* n = new KNotification(QStringLiteral("newSong"));
// Ensure it maps to cantata.notifyrc (safer for per‑app settings/history)
n->setComponentName(QStringLiteral("cantata"));
n->setTitle(song.mainText());
n->setText(song.subText());
n->setImage(CurrentCover::self()->image().scaledToHeight(512, Qt::SmoothTransformation));
n->setUrgency(KNotification::LowUrgency);
n->sendEvent();
}

#if defined(USE_KSNI)
const QString title = song.isStandardStream()
? song.name()
: QStringLiteral("%1 — %2").arg(song.artist, song.title);
const QString sub = song.isStandardStream() ? song.title : song.album;
setToolTip(QStringLiteral("audio-x-generic"), title, sub);
setOverlayPaused(!isPlaying);
#else
const QString oneLine = song.isStandardStream()
? QStringLiteral("%1 — %2").arg(song.name(), song.title)
: QStringLiteral("%1 — %2").arg(song.artist, song.title);
setToolTip(QString(), oneLine, QString());
#endif
}

#ifndef Q_OS_MAC
Expand Down
48 changes: 33 additions & 15 deletions gui/trayitem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@
#include "support/icon.h"
#include <QObject>
#include <QSystemTrayIcon>
#if defined(USE_KSNI)
#include <KStatusNotifierItem>
#endif

class QMenu;
#include "config.h"

Expand All @@ -49,40 +53,54 @@ class TrayItem : public QObject {
void setToolTip(const QString&, const QString&, const QString&) {}
#else
bool isActive() const { return nullptr != trayItem; }

void setIcon(const QIcon& icon)
{
if (trayItem) {
trayItem->setIcon(icon);
}
#if defined(USE_KSNI)
if (trayItem) trayItem->setIcon(icon);
#else
if (trayItem) trayItem->setIcon(icon);
#endif
}
void setToolTip(const QString& iconName, const QString& title, const QString& subTitle)
{
if (trayItem) {
Q_UNUSED(iconName)
Q_UNUSED(subTitle)
trayItem->setToolTip(title);
}
if (!trayItem) return;
#if defined(USE_KSNI)
Q_UNUSED(subTitle)// body comes from separate call below if needed
trayItem->setToolTip(QIcon::fromTheme(iconName), title, QString());
#else
Q_UNUSED(iconName)
Q_UNUSED(subTitle)
trayItem->setToolTip(title);
#endif
}
#endif
void songChanged(const Song& song, bool isPlaying);
void updateConnections();
void updatePartitions();
void updateOutputs();

#if defined(USE_KSNI)
void setOverlayPaused(bool paused);
#endif

private Q_SLOTS:
void trayItemClicked(QSystemTrayIcon::ActivationReason reason);

private:
#ifndef Q_OS_MAC

MainWindow* mw;
QSystemTrayIcon* trayItem;
QMenu* trayItemMenu;
Action* connectionsAction;
Action* partitionsAction;
Action* outputsAction;

#if defined(USE_KSNI)
KStatusNotifierItem* trayItem = nullptr;
#else
QSystemTrayIcon* trayItem = nullptr;
#endif
QMenu* trayItemMenu = nullptr;
Action* connectionsAction = nullptr;
Action* partitionsAction = nullptr;
Action* outputsAction = nullptr;
#endif

KNotification* songNotif = nullptr;
};

Expand Down
16 changes: 9 additions & 7 deletions support/QtAwesome.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#endif

// Initializing namespaces need to happen outside a namespace
static void qtawesome_init_resources()
[[maybe_unused]] static void qtawesome_init_resources()
{
#ifdef BUNDLED_FONTAWESOME
Q_INIT_RESOURCE(QtAwesomeFree);
Expand Down Expand Up @@ -297,7 +297,7 @@ bool QtAwesome::initFontAwesome()
if (hasInit) return true;
bool success = true;

#ifdef BUNDLED_FONTAWESOME
#ifdef BUNDLED_FONTAWESOME
// The macro below internally calls "qInitResources_QtAwesome()". this initializes
// the resource system. For a .pri project this isn't required, but when building and using a
// static library the resource need to initialized first.
Expand Down Expand Up @@ -333,11 +333,11 @@ bool QtAwesome::initFontAwesome()
fd.setFontFamily(loadedFontFamilies.at(0));
}
}
#else
#else
for (QtAwesomeFontData& fd : _fontDetails) {
fd.setFontFamily(fd.fontFilename()); // yes, what a great semantic use of the variable...
fd.setFontFamily(fd.fontFilename());// yes, what a great semantic use of the variable...
}
#endif
#endif

// intialize the brands icon map
addToNamedCodePoints(fa::fa_brands, faBrandsIconArray, sizeof(faBrandsIconArray) / sizeof(QtAwesomeNamedIcon));
Expand Down Expand Up @@ -564,7 +564,8 @@ QFont::Weight QtAwesomeFontData::fontWeight() const
return _fontWeight;
}

const QString& QtAwesomeFontData::fontStyle() const {
const QString& QtAwesomeFontData::fontStyle() const
{
return _fontStyle;
}

Expand All @@ -586,7 +587,8 @@ void QtAwesomeFontData::setFontWeight(QFont::Weight weight)
_fontWeight = weight;
}

void QtAwesomeFontData::setFontStyle(const QString& style) {
void QtAwesomeFontData::setFontStyle(const QString& style)
{
_fontStyle = style;
}

Expand Down
Loading