531418c7d2
## Summary
On MacOS the system tray icon is off-color because it uses the gray-colored `kdeconnectindicatordark` icon which does not match the rest of MacOS.
BUG: 430226
I've used two patches to fix this:
1. Always use the status `KStatusNotifierItem::Passive` on MacOS. `KStatusNotifierItem` will only mark the icon as a mask (which is needed to allow it to dynamically switch between light and dark theme) [if the status is passive](cff7c337ab/src/kstatusnotifieritem.cpp (L1079-1081)).
2. The above should theoretically be enough to fix the issue and I swear at one point it was all that was needed. However, to fix this issue in my dev environment I also needed to pass in a `QIcon` with `setIsMask(true)` instead of setting the icon by its name. And I also use the `kdeconnectindicator` instead of `kdeconnectindicatordark` icon.
## Test Plan
The icon now renders in the correct color, regardless of whether devices are connected:
 
## Future work
Once I've verified this PR is working in the right direction, I want to look into making the icon gray (and hopefully a much easier-to-see gray) when no devices are connected!
For example, WireGuard, when not connected, looks like this:
 
P.S. I've been testing off the v21.12.2 tag since the master branch doesn't compile for me, so I haven't tested this change on the latest dev commit. But there should be no conflicts.
138 lines
4.6 KiB
C++
138 lines
4.6 KiB
C++
/*
|
|
* SPDX-FileCopyrightText: 2019 Weixuan XIAO <veyx.shaw@gmail.com>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
|
|
*/
|
|
|
|
#include <QApplication>
|
|
#include <QFile>
|
|
#include <QIcon>
|
|
#include <QMessageBox>
|
|
#include <QStandardPaths>
|
|
#include <QThread>
|
|
#include <QDebug>
|
|
|
|
#include <KLocalizedString>
|
|
|
|
#include <dbushelper.h>
|
|
|
|
#include "indicatorhelper.h"
|
|
|
|
#include "serviceregister_mac.h"
|
|
|
|
IndicatorHelper::IndicatorHelper()
|
|
{
|
|
registerServices();
|
|
|
|
QIcon kdeconnectIcon = QIcon::fromTheme(QStringLiteral("kdeconnect"));
|
|
QPixmap splashPixmap(kdeconnectIcon.pixmap(256, 256));
|
|
|
|
m_splashScreen = new QSplashScreen(splashPixmap);
|
|
|
|
m_splashScreen->showMessage(i18n("Launching") + QStringLiteral("\n"), Qt::AlignHCenter | Qt::AlignBottom, Qt::white);
|
|
m_splashScreen->show();
|
|
}
|
|
|
|
IndicatorHelper::~IndicatorHelper()
|
|
{
|
|
if (m_splashScreen != nullptr) {
|
|
delete m_splashScreen;
|
|
m_splashScreen = nullptr;
|
|
}
|
|
}
|
|
|
|
void IndicatorHelper::preInit() {}
|
|
|
|
void IndicatorHelper::postInit()
|
|
{
|
|
m_splashScreen->finish(nullptr);
|
|
}
|
|
|
|
void IndicatorHelper::iconPathHook()
|
|
{
|
|
const QString iconPath = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("kdeconnect-icons"), QStandardPaths::LocateDirectory);
|
|
if (!iconPath.isNull()) {
|
|
QStringList themeSearchPaths = QIcon::themeSearchPaths();
|
|
themeSearchPaths << iconPath;
|
|
QIcon::setThemeSearchPaths(themeSearchPaths);
|
|
}
|
|
}
|
|
|
|
int IndicatorHelper::daemonHook(QProcess &kdeconnectd)
|
|
{
|
|
#ifdef USE_PRIVATE_DBUS
|
|
// Unset launchctl env, avoid block
|
|
DBusHelper::macosUnsetLaunchctlEnv();
|
|
#endif
|
|
|
|
// Start kdeconnectd
|
|
m_splashScreen->showMessage(i18n("Launching daemon") + QStringLiteral("\n"), Qt::AlignHCenter | Qt::AlignBottom, Qt::white);
|
|
if (QFile::exists(QCoreApplication::applicationDirPath() + QStringLiteral("/kdeconnectd"))) {
|
|
kdeconnectd.startDetached(QCoreApplication::applicationDirPath() + QStringLiteral("/kdeconnectd"));
|
|
} else if (QFile::exists(QString::fromLatin1(qgetenv("craftRoot")) + QStringLiteral("/../lib/libexec/kdeconnectd"))) {
|
|
kdeconnectd.startDetached(QString::fromLatin1(qgetenv("craftRoot")) + QStringLiteral("/../lib/libexec/kdeconnectd"));
|
|
} else {
|
|
QMessageBox::critical(nullptr, i18n("KDE Connect"),
|
|
i18n("Cannot find kdeconnectd"),
|
|
QMessageBox::Abort,
|
|
QMessageBox::Abort);
|
|
return -1;
|
|
}
|
|
|
|
// Wait for dbus daemon env
|
|
QProcess getLaunchdDBusEnv;
|
|
m_splashScreen->showMessage(i18n("Waiting D-Bus") + QStringLiteral("\n"), Qt::AlignHCenter | Qt::AlignBottom, Qt::white);
|
|
int retry = 0;
|
|
do {
|
|
getLaunchdDBusEnv.setProgram(QStringLiteral("launchctl"));
|
|
getLaunchdDBusEnv.setArguments({
|
|
QStringLiteral("getenv"),
|
|
QStringLiteral(KDECONNECT_SESSION_DBUS_LAUNCHD_ENV)
|
|
});
|
|
getLaunchdDBusEnv.start();
|
|
getLaunchdDBusEnv.waitForFinished();
|
|
|
|
QString launchdDBusEnv = QString::fromLocal8Bit(getLaunchdDBusEnv.readAllStandardOutput());
|
|
|
|
if (launchdDBusEnv.length() > 0) {
|
|
break;
|
|
} else if (retry >= 10) {
|
|
// Show a warning and exit
|
|
qCritical() << "Fail to get launchctl" << KDECONNECT_SESSION_DBUS_LAUNCHD_ENV << "env";
|
|
|
|
QMessageBox::critical(nullptr, i18n("KDE Connect"),
|
|
i18n("Cannot connect to DBus\n"
|
|
"KDE Connect will quit"),
|
|
QMessageBox::Abort,
|
|
QMessageBox::Abort);
|
|
return -2;
|
|
} else {
|
|
QThread::sleep(3); // Retry after 3s
|
|
retry++;
|
|
}
|
|
} while(true);
|
|
|
|
m_splashScreen->showMessage(i18n("Loading modules") + QStringLiteral("\n"), Qt::AlignHCenter | Qt::AlignBottom, Qt::white);
|
|
|
|
return 0;
|
|
}
|
|
|
|
#ifdef QSYSTRAY
|
|
void IndicatorHelper::systrayIconHook(QSystemTrayIcon &systray)
|
|
{
|
|
Q_UNUSED(systray);
|
|
}
|
|
#else
|
|
void IndicatorHelper::systrayIconHook(KStatusNotifierItem &systray)
|
|
{
|
|
const QString iconPath = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("kdeconnect-icons"), QStandardPaths::LocateDirectory);
|
|
if (!iconPath.isNull()) {
|
|
auto icon = QIcon::fromTheme(QStringLiteral("kdeconnectindicator"));
|
|
icon.setIsMask(true); // Make icon adapt to menu bar color
|
|
systray.setIconByPixmap(icon);
|
|
} else {
|
|
// We are in macOS dev env, just continue
|
|
qWarning() << "Fail to find indicator icon, continue anyway";
|
|
}
|
|
}
|
|
#endif
|