OS X multi-app hacks.

diff --git a/graphics/128/dcpomatic2.png b/graphics/128/dcpomatic2.png
index 0470d3b783da47e3d8cc4624ee7b1d4ba3bff3ac..961b610806dc4dfd287c40267a7020aa115ee37f 100644 (file)
Binary files a/graphics/128/dcpomatic2.png and b/graphics/128/dcpomatic2.png differ

diff --git a/graphics/128/dcpomatic2_batch.png b/graphics/128/dcpomatic2_batch.png
index 0ce1e35f5a8bc385ac3551f4f27835f0a7790eb9..2c47ab2b262e725448759a9399a75e4e2b28dc14 100644 (file)
Binary files a/graphics/128/dcpomatic2_batch.png and b/graphics/128/dcpomatic2_batch.png differ

diff --git a/graphics/128/dcpomatic2_kdm.png b/graphics/128/dcpomatic2_kdm.png
index f6d5f04e094678b046cef3c0e8c343ac7e310474..9a6e91b3fd97af59f98e23dcfd5f06606746cf47 100644 (file)
Binary files a/graphics/128/dcpomatic2_kdm.png and b/graphics/128/dcpomatic2_kdm.png differ

diff --git a/graphics/128/dcpomatic2_server.png b/graphics/128/dcpomatic2_server.png
index fbbedd4e06a16960c3b3f0b8e1ab62f6c21c05c7..583aa6219e8569bee41afce5ec8709177802b62c 100644 (file)
Binary files a/graphics/128/dcpomatic2_server.png and b/graphics/128/dcpomatic2_server.png differ

diff --git a/graphics/16/dcpomatic2.png b/graphics/16/dcpomatic2.png
index 8d32717a9b422eda38bbfa580c9e25514b8a086c..bb1c5c58eb3918a6852237bbce3b70a348c9fe7e 100644 (file)
Binary files a/graphics/16/dcpomatic2.png and b/graphics/16/dcpomatic2.png differ

diff --git a/graphics/16/dcpomatic2_batch.png b/graphics/16/dcpomatic2_batch.png
index 4dadb988ee0f917e33118525a940b78c33234946..1036ddadd40c186ea244aa090a80e3f75697cc31 100644 (file)
Binary files a/graphics/16/dcpomatic2_batch.png and b/graphics/16/dcpomatic2_batch.png differ

diff --git a/graphics/16/dcpomatic2_kdm.png b/graphics/16/dcpomatic2_kdm.png
index c4d8b03b8cde78905a6b246999f906b61e9580f9..7133c1aab9d7c29f3b23180ec31521d36384f898 100644 (file)
Binary files a/graphics/16/dcpomatic2_kdm.png and b/graphics/16/dcpomatic2_kdm.png differ

diff --git a/graphics/16/dcpomatic2_server.png b/graphics/16/dcpomatic2_server.png
index 12815b847f75dbc0bbf8aede3b2741dbc40003d1..6307c7afb61ae6073cebf511c0d3694904e167f8 100644 (file)
Binary files a/graphics/16/dcpomatic2_server.png and b/graphics/16/dcpomatic2_server.png differ

diff --git a/graphics/22/dcpomatic2.png b/graphics/22/dcpomatic2.png
index 8813507df59b984e95e618bf9e2b93cc9d5e8131..54fb0b246d1fc6d0655f01fed7a112ca14cb9c72 100644 (file)
Binary files a/graphics/22/dcpomatic2.png and b/graphics/22/dcpomatic2.png differ

diff --git a/graphics/22/dcpomatic2_batch.png b/graphics/22/dcpomatic2_batch.png
index 99104205dec2a6ef31682e74ae35d092863cd79b..19fb22efa9aa8b5d8977f88ba12e3a173dcffae0 100644 (file)
Binary files a/graphics/22/dcpomatic2_batch.png and b/graphics/22/dcpomatic2_batch.png differ

diff --git a/graphics/22/dcpomatic2_kdm.png b/graphics/22/dcpomatic2_kdm.png
index 23df553f34928196f37ba89e8dc764a98d43715e..e2f5f87d1533b23522ef83ca7d885bfe86d6e0c6 100644 (file)
Binary files a/graphics/22/dcpomatic2_kdm.png and b/graphics/22/dcpomatic2_kdm.png differ

