Incorporate new icon by Julian van Mil for main DCP-o-matic.

6 files changed, 18 insertions, 22 deletions

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 4d6cb90f1..f07b85af1 100644
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -113,21 +113,21 @@ function copy_libs {
 # @param #1 directory to copy to
 function copy_resources {
     local dest="$1"
-    cp $ROOT/32/src/dcpomatic/graphics/dcpomatic2.icns "$dest"
-    cp $ROOT/32/src/dcpomatic/graphics/dcpomatic2_kdm.icns "$dest"
-    cp $ROOT/32/src/dcpomatic/graphics/dcpomatic2_server.icns "$dest"
-    cp $ROOT/32/src/dcpomatic/graphics/dcpomatic2_batch.icns "$dest"
-    cp $ROOT/32/src/dcpomatic/graphics/colour_conversions.png "$dest"
-    cp $ROOT/32/src/dcpomatic/graphics/defaults.png "$dest"
-    cp $ROOT/32/src/dcpomatic/graphics/kdm_email.png "$dest"
-    cp $ROOT/32/src/dcpomatic/graphics/servers.png "$dest"
-    cp $ROOT/32/src/dcpomatic/graphics/tms.png "$dest"
-    cp $ROOT/32/src/dcpomatic/graphics/keys.png "$dest"
+    cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic2.icns "$dest"
+    cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic2_kdm.icns "$dest"
+    cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic2_server.icns "$dest"
+    cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic2_batch.icns "$dest"
+    cp $ROOT/32/src/dcpomatic/graphics/osx/colour_conversions.png "$dest"
+    cp $ROOT/32/src/dcpomatic/graphics/osx/defaults.png "$dest"
+    cp $ROOT/32/src/dcpomatic/graphics/osx/kdm_email.png "$dest"
+    cp $ROOT/32/src/dcpomatic/graphics/osx/servers.png "$dest"
+    cp $ROOT/32/src/dcpomatic/graphics/osx/tms.png "$dest"
+    cp $ROOT/32/src/dcpomatic/graphics/osx/keys.png "$dest"
     cp $ROOT/32/src/dcpomatic/fonts/LiberationSans-Regular.ttf "$dest"
     cp $ROOT/32/src/dcpomatic/fonts/LiberationSans-Italic.ttf "$dest"
     cp $ROOT/32/src/dcpomatic/fonts/LiberationSans-Bold.ttf "$dest"
     cp $ROOT/32/src/dcpomatic/graphics/splash.png "$dest"
-    cp $ROOT/32/src/dcpomatic/graphics/dcpomatic2_server_small.png "$dest"
+    cp $ROOT/32/src/dcpomatic/graphics/src/dcpomatic2_server_small.png "$dest"
 
     # i18n: DCP-o-matic .mo files
     for lang in de_DE es_ES fr_FR it_IT sv_SE nl_NL ru_RU pl_PL da_DK pt_PT pt_BR sk_SK cs_CZ uk_UA zh_CN; do
diff --git a/platform/windows/dcpomatic.rc b/platform/windows/dcpomatic.rc
index 12747f539..4afb67abd 100644
--- a/platform/windows/dcpomatic.rc
+++ b/platform/windows/dcpomatic.rc
@@ -1,3 +1,2 @@
-id ICON "../../graphics/dcpomatic2.ico"
-taskbar_icon ICON "../../graphics/dcpomatic2_server_small.ico"
+id ICON "../../graphics/windows/dcpomatic2.ico"
 #include "wx-3.0/wx/msw/wx.rc"
diff --git a/platform/windows/dcpomatic_batch.rc b/platform/windows/dcpomatic_batch.rc
index de68302de..c775bed21 100644
--- a/platform/windows/dcpomatic_batch.rc
+++ b/platform/windows/dcpomatic_batch.rc
@@ -1,3 +1,2 @@
-id ICON "../../graphics/dcpomatic2_batch.ico"
-taskbar_icon ICON "../../graphics/dcpomatic2_server_small.ico"
+id ICON "../../graphics/windows/dcpomatic2_batch.ico"
 #include "wx-3.0/wx/msw/wx.rc"
diff --git a/platform/windows/dcpomatic_kdm.rc b/platform/windows/dcpomatic_kdm.rc
index e641436c9..2ebaef50a 100644
--- a/platform/windows/dcpomatic_kdm.rc
+++ b/platform/windows/dcpomatic_kdm.rc
@@ -1,3 +1,2 @@
-id ICON "../../graphics/dcpomatic2_kdm.ico"
-taskbar_icon ICON "../../graphics/dcpomatic2_server_small.ico"
+id ICON "../../graphics/windows/dcpomatic2_kdm.ico"
 #include "wx-3.0/wx/msw/wx.rc"
diff --git a/platform/windows/dcpomatic_server.rc b/platform/windows/dcpomatic_server.rc
index 19da9cfd1..3a036c791 100644
--- a/platform/windows/dcpomatic_server.rc
+++ b/platform/windows/dcpomatic_server.rc
@@ -1,3 +1,2 @@
-id ICON "../../graphics/dcpomatic2_server.ico"
-taskbar_icon ICON "../../graphics/dcpomatic2_server_small.ico"
+id ICON "../../graphics/windows/dcpomatic2_server.ico"
 #include "wx-3.0/wx/msw/wx.rc"
diff --git a/platform/windows/wscript b/platform/windows/wscript
index 996d8acd0..144696fc7 100644
--- a/platform/windows/wscript
+++ b/platform/windows/wscript
@@ -35,9 +35,9 @@ def write_installer(bits, windows_version, dcpomatic_version, debug):
     print('outFile "%s"' % outfile, file=f)
 
     print("""
-!define MUI_ICON "%graphics%/dcpomatic2.ico"
-!define MUI_UNICON "%graphics%/dcpomatic2.ico"
-!define MUI_SPECIALBITMAP "%graphics%/dcpomatic.bmp"
+!define MUI_ICON "%graphics%/windows/dcpomatic2.ico"
+!define MUI_UNICON "%graphics%/windows/dcpomatic2.ico"
+!define MUI_SPECIALBITMAP "%graphics%/windows/dcpomatic.bmp"
 !include "Sections.nsh"
     """, file=f)