Use different icons for the timeline in dark/light modes.

diff --git a/cscript b/cscript
index 54af98a7dcb7987874f5a79972a290688fe09bef..f0f0d3fbf78a3e82c2279e3c0e45d56b4b21f5e9 100644 (file)
--- a/cscript
+++ b/cscript
@@ -368,11 +368,16 @@ def make_spec(filename, version, target, options, requires=None):
     if can_build_disk(target):
         print('%{_datadir}/applications/dcpomatic2_disk.desktop', file=f)
     print('%{_datadir}/dcpomatic2/dcpomatic2_server_small.png', file=f)
-    print('%{_datadir}/dcpomatic2/select.png', file=f)
-    print('%{_datadir}/dcpomatic2/sequence.png', file=f)
-    print('%{_datadir}/dcpomatic2/snap.png', file=f)
-    print('%{_datadir}/dcpomatic2/zoom.png', file=f)
-    print('%{_datadir}/dcpomatic2/zoom_all.png', file=f)
+    print('%{_datadir}/dcpomatic2/select_white.png', file=f)
+    print('%{_datadir}/dcpomatic2/select_black.png', file=f)
+    print('%{_datadir}/dcpomatic2/sequence_white.png', file=f)
+    print('%{_datadir}/dcpomatic2/sequence_black.png', file=f)
+    print('%{_datadir}/dcpomatic2/snap_white.png', file=f)
+    print('%{_datadir}/dcpomatic2/snap_black.png', file=f)
+    print('%{_datadir}/dcpomatic2/zoom_white.png', file=f)
+    print('%{_datadir}/dcpomatic2/zoom_black.png', file=f)
+    print('%{_datadir}/dcpomatic2/zoom_all_white.png', file=f)
+    print('%{_datadir}/dcpomatic2/zoom_all_black.png', file=f)
     print('%{_datadir}/dcpomatic2/tick.png', file=f)
     print('%{_datadir}/dcpomatic2/no_tick.png', file=f)
     print('%{_datadir}/dcpomatic2/link.png', file=f)

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

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

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

diff --git a/graphics/sequence_white.png b/graphics/sequence_white.png
new file mode 100644 (file)
index 0000000..67592d0
Binary files /dev/null and b/graphics/sequence_white.png differ

diff --git a/graphics/snap_black.png b/graphics/snap_black.png
new file mode 100644 (file)
index 0000000..01580dc
Binary files /dev/null and b/graphics/snap_black.png differ

diff --git a/graphics/snap_white.png b/graphics/snap_white.png
new file mode 100644 (file)
index 0000000..801e9c5
Binary files /dev/null and b/graphics/snap_white.png differ