diff --git a/graphics/22/dcpomatic2_server.png b/graphics/22/dcpomatic2_server.png
index dc22e662d70913ce00232849922f35637d949a8f..893ca76fd29f0ba03c449f18f342ab82b1c765d7 100644 (file)
Binary files a/graphics/22/dcpomatic2_server.png and b/graphics/22/dcpomatic2_server.png differ

diff --git a/graphics/256/dcpomatic2.png b/graphics/256/dcpomatic2.png
index b80f9447ac4eff5711a0086e06ec5f7465f434ea..d12b00efbe9026848a3a3a167cee0a250cead227 100644 (file)
Binary files a/graphics/256/dcpomatic2.png and b/graphics/256/dcpomatic2.png differ

diff --git a/graphics/256/dcpomatic2_batch.png b/graphics/256/dcpomatic2_batch.png
index 9a2dcba9b24aa7c18516f309033246251d74b941..042ff585917e99b9deef3985efe37328338745d1 100644 (file)
Binary files a/graphics/256/dcpomatic2_batch.png and b/graphics/256/dcpomatic2_batch.png differ

diff --git a/graphics/256/dcpomatic2_kdm.png b/graphics/256/dcpomatic2_kdm.png
index ee02fc5638a9ceed63e1ed58abb15176a77e6349..e1b7fc53743a54d01464bcb41c421517e2a69867 100644 (file)
Binary files a/graphics/256/dcpomatic2_kdm.png and b/graphics/256/dcpomatic2_kdm.png differ

diff --git a/graphics/256/dcpomatic2_server.png b/graphics/256/dcpomatic2_server.png
index c0ccfe71c2585c26102c21347f877d151ccb104f..41f6ff61bd779ffb5d53824a2d8453a6e5d5927c 100644 (file)
Binary files a/graphics/256/dcpomatic2_server.png and b/graphics/256/dcpomatic2_server.png differ

diff --git a/graphics/32/dcpomatic2.png b/graphics/32/dcpomatic2.png
index c7ef117d81a4c061851607b6992fe472320053dd..ce5e7c23ba64aa5ea5ee7af965f1a8e318221847 100644 (file)
Binary files a/graphics/32/dcpomatic2.png and b/graphics/32/dcpomatic2.png differ

diff --git a/graphics/32/dcpomatic2_batch.png b/graphics/32/dcpomatic2_batch.png
index 5b00854bb3e252eecfc914fa1907a3a6f3bd33fd..ea3c87e3430db628db676aeea30e00e40ae229a8 100644 (file)
Binary files a/graphics/32/dcpomatic2_batch.png and b/graphics/32/dcpomatic2_batch.png differ

diff --git a/graphics/32/dcpomatic2_kdm.png b/graphics/32/dcpomatic2_kdm.png
index 7861eacedac00e7050ef551b55578f735e879587..9c95faa870fb8b48be842dfd38a28eb51c894ca4 100644 (file)
Binary files a/graphics/32/dcpomatic2_kdm.png and b/graphics/32/dcpomatic2_kdm.png differ

diff --git a/graphics/32/dcpomatic2_server.png b/graphics/32/dcpomatic2_server.png
index f2c154e43e77c167f9a10624e7f8f02c53a071b9..b893f24803269c15c55c35d54f50277e4d48924f 100644 (file)
Binary files a/graphics/32/dcpomatic2_server.png and b/graphics/32/dcpomatic2_server.png differ

diff --git a/graphics/48/dcpomatic2.png b/graphics/48/dcpomatic2.png
index 4ecdce557ad6090cff9d05f8289a5e272dc94875..dccb1aa945a563c1baa79cdcc296346388cc2e59 100644 (file)
Binary files a/graphics/48/dcpomatic2.png and b/graphics/48/dcpomatic2.png differ

