From 6c45fcbfc740ea8bf23e408d8f9f5d0597a63f36 Mon Sep 17 00:00:00 2001 From: Janek Bevendorff Date: Wed, 8 Feb 2017 17:55:50 +0100 Subject: [PATCH] Don't try to use theme icons for the system tray, resolves #194 Qt also looks in the program's working directory for icons, but apparently, the Ubuntu system tray doesn't, resulting in missing tray icons --- AppImage-Recipe.sh | 2 -- src/core/FilePath.cpp | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/AppImage-Recipe.sh b/AppImage-Recipe.sh index dc30cb696..ba47e1b2d 100755 --- a/AppImage-Recipe.sh +++ b/AppImage-Recipe.sh @@ -49,8 +49,6 @@ cp -a ../../bin-release/* . cp -a ./usr/local/* ./usr rm -R ./usr/local rmdir ./opt 2> /dev/null -patch_strings_in_file /usr/local ././ -patch_strings_in_file /usr ./ # bundle Qt platform plugins and themes QXCB_PLUGIN="$(find /usr/lib -name 'libqxcb.so' 2> /dev/null)" diff --git a/src/core/FilePath.cpp b/src/core/FilePath.cpp index 0506e3ab7..efbc18a10 100644 --- a/src/core/FilePath.cpp +++ b/src/core/FilePath.cpp @@ -91,12 +91,12 @@ QString FilePath::pluginPath(const QString& name) QIcon FilePath::applicationIcon() { - return icon("apps", "keepassxc"); + return icon("apps", "keepassxc", false); } QIcon FilePath::trayIconLocked() { - return icon("apps", "keepassxc-locked"); + return icon("apps", "keepassxc-locked", false); } QIcon FilePath::trayIconUnlocked()