diff options
author | saturneric <[email protected]> | 2025-04-30 16:22:09 +0000 |
---|---|---|
committer | saturneric <[email protected]> | 2025-04-30 16:22:09 +0000 |
commit | 442c0e8b4fe3ac54aa31323e8e885062b6544638 (patch) | |
tree | 23b1b7424d77bd4b37aa20228177c2f7abf55b30 /src/ui/GpgFrontendApplication.cpp | |
parent | fix: correct tooltips and text of buttons of key lists (diff) | |
parent | Merge pull request #212 from Anthony-Lloyd/main (diff) | |
download | GpgFrontend-442c0e8b4fe3ac54aa31323e8e885062b6544638.tar.gz GpgFrontend-442c0e8b4fe3ac54aa31323e8e885062b6544638.zip |
Merge remote-tracking branch 'github/main' into develop
Diffstat (limited to 'src/ui/GpgFrontendApplication.cpp')
-rw-r--r-- | src/ui/GpgFrontendApplication.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ui/GpgFrontendApplication.cpp b/src/ui/GpgFrontendApplication.cpp index 5f896fd5..eed6a054 100644 --- a/src/ui/GpgFrontendApplication.cpp +++ b/src/ui/GpgFrontendApplication.cpp @@ -35,8 +35,9 @@ namespace GpgFrontend::UI { GpgFrontendApplication::GpgFrontendApplication(int &argc, char *argv[]) : QApplication(argc, argv) { #if !(defined(__APPLE__) && defined(__MACH__)) - GpgFrontend::UI::GpgFrontendApplication::setWindowIcon( - QIcon(":/icons/gpgfrontend.png")); + // Try system theme icon first, fall back to resource + QIcon appIcon = QIcon::fromTheme("gpgfrontend", QIcon(":/icons/gpgfrontend.png")); + GpgFrontend::UI::GpgFrontendApplication::setWindowIcon(appIcon); #endif QString application_display_name = GetProjectName(); |