diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-10-08 09:52:39 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-10-09 13:45:04 +0100 |
| commit | c314f25178bd32120dfc64ec72a7a94a32b1b7b0 (patch) | |
| tree | 63c327e78fea9dcc2b03272c86f30f31647c5ede /platform/windows | |
| parent | a6c709878735820af75ad887084f615fd3b8249d (diff) | |
Graphics rearrangement and probably breakage.
Diffstat (limited to 'platform/windows')
| -rw-r--r-- | platform/windows/dcpomatic.bmp | bin | 343254 -> 0 bytes | |||
| -rw-r--r-- | platform/windows/dcpomatic.ico | bin | 9662 -> 0 bytes | |||
| -rw-r--r-- | platform/windows/dcpomatic.rc | 4 | ||||
| -rw-r--r-- | platform/windows/dcpomatic_batch.rc | 3 | ||||
| -rw-r--r-- | platform/windows/dcpomatic_kdm.rc | 3 | ||||
| -rw-r--r-- | platform/windows/dcpomatic_server.rc | 3 | ||||
| -rw-r--r-- | platform/windows/dcpomatic_taskbar.ico | bin | 1150 -> 0 bytes | |||
| -rw-r--r-- | platform/windows/wscript | 6 |
8 files changed, 14 insertions, 5 deletions
diff --git a/platform/windows/dcpomatic.bmp b/platform/windows/dcpomatic.bmp Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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) |
