Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-11-25 17:16:33 -05:00
Code Issues Projects Releases Packages Wiki Activity

Improve colorful lock icon for system tray (#9632)

Browse source 
* Fix #9432
* Simplify tray icon selection code
* Update all icons with latest export
* Fix MIME type icon appearance on KDE
---------
Co-authored-by: Janek Bevendorff <janek@keepassxc.org>
This commit is contained in:
Jonathan White 2023-08-14 21:39:50 -04:00 • committed by GitHub
parent 139153d9a3
commit 0eded87dd3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
49 changed files with 800 additions and 902 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/gui/Icons.cpp
View file

@ -77,29 +77,27 @@ QString Icons::trayIconAppearance() const
return iconAppearance;
}
QIcon Icons::trayIcon(QString style)
QIcon Icons::trayIcon(bool unlocked)
{
if (style == "unlocked") {
style.clear();
}
if (!style.isEmpty()) {
style = "-" + style;
QString suffix;
if (!unlocked) {
suffix = "-locked";
}
auto iconApperance = trayIconAppearance();
if (!iconApperance.startsWith("monochrome")) {
return icon(QString("%1%2").arg(applicationIconName(), style), false);
return icon(QString("%1%2").arg(applicationIconName(), suffix), false);
}
QIcon i;
#if defined(Q_OS_MACOS) || defined(Q_OS_WIN)
if (osUtils->isStatusBarDark()) {
i = icon(QString("keepassxc-monochrome-light%1").arg(style), false);
i = icon(QString("keepassxc-monochrome-light%1").arg(suffix), false);
} else {
i = icon(QString("keepassxc-monochrome-dark%1").arg(style), false);
i = icon(QString("keepassxc-monochrome-dark%1").arg(suffix), false);
}
#else
i = icon(QString("%1-%2%3").arg(applicationIconName(), iconApperance, style), false);
i = icon(QString("%1-%2%3").arg(applicationIconName(), iconApperance, suffix), false);
#endif
#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
// Set as mask to allow the operating system to recolour the tray icon. This may look weird
@ -111,16 +109,6 @@ QIcon Icons::trayIcon(QString style)
return i;
}
QIcon Icons::trayIconLocked()
{
return trayIcon("locked");
}
QIcon Icons::trayIconUnlocked()
{
return trayIcon("unlocked");
}
AdaptiveIconEngine::AdaptiveIconEngine(QIcon baseIcon, QColor overrideColor)
: QIconEngine()
, m_baseIcon(std::move(baseIcon))