mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2024-10-01 01:26:01 -04:00
Moved dark icon logic into FilePath.
This commit is contained in:
parent
55271311c4
commit
4fa00b74ad
@ -23,6 +23,7 @@
|
|||||||
|
|
||||||
#include "config-keepassx.h"
|
#include "config-keepassx.h"
|
||||||
#include "core/Global.h"
|
#include "core/Global.h"
|
||||||
|
#include "core/Config.h"
|
||||||
|
|
||||||
FilePath* FilePath::m_instance(nullptr);
|
FilePath* FilePath::m_instance(nullptr);
|
||||||
|
|
||||||
@ -91,21 +92,15 @@ QString FilePath::pluginPath(const QString& name)
|
|||||||
|
|
||||||
QIcon FilePath::applicationIcon()
|
QIcon FilePath::applicationIcon()
|
||||||
{
|
{
|
||||||
|
bool darkIcon = useDarkIcon();
|
||||||
|
|
||||||
#ifdef KEEPASSXC_DIST_SNAP
|
#ifdef KEEPASSXC_DIST_SNAP
|
||||||
return icon("apps", "keepassxc", false);
|
return (darkIcon) ? icon("apps", "keepassxc-dark", false) : icon("apps", "keepassxc", false);
|
||||||
#else
|
#else
|
||||||
return icon("apps", "keepassxc");
|
return (darkIcon) ? icon("apps", "keepassxc-dark") : icon("apps", "keepassxc");
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
QIcon FilePath::applicationIconDark()
|
|
||||||
{
|
|
||||||
#ifdef KEEPASSXC_DIST_SNAP
|
|
||||||
return icon("apps", "keepassxc-dark", false);
|
|
||||||
#else
|
|
||||||
return icon("apps", "keepassxc-dark");
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
QIcon FilePath::trayIconLocked()
|
QIcon FilePath::trayIconLocked()
|
||||||
{
|
{
|
||||||
@ -118,19 +113,12 @@ QIcon FilePath::trayIconLocked()
|
|||||||
|
|
||||||
QIcon FilePath::trayIconUnlocked()
|
QIcon FilePath::trayIconUnlocked()
|
||||||
{
|
{
|
||||||
#ifdef KEEPASSXC_DIST_SNAP
|
bool darkIcon = useDarkIcon();
|
||||||
return icon("apps", "keepassxc-unlocked", false);
|
|
||||||
#else
|
|
||||||
return icon("apps", "keepassxc-unlocked");
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
QIcon FilePath::trayIconUnlockedDark()
|
|
||||||
{
|
|
||||||
#ifdef KEEPASSXC_DIST_SNAP
|
#ifdef KEEPASSXC_DIST_SNAP
|
||||||
return icon("apps", "keepassxc-dark", false);
|
return (darkIcon) ? icon("apps", "keepassxc-dark", false) : icon("apps", "keepassxc-unlocked", false);
|
||||||
#else
|
#else
|
||||||
return icon("apps", "keepassxc-dark");
|
return (darkIcon) ? icon("apps", "keepassxc-dark") : icon("apps", "keepassxc-unlocked");
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -264,6 +252,11 @@ bool FilePath::testSetDir(const QString& dir)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool FilePath::useDarkIcon()
|
||||||
|
{
|
||||||
|
return config()->get("GUI/DarkTrayIcon").toBool();
|
||||||
|
}
|
||||||
|
|
||||||
FilePath* FilePath::instance()
|
FilePath* FilePath::instance()
|
||||||
{
|
{
|
||||||
if (!m_instance) {
|
if (!m_instance) {
|
||||||
|
@ -28,10 +28,8 @@ public:
|
|||||||
QString dataPath(const QString& name);
|
QString dataPath(const QString& name);
|
||||||
QString pluginPath(const QString& name);
|
QString pluginPath(const QString& name);
|
||||||
QIcon applicationIcon();
|
QIcon applicationIcon();
|
||||||
QIcon applicationIconDark();
|
|
||||||
QIcon trayIconLocked();
|
QIcon trayIconLocked();
|
||||||
QIcon trayIconUnlocked();
|
QIcon trayIconUnlocked();
|
||||||
QIcon trayIconUnlockedDark();
|
|
||||||
QIcon icon(const QString& category, const QString& name, bool fromTheme = true);
|
QIcon icon(const QString& category, const QString& name, bool fromTheme = true);
|
||||||
QIcon onOffIcon(const QString& category, const QString& name);
|
QIcon onOffIcon(const QString& category, const QString& name);
|
||||||
|
|
||||||
@ -40,6 +38,7 @@ public:
|
|||||||
private:
|
private:
|
||||||
FilePath();
|
FilePath();
|
||||||
bool testSetDir(const QString& dir);
|
bool testSetDir(const QString& dir);
|
||||||
|
bool useDarkIcon();
|
||||||
|
|
||||||
static FilePath* m_instance;
|
static FilePath* m_instance;
|
||||||
|
|
||||||
|
@ -773,8 +773,6 @@ bool MainWindow::saveLastDatabases()
|
|||||||
void MainWindow::updateTrayIcon()
|
void MainWindow::updateTrayIcon()
|
||||||
{
|
{
|
||||||
if (isTrayIconEnabled()) {
|
if (isTrayIconEnabled()) {
|
||||||
bool darkIcon = config()->get("GUI/DarkTrayIcon").toBool();
|
|
||||||
|
|
||||||
if (!m_trayIcon) {
|
if (!m_trayIcon) {
|
||||||
m_trayIcon = new QSystemTrayIcon(this);
|
m_trayIcon = new QSystemTrayIcon(this);
|
||||||
QMenu* menu = new QMenu(this);
|
QMenu* menu = new QMenu(this);
|
||||||
@ -797,20 +795,11 @@ void MainWindow::updateTrayIcon()
|
|||||||
|
|
||||||
m_trayIcon->setContextMenu(menu);
|
m_trayIcon->setContextMenu(menu);
|
||||||
|
|
||||||
if(darkIcon){
|
m_trayIcon->setIcon(filePath()->applicationIcon());
|
||||||
m_trayIcon->setIcon(filePath()->applicationIconDark());
|
|
||||||
} else {
|
|
||||||
m_trayIcon->setIcon(filePath()->applicationIcon());
|
|
||||||
}
|
|
||||||
|
|
||||||
m_trayIcon->show();
|
m_trayIcon->show();
|
||||||
}
|
}
|
||||||
if (m_ui->tabWidget->hasLockableDatabases()) {
|
if (m_ui->tabWidget->hasLockableDatabases()) {
|
||||||
if(darkIcon){
|
m_trayIcon->setIcon(filePath()->trayIconUnlocked());
|
||||||
m_trayIcon->setIcon(filePath()->trayIconUnlockedDark());
|
|
||||||
} else {
|
|
||||||
m_trayIcon->setIcon(filePath()->trayIconUnlocked());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
m_trayIcon->setIcon(filePath()->trayIconLocked());
|
m_trayIcon->setIcon(filePath()->trayIconLocked());
|
||||||
|
Loading…
Reference in New Issue
Block a user