Improve the appearance of things in macOS dark mode in various ways.

2 files changed, 28 insertions, 36 deletions

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 3ae60143f..40eabef1f 100644
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -224,42 +224,29 @@ function copy_resources {
     cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2_disk.icns "$dest"
     cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2_combiner.icns "$dest"
     cp $prefix/src/dcpomatic/graphics/osx/dcpomatic2_editor.icns "$dest"
-    cp $prefix/src/dcpomatic/graphics/osx/preferences/defaults.png "$dest"
-    cp $prefix/src/dcpomatic/graphics/osx/preferences/defaults@2x.png "$dest"
-    cp $prefix/src/dcpomatic/graphics/osx/preferences/kdm_email.png "$dest"
-    cp $prefix/src/dcpomatic/graphics/osx/preferences/kdm_email@2x.png "$dest"
-    cp $prefix/src/dcpomatic/graphics/osx/preferences/email.png "$dest"
-    cp $prefix/src/dcpomatic/graphics/osx/preferences/email@2x.png "$dest"
-    cp $prefix/src/dcpomatic/graphics/osx/preferences/servers.png "$dest"
-    cp $prefix/src/dcpomatic/graphics/osx/preferences/servers@2x.png "$dest"
-    cp $prefix/src/dcpomatic/graphics/osx/preferences/tms.png "$dest"
-    cp $prefix/src/dcpomatic/graphics/osx/preferences/tms@2x.png "$dest"
-    cp $prefix/src/dcpomatic/graphics/osx/preferences/keys.png "$dest"
-    cp $prefix/src/dcpomatic/graphics/osx/preferences/keys@2x.png "$dest"
-    cp $prefix/src/dcpomatic/graphics/osx/preferences/cover_sheet.png "$dest"
-    cp $prefix/src/dcpomatic/graphics/osx/preferences/cover_sheet@2x.png "$dest"
-    cp $prefix/src/dcpomatic/graphics/osx/preferences/notifications.png "$dest"
-    cp $prefix/src/dcpomatic/graphics/osx/preferences/notifications@2x.png "$dest"
-    cp $prefix/src/dcpomatic/graphics/osx/preferences/sound.png "$dest"
-    cp $prefix/src/dcpomatic/graphics/osx/preferences/sound@2x.png "$dest"
-    cp $prefix/src/dcpomatic/graphics/osx/preferences/identifiers.png "$dest"
-    cp $prefix/src/dcpomatic/graphics/osx/preferences/identifiers@2x.png "$dest"
-    cp $prefix/src/dcpomatic/graphics/osx/preferences/general.png "$dest"
-    cp $prefix/src/dcpomatic/graphics/osx/preferences/general@2x.png "$dest"
-    cp $prefix/src/dcpomatic/graphics/osx/preferences/advanced.png "$dest"
-    cp $prefix/src/dcpomatic/graphics/osx/preferences/advanced@2x.png "$dest"
-    cp $prefix/src/dcpomatic/graphics/osx/preferences/locations.png "$dest"
-    cp $prefix/src/dcpomatic/graphics/osx/preferences/locations@2x.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/defaults*.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/kdm_email*.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/email*.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/servers*.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/tms*.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/keys*.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/cover_sheet*.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/notifications*.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/sound*.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/identifiers*.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/general*.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/advanced*.png "$dest"
+    cp $prefix/src/dcpomatic/graphics/osx/preferences/locations*.png "$dest"
     cp $prefix/src/dcpomatic/fonts/LiberationSans-Regular.ttf "$dest"
     cp $prefix/src/dcpomatic/fonts/LiberationSans-Italic.ttf "$dest"
     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 84291b3ca..94b7fc3d3 100644
--- 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"