diff --git a/graphics/48/dcpomatic2_batch.png b/graphics/48/dcpomatic2_batch.png
index 6a22fce99e09a2ac73b72d0a68a463a3ebfb1dbd..ac0d54242bb086e09a9373c3504bb1012cc43646 100644 (file)
Binary files a/graphics/48/dcpomatic2_batch.png and b/graphics/48/dcpomatic2_batch.png differ

diff --git a/graphics/48/dcpomatic2_kdm.png b/graphics/48/dcpomatic2_kdm.png
index d5493533328b8184806c0158b2dce27741f136c0..9f7414cae451e32563041f638b2076b681401841 100644 (file)
Binary files a/graphics/48/dcpomatic2_kdm.png and b/graphics/48/dcpomatic2_kdm.png differ

diff --git a/graphics/48/dcpomatic2_server.png b/graphics/48/dcpomatic2_server.png
index a2d202c1098fcb1e6d3e2fa6520d8f068a1ad2dd..278a4884207af4426e475a473b9e8cc300b92021 100644 (file)
Binary files a/graphics/48/dcpomatic2_server.png and b/graphics/48/dcpomatic2_server.png differ

diff --git a/graphics/512/dcpomatic2.png b/graphics/512/dcpomatic2.png
index 3ec37b9437d56312d4bb185c7c8493740d6c0bfb..7036de427cbf42cc32b90f047df17940041b4456 100644 (file)
Binary files a/graphics/512/dcpomatic2.png and b/graphics/512/dcpomatic2.png differ

diff --git a/graphics/512/dcpomatic2_batch.png b/graphics/512/dcpomatic2_batch.png
index 1c6b9e99051771776cafebfeca2f6fdd8dc3d3b6..cab645ecf755465a1984e281a0b15ae7d376d7d8 100644 (file)
Binary files a/graphics/512/dcpomatic2_batch.png and b/graphics/512/dcpomatic2_batch.png differ

diff --git a/graphics/512/dcpomatic2_kdm.png b/graphics/512/dcpomatic2_kdm.png
index e1bff7ccc55ef38075c10dee63bf7325eadc2575..25c443a85e946be775993cdbc33653c9cda15710 100644 (file)
Binary files a/graphics/512/dcpomatic2_kdm.png and b/graphics/512/dcpomatic2_kdm.png differ

diff --git a/graphics/512/dcpomatic2_server.png b/graphics/512/dcpomatic2_server.png
index 0ec58765c34507e6afbb05b3bdc67223e766d19d..8c93550763d3cae94934d40152ffaf0c6b8476c7 100644 (file)
Binary files a/graphics/512/dcpomatic2_server.png and b/graphics/512/dcpomatic2_server.png differ

diff --git a/graphics/64/dcpomatic2.png b/graphics/64/dcpomatic2.png
index 2a0fc225253fc3aa281b59349840e6ab08bb8b4c..8b516bd0842d920101639df8b1edf1090b0be72a 100644 (file)
Binary files a/graphics/64/dcpomatic2.png and b/graphics/64/dcpomatic2.png differ

diff --git a/graphics/64/dcpomatic2_batch.png b/graphics/64/dcpomatic2_batch.png
index efa66adee82ce202f1f42f5534a9a29398c58019..63964bf7161d8c510dce179d71d6f5a75582d972 100644 (file)
Binary files a/graphics/64/dcpomatic2_batch.png and b/graphics/64/dcpomatic2_batch.png differ

diff --git a/graphics/64/dcpomatic2_kdm.png b/graphics/64/dcpomatic2_kdm.png
index b52930d5c9c508e9aad5aaf2de945fbe09f3344f..96b051f9c8e7a75a42211e3d2932c9b4e729736c 100644 (file)
Binary files a/graphics/64/dcpomatic2_kdm.png and b/graphics/64/dcpomatic2_kdm.png differ

diff --git a/graphics/64/dcpomatic2_server.png b/graphics/64/dcpomatic2_server.png
index 6bd4498e37ccae4f6168c22ada825ff5ff0d4dbe..34e78354159334a31c2e4aa2177be217ec180cf0 100644 (file)
Binary files a/graphics/64/dcpomatic2_server.png and b/graphics/64/dcpomatic2_server.png differ

