diff options
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | dist-assets/icon-macos.icns | bin | 0 -> 191192 bytes | |||
| -rw-r--r-- | graphics/macOS/icon-128.png | bin | 0 -> 6275 bytes | |||
| -rw-r--r-- | graphics/macOS/icon-128@2x.png | bin | 0 -> 14713 bytes | |||
| -rw-r--r-- | graphics/macOS/icon-16.png | bin | 0 -> 734 bytes | |||
| -rw-r--r-- | graphics/macOS/icon-16@2x.png | bin | 0 -> 1423 bytes | |||
| -rw-r--r-- | graphics/macOS/icon-256.png | bin | 0 -> 13885 bytes | |||
| -rw-r--r-- | graphics/macOS/icon-256@2x.png | bin | 0 -> 33041 bytes | |||
| -rw-r--r-- | graphics/macOS/icon-32.png | bin | 0 -> 1423 bytes | |||
| -rw-r--r-- | graphics/macOS/icon-32@2x.png | bin | 0 -> 2585 bytes | |||
| -rw-r--r-- | graphics/macOS/icon-512.png | bin | 0 -> 33041 bytes | |||
| -rw-r--r-- | graphics/macOS/icon-512@2x.png | bin | 0 -> 83493 bytes | |||
| -rwxr-xr-x | gui/scripts/build-logo-icons.sh | 17 | ||||
| -rw-r--r-- | gui/tasks/distribution.js | 2 |
14 files changed, 18 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e6589504d..32eec0f408 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,9 @@ Line wrap the file at 100 chars. Th #### Android - Improve stability by running the UI and the tunnel management logic in separate processes. +#### macOS +- Update shape of macOS icon to be in line with Apple's guidelines. + ### Fixed - Fix relay selection failing to pick a WireGuard relay when no tunnel protocol is specified. - Fix time left not always being translated in desktop app settings. diff --git a/dist-assets/icon-macos.icns b/dist-assets/icon-macos.icns Binary files differnew file mode 100644 index 0000000000..231c97df26 --- /dev/null +++ b/dist-assets/icon-macos.icns diff --git a/graphics/macOS/icon-128.png b/graphics/macOS/icon-128.png Binary files differnew file mode 100644 index 0000000000..84cc2b009d --- /dev/null +++ b/graphics/macOS/icon-128.png diff --git a/graphics/macOS/icon-128@2x.png b/graphics/macOS/icon-128@2x.png Binary files differnew file mode 100644 index 0000000000..6162e47547 --- /dev/null +++ b/graphics/macOS/icon-128@2x.png diff --git a/graphics/macOS/icon-16.png b/graphics/macOS/icon-16.png Binary files differnew file mode 100644 index 0000000000..2a4c8d8edc --- /dev/null +++ b/graphics/macOS/icon-16.png diff --git a/graphics/macOS/icon-16@2x.png b/graphics/macOS/icon-16@2x.png Binary files differnew file mode 100644 index 0000000000..880ae61d68 --- /dev/null +++ b/graphics/macOS/icon-16@2x.png diff --git a/graphics/macOS/icon-256.png b/graphics/macOS/icon-256.png Binary files differnew file mode 100644 index 0000000000..5dd510c4f1 --- /dev/null +++ b/graphics/macOS/icon-256.png diff --git a/graphics/macOS/icon-256@2x.png b/graphics/macOS/icon-256@2x.png Binary files differnew file mode 100644 index 0000000000..c15d24b595 --- /dev/null +++ b/graphics/macOS/icon-256@2x.png diff --git a/graphics/macOS/icon-32.png b/graphics/macOS/icon-32.png Binary files differnew file mode 100644 index 0000000000..880ae61d68 --- /dev/null +++ b/graphics/macOS/icon-32.png diff --git a/graphics/macOS/icon-32@2x.png b/graphics/macOS/icon-32@2x.png Binary files differnew file mode 100644 index 0000000000..bdc3d42679 --- /dev/null +++ b/graphics/macOS/icon-32@2x.png diff --git a/graphics/macOS/icon-512.png b/graphics/macOS/icon-512.png Binary files differnew file mode 100644 index 0000000000..c15d24b595 --- /dev/null +++ b/graphics/macOS/icon-512.png diff --git a/graphics/macOS/icon-512@2x.png b/graphics/macOS/icon-512@2x.png Binary files differnew file mode 100644 index 0000000000..5567d784e0 --- /dev/null +++ b/graphics/macOS/icon-512@2x.png 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: '.' }, |
