X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=graphics%2Fupdate;h=46964470ba039c7f11852143ba6ab6b6c731920d;hb=HEAD;hp=cea8fd2249e7c090d19c14476f335ca864ad8012;hpb=8cd5b3c968b1dd0052ed78f4674b5b1e7ce14c05;p=dcpomatic.git

diff --git a/graphics/update b/graphics/update
index cea8fd224..46964470b 100755
--- a/graphics/update
+++ b/graphics/update
@@ -25,7 +25,7 @@ function required_font()
     fi
 }
 
-svg_apps="dcpomatic2_kdm dcpomatic2_server dcpomatic2_batch dcpomatic2_player dcpomatic2_playlist dcpomatic2_disk dcpomatic2_combiner"
+svg_apps="dcpomatic2_kdm dcpomatic2_server dcpomatic2_batch dcpomatic2_player dcpomatic2_playlist dcpomatic2_disk dcpomatic2_combiner dcpomatic2_editor"
 
 
 if [ `uname -s` == "Darwin" ]; then
@@ -36,14 +36,15 @@ if [ `uname -s` == "Darwin" ]; then
 else
     required_font "Libre Baskerville"
 
-    for c in icotool convert inkscape inkbatch; do
+    INKSCAPE="$HOME/Applications/inkscape"
+    for c in icotool convert inkbatch $INKSCAPE; do
         if [ ! -x "$(command -v $c)" ]; then
             echo "$c is required"
             exit 1
         fi
     done
 
-    INKSCAPE="$HOME/Applications/inkscape -C --export-type=png"
+    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
 
@@ -79,28 +80,38 @@ 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
+    for c in black white; do
+	for i in defaults email kdm_email cover_sheet keys tms notifications locations sound identifiers servers general advanced non_standard; do
+	    inkbatch --inkscape $INKSCAPE -i bounds-$i -o osx/preferences/${i}_${c}.png --width 32 --height 32 src/preferences_$c.svg
+	    inkbatch --inkscape $INKSCAPE -i bounds-$i -o osx/preferences/${i}@2x_${c}.png --width 64 --height 64 src/preferences_$c.svg
+	done
     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
+    for c in black white; do
+        for i in select zoom zoom_all snap sequence; do
+            inkbatch --inkscape $INKSCAPE -i timeline-$i -o ${i}_${c}.png --width 32 --height 32 src/timeline_$c.svg
+        done
     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
+    # Batch converter toolbar icons (all platforms)
+    for c in black white; do
+        for i in add pause; do
+            inkbatch --inkscape $INKSCAPE -i batch-$i -o ${i}_${c}.png --width 32 --height 32 src/batch_$c.svg
+        done
+    done
 
     # Link icon
-    $INKSCAPE --export-filename=link.png src/link.svg -w 9 -h 16
+    for c in black white; do
+        $INKSCAPE_EXPORT --export-filename=link_$c.png src/link_$c.svg -w 9 -h 16
+    done
 
     # favicon
     mkdir -p web