diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2021-05-10 10:17:12 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2021-05-10 10:17:12 +0200 |
| commit | fe1631c50bb72d15acac7f2418a30732c21268df (patch) | |
| tree | e1e6288c1c8adedec88e8a34a2fd83c992ac399b /gui | |
| parent | 9068494b2daf4faca5977fc3f0f531a7814c9d27 (diff) | |
| parent | 9a04fdfbb398bccf00101128806d1e44cd10b2c6 (diff) | |
| download | mullvadvpn-fe1631c50bb72d15acac7f2418a30732c21268df.tar.xz mullvadvpn-fe1631c50bb72d15acac7f2418a30732c21268df.zip | |
Merge branch 'macos-squircle-icon'
Diffstat (limited to 'gui')
| -rwxr-xr-x | gui/scripts/build-logo-icons.sh | 17 | ||||
| -rw-r--r-- | gui/tasks/distribution.js | 2 |
2 files changed, 15 insertions, 4 deletions
diff --git a/gui/scripts/build-logo-icons.sh b/gui/scripts/build-logo-icons.sh index 720fe3646a..78d8652096 100755 --- a/gui/scripts/build-logo-icons.sh +++ b/gui/scripts/build-logo-icons.sh @@ -34,22 +34,31 @@ TMP_DIR=$(mktemp -d) TMP_ICO_DIR="$TMP_DIR/ico" TMP_ICONSET_DIR="$TMP_DIR/icon.iconset" +mkdir $TMP_ICONSET_DIR +mkdir $TMP_ICO_DIR + COMPRESSION_OPTIONS="-define png:compression-filter=5 -define png:compression-level=9 \ -define png:compression-strategy=1 -define png:exclude-chunk=all -strip" -# MacOS and Linux .icns icon -mkdir $TMP_ICONSET_DIR +# macOS .icns icon +for icon in "$GRAPHICS_DIR/macOS"/*; do + cp "$icon" "$TMP_ICONSET_DIR"/ +done + +iconutil --convert icns --output "$DIST_ASSETS_DIR/icon-macos.icns" "$TMP_ICONSET_DIR" +rm "$TMP_ICONSET_DIR"/* + +# Linux .icns icon for size in 16 32 128 256 512; do double_size=$[$size * 2] rsvg-convert -o $TMP_ICONSET_DIR/icon-$size.png -w $size -h $size $SVG_SOURCE_PATH rsvg-convert -o $TMP_ICONSET_DIR/icon-$size@2x.png -w $double_size -h $double_size \ $SVG_SOURCE_PATH done -iconutil --convert icns --output $DIST_ASSETS_DIR/icon.icns $TMP_ICONSET_DIR +iconutil --convert icns --output $DIST_ASSETS_DIR/icon.icns $TMP_ICONSET_DIR rm -rf $TMP_ICONSET_DIR # Windows .ico icon -mkdir $TMP_ICO_DIR for size in 16 20 24 30 32 36 40 48 60 64 72 80 96 256 512; do rsvg-convert -o $TMP_ICO_DIR/$size.png -w $size -h $size $SVG_SOURCE_PATH done diff --git a/gui/tasks/distribution.js b/gui/tasks/distribution.js index 7270dbdfc6..bedeeb09eb 100644 --- a/gui/tasks/distribution.js +++ b/gui/tasks/distribution.js @@ -53,6 +53,7 @@ const config = { }, artifactName: 'MullvadVPN-${version}.${ext}', category: 'public.app-category.tools', + icon: distAssets('icon-macos.icns'), extendInfo: { LSUIElement: true, NSUserNotificationAlertStyle: 'alert', @@ -121,6 +122,7 @@ const config = { target: ['deb', 'rpm'], artifactName: 'MullvadVPN-${version}_${arch}.${ext}', category: 'Network', + icon: distAssets('icon.icns'), extraFiles: [{ from: distAssets('linux/mullvad-gui-launcher.sh'), to: '.' }], extraResources: [ { from: distAssets('mullvad-problem-report'), to: '.' }, |