diff --git a/graphics/src/timeline.svg b/graphics/src/timeline.svg
deleted file mode 100644 (file)
index 58e2772..0000000
--- a/graphics/src/timeline.svg
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="210mm"
-   height="297mm"
-   viewBox="0 0 793.70081 1122.5197"
-   version="1.1"
-   id="svg831"
-   inkscape:version="1.1.1 (3bf5ae0, 2021-09-20)"
-   sodipodi:docname="timeline.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview
-     id="namedview833"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:document-units="px"
-     showgrid="true"
-     inkscape:zoom="4"
-     inkscape:cx="9.125"
-     inkscape:cy="143.25"
-     inkscape:window-width="1920"
-     inkscape:window-height="1043"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid1158"
-       spacingx="0.13229167"
-       spacingy="0.13229167"
-       empspacing="2" />
-    <sodipodi:guide
-       position="24.077084,216.30208"
-       orientation="0,18"
-       id="guide1500" />
-    <sodipodi:guide
-       position="30.427083,218.28646"
-       orientation="8.0000013,0"
-       id="guide1617" />
-  </sodipodi:namedview>
-  <defs
-     id="defs828" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Bounding"
-     style="display:none">
-    <rect
-       y="81"
-       x="-60"
-       height="32"
-       width="32"
-       id="timeline-select"
-       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528903;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
-    <rect
-       y="81"
-       x="-24"
-       height="32"
-       width="32"
-       id="timeline-zoom"
-       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528903;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
-    <rect
-       y="81"
-       x="12"
-       height="32"
-       width="32"
-       id="timeline-zoom_all"
-       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528902;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
-    <rect
-       y="81"
-       x="48"
-       height="32"
-       width="32"
-       id="timeline-snap"
-       style="font-variation-settings:normal;display:inline;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
-    <rect
-       y="81"
-       x="84"
-       height="32"
-       width="32"
-       id="timeline-sequence"
-       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528902;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
-  </g>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <g
-       id="g4213"
-       transform="matrix(3.9027502,0,0,3.9027502,-144.46067,-233.02714)"
-       style="stroke-width:0.384344;stroke-miterlimit:4;stroke-dasharray:none">
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path5834"
-         d="m 50.349285,88.262618 1.557191,-0.251405 c -2.611342,-7.601293 5.715866,-7.545956 3.08209,0.02284 l 1.499904,0.228568 c 3.706429,-9.76304 -9.828096,-9.975131 -6.139185,0 z"
-         style="fill:#ff0000;stroke:none;stroke-width:0.384344;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path5871"
-         d="m 49.9636,86.56046 0.385684,1.702152 1.557192,-0.251399 -0.364319,-1.713603 z"
-         style="fill:#b3b3b3;stroke:none;stroke-width:0.384344;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path5871-7"
-         d="m 54.988566,88.03405 0.4671,-1.724988 1.36291,0.251398 -0.330033,1.702176 z"
-         style="fill:#b3b3b3;stroke:none;stroke-width:0.384344;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path5834-6"
-         d="m 50.349358,88.262615 1.557118,-0.251402 c -2.611342,-7.601293 5.715867,-7.545956 3.08209,0.02284 l 1.499977,0.228565 c 3.70643,-9.76304 -9.828097,-9.97513 -6.139185,0 z"
-         style="fill:none;stroke:#000000;stroke-width:0.384344;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-    <path
-       style="fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:0.999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none"
-       d="M -10.453236,96.465086 3.6389414,110.54054 c 0.6531099,0.36517 1.3199842,0.69414 2.3610569,0.0402 0.6832704,-1.05256 0.3718144,-1.70252 0,-2.32807 L -8.1558906,94.068703 c -5.64e-5,-0.06049 -1.201877,1.427229 -2.2973454,2.396383 z"
-       id="path5828-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
-    <ellipse
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none"
-       id="path5809"
-       cx="-11.403519"
-       cy="93.370117"
-       rx="10.950784"
-       ry="10.950711" />
-    <path
-       style="fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:0.999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none"
-       d="m 25.586972,96.505865 13.970902,13.954315 c 0.647489,0.36203 1.308623,0.68817 2.340733,0.0398 0.677391,-1.04349 0.368609,-1.68787 0,-2.30803 L 27.864547,94.130095 c -6e-5,-0.05998 -1.191538,1.414951 -2.277575,2.37577 z"
-       id="path5828-3-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
-    <ellipse
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none"
-       id="path5809-2"
-       cx="24.644865"
-       cy="93.437508"
-       rx="10.856544"
-       ry="10.856471" />
-    <rect
-       style="fill:#cccccc;fill-opacity:1;stroke:#666666;stroke-width:0.999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none"
-       id="rect5806"
-       width="16.286842"
-       height="10.000005"
-       x="16.5"
-       y="88.5"
-       ry="0.0693992" />
-    <rect
-       style="fill:#b3b3b3;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none"
-       id="rect5913"
-       width="9.0000076"
-       height="16.999996"
-       x="85.499992"
-       y="88.500015" />
-    <rect
-       style="display:inline;fill:#b3b3b3;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none"
-       id="rect5913-9"
-       width="9.0000076"
-       height="16.999996"
-       x="105.49999"
-       y="88.5" />
-    <path
-       style="fill:#ff0000;stroke:#000000;stroke-width:0.999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 110.5,94.500002 h -10 v -3.5 L 88.000002,97.000009 100.5,103 v -3.499997 h 10 z"
-       id="path5822"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
-    <g
-       id="g4193"
-       transform="matrix(3.9193814,0,0,3.9193814,-141.96024,-235.32292)"
-       style="stroke-width:0.255142;stroke-miterlimit:4;stroke-dasharray:none">
-      <path
-         style="fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:0.255142;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none"
-         d="m 24.29557,84.6902 3.665328,3.660979 c 0.169872,0.09498 0.343323,0.180545 0.614102,0.01045 0.177717,-0.273767 0.09671,-0.442822 0,-0.605523 L 24.893101,84.06691 c -1.5e-5,-0.01573 -0.312604,0.371218 -0.597531,0.623292 z"
-         id="path5828"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccc" />
-      <path
-         style="fill:#cccccc;fill-opacity:1;stroke:#000000;stroke-width:0.255142;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none"
-         d="m 27.75043,83.895311 c -2.357002,0.816238 -3.031587,1.601581 -3.823561,4.172695 -0.05449,0.176901 -1.849808,-4.721711 -2.760202,-7.105504 z"
-         id="path5884"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cscc" />
-    </g>
-  </g>
-</svg>

