Browse Source

Use icons provided by tobihagemann

Ralph Plawetzki 1 year ago
parent
commit
8b94c82889

+ 4 - 2
.github/workflows/appimage.yml

@@ -102,12 +102,14 @@ 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-unlocked.svg Cryptomator.AppDir/usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator-unlocked.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.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-unlocked.svg Cryptomator.AppDir/org.cryptomator.Cryptomator-unlocked.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.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

dist/linux/common/org.cryptomator.Cryptomator-unlocked.svg → dist/linux/common/org.cryptomator.Cryptomator-monochrome-unlocked.svg


File diff suppressed because it is too large
+ 1 - 0
dist/linux/common/org.cryptomator.Cryptomator-monochrome.svg


+ 2 - 1
dist/linux/debian/cryptomator.install

@@ -1,7 +1,8 @@
 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-unlocked.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.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

+ 1 - 1
pom.xml

@@ -34,7 +34,7 @@
 
 		<!-- cryptomator dependencies -->
 		<cryptomator.cryptofs.version>2.6.2</cryptomator.cryptofs.version>
-		<cryptomator.integrations.version>2.0.0-alpha2</cryptomator.integrations.version>
+		<cryptomator.integrations.version>1.3.0-beta1</cryptomator.integrations.version>
 		<cryptomator.integrations.win.version>1.2.0</cryptomator.integrations.win.version>
 		<cryptomator.integrations.mac.version>1.2.0</cryptomator.integrations.mac.version>
 		<cryptomator.integrations.linux.version>2.0.0-alpha1</cryptomator.integrations.linux.version>

+ 1 - 1
src/main/java/org/cryptomator/ui/traymenu/TrayMenuBuilder.java

@@ -187,6 +187,6 @@ public class TrayMenuBuilder {
 	private String getAppropriateTrayIconSVG() {
 		boolean isAnyVaultUnlocked = vaults.stream().anyMatch(Vault::isUnlocked);
 
-		return isAnyVaultUnlocked ? "org.cryptomator.Cryptomator-unlocked" : "org.cryptomator.Cryptomator";
+		return isAnyVaultUnlocked ? "org.cryptomator.Cryptomator-monochrome-unlocked" : "org.cryptomator.Cryptomator-monochrome";
 	}
 }