New OS X menu bar icon for server.

diff --git a/graphics/linux/128/dcpomatic2.png b/graphics/linux/128/dcpomatic2.png
index c18c4ea127b7958b33eaa18f408985d1749aa888..79cbbef4f7e2d770a13f94278684b9264dd16934 100644 (file)
Binary files a/graphics/linux/128/dcpomatic2.png and b/graphics/linux/128/dcpomatic2.png differ

diff --git a/graphics/linux/16/dcpomatic2.png b/graphics/linux/16/dcpomatic2.png
index ebcb845f12be881067e8fd41a0831efba8a6c657..a11b8576ec7c5d9ffbd96d83857ef2a0bfb525f1 100644 (file)
Binary files a/graphics/linux/16/dcpomatic2.png and b/graphics/linux/16/dcpomatic2.png differ

diff --git a/graphics/linux/22/dcpomatic2.png b/graphics/linux/22/dcpomatic2.png
index 2bca6e89ff1004fe618bb233a286ed281150e023..7f2730f230b7c0f8f81e576f8294e1474d96e97e 100644 (file)
Binary files a/graphics/linux/22/dcpomatic2.png and b/graphics/linux/22/dcpomatic2.png differ

diff --git a/graphics/linux/256/dcpomatic2.png b/graphics/linux/256/dcpomatic2.png
index fa767b8294deea38c9602c7f90f77d0e21a99c16..b517b9da289643a5dba7f86a289c1cdff8849dda 100644 (file)
Binary files a/graphics/linux/256/dcpomatic2.png and b/graphics/linux/256/dcpomatic2.png differ

diff --git a/graphics/linux/32/dcpomatic2.png b/graphics/linux/32/dcpomatic2.png
index 3dea8b696ff63004618c0896f6f9ac3597cb27ae..794c01b58c6df5e1369e86d57b75a86b0d8b23ad 100644 (file)
Binary files a/graphics/linux/32/dcpomatic2.png and b/graphics/linux/32/dcpomatic2.png differ

diff --git a/graphics/linux/48/dcpomatic2.png b/graphics/linux/48/dcpomatic2.png
index 886c4a22dd3b16c223cb484ee4907625cb002c21..5edc416db2a090c2e3a25cc0b5bd2965063dbf28 100644 (file)
Binary files a/graphics/linux/48/dcpomatic2.png and b/graphics/linux/48/dcpomatic2.png differ

diff --git a/graphics/linux/512/dcpomatic2.png b/graphics/linux/512/dcpomatic2.png
index 489650a0e37e1ee010952735033a4c36c427f083..08c274dd82210c33d766123647f527211f51d228 100644 (file)
Binary files a/graphics/linux/512/dcpomatic2.png and b/graphics/linux/512/dcpomatic2.png differ

diff --git a/graphics/linux/64/dcpomatic2.png b/graphics/linux/64/dcpomatic2.png
index 524143c9cde2b718c2035038f8f37cb84bb58f1c..139a70f153ba47aa11bd63556cb425aaed7532fc 100644 (file)
Binary files a/graphics/linux/64/dcpomatic2.png and b/graphics/linux/64/dcpomatic2.png differ

diff --git a/graphics/osx/dcpomatic2.iconset/icon_128x128.png b/graphics/osx/dcpomatic2.iconset/icon_128x128.png
index f3aaaaf6967aa283db3f84090b92a6e5c5763c62..0c2db5ef45a9f0e4f78f14078cf3de70537c9e49 100644 (file)
Binary files a/graphics/osx/dcpomatic2.iconset/icon_128x128.png and b/graphics/osx/dcpomatic2.iconset/icon_128x128.png differ

diff --git a/graphics/osx/dcpomatic2.iconset/icon_128x128@2x.png b/graphics/osx/dcpomatic2.iconset/icon_128x128@2x.png
index f3aaaaf6967aa283db3f84090b92a6e5c5763c62..0c2db5ef45a9f0e4f78f14078cf3de70537c9e49 100644 (file)
Binary files a/graphics/osx/dcpomatic2.iconset/icon_128x128@2x.png and b/graphics/osx/dcpomatic2.iconset/icon_128x128@2x.png differ

diff --git a/graphics/osx/dcpomatic2.iconset/icon_16x16.png b/graphics/osx/dcpomatic2.iconset/icon_16x16.png
index 84c538de00d6c6a2ad8d3e2c79ee364265ec94d4..c27bef447967ddafb2ccce5c15a2597b63268d37 100644 (file)
Binary files a/graphics/osx/dcpomatic2.iconset/icon_16x16.png and b/graphics/osx/dcpomatic2.iconset/icon_16x16.png differ

diff --git a/graphics/osx/dcpomatic2.iconset/icon_16x16@2x.png b/graphics/osx/dcpomatic2.iconset/icon_16x16@2x.png
index 84c538de00d6c6a2ad8d3e2c79ee364265ec94d4..c27bef447967ddafb2ccce5c15a2597b63268d37 100644 (file)
Binary files a/graphics/osx/dcpomatic2.iconset/icon_16x16@2x.png and b/graphics/osx/dcpomatic2.iconset/icon_16x16@2x.png differ

diff --git a/graphics/osx/dcpomatic2.iconset/icon_256x256.png b/graphics/osx/dcpomatic2.iconset/icon_256x256.png
index 9cd6b599c1b730171b85b4fcb7e524f76430e47a..66face3b8f04bf3a01bf8ea6eb7b3bf1175e3252 100644 (file)
Binary files a/graphics/osx/dcpomatic2.iconset/icon_256x256.png and b/graphics/osx/dcpomatic2.iconset/icon_256x256.png differ