diff --git a/graphics/src/timeline_black.svg b/graphics/src/timeline_black.svg
new file mode 100644 (file)
index 0000000..58e2772
--- /dev/null
+++ b/graphics/src/timeline_black.svg
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="210mm"
+   height="297mm"
+   viewBox="0 0 793.70081 1122.5197"
+   version="1.1"
+   id="svg831"
+   inkscape:version="1.1.1 (3bf5ae0, 2021-09-20)"
+   sodipodi:docname="timeline.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview833"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     inkscape:zoom="4"
+     inkscape:cx="9.125"
+     inkscape:cy="143.25"
+     inkscape:window-width="1920"
+     inkscape:window-height="1043"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1158"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+    <sodipodi:guide
+       position="24.077084,216.30208"
+       orientation="0,18"
+       id="guide1500" />
+    <sodipodi:guide
+       position="30.427083,218.28646"
+       orientation="8.0000013,0"
+       id="guide1617" />
+  </sodipodi:namedview>
+  <defs
+     id="defs828" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Bounding"
+     style="display:none">
+    <rect
+       y="81"
+       x="-60"
+       height="32"
+       width="32"
+       id="timeline-select"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528903;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
+    <rect
+       y="81"
+       x="-24"
+       height="32"
+       width="32"
+       id="timeline-zoom"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528903;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
+    <rect
+       y="81"
+       x="12"
+       height="32"
+       width="32"
+       id="timeline-zoom_all"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528902;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
+    <rect
+       y="81"
+       x="48"
+       height="32"
+       width="32"
+       id="timeline-snap"
+       style="font-variation-settings:normal;display:inline;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
+    <rect
+       y="81"
+       x="84"
+       height="32"
+       width="32"
+       id="timeline-sequence"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528902;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
+  </g>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <g
+       id="g4213"
+       transform="matrix(3.9027502,0,0,3.9027502,-144.46067,-233.02714)"
+       style="stroke-width:0.384344;stroke-miterlimit:4;stroke-dasharray:none">
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path5834"
+         d="m 50.349285,88.262618 1.557191,-0.251405 c -2.611342,-7.601293 5.715866,-7.545956 3.08209,0.02284 l 1.499904,0.228568 c 3.706429,-9.76304 -9.828096,-9.975131 -6.139185,0 z"
+         style="fill:#ff0000;stroke:none;stroke-width:0.384344;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path5871"
+         d="m 49.9636,86.56046 0.385684,1.702152 1.557192,-0.251399 -0.364319,-1.713603 z"
+         style="fill:#b3b3b3;stroke:none;stroke-width:0.384344;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path5871-7"
+         d="m 54.988566,88.03405 0.4671,-1.724988 1.36291,0.251398 -0.330033,1.702176 z"
+         style="fill:#b3b3b3;stroke:none;stroke-width:0.384344;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path5834-6"
+         d="m 50.349358,88.262615 1.557118,-0.251402 c -2.611342,-7.601293 5.715867,-7.545956 3.08209,0.02284 l 1.499977,0.228565 c 3.70643,-9.76304 -9.828097,-9.97513 -6.139185,0 z"
+         style="fill:none;stroke:#000000;stroke-width:0.384344;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <path
+       style="fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:0.999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none"
+       d="M -10.453236,96.465086 3.6389414,110.54054 c 0.6531099,0.36517 1.3199842,0.69414 2.3610569,0.0402 0.6832704,-1.05256 0.3718144,-1.70252 0,-2.32807 L -8.1558906,94.068703 c -5.64e-5,-0.06049 -1.201877,1.427229 -2.2973454,2.396383 z"
+       id="path5828-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <ellipse
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none"
+       id="path5809"
+       cx="-11.403519"
+       cy="93.370117"
+       rx="10.950784"
+       ry="10.950711" />
+    <path
+       style="fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:0.999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none"
+       d="m 25.586972,96.505865 13.970902,13.954315 c 0.647489,0.36203 1.308623,0.68817 2.340733,0.0398 0.677391,-1.04349 0.368609,-1.68787 0,-2.30803 L 27.864547,94.130095 c -6e-5,-0.05998 -1.191538,1.414951 -2.277575,2.37577 z"
+       id="path5828-3-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <ellipse
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none"
+       id="path5809-2"
+       cx="24.644865"
+       cy="93.437508"
+       rx="10.856544"
+       ry="10.856471" />
+    <rect
+       style="fill:#cccccc;fill-opacity:1;stroke:#666666;stroke-width:0.999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none"
+       id="rect5806"
+       width="16.286842"
+       height="10.000005"
+       x="16.5"
+       y="88.5"
+       ry="0.0693992" />
+    <rect
+       style="fill:#b3b3b3;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none"
+       id="rect5913"
+       width="9.0000076"
+       height="16.999996"
+       x="85.499992"
+       y="88.500015" />
+    <rect
+       style="display:inline;fill:#b3b3b3;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none"
+       id="rect5913-9"
+       width="9.0000076"
+       height="16.999996"
+       x="105.49999"
+       y="88.5" />
+    <path
+       style="fill:#ff0000;stroke:#000000;stroke-width:0.999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 110.5,94.500002 h -10 v -3.5 L 88.000002,97.000009 100.5,103 v -3.499997 h 10 z"
+       id="path5822"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc" />
+    <g
+       id="g4193"
+       transform="matrix(3.9193814,0,0,3.9193814,-141.96024,-235.32292)"
+       style="stroke-width:0.255142;stroke-miterlimit:4;stroke-dasharray:none">
+      <path
+         style="fill:#f2f2f2;fill-opacity:1;stroke:#000000;stroke-width:0.255142;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none"
+         d="m 24.29557,84.6902 3.665328,3.660979 c 0.169872,0.09498 0.343323,0.180545 0.614102,0.01045 0.177717,-0.273767 0.09671,-0.442822 0,-0.605523 L 24.893101,84.06691 c -1.5e-5,-0.01573 -0.312604,0.371218 -0.597531,0.623292 z"
+         id="path5828"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccc" />
+      <path
+         style="fill:#cccccc;fill-opacity:1;stroke:#000000;stroke-width:0.255142;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none"
+         d="m 27.75043,83.895311 c -2.357002,0.816238 -3.031587,1.601581 -3.823561,4.172695 -0.05449,0.176901 -1.849808,-4.721711 -2.760202,-7.105504 z"
+         id="path5884"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cscc" />
+    </g>
+  </g>
+</svg>

