X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=graphics%2Fupdate;h=35aec325a78bb0f279f5b988804a65ca713038b5;hb=eaee99e58f3f8b2f63f43dee9e346d0b025f688a;hp=464a3a068b0b6a2cc819b7c1a5b0bf4c92d018fb;hpb=95e6551c7e77f03455d14b41a9bc0430c9dc086d;p=dcpomatic.git

diff --git a/graphics/update b/graphics/update
index 464a3a068..35aec325a 100755
--- a/graphics/update
+++ b/graphics/update
@@ -44,6 +44,7 @@ else
         fi
     done
 
+    INKSCAPE_EXPORT="$INKSCAPE -C --export-type=png"
 
     # OS X application icons
     mkdir -p osx
@@ -55,8 +56,8 @@ else
 	done
 	for p in $svg_apps; do
 	    mkdir -p osx/$p.iconset
-	    $INKSCAPE --export-filename=osx/$p.iconset/icon_${r}x${r}.png -w $r -h $r src/$p.svg
-	    $INKSCAPE --export-filename=osx/$p.iconset/icon_${r}x${r}@2x.png -w $r -h $r src/$p.svg
+	    $INKSCAPE_EXPORT --export-filename=osx/$p.iconset/icon_${r}x${r}.png -w $r -h $r src/$p.svg
+	    $INKSCAPE_EXPORT --export-filename=osx/$p.iconset/icon_${r}x${r}@2x.png -w $r -h $r src/$p.svg
 	done
     done
 
@@ -66,7 +67,7 @@ else
 	mkdir -p linux/$r
 	convert src/dcpomatic.png -resize $rx$r linux/$r/dcpomatic2.png
 	for p in $svg_apps; do
-	    $INKSCAPE --export-filename=linux/$r/$p.png src/$p.svg -w $r -h $r
+	    $INKSCAPE_EXPORT --export-filename=linux/$r/$p.png src/$p.svg -w $r -h $r
 	done
     done
 
@@ -80,27 +81,28 @@ else
     # OS X preferences icons
     mkdir -p osx/preferences
     for i in defaults email kdm_email cover_sheet keys tms notifications locations sound identifiers servers general advanced; do
-        inkbatch -i bounds-$i -o osx/preferences/$i.png --width 32 --height 32 src/preferences.svg
-        inkbatch -i bounds-$i -o osx/preferences/$i@2x.png --width 64 --height 64 src/preferences.svg
+        inkbatch --inkscape $INKSCAPE -i bounds-$i -o osx/preferences/$i.png --width 32 --height 32 src/preferences.svg
+        inkbatch --inkscape $INKSCAPE -i bounds-$i -o osx/preferences/$i@2x.png --width 64 --height 64 src/preferences.svg
     done
 
-    # OS X menu bar icon for the server
-    $INKSCAPE --export-filename=osx/dcpomatic_small.png -w 64 -h 64 src/dcpomatic_small.svg
+    # OS X menu bar icon for the server (in dark and light mode)
+    $INKSCAPE_EXPORT --export-filename=osx/dcpomatic_small_white.png -w 64 -h 64 src/dcpomatic_small_white.svg
+    $INKSCAPE_EXPORT --export-filename=osx/dcpomatic_small_black.png -w 64 -h 64 src/dcpomatic_small_black.svg
 
     # Splash screen (all platforms)
-    $INKSCAPE --export-filename=splash.png src/splash.svg -w 400 -h 300
+    $INKSCAPE_EXPORT --export-filename=splash.png src/splash.svg -w 400 -h 300
 
     # Timeline toolbar icons (all platforms)
     for i in select zoom zoom_all snap sequence; do
-        $INKSCAPE --export-filename=$i.png src/$i.svg -w 32 -h 32
+        $INKSCAPE_EXPORT --export-filename=$i.png src/$i.svg -w 32 -h 32
     done
 
     # Playlist editor tick/no-tick
-    $INKSCAPE --export-filename=tick.png src/tick.svg -w 16 -h 16
-    $INKSCAPE --export-filename=no_tick.png src/no_tick.svg -w 16 -h 16
+    $INKSCAPE_EXPORT --export-filename=tick.png src/tick.svg -w 16 -h 16
+    $INKSCAPE_EXPORT --export-filename=no_tick.png src/no_tick.svg -w 16 -h 16
 
     # Link icon
-    $INKSCAPE --export-filename=link.png src/link.svg -w 9 -h 16
+    $INKSCAPE_EXPORT --export-filename=link.png src/link.svg -w 9 -h 16
 
     # favicon
     mkdir -p web