New OS X menu bar icon for server.

29 files changed, 100 insertions, 2 deletions

diff --git a/graphics/linux/128/dcpomatic2.png b/graphics/linux/128/dcpomatic2.png
index c18c4ea12..79cbbef4f 100644
--- a/graphics/linux/128/dcpomatic2.png
+++ b/graphics/linux/128/dcpomatic2.png
diff --git a/graphics/linux/16/dcpomatic2.png b/graphics/linux/16/dcpomatic2.png
index ebcb845f1..a11b8576e 100644
--- a/graphics/linux/16/dcpomatic2.png
+++ b/graphics/linux/16/dcpomatic2.png
diff --git a/graphics/linux/22/dcpomatic2.png b/graphics/linux/22/dcpomatic2.png
index 2bca6e89f..7f2730f23 100644
--- a/graphics/linux/22/dcpomatic2.png
+++ b/graphics/linux/22/dcpomatic2.png
diff --git a/graphics/linux/256/dcpomatic2.png b/graphics/linux/256/dcpomatic2.png
index fa767b829..b517b9da2 100644
--- a/graphics/linux/256/dcpomatic2.png
+++ b/graphics/linux/256/dcpomatic2.png
diff --git a/graphics/linux/32/dcpomatic2.png b/graphics/linux/32/dcpomatic2.png
index 3dea8b696..794c01b58 100644
--- a/graphics/linux/32/dcpomatic2.png
+++ b/graphics/linux/32/dcpomatic2.png
diff --git a/graphics/linux/48/dcpomatic2.png b/graphics/linux/48/dcpomatic2.png
index 886c4a22d..5edc416db 100644
--- a/graphics/linux/48/dcpomatic2.png
+++ b/graphics/linux/48/dcpomatic2.png
diff --git a/graphics/linux/512/dcpomatic2.png b/graphics/linux/512/dcpomatic2.png
index 489650a0e..08c274dd8 100644
--- a/graphics/linux/512/dcpomatic2.png
+++ b/graphics/linux/512/dcpomatic2.png
diff --git a/graphics/linux/64/dcpomatic2.png b/graphics/linux/64/dcpomatic2.png
index 524143c9c..139a70f15 100644
--- a/graphics/linux/64/dcpomatic2.png
+++ b/graphics/linux/64/dcpomatic2.png
diff --git a/graphics/osx/dcpomatic2.iconset/icon_128x128.png b/graphics/osx/dcpomatic2.iconset/icon_128x128.png
index f3aaaaf69..0c2db5ef4 100644
--- a/graphics/osx/dcpomatic2.iconset/icon_128x128.png
+++ b/graphics/osx/dcpomatic2.iconset/icon_128x128.png
diff --git a/graphics/osx/dcpomatic2.iconset/icon_128x128@2x.png b/graphics/osx/dcpomatic2.iconset/icon_128x128@2x.png
index f3aaaaf69..0c2db5ef4 100644
--- a/graphics/osx/dcpomatic2.iconset/icon_128x128@2x.png
+++ b/graphics/osx/dcpomatic2.iconset/icon_128x128@2x.png
diff --git a/graphics/osx/dcpomatic2.iconset/icon_16x16.png b/graphics/osx/dcpomatic2.iconset/icon_16x16.png
index 84c538de0..c27bef447 100644
--- a/graphics/osx/dcpomatic2.iconset/icon_16x16.png
+++ b/graphics/osx/dcpomatic2.iconset/icon_16x16.png
diff --git a/graphics/osx/dcpomatic2.iconset/icon_16x16@2x.png b/graphics/osx/dcpomatic2.iconset/icon_16x16@2x.png
index 84c538de0..c27bef447 100644
--- a/graphics/osx/dcpomatic2.iconset/icon_16x16@2x.png
+++ b/graphics/osx/dcpomatic2.iconset/icon_16x16@2x.png
diff --git a/graphics/osx/dcpomatic2.iconset/icon_256x256.png b/graphics/osx/dcpomatic2.iconset/icon_256x256.png
index 9cd6b599c..66face3b8 100644
--- a/graphics/osx/dcpomatic2.iconset/icon_256x256.png
+++ b/graphics/osx/dcpomatic2.iconset/icon_256x256.png
diff --git a/graphics/osx/dcpomatic2.iconset/icon_256x256@2x.png b/graphics/osx/dcpomatic2.iconset/icon_256x256@2x.png
index 9cd6b599c..66face3b8 100644
--- a/graphics/osx/dcpomatic2.iconset/icon_256x256@2x.png
+++ b/graphics/osx/dcpomatic2.iconset/icon_256x256@2x.png
diff --git a/graphics/osx/dcpomatic2.iconset/icon_32x32.png b/graphics/osx/dcpomatic2.iconset/icon_32x32.png
index d58ddb6e2..c738d48a7 100644
--- a/graphics/osx/dcpomatic2.iconset/icon_32x32.png
+++ b/graphics/osx/dcpomatic2.iconset/icon_32x32.png
diff --git a/graphics/osx/dcpomatic2.iconset/icon_32x32@2x.png b/graphics/osx/dcpomatic2.iconset/icon_32x32@2x.png
index d58ddb6e2..c738d48a7 100644
--- a/graphics/osx/dcpomatic2.iconset/icon_32x32@2x.png
+++ b/graphics/osx/dcpomatic2.iconset/icon_32x32@2x.png
diff --git a/graphics/osx/dcpomatic2.iconset/icon_512x512.png b/graphics/osx/dcpomatic2.iconset/icon_512x512.png
index 19be4b7ac..52b205926 100644
--- a/graphics/osx/dcpomatic2.iconset/icon_512x512.png
+++ b/graphics/osx/dcpomatic2.iconset/icon_512x512.png
diff --git a/graphics/osx/dcpomatic2.iconset/icon_512x512@2x.png b/graphics/osx/dcpomatic2.iconset/icon_512x512@2x.png
index 19be4b7ac..a9ea27e93 100644
--- a/graphics/osx/dcpomatic2.iconset/icon_512x512@2x.png
+++ b/graphics/osx/dcpomatic2.iconset/icon_512x512@2x.png
diff --git a/graphics/osx/dcpomatic_small.png b/graphics/osx/dcpomatic_small.png
new file mode 100644
index 000000000..6d1a85007
--- /dev/null
+++ b/graphics/osx/dcpomatic_small.png
diff --git a/graphics/src/dcpomatic_small.svg b/graphics/src/dcpomatic_small.svg
new file mode 100644
index 000000000..e6b355c35
--- /dev/null
+++ b/graphics/src/dcpomatic_small.svg
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="71.686127mm"
+   height="71.686119mm"
+   viewBox="0 0 71.686127 71.686119"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92+devel 15537"
+   sodipodi:docname="dcpomatic_small.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.7"
+     inkscape:cx="117.53117"
+     inkscape:cy="33.622077"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     inkscape:window-width="786"
+     inkscape:window-height="613"
+     inkscape:window-x="25"
+     inkscape:window-y="117"
+     inkscape:window-maximized="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-47.183062,-92.736803)">
+    <circle
+       style="color:#000000;overflow:visible;vector-effect:none;fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path4807"
+       cx="83.026123"
+       cy="128.57986"
+       r="29.482143" />
+    <circle
+       style="color:#000000;overflow:visible;vector-effect:none;fill:none;fill-rule:evenodd;stroke:#ff0000;stroke-width:8.56410217;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path4807-3"
+       cx="83.026123"
+       cy="128.57986"
+       r="31.56101" />
+    <text
+       xml:space="preserve"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:40.17214203px;line-height:125%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans Bold';text-decoration:none;text-decoration-line:none;text-decoration-color:#000000;letter-spacing:0px;word-spacing:0px;shape-padding:0;overflow:visible;vector-effect:none;fill:#ffffff;fill-rule:evenodd;stroke:#ff0000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
+       x="67.004135"
+       y="142.65572"
+       id="text4826"><tspan
+         sodipodi:role="line"
+         id="tspan4824"
+         x="67.004135"
+         y="142.65572"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans Bold';fill:#ffffff;stroke-width:0">D</tspan></text>
+    <circle
+       style="color:#000000;overflow:visible;vector-effect:none;fill:none;fill-rule:evenodd;stroke:#00ffff;stroke-width:3.1615386;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path4828"
+       cx="83.026123"
+       cy="128.57986"
+       r="25.891365" />
+  </g>
+</svg>
diff --git a/graphics/update b/graphics/update
index 73436cb6a..fbd522597 100755
--- a/graphics/update
+++ b/graphics/update
@@ -22,7 +22,6 @@ else
 
     # OS X application icons
     mkdir -p osx