diff --git a/graphics/src/timeline_white.svg b/graphics/src/timeline_white.svg
new file mode 100644 (file)
index 0000000..14dd8cc
--- /dev/null
+++ b/graphics/src/timeline_white.svg
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="210mm"
+   height="297mm"
+   viewBox="0 0 793.70081 1122.5197"
+   version="1.1"
+   id="svg831"
+   inkscape:version="1.1.1 (3bf5ae0, 2021-09-20)"
+   sodipodi:docname="timeline_white.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview833"
+     pagecolor="#1f1f1f"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="true"
+     inkscape:zoom="4"
+     inkscape:cx="36.125"
+     inkscape:cy="37"
+     inkscape:window-width="1920"
+     inkscape:window-height="1011"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1158"
+       spacingx="0.13229167"
+       spacingy="0.13229167"
+       empspacing="2" />
+    <sodipodi:guide
+       position="24.077084,216.30208"
+       orientation="0,18"
+       id="guide1500" />
+    <sodipodi:guide
+       position="30.427083,218.28646"
+       orientation="8.0000013,0"
+       id="guide1617" />
+  </sodipodi:namedview>
+  <defs
+     id="defs828" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Bounding"
+     style="display:none">
+    <rect
+       y="81"
+       x="-60"
+       height="32"
+       width="32"
+       id="timeline-select"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528903;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
+    <rect
+       y="81"
+       x="-24"
+       height="32"
+       width="32"
+       id="timeline-zoom"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528903;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
+    <rect
+       y="81"
+       x="12"
+       height="32"
+       width="32"
+       id="timeline-zoom_all"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528902;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
+    <rect
+       y="81"
+       x="48"
+       height="32"
+       width="32"
+       id="timeline-snap"
+       style="font-variation-settings:normal;display:inline;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
+    <rect
+       y="81"
+       x="84"
+       height="32"
+       width="32"
+       id="timeline-sequence"
+       style="font-variation-settings:normal;display:inline;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.528902;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000" />
+  </g>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline">
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path5834"
+       d="m 52.040012,111.43981 6.077328,-0.98117 c -10.191416,-29.665949 22.307597,-29.449982 12.028627,0.0891 l 5.853751,0.89204 c 14.465266,-38.102705 -38.356604,-38.930443 -23.959706,0 z"
+       style="fill:#ff0000;stroke:#ffffff;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path5871"
+       d="m 50.53478,104.79671 1.505228,6.64308 6.077332,-0.98115 -1.421846,-6.68777 z"
+       style="fill:#333333;stroke:#ffffff;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path5871-7"
+       d="m 70.145967,110.54777 1.822975,-6.7322 5.319097,0.98114 -1.288037,6.64317 z"
+       style="fill:#333333;stroke:#ffffff;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path5834-6"
+       d="m 52.040297,111.4398 6.077043,-0.98116 c -10.191416,-29.665949 22.307601,-29.449982 12.028627,0.0891 l 5.854035,0.89203 c 14.465271,-38.102706 -38.356607,-38.930441 -23.959705,0 z"
+       style="fill:none;stroke:#ffffff;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="fill:#4d4d4d;fill-opacity:1;stroke:#ffffff;stroke-width:0.999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none"
+       d="M -10.453236,96.465086 3.6389414,110.54054 c 0.6531099,0.36517 1.3199842,0.69414 2.3610569,0.0402 0.6832704,-1.05256 0.3718144,-1.70252 0,-2.32807 L -8.1558906,94.068703 c -5.64e-5,-0.06049 -1.201877,1.427229 -2.2973454,2.396383 z"
+       id="path5828-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <ellipse
+       style="fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none"
+       id="path5809"
+       cx="-11.403519"
+       cy="93.370117"
+       rx="10.950784"
+       ry="10.950711" />
+    <path
+       style="fill:#4d4d4d;fill-opacity:1;stroke:#ffffff;stroke-width:0.999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none"
+       d="m 25.586972,96.505865 13.970902,13.954315 c 0.647489,0.36203 1.308623,0.68817 2.340733,0.0398 0.677391,-1.04349 0.368609,-1.68787 0,-2.30803 L 27.864547,94.130095 c -6e-5,-0.05998 -1.191538,1.414951 -2.277575,2.37577 z"
+       id="path5828-3-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <ellipse
+       style="fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none"
+       id="path5809-2"
+       cx="24.644865"
+       cy="93.437508"
+       rx="10.856544"
+       ry="10.856471" />
+    <rect
+       style="fill:#4d4d4d;fill-opacity:1;stroke:#ffffff;stroke-width:0.999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none"
+       id="rect5806"
+       width="16.286842"
+       height="10.000005"
+       x="16.5"
+       y="88.5"
+       ry="0.0693992" />
+    <rect
+       style="fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none"
+       id="rect5913"
+       width="9.0000076"
+       height="16.999996"
+       x="85.499992"
+       y="88.500015" />
+    <rect
+       style="display:inline;fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none"
+       id="rect5913-9"
+       width="9.0000076"
+       height="16.999996"
+       x="105.49999"
+       y="88.5" />
+    <path
+       style="fill:#ff0000;stroke:#ffffff;stroke-width:0.999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 110.5,94.500002 h -10 v -3.5 L 88.000002,97.000009 100.5,103 v -3.499997 h 10 z"
+       id="path5822"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc" />
+    <path
+       style="fill:#4d4d4d;fill-opacity:1;stroke:#ffffff;stroke-width:0.999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none"
+       d="m -46.736635,96.610275 14.365819,14.348775 c 0.665793,0.37226 1.345613,0.70762 2.4069,0.041 0.69654,-1.073 0.379043,-1.73559 0,-2.37328 L -44.394683,94.167363 c -5.9e-5,-0.06165 -1.225214,1.454945 -2.341952,2.442919 z"
+       id="path5828"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       style="fill:#333333;fill-opacity:1;stroke:#ffffff;stroke-width:0.999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-end:none"
+       d="m -33.195721,93.494801 c -9.23799,3.199149 -11.881946,6.277207 -14.985994,16.354379 -0.213567,0.69335 -7.250103,-18.506182 -10.818284,-27.849176 z"
+       id="path5884"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cscc" />
+  </g>
+</svg>

