From 71caefbe70f0cdec32ca560450c4548556e1e676 Mon Sep 17 00:00:00 2001 From: Ralph Plawetzki Date: Thu, 25 May 2023 11:23:24 +0200 Subject: [PATCH] Rename icons and bring them in place --- .github/workflows/appimage.yml | 12 ++++++++---- ...g.cryptomator.Cryptomator-monochrome-unlocked.svg | 1 - .../org.cryptomator.Cryptomator-monochrome.svg | 1 - .../org.cryptomator.Cryptomator.tray-unlocked.svg | 12 ++++++++++++ .../common/org.cryptomator.Cryptomator.tray.svg | 8 ++++++++ dist/linux/debian/cryptomator.install | 6 ++++-- pom.xml | 2 +- .../org/cryptomator/ui/traymenu/TrayMenuBuilder.java | 2 +- 8 files changed, 34 insertions(+), 10 deletions(-) delete mode 100644 dist/linux/common/org.cryptomator.Cryptomator-monochrome-unlocked.svg delete mode 100644 dist/linux/common/org.cryptomator.Cryptomator-monochrome.svg create mode 100644 dist/linux/common/org.cryptomator.Cryptomator.tray-unlocked.svg create mode 100644 dist/linux/common/org.cryptomator.Cryptomator.tray.svg diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 552cbee65..ab8ddd92e 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -102,14 +102,18 @@ jobs: cp dist/linux/common/org.cryptomator.Cryptomator256.png Cryptomator.AppDir/usr/share/icons/hicolor/256x256/apps/org.cryptomator.Cryptomator.png cp dist/linux/common/org.cryptomator.Cryptomator512.png Cryptomator.AppDir/usr/share/icons/hicolor/512x512/apps/org.cryptomator.Cryptomator.png cp dist/linux/common/org.cryptomator.Cryptomator.svg Cryptomator.AppDir/usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg - cp dist/linux/common/org.cryptomator.Cryptomator-monochrome.svg Cryptomator.AppDir/usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator-monochrome.svg - cp dist/linux/common/org.cryptomator.Cryptomator-monochrome-unlocked.svg Cryptomator.AppDir/usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator-monochrome-unlocked.svg + cp dist/linux/common/org.cryptomator.Cryptomator.tray.svg Cryptomator.AppDir/usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.tray.svg + cp dist/linux/common/org.cryptomator.Cryptomator.tray-unlocked.svg Cryptomator.AppDir/usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.tray-unlocked.svg + cp dist/linux/common/org.cryptomator.Cryptomator.tray.svg Cryptomator.AppDir/usr/share/icons/hicolor/symbolic/apps/org.cryptomator.Cryptomator.tray.svg + cp dist/linux/common/org.cryptomator.Cryptomator.tray-unlocked.svg Cryptomator.AppDir/usr/share/icons/hicolor/symbolic/apps/org.cryptomator.Cryptomator.tray-unlocked.svg cp dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml Cryptomator.AppDir/usr/share/metainfo/org.cryptomator.Cryptomator.metainfo.xml cp dist/linux/common/org.cryptomator.Cryptomator.desktop Cryptomator.AppDir/usr/share/applications/org.cryptomator.Cryptomator.desktop cp dist/linux/common/application-vnd.cryptomator.vault.xml Cryptomator.AppDir/usr/share/mime/packages/application-vnd.cryptomator.vault.xml ln -s usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg Cryptomator.AppDir/org.cryptomator.Cryptomator.svg - ln -s usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator-monochrome.svg Cryptomator.AppDir/org.cryptomator.Cryptomator-monochrome.svg - ln -s usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator-monochrome-unlocked.svg Cryptomator.AppDir/org.cryptomator.Cryptomator-monochrome-unlocked.svg + ln -s usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.tray.svg Cryptomator.AppDir/org.cryptomator.Cryptomator.tray.svg + ln -s usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.tray-unlocked.svg Cryptomator.AppDir/org.cryptomator.Cryptomator.tray-unlocked.svg + ln -s usr/share/icons/hicolor/symbolic/apps/org.cryptomator.Cryptomator.tray.svg Cryptomator.AppDir/org.cryptomator.Cryptomator.tray.svg + ln -s usr/share/icons/hicolor/symbolic/apps/org.cryptomator.Cryptomator.tray-unlocked.svg Cryptomator.AppDir/org.cryptomator.Cryptomator.tray-unlocked.svg ln -s usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg Cryptomator.AppDir/Cryptomator.svg ln -s usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg Cryptomator.AppDir/.DirIcon ln -s usr/share/applications/org.cryptomator.Cryptomator.desktop Cryptomator.AppDir/Cryptomator.desktop diff --git a/dist/linux/common/org.cryptomator.Cryptomator-monochrome-unlocked.svg b/dist/linux/common/org.cryptomator.Cryptomator-monochrome-unlocked.svg deleted file mode 100644 index 84ef95909..000000000 --- a/dist/linux/common/org.cryptomator.Cryptomator-monochrome-unlocked.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/dist/linux/common/org.cryptomator.Cryptomator-monochrome.svg b/dist/linux/common/org.cryptomator.Cryptomator-monochrome.svg deleted file mode 100644 index 59bd8a090..000000000 --- a/dist/linux/common/org.cryptomator.Cryptomator-monochrome.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/dist/linux/common/org.cryptomator.Cryptomator.tray-unlocked.svg b/dist/linux/common/org.cryptomator.Cryptomator.tray-unlocked.svg new file mode 100644 index 000000000..f8e79de1b --- /dev/null +++ b/dist/linux/common/org.cryptomator.Cryptomator.tray-unlocked.svg @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/dist/linux/common/org.cryptomator.Cryptomator.tray.svg b/dist/linux/common/org.cryptomator.Cryptomator.tray.svg new file mode 100644 index 000000000..205998020 --- /dev/null +++ b/dist/linux/common/org.cryptomator.Cryptomator.tray.svg @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/dist/linux/debian/cryptomator.install b/dist/linux/debian/cryptomator.install index 93337145e..60e9a2f3c 100644 --- a/dist/linux/debian/cryptomator.install +++ b/dist/linux/debian/cryptomator.install @@ -1,8 +1,10 @@ cryptomator usr/lib common/org.cryptomator.Cryptomator.desktop usr/share/applications common/org.cryptomator.Cryptomator.svg usr/share/icons/hicolor/scalable/apps -common/org.cryptomator.Cryptomator-monochrome.svg usr/share/icons/hicolor/scalable/apps -common/org.cryptomator.Cryptomator-monochrome-unlocked.svg usr/share/icons/hicolor/scalable/apps +common/org.cryptomator.Cryptomator.tray.svg usr/share/icons/hicolor/scalable/apps +common/org.cryptomator.Cryptomator.tray-unlocked.svg usr/share/icons/hicolor/scalable/apps +common/org.cryptomator.Cryptomator.tray.svg usr/share/icons/hicolor/symbolic/apps +common/org.cryptomator.Cryptomator.tray-unlocked.svg usr/share/icons/hicolor/symbolic/apps common/org.cryptomator.Cryptomator256.png usr/share/icons/hicolor/256x256/apps common/org.cryptomator.Cryptomator512.png usr/share/icons/hicolor/512x512/apps common/org.cryptomator.Cryptomator.metainfo.xml usr/share/metainfo diff --git a/pom.xml b/pom.xml index af89f6bc3..1ba677f4a 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ 1.3.0-beta1 1.2.0 1.2.0 - 1.3.0-beta1 + 1.3.0-beta2 3.0.0 2.0.0 2.0.2 diff --git a/src/main/java/org/cryptomator/ui/traymenu/TrayMenuBuilder.java b/src/main/java/org/cryptomator/ui/traymenu/TrayMenuBuilder.java index b471e9104..7c968c140 100644 --- a/src/main/java/org/cryptomator/ui/traymenu/TrayMenuBuilder.java +++ b/src/main/java/org/cryptomator/ui/traymenu/TrayMenuBuilder.java @@ -187,6 +187,6 @@ public class TrayMenuBuilder { private String getAppropriateFreedesktopIconName() { boolean isAnyVaultUnlocked = vaults.stream().anyMatch(Vault::isUnlocked); - return isAnyVaultUnlocked ? "org.cryptomator.Cryptomator-monochrome-unlocked" : "org.cryptomator.Cryptomator-monochrome"; + return isAnyVaultUnlocked ? "org.cryptomator.Cryptomator.tray-unlocked" : "org.cryptomator.Cryptomator.tray"; } }