Make white/black versions of server icon.

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

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

diff --git a/graphics/src/dcpomatic_small.svg b/graphics/src/dcpomatic_small.svg
deleted file mode 100644 (file)
index 1932d17..0000000
--- a/graphics/src/dcpomatic_small.svg
+++ /dev/null
@@ -1,79 +0,0 @@
-<?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.3 (2405546, 2018-03-11)"
-   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="1.979899"
-     inkscape:cx="204.33305"
-     inkscape:cy="103.0357"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     inkscape:document-rotation="0"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1025"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     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 />
-      </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:none;fill-rule:evenodd;stroke:#000000;stroke-width:7.2;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:#000000;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:#000000;stroke-width:0;">D</tspan></text>
-  </g>
-</svg>

diff --git a/graphics/src/dcpomatic_small_black.svg b/graphics/src/dcpomatic_small_black.svg
new file mode 100644 (file)
index 0000000..1932d17
--- /dev/null
+++ b/graphics/src/dcpomatic_small_black.svg
@@ -0,0 +1,79 @@
+<?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.3 (2405546, 2018-03-11)"
+   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="1.979899"
+     inkscape:cx="204.33305"
+     inkscape:cy="103.0357"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1025"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     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 />
+      </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:none;fill-rule:evenodd;stroke:#000000;stroke-width:7.2;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:#000000;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:#000000;stroke-width:0;">D</tspan></text>
+  </g>
+</svg>

diff --git a/graphics/src/dcpomatic_small_white.svg b/graphics/src/dcpomatic_small_white.svg
new file mode 100644 (file)
index 0000000..a11f60d
--- /dev/null
+++ b/graphics/src/dcpomatic_small_white.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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="1.0.2 (e86c870, 2021-01-15)"
+   sodipodi:docname="dcpomatic_small_white.svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.979899"
+     inkscape:cx="204.33305"
+     inkscape:cy="103.0357"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     inkscape:document-rotation="0"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:pagecheckerboard="false" />
+  <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:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:7.2;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.1721px;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:#ffffff;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;stroke:#ffffff;">D</tspan></text>
+  </g>
+</svg>

diff --git a/graphics/update b/graphics/update
index 144016ad8f7c3b979a0f9752fbf3fe74698aa77f..35aec325a78bb0f279f5b988804a65ca713038b5 100755 (executable)
--- a/graphics/update
+++ b/graphics/update
@@ -85,8 +85,9 @@ else
         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 --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 --export-filename=splash.png src/splash.svg -w 400 -h 300

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 4999268766c71514884bd7fb08b728375bba4f4f..aefa94e2cdbbe50dc2c3f01e45979ca796f971dd 100644 (file)
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -178,7 +178,8 @@ function copy_resources {
        else
                local prefix=$ROOT/$ARCH1
        fi
-    cp $prefix/src/dcpomatic/graphics/osx/dcpomatic_small.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/dcpomatic_small_white.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/dcpomatic_small_black.png "$dest"
     cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2.icns "$dest"
     cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2_kdm.icns "$dest"
     cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2_server.icns "$dest"

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index be0f05ea1f9f9ffc78d0e4f5ba1afdc6372b49e8..aec5ae90754a8e16ad5eaf5cc14f1ceb38ca5a7d 100644 (file)
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -217,7 +217,7 @@ public:
 #ifdef DCPOMATIC_WINDOWS
                wxIcon icon (std_to_wx ("id"));
 #else
-               wxBitmap bitmap (bitmap_path("dcpomatic_small"), wxBITMAP_TYPE_PNG);
+               wxBitmap bitmap (bitmap_path("dcpomatic_small_black"), wxBITMAP_TYPE_PNG);
                wxIcon icon;
                icon.CopyFromBitmap (bitmap);
 #endif