diff --git a/graphics/update b/graphics/update
index 755b73fc0705fe4bea48877afa57d693d787fae1..f42c3182b80d4b06b667c70be737b9bccec3b6ac 100755 (executable)
--- a/graphics/update
+++ b/graphics/update
@@ -95,8 +95,10 @@ else
     $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
-        inkbatch --inkscape $INKSCAPE -i timeline-$i -o $i.png --width 32 --height 32 src/timeline.svg
+    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

diff --git a/graphics/wscript b/graphics/wscript
index c879046835e03d74fccc0fbab0b76b11c7e8da14..c67d0695b636aaa3a13683c5f56fb141dab95641 100644 (file)
--- a/graphics/wscript
+++ b/graphics/wscript
@@ -39,11 +39,16 @@ def build(bld):
     if not bld.env.TARGET_WINDOWS_64 and not bld.env.TARGET_WINDOWS_32 and not bld.env.DISABLE_GUI:
         bld.install_as('${PREFIX}/share/dcpomatic2/dcpomatic2_server_small.png', 'linux/16/dcpomatic2.png')
         bld.install_files('${PREFIX}/share/dcpomatic2', 'splash.png')
-        bld.install_files('${PREFIX}/share/dcpomatic2', 'zoom.png')
-        bld.install_files('${PREFIX}/share/dcpomatic2', 'zoom_all.png')
-        bld.install_files('${PREFIX}/share/dcpomatic2', 'select.png')
-        bld.install_files('${PREFIX}/share/dcpomatic2', 'snap.png')
-        bld.install_files('${PREFIX}/share/dcpomatic2', 'sequence.png')
+        bld.install_files('${PREFIX}/share/dcpomatic2', 'zoom_white.png')
+        bld.install_files('${PREFIX}/share/dcpomatic2', 'zoom_black.png')
+        bld.install_files('${PREFIX}/share/dcpomatic2', 'select_white.png')
+        bld.install_files('${PREFIX}/share/dcpomatic2', 'select_black.png')
+        bld.install_files('${PREFIX}/share/dcpomatic2', 'snap_white.png')
+        bld.install_files('${PREFIX}/share/dcpomatic2', 'snap_black.png')
+        bld.install_files('${PREFIX}/share/dcpomatic2', 'sequence_white.png')
+        bld.install_files('${PREFIX}/share/dcpomatic2', 'sequence_black.png')
+        bld.install_files('${PREFIX}/share/dcpomatic2', 'zoom_all_white.png')
+        bld.install_files('${PREFIX}/share/dcpomatic2', 'zoom_all_black.png')
         bld.install_files('${PREFIX}/share/dcpomatic2', 'me.jpg')
         bld.install_files('${PREFIX}/share/dcpomatic2', 'tick.png')
         bld.install_files('${PREFIX}/share/dcpomatic2', 'no_tick.png')

