diff options
| author | Anne Jan Brouwer <brouwer@annejan.com> | 2023-09-27 10:10:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-27 10:10:44 +0200 |
| commit | f25b8ea80cbacb7195677de126c11d702b44ea16 (patch) | |
| tree | 2d75c1f0c96340129ebf071d8ee38175ea25cf27 | |
| parent | 2d9a87ed632d97d17fca54d44d72d5c25c63852f (diff) | |
| parent | c39926b2b800c6c3e26521b9f38f2fcb9f661587 (diff) | |
Merge pull request #662 from IJHack/new-macos-logo
new macOS icon by @ivan-avalos
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | artwork/icon.icns | bin | 55823 -> 305709 bytes | |||
| -rw-r--r-- | main/main.cpp | 3 |
3 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index f8d4d368..2dcc1297 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,7 +28,7 @@ **Fixed bugs:** -- Update website to reflect new brew command syntax [\#601](https://github.com/IJHack/QtPass/issues/601) +- Update site to reflect new brew command syntax [\#601](https://github.com/IJHack/QtPass/issues/601) - Qtpass - not asking for password [\#585](https://github.com/IJHack/QtPass/issues/585) - Missing menu [\#574](https://github.com/IJHack/QtPass/issues/574) diff --git a/artwork/icon.icns b/artwork/icon.icns Binary files differindex 5ac6ee33..97adde52 100644 --- a/artwork/icon.icns +++ b/artwork/icon.icns diff --git a/main/main.cpp b/main/main.cpp index 482a69fc..a8969b11 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -94,7 +94,10 @@ int main(int argc, char *argv[]) { MainWindow w(text); SingleApplication::setActiveWindow(&w); + +#ifndef Q_OS_OSX SingleApplication::setWindowIcon(QIcon(":artwork/icon.png")); +#endif #if SINGLE_APP QObject::connect(&app, &SingleApplication::messageAvailable, &w, |