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

diff --git a/graphics/update b/graphics/update
index 4f5cdc8f8..464a3a068 100755
--- a/graphics/update
+++ b/graphics/update
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 #
 # Update generated stuff in graphics/ from the source files.
 #
@@ -6,19 +6,44 @@
 # a) getting the wscript right is a complete pain in the arse
 # b) running Inkscape from the command line on OS X is a complete pain in the arse
 
+set -e
+
 pwd=`pwd`
 if [ `basename $pwd` != "graphics" ]; then
-  echo "$0: run within graphics/"
-  exit 1
+    echo "$0: run within graphics/"
+    exit 1
 fi
 
+function required_font()
+{
+    set +e
+    check=$(fc-list | grep "$1")
+    set -e
+    if [ "$check" == "" ]; then
+        echo "Missing font $1"
+        exit 1
+    fi
+}
+
+svg_apps="dcpomatic2_kdm dcpomatic2_server dcpomatic2_batch dcpomatic2_player dcpomatic2_playlist dcpomatic2_disk dcpomatic2_combiner"
+
+
 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 $svg_apps; do
 	iconutil --convert icns --output osx/$p.icns osx/$p.iconset
     done
 else
-    INKSCAPE="inkscape -z -C -e"
+    required_font "Libre Baskerville"
+
+    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
+
 
     # OS X application icons
     mkdir -p osx
@@ -28,10 +53,10 @@ 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 $svg_apps; 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
+	    $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
 	done
     done
 
@@ -40,30 +65,42 @@ else
     for r in 16 22 32 48 64 128 256 512; do
 	mkdir -p linux/$r
 	convert src/dcpomatic.png -resize $rx$r linux/$r/dcpomatic2.png
-	for p in dcpomatic2_kdm dcpomatic2_server dcpomatic2_batch dcpomatic2_player; do
-	    $INKSCAPE linux/$r/$p.png src/$p.svg -w $r -h $r
+	for p in $svg_apps; do
+	    $INKSCAPE --export-filename=linux/$r/$p.png src/$p.svg -w $r -h $r
 	done
     done
 
     # Windows application icons
     mkdir -p windows
-    for p in dcpomatic2 dcpomatic2_kdm dcpomatic2_server dcpomatic2_batch dcpomatic2_player; do
+    for p in dcpomatic2 $svg_apps; do
 	icotool -c -o windows/$p.ico linux/16/$p.png linux/32/$p.png linux/48/$p.png linux/64/$p.png linux/128/$p.png
     done
     convert src/dcpomatic.png -resize 400x400 windows/dcpomatic.bmp
 
     # OS X preferences icons
-    # servers.png does not have an SVG version
     mkdir -p osx/preferences
-    for i in colour_conversions defaults kdm_email cover_sheet keys tms; do
-	$INKSCAPE osx/preferences/$i.png src/$i.svg -w 32 -h 32
+    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
     done
 
     # OS X menu bar icon for the server
-    $INKSCAPE osx/dcpomatic_small.png -w 64 -h 64 src/dcpomatic_small.svg
+    $INKSCAPE --export-filename=osx/dcpomatic_small.png -w 64 -h 64 src/dcpomatic_small.svg
 
     # Splash screen (all platforms)
-    $INKSCAPE splash.png src/splash.svg -w 400 -h 300
+    $INKSCAPE --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
+    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
+
+    # Link icon
+    $INKSCAPE --export-filename=link.png src/link.svg -w 9 -h 16
 
     # favicon
     mkdir -p web