diff --git a/graphics/zoom_all_black.png b/graphics/zoom_all_black.png
new file mode 100644 (file)
index 0000000..19ccb71
Binary files /dev/null and b/graphics/zoom_all_black.png differ

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

diff --git a/graphics/zoom_black.png b/graphics/zoom_black.png
new file mode 100644 (file)
index 0000000..4633c8c
Binary files /dev/null and b/graphics/zoom_black.png differ

diff --git a/graphics/zoom_white.png b/graphics/zoom_white.png
new file mode 100644 (file)
index 0000000..50890f1
Binary files /dev/null and b/graphics/zoom_white.png differ

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 3285f7d1d71641007d5d6ebe9aa6c38d7693f390..40eabef1fd8a48386904a127c59de2d263d27133 100644 (file)
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -242,11 +242,11 @@ function copy_resources {
     cp $prefix/src/dcpomatic/fonts/LiberationSans-Bold.ttf "$dest"
     cp $prefix/src/dcpomatic/fonts/fonts.conf.osx "$dest"/fonts.conf
     cp $prefix/src/dcpomatic/graphics/splash.png "$dest"
-    cp $prefix/src/dcpomatic/graphics/zoom.png "$dest"
-    cp $prefix/src/dcpomatic/graphics/zoom_all.png "$dest"
-    cp $prefix/src/dcpomatic/graphics/select.png "$dest"
-    cp $prefix/src/dcpomatic/graphics/snap.png "$dest"
-    cp $prefix/src/dcpomatic/graphics/sequence.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/zoom*.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/zoom_all*.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/select*.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/snap*.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/sequence*.png "$dest"
     cp $prefix/src/dcpomatic/graphics/me.jpg "$dest"
     cp $prefix/src/dcpomatic/graphics/link.png "$dest"
     cp $prefix/src/dcpomatic/graphics/tick.png "$dest"

diff --git a/platform/windows/wscript b/platform/windows/wscript
index 84291b3ca7435f0cd16abb77cedd848cbcf2e9e9..94b7fc3d3ce1d22af6196cf0db727752e4e31a88 100644 (file)
--- a/platform/windows/wscript
+++ b/platform/windows/wscript
@@ -306,11 +306,16 @@ File "%resources%/../../fonts/LiberationSans-Italic.ttf"
 File "%resources%/../../fonts/LiberationSans-Bold.ttf"
 File /oname=fonts.conf "%resources%/../../fonts/fonts.conf.windows"
 File "%graphics%/splash.png"
-File "%graphics%/zoom.png"
-File "%graphics%/zoom_all.png"
-File "%graphics%/select.png"
-File "%graphics%/snap.png"
-File "%graphics%/sequence.png"
+File "%graphics%/zoom_white.png"
+File "%graphics%/zoom_black.png"
+File "%graphics%/zoom_all_white.png"
+File "%graphics%/zoom_all_black.png"
+File "%graphics%/select_white.png"
+File "%graphics%/select_black.png"
+File "%graphics%/snap_white.png"
+File "%graphics%/snap_black.png"
+File "%graphics%/sequence_white.png"
+File "%graphics%/sequence_black.png"
 File "%graphics%/me.jpg"
 File "%graphics%/tick.png"
 File "%graphics%/no_tick.png"

diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index 6b0be46038e6b55217fbadaf1d1d4a9f46668d0e..1aeacd3cacd9ae05df0aabcb7ebe9b1eb84acd0b 100644 (file)
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -84,16 +84,6 @@ using namespace boost::placeholders;
 using dcp::locale_convert;
 
 
-#ifdef DCPOMATIC_OSX
-static
-wxString
-icon_path(string name)
-{
-       return gui_is_dark() ? bitmap_path(String::compose("%1_white.png", name)) : bitmap_path(String::compose("%1_black.png", name));
-}
-#endif
-
-
 class FullGeneralPage : public GeneralPage
 {
 public:

diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc
index 91737f204db7352085c8fc841ab83359358c005a..0d05e66d694d5e46a0b788e28034ad85c8e03bc1 100644 (file)
--- a/src/wx/timeline_dialog.cc
+++ b/src/wx/timeline_dialog.cc
@@ -63,11 +63,11 @@ TimelineDialog::TimelineDialog(ContentPanel* cp, shared_ptr<Film> film, FilmView
 {
        auto sizer = new wxBoxSizer (wxVERTICAL);
 
-       wxBitmap select (bitmap_path("select.png"), wxBITMAP_TYPE_PNG);
-       wxBitmap zoom (bitmap_path("zoom.png"), wxBITMAP_TYPE_PNG);
-       wxBitmap zoom_all (bitmap_path("zoom_all.png"), wxBITMAP_TYPE_PNG);
-       wxBitmap snap (bitmap_path("snap.png"), wxBITMAP_TYPE_PNG);
-       wxBitmap sequence (bitmap_path("sequence.png"), wxBITMAP_TYPE_PNG);
+       wxBitmap select(icon_path("select"), wxBITMAP_TYPE_PNG);
+       wxBitmap zoom(icon_path("zoom"), wxBITMAP_TYPE_PNG);
+       wxBitmap zoom_all(icon_path("zoom_all"), wxBITMAP_TYPE_PNG);
+       wxBitmap snap(icon_path("snap"), wxBITMAP_TYPE_PNG);
+       wxBitmap sequence(icon_path("sequence"), wxBITMAP_TYPE_PNG);
 
        _toolbar = new wxToolBar (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL);
        _toolbar->SetMargins (4, 4);

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 9d9d4c599ff2862ad164e07931facfedbba6b5de..074f47d61bebd2a61ff77ee4d76bbe730ee7aff5 100644 (file)
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -651,6 +651,13 @@ bitmap_path (string name)
 }
 
 
+wxString
+icon_path(string name)
+{
+       return gui_is_dark() ? bitmap_path(String::compose("%1_white.png", name)) : bitmap_path(String::compose("%1_black.png", name));
+}
+
+
 wxSize
 small_button_size (wxWindow* parent, wxString text)
 {

diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index fb1a3a001ecd6064467ea3bd97347ac435beb52b..50fb7268f9d0724314276e98c51869132d0dcc75 100644 (file)
--- a/src/wx/wx_util.h
+++ b/src/wx/wx_util.h
@@ -119,6 +119,7 @@ extern double calculate_mark_interval (double start);
 extern bool display_progress (wxString title, wxString task);
 extern bool report_errors_from_last_job (wxWindow* parent);
 extern wxString bitmap_path (std::string name);
+extern wxString icon_path(std::string name);
 extern wxSize small_button_size (wxWindow* parent, wxString text);
 extern bool gui_is_dark ();
 extern double dpi_scale_factor (wxWindow* window);