diff --git a/graphics/colour_conversions.png b/graphics/colour_conversions.png
index 8ab6e020ea69b37a8aa379d48faf96a55a268943..b2708178692c4e6a5c795550a44d07ed43c74176 100644 (file)
Binary files a/graphics/colour_conversions.png and b/graphics/colour_conversions.png differ

diff --git a/graphics/dcpomatic.bmp b/graphics/dcpomatic.bmp
index 198f8c97132e5f332a97e22ba261c2502f3ddaf3..002b7ca4f0191eae08ea7ebb2fc56ac0a6e3f1d2 100644 (file)
Binary files a/graphics/dcpomatic.bmp and b/graphics/dcpomatic.bmp differ

diff --git a/graphics/dcpomatic.iconset/icon_128.png b/graphics/dcpomatic.iconset/icon_128.png
deleted file mode 100644 (file)
index 0470d3b..0000000
Binary files a/graphics/dcpomatic.iconset/icon_128.png and /dev/null differ

diff --git a/graphics/dcpomatic.iconset/icon_128@2x.png b/graphics/dcpomatic.iconset/icon_128@2x.png
deleted file mode 100644 (file)
index 0470d3b..0000000
Binary files a/graphics/dcpomatic.iconset/icon_128@2x.png and /dev/null differ

diff --git a/graphics/dcpomatic.iconset/icon_16.png b/graphics/dcpomatic.iconset/icon_16.png
deleted file mode 100644 (file)
index 8d32717..0000000
Binary files a/graphics/dcpomatic.iconset/icon_16.png and /dev/null differ

diff --git a/graphics/dcpomatic.iconset/icon_16@2x.png b/graphics/dcpomatic.iconset/icon_16@2x.png
deleted file mode 100644 (file)
index 8d32717..0000000
Binary files a/graphics/dcpomatic.iconset/icon_16@2x.png and /dev/null differ

diff --git a/graphics/dcpomatic.iconset/icon_256.png b/graphics/dcpomatic.iconset/icon_256.png
deleted file mode 100644 (file)
index b80f944..0000000
Binary files a/graphics/dcpomatic.iconset/icon_256.png and /dev/null differ

diff --git a/graphics/dcpomatic.iconset/icon_256@2x.png b/graphics/dcpomatic.iconset/icon_256@2x.png
deleted file mode 100644 (file)
index b80f944..0000000
Binary files a/graphics/dcpomatic.iconset/icon_256@2x.png and /dev/null differ

diff --git a/graphics/dcpomatic.iconset/icon_32.png b/graphics/dcpomatic.iconset/icon_32.png
deleted file mode 100644 (file)
index c7ef117..0000000
Binary files a/graphics/dcpomatic.iconset/icon_32.png and /dev/null differ

diff --git a/graphics/dcpomatic.iconset/icon_32@2x.png b/graphics/dcpomatic.iconset/icon_32@2x.png
deleted file mode 100644 (file)
index c7ef117..0000000
Binary files a/graphics/dcpomatic.iconset/icon_32@2x.png and /dev/null differ

diff --git a/graphics/dcpomatic.iconset/icon_512.png b/graphics/dcpomatic.iconset/icon_512.png
deleted file mode 100644 (file)
index 3ec37b9..0000000
Binary files a/graphics/dcpomatic.iconset/icon_512.png and /dev/null differ

diff --git a/graphics/dcpomatic.iconset/icon_512@2x.png b/graphics/dcpomatic.iconset/icon_512@2x.png
deleted file mode 100644 (file)
index 3ec37b9..0000000
Binary files a/graphics/dcpomatic.iconset/icon_512@2x.png and /dev/null differ

diff --git a/graphics/dcpomatic.png b/graphics/dcpomatic.png
index 2264fb24113f15a24f848bbea2c7de1db602b26f..bfdc4969d20767e6d537096c006822f4b6a9b2f7 100644 (file)
Binary files a/graphics/dcpomatic.png and b/graphics/dcpomatic.png differ

diff --git a/graphics/dcpomatic2.ico b/graphics/dcpomatic2.ico
index 8dbc776e3c26b281e046a7451c16f728e668fef8..7b95b651373ec2d9eb7685bfd3e330feae2354bb 100644 (file)
Binary files a/graphics/dcpomatic2.ico and b/graphics/dcpomatic2.ico differ

