Remove tick/no_tick icons which I believe are no longer used.

They were added to the list in the playlist editor but seemingly
not used.

diff --git a/cscript b/cscript
index ead995702a18c5a908ceb9672379aac09eabcdbc..f87268b324ccb138b913b1ea2d26d177e2c13837 100644 (file)
--- a/cscript
+++ b/cscript
@@ -430,8 +430,6 @@ def make_spec(filename, version, target, options, requires=None):
     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)
     print('%{_datadir}/dcpomatic2/me.jpg', file=f)
     print('%{_datadir}/dcpomatic2/add_black.png', file=f)

diff --git a/graphics/src/no_tick.svg b/graphics/src/no_tick.svg
deleted file mode 100644 (file)
index 82bd047..0000000
--- a/graphics/src/no_tick.svg
+++ /dev/null
@@ -1,60 +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="68mm"
-   height="68mm"
-   viewBox="0 0 68 68"
-   version="1.1"
-   id="svg8"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"
-   sodipodi:docname="no_tick.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="218.11091"
-     inkscape:cy="81.63874"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1" />
-  <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(-38.743245,-53.688651)" />
-</svg>

diff --git a/graphics/src/preferences_black.svg b/graphics/src/preferences_black.svg
index e9683951fac025d20033cc995e207fe06e80220c..1d060eeeb877aa838f578dd603d53e06b07b6c1d 100644 (file)
--- a/graphics/src/preferences_black.svg
+++ b/graphics/src/preferences_black.svg
@@ -294,15 +294,6 @@
      inkscape:label="Old"
      style="display:inline"
      transform="translate(-221.81526,-142.13316)">
-    <image
-       xlink:href="no_tick.svg"
-       id="image2055"
-       height="68.000031"
-       width="68.000031"
-       inkscape:svg-dpi="96"
-       preserveAspectRatio="none"
-       x="249.30568"
-       y="98.565674" />
     <image
        xlink:href="defaults.svg"
        id="image1269"

diff --git a/graphics/src/preferences_white.svg b/graphics/src/preferences_white.svg
index 5aba547402770f8c63841b4cd9c7e4aa960acf9f..d06169801ae2e9ef611bc54a353943fd66edee1e 100644 (file)
--- a/graphics/src/preferences_white.svg
+++ b/graphics/src/preferences_white.svg
@@ -304,15 +304,6 @@
      style="display:inline"
      transform="translate(-221.81526,-142.13316)"
      sodipodi:insensitive="true">
-    <image
-       xlink:href="no_tick.svg"
-       id="image2055"
-       height="68.000031"
-       width="68.000031"
-       inkscape:svg-dpi="96"
-       preserveAspectRatio="none"
-       x="249.30568"
-       y="98.565674" />
     <image
        xlink:href="defaults.svg"
        id="image1269"

diff --git a/graphics/src/tick.svg b/graphics/src/tick.svg
deleted file mode 100644 (file)
index 8ed6cc2..0000000
--- a/graphics/src/tick.svg
+++ /dev/null
@@ -1,67 +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="68mm"
-   height="68mm"
-   viewBox="0 0 68 68"
-   version="1.1"
-   id="svg8"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"
-   sodipodi:docname="tick.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="218.11091"
-     inkscape:cy="81.63874"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1" />
-  <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(-38.743245,-53.688651)">
-    <path
-       style="fill:none;stroke:#000000;stroke-width:12.86499977;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 45.241267,93.524044 67.35192,115.25672 C 73.462403,94.316949 82.200179,75.575894 99.802375,60.6318"
-       id="path815"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc" />
-  </g>
-</svg>

diff --git a/graphics/update b/graphics/update
index 005bcf3fdb77cbe27e3e91fc502b9bcadfabf83b..c63fa8835108225f38a17aa43d1b2cc3a6f961e5 100755 (executable)
--- a/graphics/update
+++ b/graphics/update
@@ -108,10 +108,6 @@ else
         done
     done
 
-    # Playlist editor tick/no-tick
-    $INKSCAPE_EXPORT --export-filename=tick.png src/tick.svg -w 16 -h 16
-    $INKSCAPE_EXPORT --export-filename=no_tick.png src/no_tick.svg -w 16 -h 16
-
     # Link icon
     $INKSCAPE_EXPORT --export-filename=link.png src/link.svg -w 9 -h 16
 

diff --git a/graphics/wscript b/graphics/wscript
index 5188ef0bba2832e803b6308fa7181e435a1b611d..7937a389adec29d66b0e669be89af4680c683f7c 100644 (file)
--- a/graphics/wscript
+++ b/graphics/wscript
@@ -51,8 +51,6 @@ def build(bld):
             'zoom_all_white.png',
             'zoom_all_black.png',
             'me.jpg',
-            'tick.png',
-            'no_tick.png',
             'link.png',
             'add_black.png',
             'add_white.png',

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index a70a0e399f2e43b87ca8fc9a2b3a5585a23caa33..fb9a24a9bb4f2af7883b554fd861a7a4987cd97d 100644 (file)
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -250,8 +250,6 @@ function copy_resources {
     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"
-    cp $prefix/src/dcpomatic/graphics/no_tick.png "$dest"
     cp $prefix/src/dcpomatic/graphics/add*.png "$dest"
     cp $prefix/src/dcpomatic/graphics/pause*.png "$dest"
     cp -r $prefix/share/libdcp/xsd "$dest"

diff --git a/platform/windows/wscript b/platform/windows/wscript
index 058fa679353b652ffa5dc57e391ec1a1cd3d4ec5..8eb0fafa928f3f9f0e6fdcc6284c570615f914b1 100644 (file)
--- a/platform/windows/wscript
+++ b/platform/windows/wscript
@@ -336,8 +336,6 @@ 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"
 File "%graphics%/link.png"
 File "%graphics%/add_black.png"
 File "%graphics%/add_white.png"

diff --git a/src/tools/dcpomatic_playlist.cc b/src/tools/dcpomatic_playlist.cc
index 8c7c38038df7ad318379edf9a94da197d5df834a..e2f2536dba878ad98887708ba3cb86a59c5f9bda 100644 (file)
--- a/src/tools/dcpomatic_playlist.cc
+++ b/src/tools/dcpomatic_playlist.cc
@@ -331,16 +331,6 @@ public:
                _list->AppendColumn (_("Type"), wxLIST_FORMAT_LEFT, 100);
                _list->AppendColumn (_("Encrypted"), wxLIST_FORMAT_CENTRE, 90);
 
-               auto images = new wxImageList (16, 16);
-               wxIcon tick_icon;
-               wxIcon no_tick_icon;
-               tick_icon.LoadFile (bitmap_path("tick.png"), wxBITMAP_TYPE_PNG);
-               no_tick_icon.LoadFile (bitmap_path("no_tick.png"), wxBITMAP_TYPE_PNG);
-               images->Add (tick_icon);
-               images->Add (no_tick_icon);
-
-               _list->SetImageList (images, wxIMAGE_LIST_SMALL);
-
                list->Add (_list, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_GAP);
 
                auto button_sizer = new wxBoxSizer (wxVERTICAL);