diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-10-08 20:04:58 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-10-09 13:45:07 +0100 |
| commit | fafcda9bddf57be0c6cecdcb758c4c56df3c8b16 (patch) | |
| tree | 534e7f437ebd02c697be874abb2f975fbd91757a | |
| parent | fa76c85e0e880edec684e4da5c5477939a3ac78d (diff) | |
OS X multi-app hacks.
101 files changed, 140 insertions, 14 deletions
diff --git a/graphics/128/dcpomatic2.png b/graphics/128/dcpomatic2.png Binary files differindex 0470d3b78..961b61080 100644 --- a/graphics/128/dcpomatic2.png +++ b/graphics/128/dcpomatic2.png diff --git a/graphics/128/dcpomatic2_batch.png b/graphics/128/dcpomatic2_batch.png Binary files differindex 0ce1e35f5..2c47ab2b2 100644 --- a/graphics/128/dcpomatic2_batch.png +++ b/graphics/128/dcpomatic2_batch.png diff --git a/graphics/128/dcpomatic2_kdm.png b/graphics/128/dcpomatic2_kdm.png Binary files differindex f6d5f04e0..9a6e91b3f 100644 --- a/graphics/128/dcpomatic2_kdm.png +++ b/graphics/128/dcpomatic2_kdm.png diff --git a/graphics/128/dcpomatic2_server.png b/graphics/128/dcpomatic2_server.png Binary files differindex fbbedd4e0..583aa6219 100644 --- a/graphics/128/dcpomatic2_server.png +++ b/graphics/128/dcpomatic2_server.png diff --git a/graphics/16/dcpomatic2.png b/graphics/16/dcpomatic2.png Binary files differindex 8d32717a9..bb1c5c58e 100644 --- a/graphics/16/dcpomatic2.png +++ b/graphics/16/dcpomatic2.png diff --git a/graphics/16/dcpomatic2_batch.png b/graphics/16/dcpomatic2_batch.png Binary files differindex 4dadb988e..1036ddadd 100644 --- a/graphics/16/dcpomatic2_batch.png +++ b/graphics/16/dcpomatic2_batch.png diff --git a/graphics/16/dcpomatic2_kdm.png b/graphics/16/dcpomatic2_kdm.png Binary files differindex c4d8b03b8..7133c1aab 100644 --- a/graphics/16/dcpomatic2_kdm.png +++ b/graphics/16/dcpomatic2_kdm.png diff --git a/graphics/16/dcpomatic2_server.png b/graphics/16/dcpomatic2_server.png Binary files differindex 12815b847..6307c7afb 100644 --- a/graphics/16/dcpomatic2_server.png +++ b/graphics/16/dcpomatic2_server.png diff --git a/graphics/22/dcpomatic2.png b/graphics/22/dcpomatic2.png Binary files differindex 8813507df..54fb0b246 100644 --- a/graphics/22/dcpomatic2.png +++ b/graphics/22/dcpomatic2.png diff --git a/graphics/22/dcpomatic2_batch.png b/graphics/22/dcpomatic2_batch.png Binary files differindex 99104205d..19fb22efa 100644 --- a/graphics/22/dcpomatic2_batch.png +++ b/graphics/22/dcpomatic2_batch.png diff --git a/graphics/22/dcpomatic2_kdm.png b/graphics/22/dcpomatic2_kdm.png Binary files differindex 23df553f3..e2f5f87d1 100644 --- a/graphics/22/dcpomatic2_kdm.png +++ b/graphics/22/dcpomatic2_kdm.png diff --git a/graphics/22/dcpomatic2_server.png b/graphics/22/dcpomatic2_server.png Binary files differindex dc22e662d..893ca76fd 100644 --- a/graphics/22/dcpomatic2_server.png +++ b/graphics/22/dcpomatic2_server.png diff --git a/graphics/256/dcpomatic2.png b/graphics/256/dcpomatic2.png Binary files differindex b80f9447a..d12b00efb 100644 --- a/graphics/256/dcpomatic2.png +++ b/graphics/256/dcpomatic2.png diff --git a/graphics/256/dcpomatic2_batch.png b/graphics/256/dcpomatic2_batch.png Binary files differindex 9a2dcba9b..042ff5859 100644 --- a/graphics/256/dcpomatic2_batch.png +++ b/graphics/256/dcpomatic2_batch.png diff --git a/graphics/256/dcpomatic2_kdm.png b/graphics/256/dcpomatic2_kdm.png Binary files differindex ee02fc563..e1b7fc537 100644 --- a/graphics/256/dcpomatic2_kdm.png +++ b/graphics/256/dcpomatic2_kdm.png diff --git a/graphics/256/dcpomatic2_server.png b/graphics/256/dcpomatic2_server.png Binary files differindex c0ccfe71c..41f6ff61b 100644 --- a/graphics/256/dcpomatic2_server.png +++ b/graphics/256/dcpomatic2_server.png diff --git a/graphics/32/dcpomatic2.png b/graphics/32/dcpomatic2.png Binary files differindex c7ef117d8..ce5e7c23b 100644 --- a/graphics/32/dcpomatic2.png +++ b/graphics/32/dcpomatic2.png diff --git a/graphics/32/dcpomatic2_batch.png b/graphics/32/dcpomatic2_batch.png Binary files differindex 5b00854bb..ea3c87e34 100644 --- a/graphics/32/dcpomatic2_batch.png +++ b/graphics/32/dcpomatic2_batch.png diff --git a/graphics/32/dcpomatic2_kdm.png b/graphics/32/dcpomatic2_kdm.png Binary files differindex 7861eaced..9c95faa87 100644 --- a/graphics/32/dcpomatic2_kdm.png +++ b/graphics/32/dcpomatic2_kdm.png diff --git a/graphics/32/dcpomatic2_server.png b/graphics/32/dcpomatic2_server.png Binary files differindex f2c154e43..b893f2480 100644 --- a/graphics/32/dcpomatic2_server.png +++ b/graphics/32/dcpomatic2_server.png diff --git a/graphics/48/dcpomatic2.png b/graphics/48/dcpomatic2.png Binary files differindex 4ecdce557..dccb1aa94 100644 --- a/graphics/48/dcpomatic2.png +++ b/graphics/48/dcpomatic2.png diff --git a/graphics/48/dcpomatic2_batch.png b/graphics/48/dcpomatic2_batch.png Binary files differindex 6a22fce99..ac0d54242 100644 --- a/graphics/48/dcpomatic2_batch.png +++ b/graphics/48/dcpomatic2_batch.png diff --git a/graphics/48/dcpomatic2_kdm.png b/graphics/48/dcpomatic2_kdm.png Binary files differindex d54935333..9f7414cae 100644 --- a/graphics/48/dcpomatic2_kdm.png +++ b/graphics/48/dcpomatic2_kdm.png diff --git a/graphics/48/dcpomatic2_server.png b/graphics/48/dcpomatic2_server.png Binary files differindex a2d202c10..278a48842 100644 --- a/graphics/48/dcpomatic2_server.png +++ b/graphics/48/dcpomatic2_server.png diff --git a/graphics/512/dcpomatic2.png b/graphics/512/dcpomatic2.png Binary files differindex 3ec37b943..7036de427 100644 --- a/graphics/512/dcpomatic2.png +++ b/graphics/512/dcpomatic2.png diff --git a/graphics/512/dcpomatic2_batch.png b/graphics/512/dcpomatic2_batch.png Binary files differindex 1c6b9e990..cab645ecf 100644 --- a/graphics/512/dcpomatic2_batch.png +++ b/graphics/512/dcpomatic2_batch.png diff --git a/graphics/512/dcpomatic2_kdm.png b/graphics/512/dcpomatic2_kdm.png Binary files differindex e1bff7ccc..25c443a85 100644 --- a/graphics/512/dcpomatic2_kdm.png +++ b/graphics/512/dcpomatic2_kdm.png diff --git a/graphics/512/dcpomatic2_server.png b/graphics/512/dcpomatic2_server.png Binary files differindex 0ec58765c..8c9355076 100644 --- a/graphics/512/dcpomatic2_server.png +++ b/graphics/512/dcpomatic2_server.png diff --git a/graphics/64/dcpomatic2.png b/graphics/64/dcpomatic2.png Binary files differindex 2a0fc2252..8b516bd08 100644 --- a/graphics/64/dcpomatic2.png +++ b/graphics/64/dcpomatic2.png diff --git a/graphics/64/dcpomatic2_batch.png b/graphics/64/dcpomatic2_batch.png Binary files differindex efa66adee..63964bf71 100644 --- a/graphics/64/dcpomatic2_batch.png +++ b/graphics/64/dcpomatic2_batch.png diff --git a/graphics/64/dcpomatic2_kdm.png b/graphics/64/dcpomatic2_kdm.png Binary files differindex b52930d5c..96b051f9c 100644 --- a/graphics/64/dcpomatic2_kdm.png +++ b/graphics/64/dcpomatic2_kdm.png diff --git a/graphics/64/dcpomatic2_server.png b/graphics/64/dcpomatic2_server.png Binary files differindex 6bd4498e3..34e783541 100644 --- a/graphics/64/dcpomatic2_server.png +++ b/graphics/64/dcpomatic2_server.png diff --git a/graphics/colour_conversions.png b/graphics/colour_conversions.png Binary files differindex 8ab6e020e..b27081786 100644 --- a/graphics/colour_conversions.png +++ b/graphics/colour_conversions.png diff --git a/graphics/dcpomatic.bmp b/graphics/dcpomatic.bmp Binary files differindex 198f8c971..002b7ca4f 100644 --- a/graphics/dcpomatic.bmp +++ b/graphics/dcpomatic.bmp diff --git a/graphics/dcpomatic.iconset/icon_128.png b/graphics/dcpomatic.iconset/icon_128.png Binary files differdeleted file mode 100644 index 0470d3b78..000000000 --- a/graphics/dcpomatic.iconset/icon_128.png +++ /dev/null diff --git a/graphics/dcpomatic.iconset/icon_128@2x.png b/graphics/dcpomatic.iconset/icon_128@2x.png Binary files differdeleted file mode 100644 index 0470d3b78..000000000 --- a/graphics/dcpomatic.iconset/icon_128@2x.png +++ /dev/null diff --git a/graphics/dcpomatic.iconset/icon_16.png b/graphics/dcpomatic.iconset/icon_16.png Binary files differdeleted file mode 100644 index 8d32717a9..000000000 --- a/graphics/dcpomatic.iconset/icon_16.png +++ /dev/null diff --git a/graphics/dcpomatic.iconset/icon_16@2x.png b/graphics/dcpomatic.iconset/icon_16@2x.png Binary files differdeleted file mode 100644 index 8d32717a9..000000000 --- a/graphics/dcpomatic.iconset/icon_16@2x.png +++ /dev/null diff --git a/graphics/dcpomatic.iconset/icon_256.png b/graphics/dcpomatic.iconset/icon_256.png Binary files differdeleted file mode 100644 index b80f9447a..000000000 --- a/graphics/dcpomatic.iconset/icon_256.png +++ /dev/null diff --git a/graphics/dcpomatic.iconset/icon_256@2x.png b/graphics/dcpomatic.iconset/icon_256@2x.png Binary files differdeleted file mode 100644 index b80f9447a..000000000 --- a/graphics/dcpomatic.iconset/icon_256@2x.png +++ /dev/null diff --git a/graphics/dcpomatic.iconset/icon_32.png b/graphics/dcpomatic.iconset/icon_32.png Binary files differdeleted file mode 100644 index c7ef117d8..000000000 --- a/graphics/dcpomatic.iconset/icon_32.png +++ /dev/null diff --git a/graphics/dcpomatic.iconset/icon_32@2x.png b/graphics/dcpomatic.iconset/icon_32@2x.png Binary files differdeleted file mode 100644 index c7ef117d8..000000000 --- a/graphics/dcpomatic.iconset/icon_32@2x.png +++ /dev/null diff --git a/graphics/dcpomatic.iconset/icon_512.png b/graphics/dcpomatic.iconset/icon_512.png Binary files differdeleted file mode 100644 index 3ec37b943..000000000 --- a/graphics/dcpomatic.iconset/icon_512.png +++ /dev/null diff --git a/graphics/dcpomatic.iconset/icon_512@2x.png b/graphics/dcpomatic.iconset/icon_512@2x.png Binary files differdeleted file mode 100644 index 3ec37b943..000000000 --- a/graphics/dcpomatic.iconset/icon_512@2x.png +++ /dev/null diff --git a/graphics/dcpomatic.png b/graphics/dcpomatic.png Binary files differindex 2264fb241..bfdc4969d 100644 --- a/graphics/dcpomatic.png +++ b/graphics/dcpomatic.png diff --git a/graphics/dcpomatic2.ico b/graphics/dcpomatic2.ico Binary files differindex 8dbc776e3..7b95b6513 100644 --- a/graphics/dcpomatic2.ico +++ b/graphics/dcpomatic2.ico diff --git a/graphics/dcpomatic2.iconset/icon_128.png b/graphics/dcpomatic2.iconset/icon_128.png Binary files differnew file mode 100644 index 000000000..961b61080 --- /dev/null +++ b/graphics/dcpomatic2.iconset/icon_128.png diff --git a/graphics/dcpomatic2.iconset/icon_128@2x.png b/graphics/dcpomatic2.iconset/icon_128@2x.png Binary files differnew file mode 100644 index 000000000..961b61080 --- /dev/null +++ b/graphics/dcpomatic2.iconset/icon_128@2x.png diff --git a/graphics/dcpomatic2.iconset/icon_16.png b/graphics/dcpomatic2.iconset/icon_16.png Binary files differnew file mode 100644 index 000000000..bb1c5c58e --- /dev/null +++ b/graphics/dcpomatic2.iconset/icon_16.png diff --git a/graphics/dcpomatic2.iconset/icon_16@2x.png b/graphics/dcpomatic2.iconset/icon_16@2x.png Binary files differnew file mode 100644 index 000000000..bb1c5c58e --- /dev/null +++ b/graphics/dcpomatic2.iconset/icon_16@2x.png diff --git a/graphics/dcpomatic2.iconset/icon_256.png b/graphics/dcpomatic2.iconset/icon_256.png Binary files differnew file mode 100644 index 000000000..d12b00efb --- /dev/null +++ b/graphics/dcpomatic2.iconset/icon_256.png diff --git a/graphics/dcpomatic2.iconset/icon_256@2x.png b/graphics/dcpomatic2.iconset/icon_256@2x.png Binary files differnew file mode 100644 index 000000000..d12b00efb --- /dev/null +++ b/graphics/dcpomatic2.iconset/icon_256@2x.png diff --git a/graphics/dcpomatic2.iconset/icon_32.png b/graphics/dcpomatic2.iconset/icon_32.png Binary files differnew file mode 100644 index 000000000..ce5e7c23b --- /dev/null +++ b/graphics/dcpomatic2.iconset/icon_32.png diff --git a/graphics/dcpomatic2.iconset/icon_32@2x.png b/graphics/dcpomatic2.iconset/icon_32@2x.png Binary files differnew file mode 100644 index 000000000..ce5e7c23b --- /dev/null +++ b/graphics/dcpomatic2.iconset/icon_32@2x.png diff --git a/graphics/dcpomatic2.iconset/icon_512.png b/graphics/dcpomatic2.iconset/icon_512.png Binary files differnew file mode 100644 index 000000000..7036de427 --- /dev/null +++ b/graphics/dcpomatic2.iconset/icon_512.png diff --git a/graphics/dcpomatic2.iconset/icon_512@2x.png b/graphics/dcpomatic2.iconset/icon_512@2x.png Binary files differnew file mode 100644 index 000000000..7036de427 --- /dev/null +++ b/graphics/dcpomatic2.iconset/icon_512@2x.png diff --git a/graphics/dcpomatic2_batch.ico b/graphics/dcpomatic2_batch.ico Binary files differindex 2eb3ee9b2..4ab265376 100644 --- a/graphics/dcpomatic2_batch.ico +++ b/graphics/dcpomatic2_batch.ico diff --git a/graphics/dcpomatic2_batch.iconset/icon_128.png b/graphics/dcpomatic2_batch.iconset/icon_128.png Binary files differnew file mode 100644 index 000000000..2c47ab2b2 --- /dev/null +++ b/graphics/dcpomatic2_batch.iconset/icon_128.png diff --git a/graphics/dcpomatic2_batch.iconset/icon_128@2x.png b/graphics/dcpomatic2_batch.iconset/icon_128@2x.png Binary files differnew file mode 100644 index 000000000..2c47ab2b2 --- /dev/null +++ b/graphics/dcpomatic2_batch.iconset/icon_128@2x.png diff --git a/graphics/dcpomatic2_batch.iconset/icon_16.png b/graphics/dcpomatic2_batch.iconset/icon_16.png Binary files differnew file mode 100644 index 000000000..1036ddadd --- /dev/null +++ b/graphics/dcpomatic2_batch.iconset/icon_16.png diff --git a/graphics/dcpomatic2_batch.iconset/icon_16@2x.png b/graphics/dcpomatic2_batch.iconset/icon_16@2x.png Binary files differnew file mode 100644 index 000000000..1036ddadd --- /dev/null +++ b/graphics/dcpomatic2_batch.iconset/icon_16@2x.png diff --git a/graphics/dcpomatic2_batch.iconset/icon_256.png b/graphics/dcpomatic2_batch.iconset/icon_256.png Binary files differnew file mode 100644 index 000000000..042ff5859 --- /dev/null +++ b/graphics/dcpomatic2_batch.iconset/icon_256.png diff --git a/graphics/dcpomatic2_batch.iconset/icon_256@2x.png b/graphics/dcpomatic2_batch.iconset/icon_256@2x.png Binary files differnew file mode 100644 index 000000000..042ff5859 --- /dev/null +++ b/graphics/dcpomatic2_batch.iconset/icon_256@2x.png diff --git a/graphics/dcpomatic2_batch.iconset/icon_32.png b/graphics/dcpomatic2_batch.iconset/icon_32.png Binary files differnew file mode 100644 index 000000000..ea3c87e34 --- /dev/null +++ b/graphics/dcpomatic2_batch.iconset/icon_32.png diff --git a/graphics/dcpomatic2_batch.iconset/icon_32@2x.png b/graphics/dcpomatic2_batch.iconset/icon_32@2x.png Binary files differnew file mode 100644 index 000000000..ea3c87e34 --- /dev/null +++ b/graphics/dcpomatic2_batch.iconset/icon_32@2x.png diff --git a/graphics/dcpomatic2_batch.iconset/icon_512.png b/graphics/dcpomatic2_batch.iconset/icon_512.png Binary files differnew file mode 100644 index 000000000..cab645ecf --- /dev/null +++ b/graphics/dcpomatic2_batch.iconset/icon_512.png diff --git a/graphics/dcpomatic2_batch.iconset/icon_512@2x.png b/graphics/dcpomatic2_batch.iconset/icon_512@2x.png Binary files differnew file mode 100644 index 000000000..cab645ecf --- /dev/null +++ b/graphics/dcpomatic2_batch.iconset/icon_512@2x.png diff --git a/graphics/dcpomatic2_kdm.ico b/graphics/dcpomatic2_kdm.ico Binary files differindex 8b80c3c58..7ce853d73 100644 --- a/graphics/dcpomatic2_kdm.ico +++ b/graphics/dcpomatic2_kdm.ico diff --git a/graphics/dcpomatic2_kdm.iconset/icon_128.png b/graphics/dcpomatic2_kdm.iconset/icon_128.png Binary files differnew file mode 100644 index 000000000..9a6e91b3f --- /dev/null +++ b/graphics/dcpomatic2_kdm.iconset/icon_128.png diff --git a/graphics/dcpomatic2_kdm.iconset/icon_128@2x.png b/graphics/dcpomatic2_kdm.iconset/icon_128@2x.png Binary files differnew file mode 100644 index 000000000..9a6e91b3f --- /dev/null +++ b/graphics/dcpomatic2_kdm.iconset/icon_128@2x.png diff --git a/graphics/dcpomatic2_kdm.iconset/icon_16.png b/graphics/dcpomatic2_kdm.iconset/icon_16.png Binary files differnew file mode 100644 index 000000000..7133c1aab --- /dev/null +++ b/graphics/dcpomatic2_kdm.iconset/icon_16.png diff --git a/graphics/dcpomatic2_kdm.iconset/icon_16@2x.png b/graphics/dcpomatic2_kdm.iconset/icon_16@2x.png Binary files differnew file mode 100644 index 000000000..7133c1aab --- /dev/null +++ b/graphics/dcpomatic2_kdm.iconset/icon_16@2x.png diff --git a/graphics/dcpomatic2_kdm.iconset/icon_256.png b/graphics/dcpomatic2_kdm.iconset/icon_256.png Binary files differnew file mode 100644 index 000000000..e1b7fc537 --- /dev/null +++ b/graphics/dcpomatic2_kdm.iconset/icon_256.png diff --git a/graphics/dcpomatic2_kdm.iconset/icon_256@2x.png b/graphics/dcpomatic2_kdm.iconset/icon_256@2x.png Binary files differnew file mode 100644 index 000000000..e1b7fc537 --- /dev/null +++ b/graphics/dcpomatic2_kdm.iconset/icon_256@2x.png diff --git a/graphics/dcpomatic2_kdm.iconset/icon_32.png b/graphics/dcpomatic2_kdm.iconset/icon_32.png Binary files differnew file mode 100644 index 000000000..9c95faa87 --- /dev/null +++ b/graphics/dcpomatic2_kdm.iconset/icon_32.png diff --git a/graphics/dcpomatic2_kdm.iconset/icon_32@2x.png b/graphics/dcpomatic2_kdm.iconset/icon_32@2x.png Binary files differnew file mode 100644 index 000000000..9c95faa87 --- /dev/null +++ b/graphics/dcpomatic2_kdm.iconset/icon_32@2x.png diff --git a/graphics/dcpomatic2_kdm.iconset/icon_512.png b/graphics/dcpomatic2_kdm.iconset/icon_512.png Binary files differnew file mode 100644 index 000000000..25c443a85 --- /dev/null +++ b/graphics/dcpomatic2_kdm.iconset/icon_512.png diff --git a/graphics/dcpomatic2_kdm.iconset/icon_512@2x.png b/graphics/dcpomatic2_kdm.iconset/icon_512@2x.png Binary files differnew file mode 100644 index 000000000..25c443a85 --- /dev/null +++ b/graphics/dcpomatic2_kdm.iconset/icon_512@2x.png diff --git a/graphics/dcpomatic2_server.ico b/graphics/dcpomatic2_server.ico Binary files differindex 46dcceb28..cc323d993 100644 --- a/graphics/dcpomatic2_server.ico +++ b/graphics/dcpomatic2_server.ico diff --git a/graphics/dcpomatic2_server.iconset/icon_128.png b/graphics/dcpomatic2_server.iconset/icon_128.png Binary files differnew file mode 100644 index 000000000..583aa6219 --- /dev/null +++ b/graphics/dcpomatic2_server.iconset/icon_128.png diff --git a/graphics/dcpomatic2_server.iconset/icon_128@2x.png b/graphics/dcpomatic2_server.iconset/icon_128@2x.png Binary files differnew file mode 100644 index 000000000..583aa6219 --- /dev/null +++ b/graphics/dcpomatic2_server.iconset/icon_128@2x.png diff --git a/graphics/dcpomatic2_server.iconset/icon_16.png b/graphics/dcpomatic2_server.iconset/icon_16.png Binary files differnew file mode 100644 index 000000000..6307c7afb --- /dev/null +++ b/graphics/dcpomatic2_server.iconset/icon_16.png diff --git a/graphics/dcpomatic2_server.iconset/icon_16@2x.png b/graphics/dcpomatic2_server.iconset/icon_16@2x.png Binary files differnew file mode 100644 index 000000000..6307c7afb --- /dev/null +++ b/graphics/dcpomatic2_server.iconset/icon_16@2x.png diff --git a/graphics/dcpomatic2_server.iconset/icon_256.png b/graphics/dcpomatic2_server.iconset/icon_256.png Binary files differnew file mode 100644 index 000000000..41f6ff61b --- /dev/null +++ b/graphics/dcpomatic2_server.iconset/icon_256.png diff --git a/graphics/dcpomatic2_server.iconset/icon_256@2x.png b/graphics/dcpomatic2_server.iconset/icon_256@2x.png Binary files differnew file mode 100644 index 000000000..41f6ff61b --- /dev/null +++ b/graphics/dcpomatic2_server.iconset/icon_256@2x.png diff --git a/graphics/dcpomatic2_server.iconset/icon_32.png b/graphics/dcpomatic2_server.iconset/icon_32.png Binary files differnew file mode 100644 index 000000000..b893f2480 --- /dev/null +++ b/graphics/dcpomatic2_server.iconset/icon_32.png diff --git a/graphics/dcpomatic2_server.iconset/icon_32@2x.png b/graphics/dcpomatic2_server.iconset/icon_32@2x.png Binary files differnew file mode 100644 index 000000000..b893f2480 --- /dev/null +++ b/graphics/dcpomatic2_server.iconset/icon_32@2x.png diff --git a/graphics/dcpomatic2_server.iconset/icon_512.png b/graphics/dcpomatic2_server.iconset/icon_512.png Binary files differnew file mode 100644 index 000000000..8c9355076 --- /dev/null +++ b/graphics/dcpomatic2_server.iconset/icon_512.png diff --git a/graphics/dcpomatic2_server.iconset/icon_512@2x.png b/graphics/dcpomatic2_server.iconset/icon_512@2x.png Binary files differnew file mode 100644 index 000000000..8c9355076 --- /dev/null +++ b/graphics/dcpomatic2_server.iconset/icon_512@2x.png diff --git a/graphics/defaults.png b/graphics/defaults.png Binary files differindex 4f457fee3..6097d81dc 100644 --- a/graphics/defaults.png +++ b/graphics/defaults.png diff --git a/graphics/kdm_email.png b/graphics/kdm_email.png Binary files differindex a6c2157e8..b66a12a1b 100644 --- a/graphics/kdm_email.png +++ b/graphics/kdm_email.png diff --git a/graphics/keys.png b/graphics/keys.png Binary files differindex 33c0accbc..4f198375d 100644 --- a/graphics/keys.png +++ b/graphics/keys.png diff --git a/graphics/splash.png b/graphics/splash.png Binary files differindex 3f798b1f8..de4e0317b 100644 --- a/graphics/splash.png +++ b/graphics/splash.png diff --git a/graphics/tms.png b/graphics/tms.png Binary files differindex e7c2e7004..89ff6d5cf 100644 --- a/graphics/tms.png +++ b/graphics/tms.png diff --git a/graphics/update b/graphics/update index 9a2c9190e..b16becc96 100755 --- a/graphics/update +++ b/graphics/update @@ -14,25 +14,29 @@ fi if [ `uname -s` == "Darwin" ]; then # Convert OS X icons using OS X-only iconutil - iconutil --convert icns --output dcpomatic.icns dcpomatic.iconset + for p in dcpomatic2 dcpomatic2_kdm dcpomatic2_server dcpomatic2_batch; do + iconutil --convert icns --output $p.icns $p.iconset + done else INKSCAPE="inkscape -z -C -e" # OS X application icons - mkdir -p dcpomatic.iconset for r in 16 32 128 256 512; do - $INKSCAPE dcpomatic.iconset/icon_$rx$r.png dcpomatic2.svg -w $r -h $r dcpomatic2.svg - $INKSCAPE dcpomatic.iconset/icon_$rx$r@2x.png -w $r -h $r dcpomatic2.svg + for p in dcpomatic2 dcpomatic2_kdm dcpomatic2_server dcpomatic2_batch; do + mkdir -p $p.iconset + $INKSCAPE $p.iconset/icon_$rx$r.png -w $r -h $r $p.svg + $INKSCAPE $p.iconset/icon_$rx$r@2x.png -w $r -h $r $p.svg + done done # Linux application icons for r in 16 22 32 48 64 128 256 512; do mkdir -p $r for p in dcpomatic2 dcpomatic2_kdm dcpomatic2_server dcpomatic2_batch; do - $INKSCAPE $r/$p.png $p.svg -w $r -h $r + $INKSCAPE $r/$p.png $p.svg -w $r -h $r done done - + # Windows application icons for p in dcpomatic2 dcpomatic2_kdm dcpomatic2_server dcpomatic2_batch; do icotool -c -o $p.ico 48/$p.png @@ -40,7 +44,7 @@ else icotool -c -o dcpomatic2_server_small.ico dcpomatic2_server_small.png $INKSCAPE dcpomatic.png dcpomatic2.svg -w 400 -h 286 convert dcpomatic.png dcpomatic.bmp - + # Preferences icons (all platforms) # servers.png does not have an SVG version for i in colour_conversions defaults kdm_email keys tms; do diff --git a/platform/osx/dcpomatic2.Info.plist.in b/platform/osx/dcpomatic2.Info.plist.in index c8c1378a9..de14012ea 100644 --- a/platform/osx/dcpomatic2.Info.plist.in +++ b/platform/osx/dcpomatic2.Info.plist.in @@ -7,9 +7,9 @@ <key>CFBundleExecutable</key> <string>dcpomatic2</string> <key>CFBundleGetInfoString</key> - <string>DCP generator</string> + <string>DCP-o-matic 2</string> <key>CFBundleIconFile</key> - <string>DCP-o-matic.icns</string> + <string>dcpomatic2.icns</string> <key>CFBundleIdentifier</key> <string>com.dcpomatic</string> <key>CFBundleInfoDictionaryVersion</key> diff --git a/platform/osx/dcpomatic2_batch.Info.plist.in b/platform/osx/dcpomatic2_batch.Info.plist.in new file mode 100644 index 000000000..8c07661ac --- /dev/null +++ b/platform/osx/dcpomatic2_batch.Info.plist.in @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>CFBundleDevelopmentRegion</key> + <string>English</string> + <key>CFBundleExecutable</key> + <string>dcpomatic2_batch</string> + <key>CFBundleGetInfoString</key> + <string>DCP-o-matic Batch Converter</string> + <key>CFBundleIconFile</key> + <string>dcpomatic2_batch.icns</string> + <key>CFBundleIdentifier</key> + <string>com.dcpomatic.batch</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundleName</key> + <string>DCP-o-matic 2 Batch Converter</string> + <key>CFBundlePackageType</key> + <string>APPL</string> + <key>CFBundleShortVersions</key> + <string>@VERSION@</string> + <key>CFBundleSignature</key> + <string>DOMC</string> + <key>CFBundleVersion</key> + <string>@VERSION@</string> + <key>LSUIElement</key> + <string>0</string> + <key>NSMainNibFile</key> + <string>MainMenu</string> + <key>NSPrincipalClass</key> + <string>NSApplication</string> +</dict> +</plist> diff --git a/platform/osx/dcpomatic2_kdm.Info.plist.in b/platform/osx/dcpomatic2_kdm.Info.plist.in index 5a585a1ae..1d7741bbf 100644 --- a/platform/osx/dcpomatic2_kdm.Info.plist.in +++ b/platform/osx/dcpomatic2_kdm.Info.plist.in @@ -7,9 +7,9 @@ <key>CFBundleExecutable</key> <string>dcpomatic2_kdm</string> <key>CFBundleGetInfoString</key> - <string>DCP KDM creator</string> + <string>DCP-o-matic KDM creator</string> <key>CFBundleIconFile</key> - <string>DCP-o-matic.icns</string> + <string>dcpomatic2_kdm.icns</string> <key>CFBundleIdentifier</key> <string>com.dcpomatic.kdm</string> <key>CFBundleInfoDictionaryVersion</key> diff --git a/platform/osx/dcpomatic2_server.Info.plist.in b/platform/osx/dcpomatic2_server.Info.plist.in new file mode 100644 index 000000000..4c893be40 --- /dev/null +++ b/platform/osx/dcpomatic2_server.Info.plist.in @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>CFBundleDevelopmentRegion</key> + <string>English</string> + <key>CFBundleExecutable</key> + <string>dcpomatic2_server</string> + <key>CFBundleGetInfoString</key> + <string>DCP-o-matic Server</string> + <key>CFBundleIconFile</key> + <string>dcpomatic2.icns</string> + <key>CFBundleIdentifier</key> + <string>com.dcpomatic.server</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundleName</key> + <string>DCP-o-matic 2 Server</string> + <key>CFBundlePackageType</key> + <string>APPL</string> + <key>CFBundleShortVersions</key> + <string>@VERSION@</string> + <key>CFBundleSignature</key> + <string>DOMC</string> + <key>CFBundleVersion</key> + <string>@VERSION@</string> + <key>LSUIElement</key> + <string>0</string> + <key>NSMainNibFile</key> + <string>MainMenu</string> + <key>NSPrincipalClass</key> + <string>NSApplication</string> +</dict> +</plist> diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index 6656a26da..6e1382fef 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -35,6 +35,24 @@ resources_kdm="$approot_kdm/Resources" rm -rf "$WORK/$appdir_kdm" mkdir -p "$WORK/$macos_kdm" +# Server +appdir_server="DCP-o-matic 2 Server.app" +approot_server="$appdir_server/Contents" +libs_server="$approot_server/lib" +macos_server="$approot_server/MacOS" +resources_server="$approot_server/Resources" +rm -rf "$WORK/$appdir_server" +mkdir -p "$WORK/$macos_server" + +# Batch converter +appdir_batch="DCP-o-matic 2 Batch Converter.app" +approot_batch="$appdir_batch/Contents" +libs_batch="$approot_batch/lib" +macos_batch="$approot_batch/MacOS" +resources_batch="$approot_batch/Resources" +rm -rf "$WORK/$appdir_batch" +mkdir -p "$WORK/$macos_batch" + relink="dcpomatic" function universal_copy { @@ -65,8 +83,9 @@ function universal_copy_lib { universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2 "$WORK/$macos" universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_cli "$WORK/$macos" universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_server_cli "$WORK/$macos" -universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_batch "$WORK/$macos" universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_kdm "$WORK/$macos_kdm" +universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_server "$WORK/$macos_server" +universal_copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_batch "$WORK/$macos_batch" universal_copy $ROOT src/dcpomatic/build/src/lib/libdcpomatic2.dylib "$WORK/$libs" universal_copy $ROOT src/dcpomatic/build/src/wx/libdcpomatic2-wx.dylib "$WORK/$libs" universal_copy_lib $ROOT libcxml "$WORK/$libs" @@ -133,7 +152,15 @@ universal_copy_lib $ENV libicuuc "$WORK/$libs" relink=`echo $relink | sed -e "s/\+//g"` -for obj in "$WORK/$macos/dcpomatic2" "$WORK/$macos/dcpomatic2_batch" "$WORK/$macos/dcpomatic2_server" "$WORK/$macos_kdm/dcpomatic2_kdm" "$WORK/$macos/dcpomatic2_cli" "$WORK/$macos/dcpomatic2_server_cli" "$WORK/$macos/ffprobe" "$WORK/$libs/"*.dylib; do +for obj in \ + "$WORK/$macos/dcpomatic2" \ + "$WORK/$macos/dcpomatic2_cli" \ + "$WORK/$macos/dcpomatic2_server_cli" \ + "$WORK/$macos_kdm/dcpomatic2_kdm" \ + "$WORK/$macos_server/dcpomatic2_server" \ + "$WORK/$macos_batch/dcpomatic2_batch" \ + "$WORK/$macos/ffprobe" \ + "$WORK/$libs/"*.dylib; do deps=`otool -L "$obj" | awk '{print $1}' | egrep "($relink)" | egrep "($ENV|$ROOT|boost|libicu)"` changes="" for dep in $deps; do @@ -149,7 +176,10 @@ for obj in "$WORK/$macos/dcpomatic2" "$WORK/$macos/dcpomatic2_batch" "$WORK/$mac done cp $ROOT/32/src/dcpomatic/build/platform/osx/dcpomatic2.Info.plist "$WORK/$approot/Info.plist" -cp $ROOT/32/src/dcpomatic/graphics/dcpomatic.icns "$WORK/$resources/DCP-o-matic.icns" +cp $ROOT/32/src/dcpomatic/graphics/dcpomatic2.icns "$WORK/$resources/dcpomatic2.icns" +cp $ROOT/32/src/dcpomatic/graphics/dcpomatic2_kdm.icns "$WORK/$resources/dcpomatic2_kdm.icns" +cp $ROOT/32/src/dcpomatic/graphics/dcpomatic2_server.icns "$WORK/$resources/dcpomatic2_server.icns" +cp $ROOT/32/src/dcpomatic/graphics/dcpomatic2_batch.icns "$WORK/$resources/dcpomatic2_batch.icns" cp $ROOT/32/src/dcpomatic/graphics/colour_conversions.png "$WORK/$resources" cp $ROOT/32/src/dcpomatic/graphics/defaults.png "$WORK/$resources" cp $ROOT/32/src/dcpomatic/graphics/kdm_email.png "$WORK/$resources" @@ -192,6 +222,28 @@ ln -s "../../DCP-o-matic 2.app/Contents/Resources" "$WORK/$resources_kdm" cp $ROOT/32/src/dcpomatic/build/platform/osx/dcpomatic2_kdm.Info.plist "$WORK/$approot_kdm/Info.plist" cp -a "$WORK/$appdir_kdm" $WORK/$vol_name +# Server +appdir_server="DCP-o-matic 2 Server.app" +approot_server="$appdir_server/Contents" +libs_server="$approot_server/lib" +macos_server="$approot_server/MacOS" +resources_server="$approot_server/Resources" +ln -s "../../DCP-o-matic 2.app/Contents/lib" "$WORK/$libs_server" +ln -s "../../DCP-o-matic 2.app/Contents/Resources" "$WORK/$resources_server" +cp $ROOT/32/src/dcpomatic/build/platform/osx/dcpomatic2_server.Info.plist "$WORK/$approot_server/Info.plist" +cp -a "$WORK/$appdir_server" $WORK/$vol_name + +# Batch converter +appdir_batch="DCP-o-matic 2 Batch Converter.app" +approot_batch="$appdir_batch/Contents" +libs_batch="$approot_batch/lib" +macos_batch="$approot_batch/MacOS" +resources_batch="$approot_batch/Resources" +ln -s "../../DCP-o-matic 2.app/Contents/lib" "$WORK/$libs_batch" +ln -s "../../DCP-o-matic 2.app/Contents/Resources" "$WORK/$resources_batch" +cp $ROOT/32/src/dcpomatic/build/platform/osx/dcpomatic2_batch.Info.plist "$WORK/$approot_batch/Info.plist" +cp -a "$WORK/$appdir_batch" $WORK/$vol_name + rm -f $tmp_dmg "$dmg" hdiutil create -srcfolder $WORK/$vol_name -volname $vol_name -fs HFS+ -fsargs "-c c=64,a=16,e=16" -format UDRW -size $DMG_SIZE $tmp_dmg attach=$(hdiutil attach -readwrite -noverify -noautoopen $tmp_dmg) diff --git a/platform/osx/wscript b/platform/osx/wscript index c1f2351dd..f2248fcb5 100644 --- a/platform/osx/wscript +++ b/platform/osx/wscript @@ -1,3 +1,5 @@ def build(bld): obj = bld(features='subst', source='dcpomatic2.Info.plist.in', target='dcpomatic2.Info.plist', version=bld.env.VERSION) obj = bld(features='subst', source='dcpomatic2_kdm.Info.plist.in', target='dcpomatic2_kdm.Info.plist', version=bld.env.VERSION) + obj = bld(features='subst', source='dcpomatic2_server.Info.plist.in', target='dcpomatic2_server.Info.plist', version=bld.env.VERSION) + obj = bld(features='subst', source='dcpomatic2_batch.Info.plist.in', target='dcpomatic2_batch.Info.plist', version=bld.env.VERSION) |