-    convert src/dcpomatic.png -resize 32x32 osx/dcpomatic2.png
     for r in 16 32 128 256 512; do
 	for p in dcpomatic2; do
 	    mkdir -p osx/$p.iconset
@@ -60,6 +59,9 @@ else
 	$INKSCAPE osx/preferences/$i.png src/$i.svg -w 32 -h 32
     done
 
+    # OS X menu bar icon for the server
+    $INKSCAPE osx/dcpomatic_small.png -w 22 -h 22 src/dcpomatic_small.svg
+
     # Splash screen (all platforms)
     $INKSCAPE splash.png src/splash.svg -w 400 -h 300
 
diff --git a/graphics/web/favicon-128x128.png b/graphics/web/favicon-128x128.png
index e50bee009..26cf94927 100644
--- a/graphics/web/favicon-128x128.png
+++ b/graphics/web/favicon-128x128.png
diff --git a/graphics/web/favicon-16x16.png b/graphics/web/favicon-16x16.png
index eaa28899d..173ea64cd 100644
--- a/graphics/web/favicon-16x16.png
+++ b/graphics/web/favicon-16x16.png
diff --git a/graphics/web/favicon-256x256.png b/graphics/web/favicon-256x256.png
index a923ba464..08b6cadd4 100644
--- a/graphics/web/favicon-256x256.png
+++ b/graphics/web/favicon-256x256.png
diff --git a/graphics/web/favicon-32x32.png b/graphics/web/favicon-32x32.png
index 6b677b636..09e59cc9b 100644
--- a/graphics/web/favicon-32x32.png
+++ b/graphics/web/favicon-32x32.png
diff --git a/graphics/web/favicon-64x64.png b/graphics/web/favicon-64x64.png
index 23d02aeb1..f6cabed99 100644
--- a/graphics/web/favicon-64x64.png
+++ b/graphics/web/favicon-64x64.png
diff --git a/graphics/web/logo.png b/graphics/web/logo.png
index cfc8c163d..352fce11c 100644
--- a/graphics/web/logo.png
+++ b/graphics/web/logo.png
diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 6a413f287..bccecfebc 100644
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -113,7 +113,7 @@ function copy_libs {
 # @param #1 directory to copy to
 function copy_resources {
     local dest="$1"
-    cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic2.png "$dest"
+    cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic_small.png "$dest"
     cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic2.icns "$dest"
     cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic2_kdm.icns "$dest"
     cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic2_server.icns "$dest"
diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index 8e9ce7537..9214d8385 100644
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -208,7 +208,12 @@ public:
 		wxIcon icon (std_to_wx ("id"));
 #else
 		wxInitAllImageHandlers();
+#ifdef DCPOMATIC_LINUX
 		wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic2.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
+#endif
+#ifdef DCPOMATIC_OSX
+		wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic_small.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
+#endif
 		wxIcon icon;
 		icon.CopyFromBitmap (bitmap);
 #endif