openclaw/deskflow
1
0
Fork 0
Code Issues Pull Requests Actions 18 Packages Projects Releases Wiki Activity

refactor: Only use symbolic tray icon

Browse Source
This commit is contained in:
sithlord48
2025-10-29 12:01:04 -04:00
committed by Chris Rizzitello
parent 066e63cc86
commit eee4efd59d
6 changed files with 8 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/lib/gui/MainWindow.cpp
View File

@ -753,17 +753,8 @@ void MainWindow::saveSettings() const
void MainWindow::setTrayIcon()
{
QString iconString = kRevFqdnName;
if (deskflow::platform::isSandboxed()) {
iconString = QStringLiteral(":/icons/%1-%2/apps/64/%3").arg(kAppId, iconMode(), kRevFqdnName);
}
if (!Settings::value(Settings::Gui::SymbolicTrayIcon).toBool()) {
m_trayIcon->setIcon(QIcon::fromTheme(iconString));
return;
}
static const auto themeIcon = QStringLiteral("%1-symbolic").arg(kRevFqdnName);
static const auto fallbackPath = QStringLiteral(":/icons/%1-%2/apps/64/%3");
#ifdef Q_OS_WIN
QSettings settings(
QStringLiteral("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"),
@ -771,13 +762,12 @@ void MainWindow::setTrayIcon()
);
const QString theme = settings.value(QStringLiteral("SystemUsesLightTheme"), 1).toBool() ? QStringLiteral("light")
: QStringLiteral("dark");
iconString = QStringLiteral(":/icons/deskflow-%1/apps/64/%2").arg(theme, kRevFqdnName);
#endif
iconString.append(QStringLiteral("-symbolic"));
auto icon = QIcon::fromTheme(iconString);
m_trayIcon->setIcon(QIcon(fallbackPath.arg(kAppId, theme, themeIcon)));
#else
auto icon = QIcon::fromTheme(themeIcon, QIcon(fallbackPath.arg(kAppId, iconMode(), themeIcon)));
icon.setIsMask(true);
m_trayIcon->setIcon(icon);
#endif
}
void MainWindow::handleLogLine(const QString &line)