From b76a5f24d8ce660ab0781153df4b280f55e61df9 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Fri, 17 Jan 2020 00:39:32 +0100 Subject: [PATCH] fix iconset --- .../icon_1024x1024.png} | Bin .../icon_167x167.png} | Bin .../icon_20x20.png} | Bin .../icon_20x20@2x.png} | Bin .../icon_20x20@3x.png} | Bin .../icon_29x29.png} | Bin .../icon_29x29@2x.png} | Bin .../icon_29x29@3x.png} | Bin .../icon_40x40.png} | Bin .../icon_40x40@2x.png} | Bin .../icon_40x40@3x.png} | Bin .../icon_60x60@2x.png} | Bin .../icon_60x60@3x.png} | Bin .../icon_76x76.png} | Bin .../icon_76x76@2x.png} | Bin packaging/osx/exportappicons.sh | 6 +++--- 16 files changed, 3 insertions(+), 3 deletions(-) rename packaging/osx/{AppIcon.appiconset/AppIcon1024x1024.png => AppIcon.iconset/icon_1024x1024.png} (100%) rename packaging/osx/{AppIcon.appiconset/AppIcon167x167.png => AppIcon.iconset/icon_167x167.png} (100%) rename packaging/osx/{AppIcon.appiconset/AppIcon20x20.png => AppIcon.iconset/icon_20x20.png} (100%) rename packaging/osx/{AppIcon.appiconset/AppIcon20x20@2x.png => AppIcon.iconset/icon_20x20@2x.png} (100%) rename packaging/osx/{AppIcon.appiconset/AppIcon20x20@3x.png => AppIcon.iconset/icon_20x20@3x.png} (100%) rename packaging/osx/{AppIcon.appiconset/AppIcon29x29.png => AppIcon.iconset/icon_29x29.png} (100%) rename packaging/osx/{AppIcon.appiconset/AppIcon29x29@2x.png => AppIcon.iconset/icon_29x29@2x.png} (100%) rename packaging/osx/{AppIcon.appiconset/AppIcon29x29@3x.png => AppIcon.iconset/icon_29x29@3x.png} (100%) rename packaging/osx/{AppIcon.appiconset/AppIcon40x40.png => AppIcon.iconset/icon_40x40.png} (100%) rename packaging/osx/{AppIcon.appiconset/AppIcon40x40@2x.png => AppIcon.iconset/icon_40x40@2x.png} (100%) rename packaging/osx/{AppIcon.appiconset/AppIcon40x40@3x.png => AppIcon.iconset/icon_40x40@3x.png} (100%) rename packaging/osx/{AppIcon.appiconset/AppIcon60x60@2x.png => AppIcon.iconset/icon_60x60@2x.png} (100%) rename packaging/osx/{AppIcon.appiconset/AppIcon60x60@3x.png => AppIcon.iconset/icon_60x60@3x.png} (100%) rename packaging/osx/{AppIcon.appiconset/AppIcon76x76.png => AppIcon.iconset/icon_76x76.png} (100%) rename packaging/osx/{AppIcon.appiconset/AppIcon76x76@2x.png => AppIcon.iconset/icon_76x76@2x.png} (100%) diff --git a/packaging/osx/AppIcon.appiconset/AppIcon1024x1024.png b/packaging/osx/AppIcon.iconset/icon_1024x1024.png similarity index 100% rename from packaging/osx/AppIcon.appiconset/AppIcon1024x1024.png rename to packaging/osx/AppIcon.iconset/icon_1024x1024.png diff --git a/packaging/osx/AppIcon.appiconset/AppIcon167x167.png b/packaging/osx/AppIcon.iconset/icon_167x167.png similarity index 100% rename from packaging/osx/AppIcon.appiconset/AppIcon167x167.png rename to packaging/osx/AppIcon.iconset/icon_167x167.png diff --git a/packaging/osx/AppIcon.appiconset/AppIcon20x20.png b/packaging/osx/AppIcon.iconset/icon_20x20.png similarity index 100% rename from packaging/osx/AppIcon.appiconset/AppIcon20x20.png rename to packaging/osx/AppIcon.iconset/icon_20x20.png diff --git a/packaging/osx/AppIcon.appiconset/AppIcon20x20@2x.png b/packaging/osx/AppIcon.iconset/icon_20x20@2x.png similarity index 100% rename from packaging/osx/AppIcon.appiconset/AppIcon20x20@2x.png rename to packaging/osx/AppIcon.iconset/icon_20x20@2x.png diff --git a/packaging/osx/AppIcon.appiconset/AppIcon20x20@3x.png b/packaging/osx/AppIcon.iconset/icon_20x20@3x.png similarity index 100% rename from packaging/osx/AppIcon.appiconset/AppIcon20x20@3x.png rename to packaging/osx/AppIcon.iconset/icon_20x20@3x.png diff --git a/packaging/osx/AppIcon.appiconset/AppIcon29x29.png b/packaging/osx/AppIcon.iconset/icon_29x29.png similarity index 100% rename from packaging/osx/AppIcon.appiconset/AppIcon29x29.png rename to packaging/osx/AppIcon.iconset/icon_29x29.png diff --git a/packaging/osx/AppIcon.appiconset/AppIcon29x29@2x.png b/packaging/osx/AppIcon.iconset/icon_29x29@2x.png similarity index 100% rename from packaging/osx/AppIcon.appiconset/AppIcon29x29@2x.png rename to packaging/osx/AppIcon.iconset/icon_29x29@2x.png diff --git a/packaging/osx/AppIcon.appiconset/AppIcon29x29@3x.png b/packaging/osx/AppIcon.iconset/icon_29x29@3x.png similarity index 100% rename from packaging/osx/AppIcon.appiconset/AppIcon29x29@3x.png rename to packaging/osx/AppIcon.iconset/icon_29x29@3x.png diff --git a/packaging/osx/AppIcon.appiconset/AppIcon40x40.png b/packaging/osx/AppIcon.iconset/icon_40x40.png similarity index 100% rename from packaging/osx/AppIcon.appiconset/AppIcon40x40.png rename to packaging/osx/AppIcon.iconset/icon_40x40.png diff --git a/packaging/osx/AppIcon.appiconset/AppIcon40x40@2x.png b/packaging/osx/AppIcon.iconset/icon_40x40@2x.png similarity index 100% rename from packaging/osx/AppIcon.appiconset/AppIcon40x40@2x.png rename to packaging/osx/AppIcon.iconset/icon_40x40@2x.png diff --git a/packaging/osx/AppIcon.appiconset/AppIcon40x40@3x.png b/packaging/osx/AppIcon.iconset/icon_40x40@3x.png similarity index 100% rename from packaging/osx/AppIcon.appiconset/AppIcon40x40@3x.png rename to packaging/osx/AppIcon.iconset/icon_40x40@3x.png diff --git a/packaging/osx/AppIcon.appiconset/AppIcon60x60@2x.png b/packaging/osx/AppIcon.iconset/icon_60x60@2x.png similarity index 100% rename from packaging/osx/AppIcon.appiconset/AppIcon60x60@2x.png rename to packaging/osx/AppIcon.iconset/icon_60x60@2x.png diff --git a/packaging/osx/AppIcon.appiconset/AppIcon60x60@3x.png b/packaging/osx/AppIcon.iconset/icon_60x60@3x.png similarity index 100% rename from packaging/osx/AppIcon.appiconset/AppIcon60x60@3x.png rename to packaging/osx/AppIcon.iconset/icon_60x60@3x.png diff --git a/packaging/osx/AppIcon.appiconset/AppIcon76x76.png b/packaging/osx/AppIcon.iconset/icon_76x76.png similarity index 100% rename from packaging/osx/AppIcon.appiconset/AppIcon76x76.png rename to packaging/osx/AppIcon.iconset/icon_76x76.png diff --git a/packaging/osx/AppIcon.appiconset/AppIcon76x76@2x.png b/packaging/osx/AppIcon.iconset/icon_76x76@2x.png similarity index 100% rename from packaging/osx/AppIcon.appiconset/AppIcon76x76@2x.png rename to packaging/osx/AppIcon.iconset/icon_76x76@2x.png diff --git a/packaging/osx/exportappicons.sh b/packaging/osx/exportappicons.sh index fd15e47c..38e2576c 100755 --- a/packaging/osx/exportappicons.sh +++ b/packaging/osx/exportappicons.sh @@ -1,16 +1,16 @@ #!/bin/bash function exportImage() { - mkdir AppIcon.appiconset + mkdir AppIcon.iconset size=$1 scaleFactor=$2 echo Exporting AppIcon with size $size and scale factor $scaleFactor if [ ${scaleFactor} -ne 1 ]; then finalSize=$((size * scaleFactor)) echo final size is ${finalSize} - inkscape AppIcon.svg -e AppIcon.appiconset/AppIcon${size}x${size}@${scaleFactor}x.png -C -w $finalSize -h $finalSize + inkscape AppIcon.svg -e AppIcon.iconset/icon_${size}x${size}@${scaleFactor}x.png -C -w $finalSize -h $finalSize else - inkscape AppIcon.svg -e AppIcon.appiconset/AppIcon${size}x${size}.png -C -w ${size} -h ${size} + inkscape AppIcon.svg -e AppIcon.iconset/icon_${size}x${size}.png -C -w ${size} -h ${size} fi }