diff --git a/graphics/osx/dcpomatic2.iconset/icon_256x256@2x.png b/graphics/osx/dcpomatic2.iconset/icon_256x256@2x.png
index 9cd6b599c1b730171b85b4fcb7e524f76430e47a..66face3b8f04bf3a01bf8ea6eb7b3bf1175e3252 100644 (file)
Binary files a/graphics/osx/dcpomatic2.iconset/icon_256x256@2x.png and b/graphics/osx/dcpomatic2.iconset/icon_256x256@2x.png differ

diff --git a/graphics/osx/dcpomatic2.iconset/icon_32x32.png b/graphics/osx/dcpomatic2.iconset/icon_32x32.png
index d58ddb6e2b11c3e505e163a6303150f51f6a63af..c738d48a76ad96476020e2059177fe7d8b391b88 100644 (file)
Binary files a/graphics/osx/dcpomatic2.iconset/icon_32x32.png and b/graphics/osx/dcpomatic2.iconset/icon_32x32.png differ

diff --git a/graphics/osx/dcpomatic2.iconset/icon_32x32@2x.png b/graphics/osx/dcpomatic2.iconset/icon_32x32@2x.png
index d58ddb6e2b11c3e505e163a6303150f51f6a63af..c738d48a76ad96476020e2059177fe7d8b391b88 100644 (file)
Binary files a/graphics/osx/dcpomatic2.iconset/icon_32x32@2x.png and b/graphics/osx/dcpomatic2.iconset/icon_32x32@2x.png differ

diff --git a/graphics/osx/dcpomatic2.iconset/icon_512x512.png b/graphics/osx/dcpomatic2.iconset/icon_512x512.png
index 19be4b7acff2b1c228294914c8291ae9939430e1..52b2059269a45d2ccf52d4b11addcfbafd429fd1 100644 (file)
Binary files a/graphics/osx/dcpomatic2.iconset/icon_512x512.png and b/graphics/osx/dcpomatic2.iconset/icon_512x512.png differ

diff --git a/graphics/osx/dcpomatic2.iconset/icon_512x512@2x.png b/graphics/osx/dcpomatic2.iconset/icon_512x512@2x.png
index 19be4b7acff2b1c228294914c8291ae9939430e1..a9ea27e933e9a4a5f6f174f3f09f61b4deeadcb3 100644 (file)
Binary files a/graphics/osx/dcpomatic2.iconset/icon_512x512@2x.png and b/graphics/osx/dcpomatic2.iconset/icon_512x512@2x.png differ

diff --git a/graphics/osx/dcpomatic_small.png b/graphics/osx/dcpomatic_small.png
new file mode 100644 (file)
index 0000000..6d1a850
Binary files /dev/null and b/graphics/osx/dcpomatic_small.png differ

diff --git a/graphics/src/dcpomatic_small.svg b/graphics/src/dcpomatic_small.svg
new file mode 100644 (file)
index 0000000..e6b355c
--- /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 73436cb6a59f4d019a1476a2cd604ec5a16e333e..fbd522597f70d6b1d22179b576a5d67a2fb6f6e9 100755 (executable)
--- 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 e50bee0090808f00c38aaeeb6f2463ba8550f3d5..26cf949276f7c7d6d8202a5e4f1638ded29c404d 100644 (file)
Binary files a/graphics/web/favicon-128x128.png and b/graphics/web/favicon-128x128.png differ

diff --git a/graphics/web/favicon-16x16.png b/graphics/web/favicon-16x16.png
index eaa28899d100196be27baedc3fc283cc1398f5c2..173ea64cda4ae5ba92f9ded74206e43e838175be 100644 (file)
Binary files a/graphics/web/favicon-16x16.png and b/graphics/web/favicon-16x16.png differ

diff --git a/graphics/web/favicon-256x256.png b/graphics/web/favicon-256x256.png
index a923ba464d8ed60b8ec22d2c9a0af94d1be5331e..08b6cadd4004b62bd129af4e49a1ec19109035a9 100644 (file)
Binary files a/graphics/web/favicon-256x256.png and b/graphics/web/favicon-256x256.png differ

diff --git a/graphics/web/favicon-32x32.png b/graphics/web/favicon-32x32.png
index 6b677b636c49e5a707126fb2f7fa64b03926307f..09e59cc9b39d346c8ce0ac1ec0622ccdb97bde7e 100644 (file)
Binary files a/graphics/web/favicon-32x32.png and b/graphics/web/favicon-32x32.png differ

diff --git a/graphics/web/favicon-64x64.png b/graphics/web/favicon-64x64.png
index 23d02aeb1ca90a253250cda31f38037b440c0da5..f6cabed990c8ea2ebdc47a32cf065fb8eb78457c 100644 (file)
Binary files a/graphics/web/favicon-64x64.png and b/graphics/web/favicon-64x64.png differ

diff --git a/graphics/web/logo.png b/graphics/web/logo.png
index cfc8c163d0291ba96cce4d2c8538e3e8d0980d94..352fce11c7fa3fe2a22233cb3f79f615093504f8 100644 (file)
Binary files a/graphics/web/logo.png and b/graphics/web/logo.png differ

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 6a413f287152a04062d47b3b7198cba7b8006f92..bccecfebcabbb977c22bb5cdbd8399d52ed5d4cf 100644 (file)
--- 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 8e9ce7537cc3ff5ef50c65e0435de4a6d77670fa..9214d8385336dc1a6b9a0cf415495c096fc73437 100644 (file)
--- 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