diff --git a/TOOLS/osxbundle/mpv.app/Contents/Info.plist b/TOOLS/osxbundle/mpv.app/Contents/Info.plist index d19c83564e..4661981803 100644 --- a/TOOLS/osxbundle/mpv.app/Contents/Info.plist +++ b/TOOLS/osxbundle/mpv.app/Contents/Info.plist @@ -35,7 +35,7 @@ wma CFBundleTypeIconFile - audio.icns + document.icns CFBundleTypeName Audio file CFBundleTypeRole @@ -122,7 +122,7 @@ wmv CFBundleTypeIconFile - movie.icns + document.icns CFBundleTypeName Movie file CFBundleTypeRole @@ -157,7 +157,7 @@ utf CFBundleTypeIconFile - subtitles.icns + document.icns CFBundleTypeName Subtitles file CFBundleTypeRole diff --git a/TOOLS/osxbundle/mpv.app/Contents/Resources/audio.icns b/TOOLS/osxbundle/mpv.app/Contents/Resources/audio.icns deleted file mode 100644 index 239b9bab12..0000000000 Binary files a/TOOLS/osxbundle/mpv.app/Contents/Resources/audio.icns and /dev/null differ diff --git a/TOOLS/osxbundle/mpv.app/Contents/Resources/document.icns b/TOOLS/osxbundle/mpv.app/Contents/Resources/document.icns new file mode 100644 index 0000000000..d6162960b2 Binary files /dev/null and b/TOOLS/osxbundle/mpv.app/Contents/Resources/document.icns differ diff --git a/TOOLS/osxbundle/mpv.app/Contents/Resources/icon.icns b/TOOLS/osxbundle/mpv.app/Contents/Resources/icon.icns index eb056f5a15..035a934582 100644 Binary files a/TOOLS/osxbundle/mpv.app/Contents/Resources/icon.icns and b/TOOLS/osxbundle/mpv.app/Contents/Resources/icon.icns differ diff --git a/TOOLS/osxbundle/mpv.app/Contents/Resources/movie.icns b/TOOLS/osxbundle/mpv.app/Contents/Resources/movie.icns deleted file mode 100644 index 8c495894a4..0000000000 Binary files a/TOOLS/osxbundle/mpv.app/Contents/Resources/movie.icns and /dev/null differ diff --git a/TOOLS/osxbundle/mpv.app/Contents/Resources/subtitles.icns b/TOOLS/osxbundle/mpv.app/Contents/Resources/subtitles.icns deleted file mode 100644 index f4c7270691..0000000000 Binary files a/TOOLS/osxbundle/mpv.app/Contents/Resources/subtitles.icns and /dev/null differ diff --git a/TOOLS/svg2ico.sh b/TOOLS/svg2ico.sh deleted file mode 100755 index 84aadf212b..0000000000 --- a/TOOLS/svg2ico.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -set -e - -if [ $# -ne 2 ]; then - echo >&2 "Usage: $0 input.svg output.ico" - exit 1 -fi - -# For smooth rendering on high-DPI displays, the standard three app icon sizes -# (16x16, 32x32 and 48x48) have to be scaled to the four Windows DPI settings -# as in the table below: - -# Small Regular Tiles -# 96 DPI (100%) 16x16 32x32 48x48 -# 120 DPI (125%) 20x20 40x40 60x60 -# 144 DPI (150%) 24x24 48x48 72x72 -# 196 DPI (200%) 32x32 64x64 96x96 - -# Also, there should also be an extra large 256x256 icon and some low colour -# 8-bit and 4-bit variants, which are still used in Remote Desktop. - -# Note: Windows Vista has a bug in its icon scaling that makes no sense. -# Instead of following the DPI setting, small icons are always a bit larger -# than they should be at 22x22, 26x26 and 36x36 for 120, 144 and 196 DPI. This -# script doesn't generate icons with those sizes, since computers with Vista -# and a high-DPI display are probably fairly rare these days. - -temppng=".$(basename "$1" .svg)-temp.png" - -inkscape --without-gui --export-png="$temppng" --export-dpi=72 \ - --export-background-opacity=0 --export-width=512 --export-height=512 \ - "$1" >/dev/null 2>&1 - -# Old versions of ImageMagick (like the one in Cygwin) use the wrong gamma when -# exporting icon files. To fix, add -gamma 2.2 after the input file. - -convert png:"$temppng" -filter lanczos2 \ - \( -clone 0 -resize 96x96 \) \ - \( -clone 0 -resize 72x72 \) \ - \( -clone 0 -resize 64x64 \) \ - \( -clone 0 -resize 60x60 \) \ - \( -clone 0 -resize 48x48 \) \ - \( -clone 0 -resize 40x40 \) \ - \( -clone 0 -resize 32x32 \) \ - \( -clone 0 -resize 24x24 \) \ - \( -clone 0 -resize 20x20 \) \ - \( -clone 0 -resize 16x16 \) \ - \( -clone 0 -resize 256x256 \) \ - \( -clone 0 -resize 32x32 \( -clone 0 -alpha opaque -colors 255 \) \ - \( -clone 0 -channel A -threshold 50% \) \ - -delete 0 -compose CopyOpacity -composite -colors 256 \) \ - \( -clone 0 -resize 16x16 \( -clone 0 -alpha opaque -colors 255 \) \ - \( -clone 0 -channel A -threshold 50% \) \ - -delete 0 -compose CopyOpacity -composite -colors 256 \) \ - \( -clone 0 -resize 32x32 \( -clone 0 -alpha opaque -colors 15 \) \ - \( -clone 0 -channel A -threshold 50% \) \ - -delete 0 -compose CopyOpacity -composite -colors 16 \) \ - \( -clone 0 -resize 16x16 \( -clone 0 -alpha opaque -colors 15 \) \ - \( -clone 0 -channel A -threshold 50% \) \ - -delete 0 -compose CopyOpacity -composite -colors 16 \) \ - -delete 0 \ - -define png:compression-level=9 -define png:include-chunk=none ico:"$2" - -rm "$temppng" diff --git a/etc/mpv-icon-source.svg b/etc/mpv-icon-source.svg deleted file mode 100644 index 6d0453bc5f..0000000000 --- a/etc/mpv-icon-source.svg +++ /dev/null @@ -1,556 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/etc/mpv-icon.ico b/etc/mpv-icon.ico index 33415be519..5467e4e5f6 100644 Binary files a/etc/mpv-icon.ico and b/etc/mpv-icon.ico differ