diff --git a/graphics/dcpomatic2.iconset/icon_128.png b/graphics/dcpomatic2.iconset/icon_128.png
new file mode 100644 (file)
index 0000000..961b610
Binary files /dev/null and b/graphics/dcpomatic2.iconset/icon_128.png differ

diff --git a/graphics/dcpomatic2.iconset/icon_128@2x.png b/graphics/dcpomatic2.iconset/icon_128@2x.png
new file mode 100644 (file)
index 0000000..961b610
Binary files /dev/null and b/graphics/dcpomatic2.iconset/icon_128@2x.png differ

diff --git a/graphics/dcpomatic2.iconset/icon_16.png b/graphics/dcpomatic2.iconset/icon_16.png
new file mode 100644 (file)
index 0000000..bb1c5c5
Binary files /dev/null and b/graphics/dcpomatic2.iconset/icon_16.png differ

diff --git a/graphics/dcpomatic2.iconset/icon_16@2x.png b/graphics/dcpomatic2.iconset/icon_16@2x.png
new file mode 100644 (file)
index 0000000..bb1c5c5
Binary files /dev/null and b/graphics/dcpomatic2.iconset/icon_16@2x.png differ

diff --git a/graphics/dcpomatic2.iconset/icon_256.png b/graphics/dcpomatic2.iconset/icon_256.png
new file mode 100644 (file)
index 0000000..d12b00e
Binary files /dev/null and b/graphics/dcpomatic2.iconset/icon_256.png differ

diff --git a/graphics/dcpomatic2.iconset/icon_256@2x.png b/graphics/dcpomatic2.iconset/icon_256@2x.png
new file mode 100644 (file)
index 0000000..d12b00e
Binary files /dev/null and b/graphics/dcpomatic2.iconset/icon_256@2x.png differ

diff --git a/graphics/dcpomatic2.iconset/icon_32.png b/graphics/dcpomatic2.iconset/icon_32.png
new file mode 100644 (file)
index 0000000..ce5e7c2
Binary files /dev/null and b/graphics/dcpomatic2.iconset/icon_32.png differ

diff --git a/graphics/dcpomatic2.iconset/icon_32@2x.png b/graphics/dcpomatic2.iconset/icon_32@2x.png
new file mode 100644 (file)
index 0000000..ce5e7c2
Binary files /dev/null and b/graphics/dcpomatic2.iconset/icon_32@2x.png differ

diff --git a/graphics/dcpomatic2.iconset/icon_512.png b/graphics/dcpomatic2.iconset/icon_512.png
new file mode 100644 (file)
index 0000000..7036de4
Binary files /dev/null and b/graphics/dcpomatic2.iconset/icon_512.png differ

diff --git a/graphics/dcpomatic2.iconset/icon_512@2x.png b/graphics/dcpomatic2.iconset/icon_512@2x.png
new file mode 100644 (file)
index 0000000..7036de4
Binary files /dev/null and b/graphics/dcpomatic2.iconset/icon_512@2x.png differ

diff --git a/graphics/dcpomatic2_batch.ico b/graphics/dcpomatic2_batch.ico
index 2eb3ee9b258f3093abcde9c21360f0b55613c871..4ab26537605bb4140117a5a231a1b3b3bc40c085 100644 (file)
Binary files a/graphics/dcpomatic2_batch.ico and b/graphics/dcpomatic2_batch.ico differ

diff --git a/graphics/dcpomatic2_batch.iconset/icon_128.png b/graphics/dcpomatic2_batch.iconset/icon_128.png
new file mode 100644 (file)
index 0000000..2c47ab2
Binary files /dev/null and b/graphics/dcpomatic2_batch.iconset/icon_128.png differ

diff --git a/graphics/dcpomatic2_batch.iconset/icon_128@2x.png b/graphics/dcpomatic2_batch.iconset/icon_128@2x.png
new file mode 100644 (file)
index 0000000..2c47ab2
Binary files /dev/null and b/graphics/dcpomatic2_batch.iconset/icon_128@2x.png differ

