X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=graphics%2Fupdate;h=2e5bccd17d63aee71b49f59b156cc7c6cccf3f0e;hb=0b21bfba60be812a5d04cc5c10868e04b5579404;hp=42e8f5e8f59daca0e91d774aa57fc6ea0ed92535;hpb=a435cb6540d462fd914eb83a32b60a1224cf76e8;p=dcpomatic.git diff --git a/graphics/update b/graphics/update index 42e8f5e8f..2e5bccd17 100755 --- a/graphics/update +++ b/graphics/update @@ -12,19 +12,20 @@ if [ `basename $pwd` != "graphics" ]; then exit 1 fi -for c in icotool convert inkscape; do - if [ ! -x "$(command -v $c)" ]; then - echo "$c is required" - exit 1 - fi -done - if [ `uname -s` == "Darwin" ]; then # Convert OS X icons using OS X-only iconutil - for p in dcpomatic2 dcpomatic2_kdm dcpomatic2_server dcpomatic2_batch dcpomatic2_player; do + for p in dcpomatic2 dcpomatic2_kdm dcpomatic2_server dcpomatic2_batch dcpomatic2_player dcpomatic2_playlist; do iconutil --convert icns --output osx/$p.icns osx/$p.iconset done else + + for c in icotool convert inkscape; do + if [ ! -x "$(command -v $c)" ]; then + echo "$c is required" + exit 1 + fi + done + INKSCAPE="inkscape -z -C -e" # OS X application icons @@ -35,7 +36,7 @@ else convert src/dcpomatic.png -resize $rx$r osx/$p.iconset/icon_${r}x${r}.png convert src/dcpomatic.png -resize $rx$r osx/$p.iconset/icon_${r}x${r}@2x.png done - for p in dcpomatic2_kdm dcpomatic2_server dcpomatic2_batch dcpomatic2_player; do + for p in dcpomatic2_kdm dcpomatic2_server dcpomatic2_batch dcpomatic2_player dcpomatic2_playlist; do mkdir -p osx/$p.iconset $INKSCAPE osx/$p.iconset/icon_${r}x${r}.png -w $r -h $r src/$p.svg $INKSCAPE osx/$p.iconset/icon_${r}x${r}@2x.png -w $r -h $r src/$p.svg @@ -62,7 +63,7 @@ else # OS X preferences icons # servers.png does not have an SVG version mkdir -p osx/preferences - for i in colour_conversions defaults email kdm_email cover_sheet keys tms notifications accounts locations; do + for i in colour_conversions defaults email kdm_email cover_sheet keys tms notifications locations sound; do $INKSCAPE osx/preferences/$i.png src/$i.svg -w 32 -h 32 done