diff --git a/share/branding/keepassxc-icon.ai b/share/branding/keepassxc-icon.ai index 350362858..47283e03e 100644 Binary files a/share/branding/keepassxc-icon.ai and b/share/branding/keepassxc-icon.ai differ diff --git a/share/branding/png/keepassxc-128x128.png b/share/branding/png/keepassxc-128x128.png index af85f91ff..88f358de7 100644 Binary files a/share/branding/png/keepassxc-128x128.png and b/share/branding/png/keepassxc-128x128.png differ diff --git a/share/branding/png/keepassxc-256x256.png b/share/branding/png/keepassxc-256x256.png index 6f6854f07..335639784 100644 Binary files a/share/branding/png/keepassxc-256x256.png and b/share/branding/png/keepassxc-256x256.png differ diff --git a/share/branding/png/keepassxc-512x512.png b/share/branding/png/keepassxc-512x512.png index 6e9f20084..4a2d14c95 100644 Binary files a/share/branding/png/keepassxc-512x512.png and b/share/branding/png/keepassxc-512x512.png differ diff --git a/share/branding/png/keepassxc-64x64.png b/share/branding/png/keepassxc-64x64.png index 8bc4f40d6..bf6fdb81c 100644 Binary files a/share/branding/png/keepassxc-64x64.png and b/share/branding/png/keepassxc-64x64.png differ diff --git a/share/branding/png/keepassxc-locked-128x128.png b/share/branding/png/keepassxc-locked-128x128.png new file mode 100644 index 000000000..7677d5d9e Binary files /dev/null and b/share/branding/png/keepassxc-locked-128x128.png differ diff --git a/share/branding/png/keepassxc-locked-256x256.png b/share/branding/png/keepassxc-locked-256x256.png new file mode 100644 index 000000000..749bbb186 Binary files /dev/null and b/share/branding/png/keepassxc-locked-256x256.png differ diff --git a/share/branding/png/keepassxc-locked-512x512.png b/share/branding/png/keepassxc-locked-512x512.png new file mode 100644 index 000000000..85b75de52 Binary files /dev/null and b/share/branding/png/keepassxc-locked-512x512.png differ diff --git a/share/branding/png/keepassxc-locked-64x64.png b/share/branding/png/keepassxc-locked-64x64.png new file mode 100644 index 000000000..2621def2e Binary files /dev/null and b/share/branding/png/keepassxc-locked-64x64.png differ diff --git a/share/branding/png/keepassxc-monochrome-dark-128x128.png b/share/branding/png/keepassxc-monochrome-dark-128x128.png index 339c71902..4e67b878f 100644 Binary files a/share/branding/png/keepassxc-monochrome-dark-128x128.png and b/share/branding/png/keepassxc-monochrome-dark-128x128.png differ diff --git a/share/branding/png/keepassxc-monochrome-dark-256x256.png b/share/branding/png/keepassxc-monochrome-dark-256x256.png index 0db193e1d..c4a078505 100644 Binary files a/share/branding/png/keepassxc-monochrome-dark-256x256.png and b/share/branding/png/keepassxc-monochrome-dark-256x256.png differ diff --git a/share/branding/png/keepassxc-monochrome-dark-512x512.png b/share/branding/png/keepassxc-monochrome-dark-512x512.png index f2f3a056e..fea1174ef 100644 Binary files a/share/branding/png/keepassxc-monochrome-dark-512x512.png and b/share/branding/png/keepassxc-monochrome-dark-512x512.png differ diff --git a/share/branding/png/keepassxc-monochrome-dark-64x64.png b/share/branding/png/keepassxc-monochrome-dark-64x64.png index 0d8c0bc0d..a723fc647 100644 Binary files a/share/branding/png/keepassxc-monochrome-dark-64x64.png and b/share/branding/png/keepassxc-monochrome-dark-64x64.png differ diff --git a/share/branding/png/keepassxc-monochrome-dark-locked-128x128.png b/share/branding/png/keepassxc-monochrome-dark-locked-128x128.png new file mode 100644 index 000000000..c22815b5b Binary files /dev/null and b/share/branding/png/keepassxc-monochrome-dark-locked-128x128.png differ diff --git a/share/branding/png/keepassxc-monochrome-dark-locked-256x256.png b/share/branding/png/keepassxc-monochrome-dark-locked-256x256.png new file mode 100644 index 000000000..c4525b651 Binary files /dev/null and b/share/branding/png/keepassxc-monochrome-dark-locked-256x256.png differ diff --git a/share/branding/png/keepassxc-monochrome-dark-locked-512x512.png b/share/branding/png/keepassxc-monochrome-dark-locked-512x512.png new file mode 100644 index 000000000..323dbede8 Binary files /dev/null and b/share/branding/png/keepassxc-monochrome-dark-locked-512x512.png differ diff --git a/share/branding/png/keepassxc-monochrome-dark-locked-64x64.png b/share/branding/png/keepassxc-monochrome-dark-locked-64x64.png new file mode 100644 index 000000000..04c1246f4 Binary files /dev/null and b/share/branding/png/keepassxc-monochrome-dark-locked-64x64.png differ diff --git a/share/branding/png/keepassxc-monochrome-light-128x128.png b/share/branding/png/keepassxc-monochrome-light-128x128.png new file mode 100644 index 000000000..c5ac3c42c Binary files /dev/null and b/share/branding/png/keepassxc-monochrome-light-128x128.png differ diff --git a/share/branding/png/keepassxc-monochrome-light-256x256.png b/share/branding/png/keepassxc-monochrome-light-256x256.png new file mode 100644 index 000000000..7140833d7 Binary files /dev/null and b/share/branding/png/keepassxc-monochrome-light-256x256.png differ diff --git a/share/branding/png/keepassxc-monochrome-light-512x512.png b/share/branding/png/keepassxc-monochrome-light-512x512.png new file mode 100644 index 000000000..1abc22225 Binary files /dev/null and b/share/branding/png/keepassxc-monochrome-light-512x512.png differ diff --git a/share/branding/png/keepassxc-monochrome-light-64x64.png b/share/branding/png/keepassxc-monochrome-light-64x64.png new file mode 100644 index 000000000..9755f0982 Binary files /dev/null and b/share/branding/png/keepassxc-monochrome-light-64x64.png differ diff --git a/share/branding/png/keepassxc-monochrome-light-locked-128x128.png b/share/branding/png/keepassxc-monochrome-light-locked-128x128.png new file mode 100644 index 000000000..3ea3e6e04 Binary files /dev/null and b/share/branding/png/keepassxc-monochrome-light-locked-128x128.png differ diff --git a/share/branding/png/keepassxc-monochrome-light-locked-256x256.png b/share/branding/png/keepassxc-monochrome-light-locked-256x256.png new file mode 100644 index 000000000..9f6004f53 Binary files /dev/null and b/share/branding/png/keepassxc-monochrome-light-locked-256x256.png differ diff --git a/share/branding/png/keepassxc-monochrome-light-locked-512x512.png b/share/branding/png/keepassxc-monochrome-light-locked-512x512.png new file mode 100644 index 000000000..486a3b3ef Binary files /dev/null and b/share/branding/png/keepassxc-monochrome-light-locked-512x512.png differ diff --git a/share/branding/png/keepassxc-monochrome-light-locked-64x64.png b/share/branding/png/keepassxc-monochrome-light-locked-64x64.png new file mode 100644 index 000000000..dcd4ad40d Binary files /dev/null and b/share/branding/png/keepassxc-monochrome-light-locked-64x64.png differ diff --git a/share/branding/png/macos-128x128.png b/share/branding/png/macos-128x128.png index c9a28a96d..02d22c1b6 100644 Binary files a/share/branding/png/macos-128x128.png and b/share/branding/png/macos-128x128.png differ diff --git a/share/branding/png/macos-256x256.png b/share/branding/png/macos-256x256.png index a8eaea5f0..1726dab67 100644 Binary files a/share/branding/png/macos-256x256.png and b/share/branding/png/macos-256x256.png differ diff --git a/share/branding/png/macos-512x512.png b/share/branding/png/macos-512x512.png index 26bf727aa..dfe4f6f0f 100644 Binary files a/share/branding/png/macos-512x512.png and b/share/branding/png/macos-512x512.png differ diff --git a/share/branding/png/macos-64x64.png b/share/branding/png/macos-64x64.png index 241a63509..b76ccc951 100644 Binary files a/share/branding/png/macos-64x64.png and b/share/branding/png/macos-64x64.png differ diff --git a/share/branding/png/macos-monochrome-dark-128x128.png b/share/branding/png/macos-monochrome-dark-128x128.png index ff586fae5..dd30e51c8 100644 Binary files a/share/branding/png/macos-monochrome-dark-128x128.png and b/share/branding/png/macos-monochrome-dark-128x128.png differ diff --git a/share/branding/png/macos-monochrome-dark-256x256.png b/share/branding/png/macos-monochrome-dark-256x256.png index c0c43d705..d769b171a 100644 Binary files a/share/branding/png/macos-monochrome-dark-256x256.png and b/share/branding/png/macos-monochrome-dark-256x256.png differ diff --git a/share/branding/png/macos-monochrome-dark-512x512.png b/share/branding/png/macos-monochrome-dark-512x512.png index 044e9421b..b849f199f 100644 Binary files a/share/branding/png/macos-monochrome-dark-512x512.png and b/share/branding/png/macos-monochrome-dark-512x512.png differ diff --git a/share/branding/png/macos-monochrome-dark-64x64.png b/share/branding/png/macos-monochrome-dark-64x64.png index 0df8118d0..9811284c2 100644 Binary files a/share/branding/png/macos-monochrome-dark-64x64.png and b/share/branding/png/macos-monochrome-dark-64x64.png differ diff --git a/share/branding/scalable/keepassxc-monochrome-dark.svg b/share/branding/scalable/keepassxc-monochrome-dark.svg index 233198814..51e107088 100644 --- a/share/branding/scalable/keepassxc-monochrome-dark.svg +++ b/share/branding/scalable/keepassxc-monochrome-dark.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/share/branding/scalable/keepassxc-monochrome-light.svg b/share/branding/scalable/keepassxc-monochrome-light.svg new file mode 100644 index 000000000..35c886cd7 --- /dev/null +++ b/share/branding/scalable/keepassxc-monochrome-light.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/share/branding/scalable/keepassxc.svg b/share/branding/scalable/keepassxc.svg index be761a38b..aad6c5a16 100644 --- a/share/branding/scalable/keepassxc.svg +++ b/share/branding/scalable/keepassxc.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/share/branding/scalable/macos-monochrome-dark.svg b/share/branding/scalable/macos-monochrome-dark.svg index b6a33ae82..2d8e45a1f 100644 --- a/share/branding/scalable/macos-monochrome-dark.svg +++ b/share/branding/scalable/macos-monochrome-dark.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/share/branding/scalable/macos.svg b/share/branding/scalable/macos.svg index 77290fd1c..f1d48eebc 100644 --- a/share/branding/scalable/macos.svg +++ b/share/branding/scalable/macos.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/share/icons/application/256x256/apps/keepassxc.png b/share/icons/application/256x256/apps/keepassxc.png index 6f6854f07..335639784 100644 Binary files a/share/icons/application/256x256/apps/keepassxc.png and b/share/icons/application/256x256/apps/keepassxc.png differ diff --git a/share/icons/application/scalable/apps/keepassxc-locked.svg b/share/icons/application/scalable/apps/keepassxc-locked.svg index 16c218648..a838d8ad4 100644 --- a/share/icons/application/scalable/apps/keepassxc-locked.svg +++ b/share/icons/application/scalable/apps/keepassxc-locked.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/share/icons/application/scalable/apps/keepassxc-monochrome-dark-locked.svg b/share/icons/application/scalable/apps/keepassxc-monochrome-dark-locked.svg index 872b5fad5..e3d392c07 100644 --- a/share/icons/application/scalable/apps/keepassxc-monochrome-dark-locked.svg +++ b/share/icons/application/scalable/apps/keepassxc-monochrome-dark-locked.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/share/icons/application/scalable/apps/keepassxc-monochrome-dark.svg b/share/icons/application/scalable/apps/keepassxc-monochrome-dark.svg index 233198814..51e107088 100644 --- a/share/icons/application/scalable/apps/keepassxc-monochrome-dark.svg +++ b/share/icons/application/scalable/apps/keepassxc-monochrome-dark.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/share/icons/application/scalable/apps/keepassxc-monochrome-light-locked.svg b/share/icons/application/scalable/apps/keepassxc-monochrome-light-locked.svg index c8c4f991e..8b2a3fad4 100644 --- a/share/icons/application/scalable/apps/keepassxc-monochrome-light-locked.svg +++ b/share/icons/application/scalable/apps/keepassxc-monochrome-light-locked.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/share/icons/application/scalable/apps/keepassxc-monochrome-light.svg b/share/icons/application/scalable/apps/keepassxc-monochrome-light.svg index 65474c9f6..35c886cd7 100644 --- a/share/icons/application/scalable/apps/keepassxc-monochrome-light.svg +++ b/share/icons/application/scalable/apps/keepassxc-monochrome-light.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/share/icons/application/scalable/apps/keepassxc.svg b/share/icons/application/scalable/apps/keepassxc.svg index bb957bc4d..aad6c5a16 100644 --- a/share/icons/application/scalable/apps/keepassxc.svg +++ b/share/icons/application/scalable/apps/keepassxc.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/share/icons/application/scalable/mimetypes/application-x-keepassxc.svg b/share/icons/application/scalable/mimetypes/application-x-keepassxc.svg index 433331616..f846a4e46 100644 --- a/share/icons/application/scalable/mimetypes/application-x-keepassxc.svg +++ b/share/icons/application/scalable/mimetypes/application-x-keepassxc.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/gui/Icons.cpp b/src/gui/Icons.cpp index 395331221..8dd0c8d0a 100644 --- a/src/gui/Icons.cpp +++ b/src/gui/Icons.cpp @@ -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)) diff --git a/src/gui/Icons.h b/src/gui/Icons.h index db342ae19..15b3b1be9 100644 --- a/src/gui/Icons.h +++ b/src/gui/Icons.h @@ -29,9 +29,7 @@ class Icons public: QString applicationIconName(); QIcon applicationIcon(); - QIcon trayIcon(QString style = "unlocked"); - QIcon trayIconLocked(); - QIcon trayIconUnlocked(); + QIcon trayIcon(bool unlocked = true); QString trayIconAppearance() const; QIcon icon(const QString& name, bool recolor = true, const QColor& overrideColor = QColor::Invalid); QIcon onOffIcon(const QString& name, bool on, bool recolor = true); diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index 0890ac4b2..c03bd4300 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -1561,12 +1561,8 @@ void MainWindow::updateTrayIcon() connect(actionToggle, SIGNAL(triggered()), SLOT(toggleWindow())); } - if (m_ui->tabWidget->hasLockableDatabases()) { - m_trayIcon->setIcon(icons()->trayIconUnlocked()); - } else { - m_trayIcon->setIcon(icons()->trayIconLocked()); - } - + bool showUnlocked = m_ui->tabWidget->hasLockableDatabases(); + m_trayIcon->setIcon(icons()->trayIcon(showUnlocked)); m_trayIcon->setToolTip(windowTitle().replace("[*]", isWindowModified() ? "*" : "")); m_trayIcon->show();