diff --git a/graphics/dcpomatic2_batch.iconset/icon_16.png b/graphics/dcpomatic2_batch.iconset/icon_16.png
new file mode 100644 (file)
index 0000000..1036dda
Binary files /dev/null and b/graphics/dcpomatic2_batch.iconset/icon_16.png differ

diff --git a/graphics/dcpomatic2_batch.iconset/icon_16@2x.png b/graphics/dcpomatic2_batch.iconset/icon_16@2x.png
new file mode 100644 (file)
index 0000000..1036dda
Binary files /dev/null and b/graphics/dcpomatic2_batch.iconset/icon_16@2x.png differ

diff --git a/graphics/dcpomatic2_batch.iconset/icon_256.png b/graphics/dcpomatic2_batch.iconset/icon_256.png
new file mode 100644 (file)
index 0000000..042ff58
Binary files /dev/null and b/graphics/dcpomatic2_batch.iconset/icon_256.png differ

diff --git a/graphics/dcpomatic2_batch.iconset/icon_256@2x.png b/graphics/dcpomatic2_batch.iconset/icon_256@2x.png
new file mode 100644 (file)
index 0000000..042ff58
Binary files /dev/null and b/graphics/dcpomatic2_batch.iconset/icon_256@2x.png differ

diff --git a/graphics/dcpomatic2_batch.iconset/icon_32.png b/graphics/dcpomatic2_batch.iconset/icon_32.png
new file mode 100644 (file)
index 0000000..ea3c87e
Binary files /dev/null and b/graphics/dcpomatic2_batch.iconset/icon_32.png differ

diff --git a/graphics/dcpomatic2_batch.iconset/icon_32@2x.png b/graphics/dcpomatic2_batch.iconset/icon_32@2x.png
new file mode 100644 (file)
index 0000000..ea3c87e
Binary files /dev/null and b/graphics/dcpomatic2_batch.iconset/icon_32@2x.png differ

diff --git a/graphics/dcpomatic2_batch.iconset/icon_512.png b/graphics/dcpomatic2_batch.iconset/icon_512.png
new file mode 100644 (file)
index 0000000..cab645e
Binary files /dev/null and b/graphics/dcpomatic2_batch.iconset/icon_512.png differ

diff --git a/graphics/dcpomatic2_batch.iconset/icon_512@2x.png b/graphics/dcpomatic2_batch.iconset/icon_512@2x.png
new file mode 100644 (file)
index 0000000..cab645e
Binary files /dev/null and b/graphics/dcpomatic2_batch.iconset/icon_512@2x.png differ

diff --git a/graphics/dcpomatic2_kdm.ico b/graphics/dcpomatic2_kdm.ico
index 8b80c3c581d4b0ae79030ca6dfbd12873b1dde7b..7ce853d733e53c657fa7b340614f97f6808eee40 100644 (file)
Binary files a/graphics/dcpomatic2_kdm.ico and b/graphics/dcpomatic2_kdm.ico differ

diff --git a/graphics/dcpomatic2_kdm.iconset/icon_128.png b/graphics/dcpomatic2_kdm.iconset/icon_128.png
new file mode 100644 (file)
index 0000000..9a6e91b
Binary files /dev/null and b/graphics/dcpomatic2_kdm.iconset/icon_128.png differ

diff --git a/graphics/dcpomatic2_kdm.iconset/icon_128@2x.png b/graphics/dcpomatic2_kdm.iconset/icon_128@2x.png
new file mode 100644 (file)
index 0000000..9a6e91b
Binary files /dev/null and b/graphics/dcpomatic2_kdm.iconset/icon_128@2x.png differ

diff --git a/graphics/dcpomatic2_kdm.iconset/icon_16.png b/graphics/dcpomatic2_kdm.iconset/icon_16.png
new file mode 100644 (file)
index 0000000..7133c1a
Binary files /dev/null and b/graphics/dcpomatic2_kdm.iconset/icon_16.png differ

