From: Carl Hetherington Date: Fri, 15 Mar 2024 20:00:12 +0000 (+0100) Subject: Add dark-mode link icon. X-Git-Tag: v2.16.79~7 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=bf124d1ee666a1cef597f6e6291c931d276b831f Add dark-mode link icon. --- diff --git a/cscript b/cscript index 84b6076e6..f70b55568 100644 --- a/cscript +++ b/cscript @@ -457,7 +457,8 @@ 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/link.png', file=f) + print('%{_datadir}/dcpomatic2/link_black.png', file=f) + print('%{_datadir}/dcpomatic2/link_white.png', file=f) print('%{_datadir}/dcpomatic2/me.jpg', file=f) print('%{_datadir}/dcpomatic2/add_black.png', file=f) print('%{_datadir}/dcpomatic2/add_white.png', file=f) diff --git a/graphics/link.png b/graphics/link.png deleted file mode 100644 index 3249d3710..000000000 Binary files a/graphics/link.png and /dev/null differ diff --git a/graphics/link_black.png b/graphics/link_black.png new file mode 100644 index 000000000..3249d3710 Binary files /dev/null and b/graphics/link_black.png differ diff --git a/graphics/link_white.png b/graphics/link_white.png new file mode 100644 index 000000000..274e47a38 Binary files /dev/null and b/graphics/link_white.png differ diff --git a/graphics/src/link_black.svg b/graphics/src/link_black.svg new file mode 100644 index 000000000..00d4f6b16 --- /dev/null +++ b/graphics/src/link_black.svg @@ -0,0 +1,78 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/graphics/src/link_white.svg b/graphics/src/link_white.svg new file mode 100644 index 000000000..e16a2a266 --- /dev/null +++ b/graphics/src/link_white.svg @@ -0,0 +1,78 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/graphics/update b/graphics/update index c63fa8835..46964470b 100755 --- a/graphics/update +++ b/graphics/update @@ -109,7 +109,9 @@ else done # Link icon - $INKSCAPE_EXPORT --export-filename=link.png src/link.svg -w 9 -h 16 + for c in black white; do + $INKSCAPE_EXPORT --export-filename=link_$c.png src/link_$c.svg -w 9 -h 16 + done # favicon mkdir -p web diff --git a/graphics/wscript b/graphics/wscript index 7937a389a..663e28287 100644 --- a/graphics/wscript +++ b/graphics/wscript @@ -51,7 +51,8 @@ def build(bld): 'zoom_all_white.png', 'zoom_all_black.png', 'me.jpg', - 'link.png', + 'link_white.png', + 'link_black.png', 'add_black.png', 'add_white.png', 'pause_black.png', diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index 4772d8b19..bebd089bd 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -251,7 +251,7 @@ function copy_resources { 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/link*.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 8eb0fafa9..17965d54c 100644 --- a/platform/windows/wscript +++ b/platform/windows/wscript @@ -336,7 +336,8 @@ File "%graphics%/snap_black.png" File "%graphics%/sequence_white.png" File "%graphics%/sequence_black.png" File "%graphics%/me.jpg" -File "%graphics%/link.png" +File "%graphics%/link_white.png" +File "%graphics%/link_black.png" File "%graphics%/add_black.png" File "%graphics%/add_white.png" File "%graphics%/pause_black.png" diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc index db42a0c28..859c0a886 100644 --- a/src/wx/video_panel.cc +++ b/src/wx/video_panel.cc @@ -127,8 +127,10 @@ VideoPanel::create () boost::bind (&VideoPanel::left_crop_changed, this) ); + auto const link_path = bitmap_path(gui_is_dark() ? "link_white.png" : "link_black.png"); + _left_right_link = new wxToggleButton (this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(link_width, link_height)); - _left_right_link->SetBitmap (wxBitmap(bitmap_path("link.png"), wxBITMAP_TYPE_PNG)); + _left_right_link->SetBitmap(wxBitmap(link_path, wxBITMAP_TYPE_PNG)); _right_crop_label = create_label (this, _("Right"), true); _right_crop = new ContentSpinCtrl ( @@ -153,7 +155,7 @@ VideoPanel::create () ); _top_bottom_link = new wxToggleButton (this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(link_width, link_height)); - _top_bottom_link->SetBitmap (wxBitmap(bitmap_path("link.png"), wxBITMAP_TYPE_PNG)); + _top_bottom_link->SetBitmap(wxBitmap(link_path, wxBITMAP_TYPE_PNG)); _bottom_crop_label = create_label (this, _("Bottom"), true); _bottom_crop = new ContentSpinCtrl (