Graphics rearrangement and probably breakage.

12 files changed, 33 insertions, 8 deletions

diff --git a/platform/linux/dcpomatic_batch.desktop.in b/platform/linux/dcpomatic_batch.desktop.in
index 23eb2e4a1..ad8e4adb0 100644
--- a/platform/linux/dcpomatic_batch.desktop.in
+++ b/platform/linux/dcpomatic_batch.desktop.in
@@ -5,6 +5,6 @@ Type=Application
 Terminal=false
 Exec=@INSTALL_PREFIX@/bin/dcpomatic2_batch
 Name=DCP-o-matic 2 Batch Converter
-Icon=dcpomatic2
+Icon=dcpomatic2_batch
 Comment=DCP generator
 Categories=AudioVideo;Video
diff --git a/platform/linux/dcpomatic_kdm.desktop.in b/platform/linux/dcpomatic_kdm.desktop.in
new file mode 100644
index 000000000..439d036ca
--- /dev/null
+++ b/platform/linux/dcpomatic_kdm.desktop.in
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Terminal=false
+Exec=@INSTALL_PREFIX@/bin/dcpomatic2_kdm
+Name=DCP-o-matic 2 KDM Creator
+Icon=dcpomatic2_kdm
+Comment=DCP generator
+Categories=AudioVideo;Video
diff --git a/platform/linux/dcpomatic_server.desktop.in b/platform/linux/dcpomatic_server.desktop.in
index f28ab052f..23a56d478 100644
--- a/platform/linux/dcpomatic_server.desktop.in
+++ b/platform/linux/dcpomatic_server.desktop.in
@@ -5,6 +5,6 @@ Type=Application
 Terminal=false
 Exec=@INSTALL_PREFIX@/bin/dcpomatic2_server
 Name=DCP-o-matic 2 Encode Server
-Icon=dcpomatic2
+Icon=dcpomatic2_server
 Comment=DCP generator
 Categories=AudioVideo;Video
diff --git a/platform/linux/wscript b/platform/linux/wscript
index 5f1dc48a2..6e96f3f79 100644
--- a/platform/linux/wscript
+++ b/platform/linux/wscript
@@ -17,4 +17,10 @@ def build(bld):
     obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX
     obj.VERSION = bld.env.VERSION
 
-    bld.install_files('${PREFIX}/share/applications', ['dcpomatic2.desktop', 'dcpomatic2_batch.desktop', 'dcpomatic2_server.desktop'])
+    obj = bld(features='subst')
+    obj.source = 'dcpomatic_kdm.desktop.in'
+    obj.target = 'dcpomatic2_kdm.desktop'
+    obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX
+    obj.VERSION = bld.env.VERSION
+
+    bld.install_files('${PREFIX}/share/applications', ['dcpomatic2.desktop', 'dcpomatic2_batch.desktop', 'dcpomatic2_server.desktop', 'dcpomatic2_kdm.desktop'])
diff --git a/platform/windows/dcpomatic.bmp b/platform/windows/dcpomatic.bmp
deleted file mode 100644
index 0a196f7a0..000000000
--- a/platform/windows/dcpomatic.bmp
+++ /dev/null
diff --git a/platform/windows/dcpomatic.ico b/platform/windows/dcpomatic.ico
deleted file mode 100644
index 225008cfe..000000000
--- a/platform/windows/dcpomatic.ico
+++ /dev/null
diff --git a/platform/windows/dcpomatic.rc b/platform/windows/dcpomatic.rc
index fe2746ad9..12747f539 100644
--- a/platform/windows/dcpomatic.rc
+++ b/platform/windows/dcpomatic.rc
@@ -1,3 +1,3 @@
-id ICON "dcpomatic.ico"
-taskbar_icon ICON "dcpomatic_taskbar.ico"
+id ICON "../../graphics/dcpomatic2.ico"
+taskbar_icon ICON "../../graphics/dcpomatic2_server_small.ico"
 #include "wx-3.0/wx/msw/wx.rc"
diff --git a/platform/windows/dcpomatic_batch.rc b/platform/windows/dcpomatic_batch.rc
new file mode 100644
index 000000000..de68302de
--- /dev/null
+++ b/platform/windows/dcpomatic_batch.rc
@@ -0,0 +1,3 @@
+id ICON "../../graphics/dcpomatic2_batch.ico"
+taskbar_icon ICON "../../graphics/dcpomatic2_server_small.ico"
+#include "wx-3.0/wx/msw/wx.rc"
diff --git a/platform/windows/dcpomatic_kdm.rc b/platform/windows/dcpomatic_kdm.rc
new file mode 100644
index 000000000..e641436c9
--- /dev/null
+++ b/platform/windows/dcpomatic_kdm.rc
@@ -0,0 +1,3 @@
+id ICON "../../graphics/dcpomatic2_kdm.ico"
+taskbar_icon ICON "../../graphics/dcpomatic2_server_small.ico"
+#include "wx-3.0/wx/msw/wx.rc"
diff --git a/platform/windows/dcpomatic_server.rc b/platform/windows/dcpomatic_server.rc
new file mode 100644
index 000000000..19da9cfd1
--- /dev/null
+++ b/platform/windows/dcpomatic_server.rc
@@ -0,0 +1,3 @@
+id ICON "../../graphics/dcpomatic2_server.ico"
+taskbar_icon ICON "../../graphics/dcpomatic2_server_small.ico"
+#include "wx-3.0/wx/msw/wx.rc"
diff --git a/platform/windows/dcpomatic_taskbar.ico b/platform/windows/dcpomatic_taskbar.ico
deleted file mode 100644
index f4489fa14..000000000
--- a/platform/windows/dcpomatic_taskbar.ico
+++ /dev/null
diff --git a/platform/windows/wscript b/platform/windows/wscript
index 5d8a64b7b..f33aaaf62 100644
--- a/platform/windows/wscript
+++ b/platform/windows/wscript
@@ -25,9 +25,9 @@ def write_installer(bits, version, debug):
         print('outFile "DCP-o-matic %s %d-bit Installer.exe"' % (version, bits), file=f)
 
     print("""
-!define MUI_ICON "%resources%/dcpomatic.ico"
-!define MUI_UNICON "%resources%/dcpomatic.ico"
-!define MUI_SPECIALBITMAP "%resources%/dcpomatic.bmp"
+!define MUI_ICON "%graphics%/dcpomatic2.ico"
+!define MUI_UNICON "%graphics%/dcpomatic2.ico"
+!define MUI_SPECIALBITMAP "%graphics%/dcpomatic.bmp"
 !include "Sections.nsh"
     """, file=f)