diff --git a/graphics/dcpomatic2_kdm.iconset/icon_16@2x.png b/graphics/dcpomatic2_kdm.iconset/icon_16@2x.png
new file mode 100644 (file)
index 0000000..7133c1a
Binary files /dev/null and b/graphics/dcpomatic2_kdm.iconset/icon_16@2x.png differ

diff --git a/graphics/dcpomatic2_kdm.iconset/icon_256.png b/graphics/dcpomatic2_kdm.iconset/icon_256.png
new file mode 100644 (file)
index 0000000..e1b7fc5
Binary files /dev/null and b/graphics/dcpomatic2_kdm.iconset/icon_256.png differ

diff --git a/graphics/dcpomatic2_kdm.iconset/icon_256@2x.png b/graphics/dcpomatic2_kdm.iconset/icon_256@2x.png
new file mode 100644 (file)
index 0000000..e1b7fc5
Binary files /dev/null and b/graphics/dcpomatic2_kdm.iconset/icon_256@2x.png differ

diff --git a/graphics/dcpomatic2_kdm.iconset/icon_32.png b/graphics/dcpomatic2_kdm.iconset/icon_32.png
new file mode 100644 (file)
index 0000000..9c95faa
Binary files /dev/null and b/graphics/dcpomatic2_kdm.iconset/icon_32.png differ

diff --git a/graphics/dcpomatic2_kdm.iconset/icon_32@2x.png b/graphics/dcpomatic2_kdm.iconset/icon_32@2x.png
new file mode 100644 (file)
index 0000000..9c95faa
Binary files /dev/null and b/graphics/dcpomatic2_kdm.iconset/icon_32@2x.png differ

diff --git a/graphics/dcpomatic2_kdm.iconset/icon_512.png b/graphics/dcpomatic2_kdm.iconset/icon_512.png
new file mode 100644 (file)
index 0000000..25c443a
Binary files /dev/null and b/graphics/dcpomatic2_kdm.iconset/icon_512.png differ

diff --git a/graphics/dcpomatic2_kdm.iconset/icon_512@2x.png b/graphics/dcpomatic2_kdm.iconset/icon_512@2x.png
new file mode 100644 (file)
index 0000000..25c443a
Binary files /dev/null and b/graphics/dcpomatic2_kdm.iconset/icon_512@2x.png differ

diff --git a/graphics/dcpomatic2_server.ico b/graphics/dcpomatic2_server.ico
index 46dcceb28f5b24f17a7e99d11899f974bacac122..cc323d993047bed391620eca9d94d1526c5efcbb 100644 (file)
Binary files a/graphics/dcpomatic2_server.ico and b/graphics/dcpomatic2_server.ico differ

diff --git a/graphics/dcpomatic2_server.iconset/icon_128.png b/graphics/dcpomatic2_server.iconset/icon_128.png
new file mode 100644 (file)
index 0000000..583aa62
Binary files /dev/null and b/graphics/dcpomatic2_server.iconset/icon_128.png differ

diff --git a/graphics/dcpomatic2_server.iconset/icon_128@2x.png b/graphics/dcpomatic2_server.iconset/icon_128@2x.png
new file mode 100644 (file)
index 0000000..583aa62
Binary files /dev/null and b/graphics/dcpomatic2_server.iconset/icon_128@2x.png differ

diff --git a/graphics/dcpomatic2_server.iconset/icon_16.png b/graphics/dcpomatic2_server.iconset/icon_16.png
new file mode 100644 (file)
index 0000000..6307c7a
Binary files /dev/null and b/graphics/dcpomatic2_server.iconset/icon_16.png differ

diff --git a/graphics/dcpomatic2_server.iconset/icon_16@2x.png b/graphics/dcpomatic2_server.iconset/icon_16@2x.png
new file mode 100644 (file)
index 0000000..6307c7a
Binary files /dev/null and b/graphics/dcpomatic2_server.iconset/icon_16@2x.png differ

diff --git a/graphics/dcpomatic2_server.iconset/icon_256.png b/graphics/dcpomatic2_server.iconset/icon_256.png
new file mode 100644 (file)
index 0000000..41f6ff6
Binary files /dev/null and b/graphics/dcpomatic2_server.iconset/icon_256.png differ

