From 85b2143644d8faf16252666f738d5fda01fc1869 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 2 Jan 2024 17:28:27 +0100 Subject: [PATCH] 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. --- cscript | 2 - graphics/src/no_tick.svg | 60 -------------------------- graphics/src/preferences_black.svg | 9 ---- graphics/src/preferences_white.svg | 9 ---- graphics/src/tick.svg | 67 ------------------------------ graphics/update | 4 -- graphics/wscript | 2 - platform/osx/make_dmg.sh | 2 - platform/windows/wscript | 2 - src/tools/dcpomatic_playlist.cc | 10 ----- 10 files changed, 167 deletions(-) delete mode 100644 graphics/src/no_tick.svg delete mode 100644 graphics/src/tick.svg diff --git a/cscript b/cscript index ead995702..f87268b32 100644 --- 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 index 82bd047f2..000000000 --- a/graphics/src/no_tick.svg +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - diff --git a/graphics/src/preferences_black.svg b/graphics/src/preferences_black.svg index e9683951f..1d060eeeb 100644 --- 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/svg+xml - - - - - - - - - diff --git a/graphics/update b/graphics/update index 005bcf3fd..c63fa8835 100755 --- 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 5188ef0bb..7937a389a 100644 --- 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 a70a0e399..fb9a24a9b 100644 --- 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 058fa6793..8eb0fafa9 100644 --- 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 8c7c38038..e2f2536db 100644 --- 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); -- 2.30.2