From: Carl Hetherington Date: Mon, 16 Jan 2017 21:15:09 +0000 (+0000) Subject: Incorporate new icon by Julian van Mil for main DCP-o-matic. X-Git-Tag: v2.10.7-test~9 X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=9e14cd0b1ff1d30f027fbd1351bd2a94b7e119d9 Incorporate new icon by Julian van Mil for main DCP-o-matic. --- diff --git a/graphics/128/dcpomatic2.png b/graphics/128/dcpomatic2.png deleted file mode 100644 index 961b61080..000000000 Binary files a/graphics/128/dcpomatic2.png and /dev/null differ diff --git a/graphics/128/dcpomatic2_batch.png b/graphics/128/dcpomatic2_batch.png deleted file mode 100644 index 2c47ab2b2..000000000 Binary files a/graphics/128/dcpomatic2_batch.png and /dev/null differ diff --git a/graphics/128/dcpomatic2_kdm.png b/graphics/128/dcpomatic2_kdm.png deleted file mode 100644 index 9a6e91b3f..000000000 Binary files a/graphics/128/dcpomatic2_kdm.png and /dev/null differ diff --git a/graphics/128/dcpomatic2_server.png b/graphics/128/dcpomatic2_server.png deleted file mode 100644 index 583aa6219..000000000 Binary files a/graphics/128/dcpomatic2_server.png and /dev/null differ diff --git a/graphics/16/dcpomatic2.png b/graphics/16/dcpomatic2.png deleted file mode 100644 index bb1c5c58e..000000000 Binary files a/graphics/16/dcpomatic2.png and /dev/null differ diff --git a/graphics/16/dcpomatic2_batch.png b/graphics/16/dcpomatic2_batch.png deleted file mode 100644 index 1036ddadd..000000000 Binary files a/graphics/16/dcpomatic2_batch.png and /dev/null differ diff --git a/graphics/16/dcpomatic2_kdm.png b/graphics/16/dcpomatic2_kdm.png deleted file mode 100644 index 7133c1aab..000000000 Binary files a/graphics/16/dcpomatic2_kdm.png and /dev/null differ diff --git a/graphics/16/dcpomatic2_server.png b/graphics/16/dcpomatic2_server.png deleted file mode 100644 index 6307c7afb..000000000 Binary files a/graphics/16/dcpomatic2_server.png and /dev/null differ diff --git a/graphics/22/dcpomatic2.png b/graphics/22/dcpomatic2.png deleted file mode 100644 index 54fb0b246..000000000 Binary files a/graphics/22/dcpomatic2.png and /dev/null differ diff --git a/graphics/22/dcpomatic2_batch.png b/graphics/22/dcpomatic2_batch.png deleted file mode 100644 index 19fb22efa..000000000 Binary files a/graphics/22/dcpomatic2_batch.png and /dev/null differ diff --git a/graphics/22/dcpomatic2_kdm.png b/graphics/22/dcpomatic2_kdm.png deleted file mode 100644 index e2f5f87d1..000000000 Binary files a/graphics/22/dcpomatic2_kdm.png and /dev/null differ diff --git a/graphics/22/dcpomatic2_server.png b/graphics/22/dcpomatic2_server.png deleted file mode 100644 index 893ca76fd..000000000 Binary files a/graphics/22/dcpomatic2_server.png and /dev/null differ diff --git a/graphics/256/dcpomatic2.png b/graphics/256/dcpomatic2.png deleted file mode 100644 index d12b00efb..000000000 Binary files a/graphics/256/dcpomatic2.png and /dev/null differ diff --git a/graphics/256/dcpomatic2_batch.png b/graphics/256/dcpomatic2_batch.png deleted file mode 100644 index 042ff5859..000000000 Binary files a/graphics/256/dcpomatic2_batch.png and /dev/null differ diff --git a/graphics/256/dcpomatic2_kdm.png b/graphics/256/dcpomatic2_kdm.png deleted file mode 100644 index e1b7fc537..000000000 Binary files a/graphics/256/dcpomatic2_kdm.png and /dev/null differ diff --git a/graphics/256/dcpomatic2_server.png b/graphics/256/dcpomatic2_server.png deleted file mode 100644 index 41f6ff61b..000000000 Binary files a/graphics/256/dcpomatic2_server.png and /dev/null differ diff --git a/graphics/32/dcpomatic2.png b/graphics/32/dcpomatic2.png deleted file mode 100644 index ce5e7c23b..000000000 Binary files a/graphics/32/dcpomatic2.png and /dev/null differ diff --git a/graphics/32/dcpomatic2_batch.png b/graphics/32/dcpomatic2_batch.png deleted file mode 100644 index ea3c87e34..000000000 Binary files a/graphics/32/dcpomatic2_batch.png and /dev/null differ diff --git a/graphics/32/dcpomatic2_kdm.png b/graphics/32/dcpomatic2_kdm.png deleted file mode 100644 index 9c95faa87..000000000 Binary files a/graphics/32/dcpomatic2_kdm.png and /dev/null differ diff --git a/graphics/32/dcpomatic2_server.png b/graphics/32/dcpomatic2_server.png deleted file mode 100644 index b893f2480..000000000 Binary files a/graphics/32/dcpomatic2_server.png and /dev/null differ diff --git a/graphics/48/dcpomatic2.png b/graphics/48/dcpomatic2.png deleted file mode 100644 index dccb1aa94..000000000 Binary files a/graphics/48/dcpomatic2.png and /dev/null differ diff --git a/graphics/48/dcpomatic2_batch.png b/graphics/48/dcpomatic2_batch.png deleted file mode 100644 index ac0d54242..000000000 Binary files a/graphics/48/dcpomatic2_batch.png and /dev/null differ diff --git a/graphics/48/dcpomatic2_kdm.png b/graphics/48/dcpomatic2_kdm.png deleted file mode 100644 index 9f7414cae..000000000 Binary files a/graphics/48/dcpomatic2_kdm.png and /dev/null differ diff --git a/graphics/48/dcpomatic2_server.png b/graphics/48/dcpomatic2_server.png deleted file mode 100644 index 278a48842..000000000 Binary files a/graphics/48/dcpomatic2_server.png and /dev/null differ diff --git a/graphics/512/dcpomatic2.png b/graphics/512/dcpomatic2.png deleted file mode 100644 index 7036de427..000000000 Binary files a/graphics/512/dcpomatic2.png and /dev/null differ diff --git a/graphics/512/dcpomatic2_batch.png b/graphics/512/dcpomatic2_batch.png deleted file mode 100644 index cab645ecf..000000000 Binary files a/graphics/512/dcpomatic2_batch.png and /dev/null differ diff --git a/graphics/512/dcpomatic2_kdm.png b/graphics/512/dcpomatic2_kdm.png deleted file mode 100644 index 25c443a85..000000000 Binary files a/graphics/512/dcpomatic2_kdm.png and /dev/null differ diff --git a/graphics/512/dcpomatic2_server.png b/graphics/512/dcpomatic2_server.png deleted file mode 100644 index 8c9355076..000000000 Binary files a/graphics/512/dcpomatic2_server.png and /dev/null differ diff --git a/graphics/64/dcpomatic2.png b/graphics/64/dcpomatic2.png deleted file mode 100644 index 8b516bd08..000000000 Binary files a/graphics/64/dcpomatic2.png and /dev/null differ diff --git a/graphics/64/dcpomatic2_batch.png b/graphics/64/dcpomatic2_batch.png deleted file mode 100644 index 63964bf71..000000000 Binary files a/graphics/64/dcpomatic2_batch.png and /dev/null differ diff --git a/graphics/64/dcpomatic2_kdm.png b/graphics/64/dcpomatic2_kdm.png deleted file mode 100644 index 96b051f9c..000000000 Binary files a/graphics/64/dcpomatic2_kdm.png and /dev/null differ diff --git a/graphics/64/dcpomatic2_server.png b/graphics/64/dcpomatic2_server.png deleted file mode 100644 index 34e783541..000000000 Binary files a/graphics/64/dcpomatic2_server.png and /dev/null differ diff --git a/graphics/banner.svg b/graphics/banner.svg deleted file mode 100644 index 4ab436b95..000000000 --- a/graphics/banner.svg +++ /dev/null @@ -1,646 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - DCP-o-matic - Free, open-source DCP creation. - - diff --git a/graphics/bits/finish.jpg b/graphics/bits/finish.jpg deleted file mode 100644 index 3bfc27ab4..000000000 Binary files a/graphics/bits/finish.jpg and /dev/null differ diff --git a/graphics/bits/finish2.jpg b/graphics/bits/finish2.jpg deleted file mode 100644 index f05a2e76e..000000000 Binary files a/graphics/bits/finish2.jpg and /dev/null differ diff --git a/graphics/bits/finish3.jpg b/graphics/bits/finish3.jpg deleted file mode 100644 index b1fc4753d..000000000 Binary files a/graphics/bits/finish3.jpg and /dev/null differ diff --git a/graphics/bits/website-sidebar.svg b/graphics/bits/website-sidebar.svg deleted file mode 100644 index 1d67062f4..000000000 --- a/graphics/bits/website-sidebar.svg +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/graphics/colour_conversions.png b/graphics/colour_conversions.png deleted file mode 100644 index 161e8d6f1..000000000 Binary files a/graphics/colour_conversions.png and /dev/null differ diff --git a/graphics/colour_conversions.svg b/graphics/colour_conversions.svg deleted file mode 100644 index af34a347d..000000000 --- a/graphics/colour_conversions.svg +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/graphics/dcpomatic.bmp b/graphics/dcpomatic.bmp deleted file mode 100644 index d86830f16..000000000 Binary files a/graphics/dcpomatic.bmp and /dev/null differ diff --git a/graphics/dcpomatic.icns b/graphics/dcpomatic.icns deleted file mode 100644 index cb4887544..000000000 Binary files a/graphics/dcpomatic.icns and /dev/null differ diff --git a/graphics/dcpomatic.png b/graphics/dcpomatic.png deleted file mode 100644 index 674ea2544..000000000 Binary files a/graphics/dcpomatic.png and /dev/null differ diff --git a/graphics/dcpomatic2.icns b/graphics/dcpomatic2.icns deleted file mode 100644 index ee392846b..000000000 Binary files a/graphics/dcpomatic2.icns and /dev/null differ diff --git a/graphics/dcpomatic2.ico b/graphics/dcpomatic2.ico deleted file mode 100644 index 7b95b6513..000000000 Binary files a/graphics/dcpomatic2.ico and /dev/null differ diff --git a/graphics/dcpomatic2.iconset/icon_128.png b/graphics/dcpomatic2.iconset/icon_128.png deleted file mode 100644 index 961b61080..000000000 Binary files a/graphics/dcpomatic2.iconset/icon_128.png and /dev/null differ diff --git a/graphics/dcpomatic2.iconset/icon_128@2x.png b/graphics/dcpomatic2.iconset/icon_128@2x.png deleted file mode 100644 index 961b61080..000000000 Binary files a/graphics/dcpomatic2.iconset/icon_128@2x.png and /dev/null differ diff --git a/graphics/dcpomatic2.iconset/icon_16.png b/graphics/dcpomatic2.iconset/icon_16.png deleted file mode 100644 index bb1c5c58e..000000000 Binary files a/graphics/dcpomatic2.iconset/icon_16.png and /dev/null differ diff --git a/graphics/dcpomatic2.iconset/icon_16@2x.png b/graphics/dcpomatic2.iconset/icon_16@2x.png deleted file mode 100644 index bb1c5c58e..000000000 Binary files a/graphics/dcpomatic2.iconset/icon_16@2x.png and /dev/null differ diff --git a/graphics/dcpomatic2.iconset/icon_256.png b/graphics/dcpomatic2.iconset/icon_256.png deleted file mode 100644 index d12b00efb..000000000 Binary files a/graphics/dcpomatic2.iconset/icon_256.png and /dev/null differ diff --git a/graphics/dcpomatic2.iconset/icon_256@2x.png b/graphics/dcpomatic2.iconset/icon_256@2x.png deleted file mode 100644 index d12b00efb..000000000 Binary files a/graphics/dcpomatic2.iconset/icon_256@2x.png and /dev/null differ diff --git a/graphics/dcpomatic2.iconset/icon_32.png b/graphics/dcpomatic2.iconset/icon_32.png deleted file mode 100644 index ce5e7c23b..000000000 Binary files a/graphics/dcpomatic2.iconset/icon_32.png and /dev/null differ diff --git a/graphics/dcpomatic2.iconset/icon_32@2x.png b/graphics/dcpomatic2.iconset/icon_32@2x.png deleted file mode 100644 index ce5e7c23b..000000000 Binary files a/graphics/dcpomatic2.iconset/icon_32@2x.png and /dev/null differ diff --git a/graphics/dcpomatic2.iconset/icon_512.png b/graphics/dcpomatic2.iconset/icon_512.png deleted file mode 100644 index 7036de427..000000000 Binary files a/graphics/dcpomatic2.iconset/icon_512.png and /dev/null differ diff --git a/graphics/dcpomatic2.iconset/icon_512@2x.png b/graphics/dcpomatic2.iconset/icon_512@2x.png deleted file mode 100644 index 7036de427..000000000 Binary files a/graphics/dcpomatic2.iconset/icon_512@2x.png and /dev/null differ diff --git a/graphics/dcpomatic2.svg b/graphics/dcpomatic2.svg deleted file mode 100644 index c63f8be6a..000000000 --- a/graphics/dcpomatic2.svg +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/graphics/dcpomatic2_batch.icns b/graphics/dcpomatic2_batch.icns deleted file mode 100644 index 838f1a168..000000000 Binary files a/graphics/dcpomatic2_batch.icns and /dev/null differ diff --git a/graphics/dcpomatic2_batch.ico b/graphics/dcpomatic2_batch.ico deleted file mode 100644 index 4ab265376..000000000 Binary files a/graphics/dcpomatic2_batch.ico and /dev/null differ diff --git a/graphics/dcpomatic2_batch.iconset/icon_128.png b/graphics/dcpomatic2_batch.iconset/icon_128.png deleted file mode 100644 index 2c47ab2b2..000000000 Binary files a/graphics/dcpomatic2_batch.iconset/icon_128.png and /dev/null differ diff --git a/graphics/dcpomatic2_batch.iconset/icon_128@2x.png b/graphics/dcpomatic2_batch.iconset/icon_128@2x.png deleted file mode 100644 index 2c47ab2b2..000000000 Binary files a/graphics/dcpomatic2_batch.iconset/icon_128@2x.png and /dev/null differ diff --git a/graphics/dcpomatic2_batch.iconset/icon_16.png b/graphics/dcpomatic2_batch.iconset/icon_16.png deleted file mode 100644 index 1036ddadd..000000000 Binary files a/graphics/dcpomatic2_batch.iconset/icon_16.png and /dev/null differ diff --git a/graphics/dcpomatic2_batch.iconset/icon_16@2x.png b/graphics/dcpomatic2_batch.iconset/icon_16@2x.png deleted file mode 100644 index 1036ddadd..000000000 Binary files a/graphics/dcpomatic2_batch.iconset/icon_16@2x.png and /dev/null differ diff --git a/graphics/dcpomatic2_batch.iconset/icon_256.png b/graphics/dcpomatic2_batch.iconset/icon_256.png deleted file mode 100644 index 042ff5859..000000000 Binary files a/graphics/dcpomatic2_batch.iconset/icon_256.png and /dev/null differ diff --git a/graphics/dcpomatic2_batch.iconset/icon_256@2x.png b/graphics/dcpomatic2_batch.iconset/icon_256@2x.png deleted file mode 100644 index 042ff5859..000000000 Binary files a/graphics/dcpomatic2_batch.iconset/icon_256@2x.png and /dev/null differ diff --git a/graphics/dcpomatic2_batch.iconset/icon_32.png b/graphics/dcpomatic2_batch.iconset/icon_32.png deleted file mode 100644 index ea3c87e34..000000000 Binary files a/graphics/dcpomatic2_batch.iconset/icon_32.png and /dev/null differ diff --git a/graphics/dcpomatic2_batch.iconset/icon_32@2x.png b/graphics/dcpomatic2_batch.iconset/icon_32@2x.png deleted file mode 100644 index ea3c87e34..000000000 Binary files a/graphics/dcpomatic2_batch.iconset/icon_32@2x.png and /dev/null differ diff --git a/graphics/dcpomatic2_batch.iconset/icon_512.png b/graphics/dcpomatic2_batch.iconset/icon_512.png deleted file mode 100644 index cab645ecf..000000000 Binary files a/graphics/dcpomatic2_batch.iconset/icon_512.png and /dev/null differ diff --git a/graphics/dcpomatic2_batch.iconset/icon_512@2x.png b/graphics/dcpomatic2_batch.iconset/icon_512@2x.png deleted file mode 100644 index cab645ecf..000000000 Binary files a/graphics/dcpomatic2_batch.iconset/icon_512@2x.png and /dev/null differ diff --git a/graphics/dcpomatic2_batch.svg b/graphics/dcpomatic2_batch.svg deleted file mode 100644 index 12d8f3eec..000000000 --- a/graphics/dcpomatic2_batch.svg +++ /dev/null @@ -1,232 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/graphics/dcpomatic2_kdm.icns b/graphics/dcpomatic2_kdm.icns deleted file mode 100644 index 6124edc87..000000000 Binary files a/graphics/dcpomatic2_kdm.icns and /dev/null differ diff --git a/graphics/dcpomatic2_kdm.ico b/graphics/dcpomatic2_kdm.ico deleted file mode 100644 index 7ce853d73..000000000 Binary files a/graphics/dcpomatic2_kdm.ico and /dev/null differ diff --git a/graphics/dcpomatic2_kdm.iconset/icon_128.png b/graphics/dcpomatic2_kdm.iconset/icon_128.png deleted file mode 100644 index 9a6e91b3f..000000000 Binary files a/graphics/dcpomatic2_kdm.iconset/icon_128.png and /dev/null differ diff --git a/graphics/dcpomatic2_kdm.iconset/icon_128@2x.png b/graphics/dcpomatic2_kdm.iconset/icon_128@2x.png deleted file mode 100644 index 9a6e91b3f..000000000 Binary files a/graphics/dcpomatic2_kdm.iconset/icon_128@2x.png and /dev/null differ diff --git a/graphics/dcpomatic2_kdm.iconset/icon_16.png b/graphics/dcpomatic2_kdm.iconset/icon_16.png deleted file mode 100644 index 7133c1aab..000000000 Binary files a/graphics/dcpomatic2_kdm.iconset/icon_16.png and /dev/null differ diff --git a/graphics/dcpomatic2_kdm.iconset/icon_16@2x.png b/graphics/dcpomatic2_kdm.iconset/icon_16@2x.png deleted file mode 100644 index 7133c1aab..000000000 Binary files a/graphics/dcpomatic2_kdm.iconset/icon_16@2x.png and /dev/null differ diff --git a/graphics/dcpomatic2_kdm.iconset/icon_256.png b/graphics/dcpomatic2_kdm.iconset/icon_256.png deleted file mode 100644 index e1b7fc537..000000000 Binary files a/graphics/dcpomatic2_kdm.iconset/icon_256.png and /dev/null differ diff --git a/graphics/dcpomatic2_kdm.iconset/icon_256@2x.png b/graphics/dcpomatic2_kdm.iconset/icon_256@2x.png deleted file mode 100644 index e1b7fc537..000000000 Binary files a/graphics/dcpomatic2_kdm.iconset/icon_256@2x.png and /dev/null differ diff --git a/graphics/dcpomatic2_kdm.iconset/icon_32.png b/graphics/dcpomatic2_kdm.iconset/icon_32.png deleted file mode 100644 index 9c95faa87..000000000 Binary files a/graphics/dcpomatic2_kdm.iconset/icon_32.png and /dev/null differ diff --git a/graphics/dcpomatic2_kdm.iconset/icon_32@2x.png b/graphics/dcpomatic2_kdm.iconset/icon_32@2x.png deleted file mode 100644 index 9c95faa87..000000000 Binary files a/graphics/dcpomatic2_kdm.iconset/icon_32@2x.png and /dev/null differ diff --git a/graphics/dcpomatic2_kdm.iconset/icon_512.png b/graphics/dcpomatic2_kdm.iconset/icon_512.png deleted file mode 100644 index 25c443a85..000000000 Binary files a/graphics/dcpomatic2_kdm.iconset/icon_512.png and /dev/null differ diff --git a/graphics/dcpomatic2_kdm.iconset/icon_512@2x.png b/graphics/dcpomatic2_kdm.iconset/icon_512@2x.png deleted file mode 100644 index 25c443a85..000000000 Binary files a/graphics/dcpomatic2_kdm.iconset/icon_512@2x.png and /dev/null differ diff --git a/graphics/dcpomatic2_kdm.svg b/graphics/dcpomatic2_kdm.svg deleted file mode 100644 index 4000288e3..000000000 --- a/graphics/dcpomatic2_kdm.svg +++ /dev/null @@ -1,247 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/graphics/dcpomatic2_server.icns b/graphics/dcpomatic2_server.icns deleted file mode 100644 index a24acf12e..000000000 Binary files a/graphics/dcpomatic2_server.icns and /dev/null differ diff --git a/graphics/dcpomatic2_server.ico b/graphics/dcpomatic2_server.ico deleted file mode 100644 index cc323d993..000000000 Binary files a/graphics/dcpomatic2_server.ico and /dev/null differ diff --git a/graphics/dcpomatic2_server.iconset/icon_128.png b/graphics/dcpomatic2_server.iconset/icon_128.png deleted file mode 100644 index 583aa6219..000000000 Binary files a/graphics/dcpomatic2_server.iconset/icon_128.png and /dev/null differ diff --git a/graphics/dcpomatic2_server.iconset/icon_128@2x.png b/graphics/dcpomatic2_server.iconset/icon_128@2x.png deleted file mode 100644 index 583aa6219..000000000 Binary files a/graphics/dcpomatic2_server.iconset/icon_128@2x.png and /dev/null differ diff --git a/graphics/dcpomatic2_server.iconset/icon_16.png b/graphics/dcpomatic2_server.iconset/icon_16.png deleted file mode 100644 index 6307c7afb..000000000 Binary files a/graphics/dcpomatic2_server.iconset/icon_16.png and /dev/null differ diff --git a/graphics/dcpomatic2_server.iconset/icon_16@2x.png b/graphics/dcpomatic2_server.iconset/icon_16@2x.png deleted file mode 100644 index 6307c7afb..000000000 Binary files a/graphics/dcpomatic2_server.iconset/icon_16@2x.png and /dev/null differ diff --git a/graphics/dcpomatic2_server.iconset/icon_256.png b/graphics/dcpomatic2_server.iconset/icon_256.png deleted file mode 100644 index 41f6ff61b..000000000 Binary files a/graphics/dcpomatic2_server.iconset/icon_256.png and /dev/null differ diff --git a/graphics/dcpomatic2_server.iconset/icon_256@2x.png b/graphics/dcpomatic2_server.iconset/icon_256@2x.png deleted file mode 100644 index 41f6ff61b..000000000 Binary files a/graphics/dcpomatic2_server.iconset/icon_256@2x.png and /dev/null differ diff --git a/graphics/dcpomatic2_server.iconset/icon_32.png b/graphics/dcpomatic2_server.iconset/icon_32.png deleted file mode 100644 index b893f2480..000000000 Binary files a/graphics/dcpomatic2_server.iconset/icon_32.png and /dev/null differ diff --git a/graphics/dcpomatic2_server.iconset/icon_32@2x.png b/graphics/dcpomatic2_server.iconset/icon_32@2x.png deleted file mode 100644 index b893f2480..000000000 Binary files a/graphics/dcpomatic2_server.iconset/icon_32@2x.png and /dev/null differ diff --git a/graphics/dcpomatic2_server.iconset/icon_512.png b/graphics/dcpomatic2_server.iconset/icon_512.png deleted file mode 100644 index 8c9355076..000000000 Binary files a/graphics/dcpomatic2_server.iconset/icon_512.png and /dev/null differ diff --git a/graphics/dcpomatic2_server.iconset/icon_512@2x.png b/graphics/dcpomatic2_server.iconset/icon_512@2x.png deleted file mode 100644 index 8c9355076..000000000 Binary files a/graphics/dcpomatic2_server.iconset/icon_512@2x.png and /dev/null differ diff --git a/graphics/dcpomatic2_server.svg b/graphics/dcpomatic2_server.svg deleted file mode 100644 index c1ab306ae..000000000 --- a/graphics/dcpomatic2_server.svg +++ /dev/null @@ -1,281 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/graphics/dcpomatic2_server_small.ico b/graphics/dcpomatic2_server_small.ico deleted file mode 100644 index 83d25ed3f..000000000 Binary files a/graphics/dcpomatic2_server_small.ico and /dev/null differ diff --git a/graphics/dcpomatic2_server_small.png b/graphics/dcpomatic2_server_small.png deleted file mode 100644 index fd6b6e968..000000000 Binary files a/graphics/dcpomatic2_server_small.png and /dev/null differ diff --git a/graphics/defaults.png b/graphics/defaults.png deleted file mode 100644 index 6ccce17b1..000000000 Binary files a/graphics/defaults.png and /dev/null differ diff --git a/graphics/defaults.svg b/graphics/defaults.svg deleted file mode 100644 index 06a593f85..000000000 --- a/graphics/defaults.svg +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - diff --git a/graphics/kdm_email.png b/graphics/kdm_email.png deleted file mode 100644 index b66a12a1b..000000000 Binary files a/graphics/kdm_email.png and /dev/null differ diff --git a/graphics/kdm_email.svg b/graphics/kdm_email.svg deleted file mode 100644 index c09d94e81..000000000 --- a/graphics/kdm_email.svg +++ /dev/null @@ -1,474 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - Openclipart - - - tango internet mail - 2010-03-29T08:04:16 - "E-mail" icon from <a href="http://tango.freedesktop.org/Tango_Desktop_Project"> Tango Project </a> \n<br><br> \nSince version 0.8.90 Tango Project icons are Public Domain: <a href="http://tango.freedesktop.org/Frequently_Asked_Questions#Terms_of_Use.3F"> Tango Project FAQ </a> - https://openclipart.org/detail/35215/tango-internet-mail-by-warszawianka - - - warszawianka - - - - - email - envelope - externalsource - icon - letter - tango - - - - - - - - - - - diff --git a/graphics/keys.png b/graphics/keys.png deleted file mode 100644 index b7b870314..000000000 Binary files a/graphics/keys.png and /dev/null differ diff --git a/graphics/keys.svg b/graphics/keys.svg deleted file mode 100644 index 870a0f51e..000000000 --- a/graphics/keys.svg +++ /dev/null @@ -1,194 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - Openclipart - - - Key - 2007-02-27T15:15:43 - A key icon. - http://openclipart.org/detail/3330/key-by-barretr - - - barretr - - - - - clip art - clipart - icon - image - key - media - png - public domain - svg - - - - - - - - - - - - diff --git a/graphics/linux/128/dcpomatic2.png b/graphics/linux/128/dcpomatic2.png new file mode 100644 index 000000000..ae3ae23e9 Binary files /dev/null and b/graphics/linux/128/dcpomatic2.png differ diff --git a/graphics/linux/128/dcpomatic2_batch.png b/graphics/linux/128/dcpomatic2_batch.png new file mode 100644 index 000000000..2c47ab2b2 Binary files /dev/null and b/graphics/linux/128/dcpomatic2_batch.png differ diff --git a/graphics/linux/128/dcpomatic2_kdm.png b/graphics/linux/128/dcpomatic2_kdm.png new file mode 100644 index 000000000..9a6e91b3f Binary files /dev/null and b/graphics/linux/128/dcpomatic2_kdm.png differ diff --git a/graphics/linux/128/dcpomatic2_server.png b/graphics/linux/128/dcpomatic2_server.png new file mode 100644 index 000000000..583aa6219 Binary files /dev/null and b/graphics/linux/128/dcpomatic2_server.png differ diff --git a/graphics/linux/16/dcpomatic2.png b/graphics/linux/16/dcpomatic2.png new file mode 100644 index 000000000..ea90bf94b Binary files /dev/null and b/graphics/linux/16/dcpomatic2.png differ diff --git a/graphics/linux/16/dcpomatic2_batch.png b/graphics/linux/16/dcpomatic2_batch.png new file mode 100644 index 000000000..1036ddadd Binary files /dev/null and b/graphics/linux/16/dcpomatic2_batch.png differ diff --git a/graphics/linux/16/dcpomatic2_kdm.png b/graphics/linux/16/dcpomatic2_kdm.png new file mode 100644 index 000000000..7133c1aab Binary files /dev/null and b/graphics/linux/16/dcpomatic2_kdm.png differ diff --git a/graphics/linux/16/dcpomatic2_server.png b/graphics/linux/16/dcpomatic2_server.png new file mode 100644 index 000000000..6307c7afb Binary files /dev/null and b/graphics/linux/16/dcpomatic2_server.png differ diff --git a/graphics/linux/22/dcpomatic2.png b/graphics/linux/22/dcpomatic2.png new file mode 100644 index 000000000..d99654779 Binary files /dev/null and b/graphics/linux/22/dcpomatic2.png differ diff --git a/graphics/linux/22/dcpomatic2_batch.png b/graphics/linux/22/dcpomatic2_batch.png new file mode 100644 index 000000000..19fb22efa Binary files /dev/null and b/graphics/linux/22/dcpomatic2_batch.png differ diff --git a/graphics/linux/22/dcpomatic2_kdm.png b/graphics/linux/22/dcpomatic2_kdm.png new file mode 100644 index 000000000..e2f5f87d1 Binary files /dev/null and b/graphics/linux/22/dcpomatic2_kdm.png differ diff --git a/graphics/linux/22/dcpomatic2_server.png b/graphics/linux/22/dcpomatic2_server.png new file mode 100644 index 000000000..893ca76fd Binary files /dev/null and b/graphics/linux/22/dcpomatic2_server.png differ diff --git a/graphics/linux/256/dcpomatic2.png b/graphics/linux/256/dcpomatic2.png new file mode 100644 index 000000000..394da0332 Binary files /dev/null and b/graphics/linux/256/dcpomatic2.png differ diff --git a/graphics/linux/256/dcpomatic2_batch.png b/graphics/linux/256/dcpomatic2_batch.png new file mode 100644 index 000000000..042ff5859 Binary files /dev/null and b/graphics/linux/256/dcpomatic2_batch.png differ diff --git a/graphics/linux/256/dcpomatic2_kdm.png b/graphics/linux/256/dcpomatic2_kdm.png new file mode 100644 index 000000000..e1b7fc537 Binary files /dev/null and b/graphics/linux/256/dcpomatic2_kdm.png differ diff --git a/graphics/linux/256/dcpomatic2_server.png b/graphics/linux/256/dcpomatic2_server.png new file mode 100644 index 000000000..41f6ff61b Binary files /dev/null and b/graphics/linux/256/dcpomatic2_server.png differ diff --git a/graphics/linux/32/dcpomatic2.png b/graphics/linux/32/dcpomatic2.png new file mode 100644 index 000000000..5b0b2de56 Binary files /dev/null and b/graphics/linux/32/dcpomatic2.png differ diff --git a/graphics/linux/32/dcpomatic2_batch.png b/graphics/linux/32/dcpomatic2_batch.png new file mode 100644 index 000000000..ea3c87e34 Binary files /dev/null and b/graphics/linux/32/dcpomatic2_batch.png differ diff --git a/graphics/linux/32/dcpomatic2_kdm.png b/graphics/linux/32/dcpomatic2_kdm.png new file mode 100644 index 000000000..9c95faa87 Binary files /dev/null and b/graphics/linux/32/dcpomatic2_kdm.png differ diff --git a/graphics/linux/32/dcpomatic2_server.png b/graphics/linux/32/dcpomatic2_server.png new file mode 100644 index 000000000..b893f2480 Binary files /dev/null and b/graphics/linux/32/dcpomatic2_server.png differ diff --git a/graphics/linux/48/dcpomatic2.png b/graphics/linux/48/dcpomatic2.png new file mode 100644 index 000000000..746c589a9 Binary files /dev/null and b/graphics/linux/48/dcpomatic2.png differ diff --git a/graphics/linux/48/dcpomatic2_batch.png b/graphics/linux/48/dcpomatic2_batch.png new file mode 100644 index 000000000..ac0d54242 Binary files /dev/null and b/graphics/linux/48/dcpomatic2_batch.png differ diff --git a/graphics/linux/48/dcpomatic2_kdm.png b/graphics/linux/48/dcpomatic2_kdm.png new file mode 100644 index 000000000..9f7414cae Binary files /dev/null and b/graphics/linux/48/dcpomatic2_kdm.png differ diff --git a/graphics/linux/48/dcpomatic2_server.png b/graphics/linux/48/dcpomatic2_server.png new file mode 100644 index 000000000..278a48842 Binary files /dev/null and b/graphics/linux/48/dcpomatic2_server.png differ diff --git a/graphics/linux/512/dcpomatic2.png b/graphics/linux/512/dcpomatic2.png new file mode 100644 index 000000000..6f7543daf Binary files /dev/null and b/graphics/linux/512/dcpomatic2.png differ diff --git a/graphics/linux/512/dcpomatic2_batch.png b/graphics/linux/512/dcpomatic2_batch.png new file mode 100644 index 000000000..cab645ecf Binary files /dev/null and b/graphics/linux/512/dcpomatic2_batch.png differ diff --git a/graphics/linux/512/dcpomatic2_kdm.png b/graphics/linux/512/dcpomatic2_kdm.png new file mode 100644 index 000000000..25c443a85 Binary files /dev/null and b/graphics/linux/512/dcpomatic2_kdm.png differ diff --git a/graphics/linux/512/dcpomatic2_server.png b/graphics/linux/512/dcpomatic2_server.png new file mode 100644 index 000000000..8c9355076 Binary files /dev/null and b/graphics/linux/512/dcpomatic2_server.png differ diff --git a/graphics/linux/64/dcpomatic2.png b/graphics/linux/64/dcpomatic2.png new file mode 100644 index 000000000..f0c487d06 Binary files /dev/null and b/graphics/linux/64/dcpomatic2.png differ diff --git a/graphics/linux/64/dcpomatic2_batch.png b/graphics/linux/64/dcpomatic2_batch.png new file mode 100644 index 000000000..63964bf71 Binary files /dev/null and b/graphics/linux/64/dcpomatic2_batch.png differ diff --git a/graphics/linux/64/dcpomatic2_kdm.png b/graphics/linux/64/dcpomatic2_kdm.png new file mode 100644 index 000000000..96b051f9c Binary files /dev/null and b/graphics/linux/64/dcpomatic2_kdm.png differ diff --git a/graphics/linux/64/dcpomatic2_server.png b/graphics/linux/64/dcpomatic2_server.png new file mode 100644 index 000000000..34e783541 Binary files /dev/null and b/graphics/linux/64/dcpomatic2_server.png differ diff --git a/graphics/osx/dcpomatic2.icns b/graphics/osx/dcpomatic2.icns new file mode 100644 index 000000000..c9c305ff5 Binary files /dev/null and b/graphics/osx/dcpomatic2.icns differ diff --git a/graphics/osx/dcpomatic2.iconset/icon_128x128.png b/graphics/osx/dcpomatic2.iconset/icon_128x128.png new file mode 100644 index 000000000..6e028b2c3 Binary files /dev/null and b/graphics/osx/dcpomatic2.iconset/icon_128x128.png differ diff --git a/graphics/osx/dcpomatic2.iconset/icon_128x128@2x.png b/graphics/osx/dcpomatic2.iconset/icon_128x128@2x.png new file mode 100644 index 000000000..6e028b2c3 Binary files /dev/null and b/graphics/osx/dcpomatic2.iconset/icon_128x128@2x.png differ diff --git a/graphics/osx/dcpomatic2.iconset/icon_16x16.png b/graphics/osx/dcpomatic2.iconset/icon_16x16.png new file mode 100644 index 000000000..e2b750e94 Binary files /dev/null and b/graphics/osx/dcpomatic2.iconset/icon_16x16.png differ diff --git a/graphics/osx/dcpomatic2.iconset/icon_16x16@2x.png b/graphics/osx/dcpomatic2.iconset/icon_16x16@2x.png new file mode 100644 index 000000000..e2b750e94 Binary files /dev/null and b/graphics/osx/dcpomatic2.iconset/icon_16x16@2x.png differ diff --git a/graphics/osx/dcpomatic2.iconset/icon_256x256.png b/graphics/osx/dcpomatic2.iconset/icon_256x256.png new file mode 100644 index 000000000..724869aac Binary files /dev/null and b/graphics/osx/dcpomatic2.iconset/icon_256x256.png differ diff --git a/graphics/osx/dcpomatic2.iconset/icon_256x256@2x.png b/graphics/osx/dcpomatic2.iconset/icon_256x256@2x.png new file mode 100644 index 000000000..724869aac Binary files /dev/null and b/graphics/osx/dcpomatic2.iconset/icon_256x256@2x.png differ diff --git a/graphics/osx/dcpomatic2.iconset/icon_32x32.png b/graphics/osx/dcpomatic2.iconset/icon_32x32.png new file mode 100644 index 000000000..abad340e1 Binary files /dev/null and b/graphics/osx/dcpomatic2.iconset/icon_32x32.png differ diff --git a/graphics/osx/dcpomatic2.iconset/icon_32x32@2x.png b/graphics/osx/dcpomatic2.iconset/icon_32x32@2x.png new file mode 100644 index 000000000..abad340e1 Binary files /dev/null and b/graphics/osx/dcpomatic2.iconset/icon_32x32@2x.png differ diff --git a/graphics/osx/dcpomatic2.iconset/icon_512x512.png b/graphics/osx/dcpomatic2.iconset/icon_512x512.png new file mode 100644 index 000000000..846c7bd9e Binary files /dev/null and b/graphics/osx/dcpomatic2.iconset/icon_512x512.png differ diff --git a/graphics/osx/dcpomatic2.iconset/icon_512x512@2x.png b/graphics/osx/dcpomatic2.iconset/icon_512x512@2x.png new file mode 100644 index 000000000..846c7bd9e Binary files /dev/null and b/graphics/osx/dcpomatic2.iconset/icon_512x512@2x.png differ diff --git a/graphics/osx/dcpomatic2_batch.icns b/graphics/osx/dcpomatic2_batch.icns new file mode 100644 index 000000000..838f1a168 Binary files /dev/null and b/graphics/osx/dcpomatic2_batch.icns differ diff --git a/graphics/osx/dcpomatic2_batch.iconset/icon_128x128.png b/graphics/osx/dcpomatic2_batch.iconset/icon_128x128.png new file mode 100644 index 000000000..2c47ab2b2 Binary files /dev/null and b/graphics/osx/dcpomatic2_batch.iconset/icon_128x128.png differ diff --git a/graphics/osx/dcpomatic2_batch.iconset/icon_128x128@2x.png b/graphics/osx/dcpomatic2_batch.iconset/icon_128x128@2x.png new file mode 100644 index 000000000..2c47ab2b2 Binary files /dev/null and b/graphics/osx/dcpomatic2_batch.iconset/icon_128x128@2x.png differ diff --git a/graphics/osx/dcpomatic2_batch.iconset/icon_16x16.png b/graphics/osx/dcpomatic2_batch.iconset/icon_16x16.png new file mode 100644 index 000000000..1036ddadd Binary files /dev/null and b/graphics/osx/dcpomatic2_batch.iconset/icon_16x16.png differ diff --git a/graphics/osx/dcpomatic2_batch.iconset/icon_16x16@2x.png b/graphics/osx/dcpomatic2_batch.iconset/icon_16x16@2x.png new file mode 100644 index 000000000..1036ddadd Binary files /dev/null and b/graphics/osx/dcpomatic2_batch.iconset/icon_16x16@2x.png differ diff --git a/graphics/osx/dcpomatic2_batch.iconset/icon_256x256.png b/graphics/osx/dcpomatic2_batch.iconset/icon_256x256.png new file mode 100644 index 000000000..042ff5859 Binary files /dev/null and b/graphics/osx/dcpomatic2_batch.iconset/icon_256x256.png differ diff --git a/graphics/osx/dcpomatic2_batch.iconset/icon_256x256@2x.png b/graphics/osx/dcpomatic2_batch.iconset/icon_256x256@2x.png new file mode 100644 index 000000000..042ff5859 Binary files /dev/null and b/graphics/osx/dcpomatic2_batch.iconset/icon_256x256@2x.png differ diff --git a/graphics/osx/dcpomatic2_batch.iconset/icon_32x32.png b/graphics/osx/dcpomatic2_batch.iconset/icon_32x32.png new file mode 100644 index 000000000..ea3c87e34 Binary files /dev/null and b/graphics/osx/dcpomatic2_batch.iconset/icon_32x32.png differ diff --git a/graphics/osx/dcpomatic2_batch.iconset/icon_32x32@2x.png b/graphics/osx/dcpomatic2_batch.iconset/icon_32x32@2x.png new file mode 100644 index 000000000..ea3c87e34 Binary files /dev/null and b/graphics/osx/dcpomatic2_batch.iconset/icon_32x32@2x.png differ diff --git a/graphics/osx/dcpomatic2_batch.iconset/icon_512x512.png b/graphics/osx/dcpomatic2_batch.iconset/icon_512x512.png new file mode 100644 index 000000000..cab645ecf Binary files /dev/null and b/graphics/osx/dcpomatic2_batch.iconset/icon_512x512.png differ diff --git a/graphics/osx/dcpomatic2_batch.iconset/icon_512x512@2x.png b/graphics/osx/dcpomatic2_batch.iconset/icon_512x512@2x.png new file mode 100644 index 000000000..cab645ecf Binary files /dev/null and b/graphics/osx/dcpomatic2_batch.iconset/icon_512x512@2x.png differ diff --git a/graphics/osx/dcpomatic2_kdm.icns b/graphics/osx/dcpomatic2_kdm.icns new file mode 100644 index 000000000..6124edc87 Binary files /dev/null and b/graphics/osx/dcpomatic2_kdm.icns differ diff --git a/graphics/osx/dcpomatic2_kdm.iconset/icon_128x128.png b/graphics/osx/dcpomatic2_kdm.iconset/icon_128x128.png new file mode 100644 index 000000000..9a6e91b3f Binary files /dev/null and b/graphics/osx/dcpomatic2_kdm.iconset/icon_128x128.png differ diff --git a/graphics/osx/dcpomatic2_kdm.iconset/icon_128x128@2x.png b/graphics/osx/dcpomatic2_kdm.iconset/icon_128x128@2x.png new file mode 100644 index 000000000..9a6e91b3f Binary files /dev/null and b/graphics/osx/dcpomatic2_kdm.iconset/icon_128x128@2x.png differ diff --git a/graphics/osx/dcpomatic2_kdm.iconset/icon_16x16.png b/graphics/osx/dcpomatic2_kdm.iconset/icon_16x16.png new file mode 100644 index 000000000..7133c1aab Binary files /dev/null and b/graphics/osx/dcpomatic2_kdm.iconset/icon_16x16.png differ diff --git a/graphics/osx/dcpomatic2_kdm.iconset/icon_16x16@2x.png b/graphics/osx/dcpomatic2_kdm.iconset/icon_16x16@2x.png new file mode 100644 index 000000000..7133c1aab Binary files /dev/null and b/graphics/osx/dcpomatic2_kdm.iconset/icon_16x16@2x.png differ diff --git a/graphics/osx/dcpomatic2_kdm.iconset/icon_256x256.png b/graphics/osx/dcpomatic2_kdm.iconset/icon_256x256.png new file mode 100644 index 000000000..e1b7fc537 Binary files /dev/null and b/graphics/osx/dcpomatic2_kdm.iconset/icon_256x256.png differ diff --git a/graphics/osx/dcpomatic2_kdm.iconset/icon_256x256@2x.png b/graphics/osx/dcpomatic2_kdm.iconset/icon_256x256@2x.png new file mode 100644 index 000000000..e1b7fc537 Binary files /dev/null and b/graphics/osx/dcpomatic2_kdm.iconset/icon_256x256@2x.png differ diff --git a/graphics/osx/dcpomatic2_kdm.iconset/icon_32x32.png b/graphics/osx/dcpomatic2_kdm.iconset/icon_32x32.png new file mode 100644 index 000000000..9c95faa87 Binary files /dev/null and b/graphics/osx/dcpomatic2_kdm.iconset/icon_32x32.png differ diff --git a/graphics/osx/dcpomatic2_kdm.iconset/icon_32x32@2x.png b/graphics/osx/dcpomatic2_kdm.iconset/icon_32x32@2x.png new file mode 100644 index 000000000..9c95faa87 Binary files /dev/null and b/graphics/osx/dcpomatic2_kdm.iconset/icon_32x32@2x.png differ diff --git a/graphics/osx/dcpomatic2_kdm.iconset/icon_512x512.png b/graphics/osx/dcpomatic2_kdm.iconset/icon_512x512.png new file mode 100644 index 000000000..25c443a85 Binary files /dev/null and b/graphics/osx/dcpomatic2_kdm.iconset/icon_512x512.png differ diff --git a/graphics/osx/dcpomatic2_kdm.iconset/icon_512x512@2x.png b/graphics/osx/dcpomatic2_kdm.iconset/icon_512x512@2x.png new file mode 100644 index 000000000..25c443a85 Binary files /dev/null and b/graphics/osx/dcpomatic2_kdm.iconset/icon_512x512@2x.png differ diff --git a/graphics/osx/dcpomatic2_server.icns b/graphics/osx/dcpomatic2_server.icns new file mode 100644 index 000000000..a24acf12e Binary files /dev/null and b/graphics/osx/dcpomatic2_server.icns differ diff --git a/graphics/osx/dcpomatic2_server.iconset/icon_128x128.png b/graphics/osx/dcpomatic2_server.iconset/icon_128x128.png new file mode 100644 index 000000000..583aa6219 Binary files /dev/null and b/graphics/osx/dcpomatic2_server.iconset/icon_128x128.png differ diff --git a/graphics/osx/dcpomatic2_server.iconset/icon_128x128@2x.png b/graphics/osx/dcpomatic2_server.iconset/icon_128x128@2x.png new file mode 100644 index 000000000..583aa6219 Binary files /dev/null and b/graphics/osx/dcpomatic2_server.iconset/icon_128x128@2x.png differ diff --git a/graphics/osx/dcpomatic2_server.iconset/icon_16x16.png b/graphics/osx/dcpomatic2_server.iconset/icon_16x16.png new file mode 100644 index 000000000..6307c7afb Binary files /dev/null and b/graphics/osx/dcpomatic2_server.iconset/icon_16x16.png differ diff --git a/graphics/osx/dcpomatic2_server.iconset/icon_16x16@2x.png b/graphics/osx/dcpomatic2_server.iconset/icon_16x16@2x.png new file mode 100644 index 000000000..6307c7afb Binary files /dev/null and b/graphics/osx/dcpomatic2_server.iconset/icon_16x16@2x.png differ diff --git a/graphics/osx/dcpomatic2_server.iconset/icon_256x256.png b/graphics/osx/dcpomatic2_server.iconset/icon_256x256.png new file mode 100644 index 000000000..41f6ff61b Binary files /dev/null and b/graphics/osx/dcpomatic2_server.iconset/icon_256x256.png differ diff --git a/graphics/osx/dcpomatic2_server.iconset/icon_256x256@2x.png b/graphics/osx/dcpomatic2_server.iconset/icon_256x256@2x.png new file mode 100644 index 000000000..41f6ff61b Binary files /dev/null and b/graphics/osx/dcpomatic2_server.iconset/icon_256x256@2x.png differ diff --git a/graphics/osx/dcpomatic2_server.iconset/icon_32x32.png b/graphics/osx/dcpomatic2_server.iconset/icon_32x32.png new file mode 100644 index 000000000..b893f2480 Binary files /dev/null and b/graphics/osx/dcpomatic2_server.iconset/icon_32x32.png differ diff --git a/graphics/osx/dcpomatic2_server.iconset/icon_32x32@2x.png b/graphics/osx/dcpomatic2_server.iconset/icon_32x32@2x.png new file mode 100644 index 000000000..b893f2480 Binary files /dev/null and b/graphics/osx/dcpomatic2_server.iconset/icon_32x32@2x.png differ diff --git a/graphics/osx/dcpomatic2_server.iconset/icon_512x512.png b/graphics/osx/dcpomatic2_server.iconset/icon_512x512.png new file mode 100644 index 000000000..8c9355076 Binary files /dev/null and b/graphics/osx/dcpomatic2_server.iconset/icon_512x512.png differ diff --git a/graphics/osx/dcpomatic2_server.iconset/icon_512x512@2x.png b/graphics/osx/dcpomatic2_server.iconset/icon_512x512@2x.png new file mode 100644 index 000000000..8c9355076 Binary files /dev/null and b/graphics/osx/dcpomatic2_server.iconset/icon_512x512@2x.png differ diff --git a/graphics/osx/preferences/colour_conversions.png b/graphics/osx/preferences/colour_conversions.png new file mode 100644 index 000000000..161e8d6f1 Binary files /dev/null and b/graphics/osx/preferences/colour_conversions.png differ diff --git a/graphics/osx/preferences/defaults.png b/graphics/osx/preferences/defaults.png new file mode 100644 index 000000000..6ccce17b1 Binary files /dev/null and b/graphics/osx/preferences/defaults.png differ diff --git a/graphics/osx/preferences/kdm_email.png b/graphics/osx/preferences/kdm_email.png new file mode 100644 index 000000000..b66a12a1b Binary files /dev/null and b/graphics/osx/preferences/kdm_email.png differ diff --git a/graphics/osx/preferences/keys.png b/graphics/osx/preferences/keys.png new file mode 100644 index 000000000..b7b870314 Binary files /dev/null and b/graphics/osx/preferences/keys.png differ diff --git a/graphics/osx/preferences/tms.png b/graphics/osx/preferences/tms.png new file mode 100644 index 000000000..4041ccd8e Binary files /dev/null and b/graphics/osx/preferences/tms.png differ diff --git a/graphics/servers.png b/graphics/servers.png deleted file mode 100644 index b3781e45c..000000000 Binary files a/graphics/servers.png and /dev/null differ diff --git a/graphics/splash.png b/graphics/splash.png index de4e0317b..a74153092 100644 Binary files a/graphics/splash.png and b/graphics/splash.png differ diff --git a/graphics/splash.svg b/graphics/splash.svg deleted file mode 100644 index 122cca77e..000000000 --- a/graphics/splash.svg +++ /dev/null @@ -1,191 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - DCP-o-matic - Setting up... - Welcome to - - diff --git a/graphics/src/banner.svg b/graphics/src/banner.svg new file mode 100644 index 000000000..4ab436b95 --- /dev/null +++ b/graphics/src/banner.svg @@ -0,0 +1,646 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + DCP-o-matic + Free, open-source DCP creation. + + diff --git a/graphics/src/colour_conversions.svg b/graphics/src/colour_conversions.svg new file mode 100644 index 000000000..af34a347d --- /dev/null +++ b/graphics/src/colour_conversions.svg @@ -0,0 +1,91 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/graphics/src/dcpomatic.png b/graphics/src/dcpomatic.png new file mode 120000 index 000000000..95404d5fc --- /dev/null +++ b/graphics/src/dcpomatic.png @@ -0,0 +1 @@ +lens2.png \ No newline at end of file diff --git a/graphics/src/dcpomatic2_batch.svg b/graphics/src/dcpomatic2_batch.svg new file mode 100644 index 000000000..12d8f3eec --- /dev/null +++ b/graphics/src/dcpomatic2_batch.svg @@ -0,0 +1,232 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/src/dcpomatic2_kdm.svg b/graphics/src/dcpomatic2_kdm.svg new file mode 100644 index 000000000..4000288e3 --- /dev/null +++ b/graphics/src/dcpomatic2_kdm.svg @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/src/dcpomatic2_server.svg b/graphics/src/dcpomatic2_server.svg new file mode 100644 index 000000000..c1ab306ae --- /dev/null +++ b/graphics/src/dcpomatic2_server.svg @@ -0,0 +1,281 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/src/defaults.svg b/graphics/src/defaults.svg new file mode 100644 index 000000000..06a593f85 --- /dev/null +++ b/graphics/src/defaults.svg @@ -0,0 +1,118 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/src/kdm_email.svg b/graphics/src/kdm_email.svg new file mode 100644 index 000000000..c09d94e81 --- /dev/null +++ b/graphics/src/kdm_email.svg @@ -0,0 +1,474 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + tango internet mail + 2010-03-29T08:04:16 + "E-mail" icon from <a href="http://tango.freedesktop.org/Tango_Desktop_Project"> Tango Project </a> \n<br><br> \nSince version 0.8.90 Tango Project icons are Public Domain: <a href="http://tango.freedesktop.org/Frequently_Asked_Questions#Terms_of_Use.3F"> Tango Project FAQ </a> + https://openclipart.org/detail/35215/tango-internet-mail-by-warszawianka + + + warszawianka + + + + + email + envelope + externalsource + icon + letter + tango + + + + + + + + + + + diff --git a/graphics/src/keys.svg b/graphics/src/keys.svg new file mode 100644 index 000000000..870a0f51e --- /dev/null +++ b/graphics/src/keys.svg @@ -0,0 +1,194 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + Key + 2007-02-27T15:15:43 + A key icon. + http://openclipart.org/detail/3330/key-by-barretr + + + barretr + + + + + clip art + clipart + icon + image + key + media + png + public domain + svg + + + + + + + + + + + + diff --git a/graphics/src/lens1.png b/graphics/src/lens1.png new file mode 100644 index 000000000..15dc5f648 Binary files /dev/null and b/graphics/src/lens1.png differ diff --git a/graphics/src/lens2.png b/graphics/src/lens2.png new file mode 100644 index 000000000..87dd11408 Binary files /dev/null and b/graphics/src/lens2.png differ diff --git a/graphics/src/lens3.png b/graphics/src/lens3.png new file mode 100644 index 000000000..416709788 Binary files /dev/null and b/graphics/src/lens3.png differ diff --git a/graphics/src/lens4.png b/graphics/src/lens4.png new file mode 100644 index 000000000..08277c794 Binary files /dev/null and b/graphics/src/lens4.png differ diff --git a/graphics/src/lens5.png b/graphics/src/lens5.png new file mode 100644 index 000000000..0d9785100 Binary files /dev/null and b/graphics/src/lens5.png differ diff --git a/graphics/src/lens6.png b/graphics/src/lens6.png new file mode 100644 index 000000000..9f3c22e0b Binary files /dev/null and b/graphics/src/lens6.png differ diff --git a/graphics/src/splash.svg b/graphics/src/splash.svg new file mode 100644 index 000000000..f70bdfa90 --- /dev/null +++ b/graphics/src/splash.svg @@ -0,0 +1,17571 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + DCP-o-matic + Setting up... + Welcome to + + + diff --git a/graphics/src/tms.svg b/graphics/src/tms.svg new file mode 100644 index 000000000..e0b18ce2c --- /dev/null +++ b/graphics/src/tms.svg @@ -0,0 +1,197 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/graphics/src/web.png b/graphics/src/web.png new file mode 120000 index 000000000..901e0693d --- /dev/null +++ b/graphics/src/web.png @@ -0,0 +1 @@ +lens1.png \ No newline at end of file diff --git a/graphics/tms.png b/graphics/tms.png deleted file mode 100644 index 4041ccd8e..000000000 Binary files a/graphics/tms.png and /dev/null differ diff --git a/graphics/tms.svg b/graphics/tms.svg deleted file mode 100644 index e0b18ce2c..000000000 --- a/graphics/tms.svg +++ /dev/null @@ -1,197 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - diff --git a/graphics/update b/graphics/update index e60cc36ab..2b72080f8 100755 --- a/graphics/update +++ b/graphics/update @@ -15,42 +15,59 @@ fi if [ `uname -s` == "Darwin" ]; then # Convert OS X icons using OS X-only iconutil for p in dcpomatic2 dcpomatic2_kdm dcpomatic2_server dcpomatic2_batch; do - iconutil --convert icns --output $p.icns $p.iconset + iconutil --convert icns --output osx/$p.icns osx/$p.iconset done else INKSCAPE="inkscape -z -C -e" # OS X application icons + mkdir -p osx for r in 16 32 128 256 512; do - 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 + for p in dcpomatic2; do + mkdir -p osx/$p.iconset + convert src/dcpomatic.png -resize $rx$r osx/$p.iconset/icon_${r}x${r}.png + convert src/dcpomatic.png -resize $rx$r osx/$p.iconset/icon_${r}x${r}@2x.png + done + for p in dcpomatic2_kdm dcpomatic2_server dcpomatic2_batch; do + mkdir -p osx/$p.iconset + $INKSCAPE osx/$p.iconset/icon_${r}x${r}.png -w $r -h $r src/$p.svg + $INKSCAPE osx/$p.iconset/icon_${r}x${r}@2x.png -w $r -h $r src/$p.svg done done # Linux application icons + mkdir -p linux 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 + mkdir -p linux/$r + convert src/dcpomatic.png -resize $rx$r linux/$r/dcpomatic2.png + for p in dcpomatic2_kdm dcpomatic2_server dcpomatic2_batch; do + $INKSCAPE linux/$r/$p.png src/$p.svg -w $r -h $r done done # Windows application icons + mkdir -p windows for p in dcpomatic2 dcpomatic2_kdm dcpomatic2_server dcpomatic2_batch; do - icotool -c -o $p.ico 48/$p.png + icotool -c -o windows/$p.ico linux/16/$p.png linux/32/$p.png linux/48/$p.png linux/64/$p.png linux/128/$p.png done - icotool -c -o dcpomatic2_server_small.ico dcpomatic2_server_small.png - $INKSCAPE dcpomatic.png dcpomatic2.svg -w 400 -h 400 - convert dcpomatic.png dcpomatic.bmp + convert src/dcpomatic.png -resize 400x400 windows/dcpomatic.bmp # OS X preferences icons # servers.png does not have an SVG version + mkdir -p osx/preferences for i in colour_conversions defaults kdm_email keys tms; do - $INKSCAPE $i.png $i.svg -w 32 -h 32 + $INKSCAPE osx/preferences/$i.png src/$i.svg -w 32 -h 32 done # Splash screen (all platforms) - $INKSCAPE splash.png splash.svg -w 400 -h 300 + $INKSCAPE splash.png src/splash.svg -w 400 -h 300 + + # favicon + mkdir -p web + convert src/web.png -resize 256x256 -transparent white web/favicon-256x256.png + for r in 16 32 64 128; do + convert web/favicon-256x256.png -resize $rx$r web/favicon-${r}x${r}.png + done + convert web/favicon-16x16.png web/favicon-32x32.png web/favicon-64x64.png web/favicon-128x128.png web/favicon-256x256.png web/favicon.ico + convert src/web.png -resize 123x123 -transparent white web/logo.png fi diff --git a/graphics/web/favicon-128x128.png b/graphics/web/favicon-128x128.png new file mode 100644 index 000000000..3c684fc8b Binary files /dev/null and b/graphics/web/favicon-128x128.png differ diff --git a/graphics/web/favicon-16x16.png b/graphics/web/favicon-16x16.png new file mode 100644 index 000000000..666411ee2 Binary files /dev/null and b/graphics/web/favicon-16x16.png differ diff --git a/graphics/web/favicon-256x256.png b/graphics/web/favicon-256x256.png new file mode 100644 index 000000000..6be1a06ba Binary files /dev/null and b/graphics/web/favicon-256x256.png differ diff --git a/graphics/web/favicon-32x32.png b/graphics/web/favicon-32x32.png new file mode 100644 index 000000000..86d2850f1 Binary files /dev/null and b/graphics/web/favicon-32x32.png differ diff --git a/graphics/web/favicon-64x64.png b/graphics/web/favicon-64x64.png new file mode 100644 index 000000000..0c849d96a Binary files /dev/null and b/graphics/web/favicon-64x64.png differ diff --git a/graphics/web/favicon.ico b/graphics/web/favicon.ico new file mode 100644 index 000000000..2b684cae4 Binary files /dev/null and b/graphics/web/favicon.ico differ diff --git a/graphics/windows/dcpomatic.bmp b/graphics/windows/dcpomatic.bmp new file mode 100644 index 000000000..59238c9ce Binary files /dev/null and b/graphics/windows/dcpomatic.bmp differ diff --git a/graphics/windows/dcpomatic2.ico b/graphics/windows/dcpomatic2.ico new file mode 100644 index 000000000..3430f4442 Binary files /dev/null and b/graphics/windows/dcpomatic2.ico differ diff --git a/graphics/windows/dcpomatic2_batch.ico b/graphics/windows/dcpomatic2_batch.ico new file mode 100644 index 000000000..3ec0d18a1 Binary files /dev/null and b/graphics/windows/dcpomatic2_batch.ico differ diff --git a/graphics/windows/dcpomatic2_kdm.ico b/graphics/windows/dcpomatic2_kdm.ico new file mode 100644 index 000000000..4f53aee8b Binary files /dev/null and b/graphics/windows/dcpomatic2_kdm.ico differ diff --git a/graphics/windows/dcpomatic2_server.ico b/graphics/windows/dcpomatic2_server.ico new file mode 100644 index 000000000..23391bc8a Binary files /dev/null and b/graphics/windows/dcpomatic2_server.ico differ diff --git a/graphics/windows/dcpomatic2_server_small.ico b/graphics/windows/dcpomatic2_server_small.ico new file mode 100644 index 000000000..83d25ed3f Binary files /dev/null and b/graphics/windows/dcpomatic2_server_small.ico differ diff --git a/graphics/wscript b/graphics/wscript index 988ff3d7c..d70ba1e69 100644 --- a/graphics/wscript +++ b/graphics/wscript @@ -24,9 +24,9 @@ def build(bld): if bld.env.TARGET_LINUX: for r in [16, 22, 32, 48, 64, 128, 256, 512]: for p in ['dcpomatic2', 'dcpomatic2_kdm', 'dcpomatic2_server', 'dcpomatic2_batch']: - bld.install_files('${PREFIX}/share/icons/hicolor/%dx%d/apps' % (r, r), '%d/%s.png' % (r, p)) + bld.install_files('${PREFIX}/share/icons/hicolor/%dx%d/apps' % (r, r), 'linux/%d/%s.png' % (r, p)) # Install stuff for POSIX systems if not bld.env.TARGET_WINDOWS: - bld.install_files('${PREFIX}/share/dcpomatic2', 'dcpomatic2_server_small.png') + bld.install_files('${PREFIX}/share/dcpomatic2', 'linux/16/dcpomatic2.png') bld.install_files('${PREFIX}/share/dcpomatic2', 'splash.png') 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) diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 097b7905a..972436c47 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -210,6 +210,10 @@ public: setup_menu (bar); SetMenuBar (bar); +#ifdef DCPOMATIC_WINDOWS + SetIcon (wxIcon (std_to_wx ("id"))); +#endif + _config_changed_connection = Config::instance()->Changed.connect (boost::bind (&DOMFrame::config_changed, this)); config_changed (); diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc index cd09aebf8..aff98912f 100644 --- a/src/tools/dcpomatic_server.cc +++ b/src/tools/dcpomatic_server.cc @@ -205,10 +205,10 @@ public: : _status (0) { #ifdef DCPOMATIC_WINDOWS - wxIcon icon (std_to_wx ("taskbar_icon")); + wxIcon icon (std_to_wx ("id")); #else wxInitAllImageHandlers(); - wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic2_server_small.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG); + wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic2.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG); wxIcon icon; icon.CopyFromBitmap (bitmap); #endif