diff --git a/graphics/dcpomatic2_server.iconset/icon_256@2x.png b/graphics/dcpomatic2_server.iconset/icon_256@2x.png
new file mode 100644 (file)
index 0000000..41f6ff6
Binary files /dev/null and b/graphics/dcpomatic2_server.iconset/icon_256@2x.png differ

diff --git a/graphics/dcpomatic2_server.iconset/icon_32.png b/graphics/dcpomatic2_server.iconset/icon_32.png
new file mode 100644 (file)
index 0000000..b893f24
Binary files /dev/null and b/graphics/dcpomatic2_server.iconset/icon_32.png differ

diff --git a/graphics/dcpomatic2_server.iconset/icon_32@2x.png b/graphics/dcpomatic2_server.iconset/icon_32@2x.png
new file mode 100644 (file)
index 0000000..b893f24
Binary files /dev/null and b/graphics/dcpomatic2_server.iconset/icon_32@2x.png differ

diff --git a/graphics/dcpomatic2_server.iconset/icon_512.png b/graphics/dcpomatic2_server.iconset/icon_512.png
new file mode 100644 (file)
index 0000000..8c93550
Binary files /dev/null and b/graphics/dcpomatic2_server.iconset/icon_512.png differ

diff --git a/graphics/dcpomatic2_server.iconset/icon_512@2x.png b/graphics/dcpomatic2_server.iconset/icon_512@2x.png
new file mode 100644 (file)
index 0000000..8c93550
Binary files /dev/null and b/graphics/dcpomatic2_server.iconset/icon_512@2x.png differ

diff --git a/graphics/defaults.png b/graphics/defaults.png
index 4f457fee3899d1cc8ae7877b39f8bc10f42108b1..6097d81dc3a3819b6be2a99891b5d8f5012bfa1b 100644 (file)
Binary files a/graphics/defaults.png and b/graphics/defaults.png differ

diff --git a/graphics/kdm_email.png b/graphics/kdm_email.png
index a6c2157e8071eed98d11b39b5b79d2425e54d8d0..b66a12a1b3454f8c000e41c9bfa6bafdeb7015a7 100644 (file)
Binary files a/graphics/kdm_email.png and b/graphics/kdm_email.png differ

diff --git a/graphics/keys.png b/graphics/keys.png
index 33c0accbc90a45dec1eeffd1063046c6a7067d44..4f198375d24a29436fe063bd56869de1ad757687 100644 (file)
Binary files a/graphics/keys.png and b/graphics/keys.png differ

diff --git a/graphics/splash.png b/graphics/splash.png
index 3f798b1f8c4941611b8ec4821f79e9e2bb81cab1..de4e0317b77a0f6fd77e3963b4a38d3184f8731c 100644 (file)
Binary files a/graphics/splash.png and b/graphics/splash.png differ

diff --git a/graphics/tms.png b/graphics/tms.png
index e7c2e7004620b25d43f15b41780a97d85c1588df..89ff6d5cf4cf951b0cffdc8d99cbdfbf9f085be0 100644 (file)
Binary files a/graphics/tms.png and b/graphics/tms.png differ

diff --git a/graphics/update b/graphics/update
index 9a2c9190efaca2cb26ded40e302c0b477c32bca1..b16becc96741ac4faa02456f145a8c02b2482e0a 100755 (executable)
--- 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 c8c1378a9fcb44e4e1e8f2fa7c8b722d56ea9704..de14012ea86bb5760a1eea256c190369a20f40cd 100644 (file)
--- 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 (file)
index 0000000..8c07661
--- /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 5a585a1aeabce3a1acbf454de5cf904d4e53659a..1d7741bbfda5033363d78582c813a2545fcb9b33 100644 (file)
--- 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 (file)
index 0000000..4c893be
--- /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 6656a26da4010573debc4623b9f72d3c8f603c02..6e1382fef9fdaf9aa3ebdb312cb57180fcb81887 100644 (file)
--- 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 c1f2351dd91f55126845e3271fb787c8e5267be3..f2248fcb5161a935181bb38f3edf2d034f9de93e 100644 (file)
--- 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)