diff options
| author | Janek Bevendorff <janek@jbev.net> | 2020-06-02 00:37:02 +0300 |
|---|---|---|
| committer | Janek Bevendorff <janek@jbev.net> | 2020-06-04 15:21:38 +0300 |
| commit | e36cba703e433876f2f41b0679c4281859293728 (patch) | |
| tree | 04dfe9d9b45662de855daf29a9360fab941f8d62 /src/core/Resources.cpp | |
| parent | a91358e7bfac9a43c4970bcba8e21390df155ed1 (diff) | |
Fix loading of tray icon appearance setting.
The tray icon appearance setting is null by default, since we do not
want to include OSUtils into Config. As a result, we must take special
care to preselect the correct combo box entry on the settings page.
Diffstat (limited to 'src/core/Resources.cpp')
| -rw-r--r-- | src/core/Resources.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/Resources.cpp b/src/core/Resources.cpp index 608e02dcf..799475bb1 100644 --- a/src/core/Resources.cpp +++ b/src/core/Resources.cpp @@ -32,7 +32,7 @@ Resources* Resources::m_instance(nullptr); -QString Resources::dataPath(const QString& name) +QString Resources::dataPath(const QString& name) const { if (name.isEmpty() || name.startsWith('/')) { return m_dataPath + name; @@ -40,7 +40,7 @@ QString Resources::dataPath(const QString& name) return m_dataPath + "/" + name; } -QString Resources::pluginPath(const QString& name) +QString Resources::pluginPath(const QString& name) const { QStringList pluginPaths; @@ -91,7 +91,7 @@ QString Resources::pluginPath(const QString& name) return {}; } -QString Resources::wordlistPath(const QString& name) +QString Resources::wordlistPath(const QString& name) const { return dataPath(QStringLiteral("wordlists/%1").arg(name)); } @@ -101,7 +101,7 @@ QIcon Resources::applicationIcon() return icon("keepassxc", false); } -QString Resources::getTrayIconAppearance() const +QString Resources::trayIconAppearance() const { auto iconAppearance = config()->get(Config::GUI_TrayIconAppearance).toString(); if (iconAppearance.isNull()) { @@ -121,7 +121,7 @@ QIcon Resources::trayIcon() QIcon Resources::trayIconLocked() { - auto iconApperance = getTrayIconAppearance(); + auto iconApperance = trayIconAppearance(); if (iconApperance == "monochrome-light") { return icon("keepassxc-monochrome-light-locked", false); @@ -134,7 +134,7 @@ QIcon Resources::trayIconLocked() QIcon Resources::trayIconUnlocked() { - auto iconApperance = getTrayIconAppearance(); + auto iconApperance = trayIconAppearance(); if (iconApperance == "monochrome-light") { return icon("keepassxc-monochrome-light", false); |