From: Carl Hetherington Date: Thu, 8 Oct 2015 08:52:39 +0000 (+0100) Subject: Graphics rearrangement and probably breakage. X-Git-Tag: v2.4.6~20 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=c314f25178bd32120dfc64ec72a7a94a32b1b7b0 Graphics rearrangement and probably breakage. --- diff --git a/graphics/128/dcpomatic2.png b/graphics/128/dcpomatic2.png new file mode 100644 index 000000000..0470d3b78 Binary files /dev/null and b/graphics/128/dcpomatic2.png differ diff --git a/graphics/128/dcpomatic2_batch.png b/graphics/128/dcpomatic2_batch.png new file mode 100644 index 000000000..0ce1e35f5 Binary files /dev/null and b/graphics/128/dcpomatic2_batch.png differ diff --git a/graphics/128/dcpomatic2_kdm.png b/graphics/128/dcpomatic2_kdm.png new file mode 100644 index 000000000..f6d5f04e0 Binary files /dev/null and b/graphics/128/dcpomatic2_kdm.png differ diff --git a/graphics/128/dcpomatic2_server.png b/graphics/128/dcpomatic2_server.png new file mode 100644 index 000000000..fbbedd4e0 Binary files /dev/null and b/graphics/128/dcpomatic2_server.png differ diff --git a/graphics/16/dcpomatic2.png b/graphics/16/dcpomatic2.png new file mode 100644 index 000000000..8d32717a9 Binary files /dev/null and b/graphics/16/dcpomatic2.png differ diff --git a/graphics/16/dcpomatic2_batch.png b/graphics/16/dcpomatic2_batch.png new file mode 100644 index 000000000..4dadb988e Binary files /dev/null and b/graphics/16/dcpomatic2_batch.png differ diff --git a/graphics/16/dcpomatic2_kdm.png b/graphics/16/dcpomatic2_kdm.png new file mode 100644 index 000000000..c4d8b03b8 Binary files /dev/null and b/graphics/16/dcpomatic2_kdm.png differ diff --git a/graphics/16/dcpomatic2_server.png b/graphics/16/dcpomatic2_server.png new file mode 100644 index 000000000..12815b847 Binary files /dev/null and b/graphics/16/dcpomatic2_server.png differ diff --git a/graphics/22/dcpomatic2.png b/graphics/22/dcpomatic2.png new file mode 100644 index 000000000..8813507df Binary files /dev/null and b/graphics/22/dcpomatic2.png differ diff --git a/graphics/22/dcpomatic2_batch.png b/graphics/22/dcpomatic2_batch.png new file mode 100644 index 000000000..99104205d Binary files /dev/null and b/graphics/22/dcpomatic2_batch.png differ diff --git a/graphics/22/dcpomatic2_kdm.png b/graphics/22/dcpomatic2_kdm.png new file mode 100644 index 000000000..23df553f3 Binary files /dev/null and b/graphics/22/dcpomatic2_kdm.png differ diff --git a/graphics/22/dcpomatic2_server.png b/graphics/22/dcpomatic2_server.png new file mode 100644 index 000000000..dc22e662d Binary files /dev/null and b/graphics/22/dcpomatic2_server.png differ diff --git a/graphics/256/dcpomatic2.png b/graphics/256/dcpomatic2.png new file mode 100644 index 000000000..b80f9447a Binary files /dev/null and b/graphics/256/dcpomatic2.png differ diff --git a/graphics/256/dcpomatic2_batch.png b/graphics/256/dcpomatic2_batch.png new file mode 100644 index 000000000..9a2dcba9b Binary files /dev/null and b/graphics/256/dcpomatic2_batch.png differ diff --git a/graphics/256/dcpomatic2_kdm.png b/graphics/256/dcpomatic2_kdm.png new file mode 100644 index 000000000..ee02fc563 Binary files /dev/null and b/graphics/256/dcpomatic2_kdm.png differ diff --git a/graphics/256/dcpomatic2_server.png b/graphics/256/dcpomatic2_server.png new file mode 100644 index 000000000..c0ccfe71c Binary files /dev/null and b/graphics/256/dcpomatic2_server.png differ diff --git a/graphics/32/dcpomatic2.png b/graphics/32/dcpomatic2.png new file mode 100644 index 000000000..c7ef117d8 Binary files /dev/null and b/graphics/32/dcpomatic2.png differ diff --git a/graphics/32/dcpomatic2_batch.png b/graphics/32/dcpomatic2_batch.png new file mode 100644 index 000000000..5b00854bb Binary files /dev/null and b/graphics/32/dcpomatic2_batch.png differ diff --git a/graphics/32/dcpomatic2_kdm.png b/graphics/32/dcpomatic2_kdm.png new file mode 100644 index 000000000..7861eaced Binary files /dev/null and b/graphics/32/dcpomatic2_kdm.png differ diff --git a/graphics/32/dcpomatic2_server.png b/graphics/32/dcpomatic2_server.png new file mode 100644 index 000000000..f2c154e43 Binary files /dev/null and b/graphics/32/dcpomatic2_server.png differ diff --git a/graphics/48/dcpomatic2.png b/graphics/48/dcpomatic2.png new file mode 100644 index 000000000..4ecdce557 Binary files /dev/null and b/graphics/48/dcpomatic2.png differ diff --git a/graphics/48/dcpomatic2_batch.png b/graphics/48/dcpomatic2_batch.png new file mode 100644 index 000000000..6a22fce99 Binary files /dev/null and b/graphics/48/dcpomatic2_batch.png differ diff --git a/graphics/48/dcpomatic2_kdm.png b/graphics/48/dcpomatic2_kdm.png new file mode 100644 index 000000000..d54935333 Binary files /dev/null and b/graphics/48/dcpomatic2_kdm.png differ diff --git a/graphics/48/dcpomatic2_server.png b/graphics/48/dcpomatic2_server.png new file mode 100644 index 000000000..a2d202c10 Binary files /dev/null and b/graphics/48/dcpomatic2_server.png differ diff --git a/graphics/512/dcpomatic2.png b/graphics/512/dcpomatic2.png new file mode 100644 index 000000000..3ec37b943 Binary files /dev/null and b/graphics/512/dcpomatic2.png differ diff --git a/graphics/512/dcpomatic2_batch.png b/graphics/512/dcpomatic2_batch.png new file mode 100644 index 000000000..1c6b9e990 Binary files /dev/null and b/graphics/512/dcpomatic2_batch.png differ diff --git a/graphics/512/dcpomatic2_kdm.png b/graphics/512/dcpomatic2_kdm.png new file mode 100644 index 000000000..e1bff7ccc Binary files /dev/null and b/graphics/512/dcpomatic2_kdm.png differ diff --git a/graphics/512/dcpomatic2_server.png b/graphics/512/dcpomatic2_server.png new file mode 100644 index 000000000..0ec58765c Binary files /dev/null and b/graphics/512/dcpomatic2_server.png differ diff --git a/graphics/64/dcpomatic2.png b/graphics/64/dcpomatic2.png new file mode 100644 index 000000000..2a0fc2252 Binary files /dev/null and b/graphics/64/dcpomatic2.png differ diff --git a/graphics/64/dcpomatic2_batch.png b/graphics/64/dcpomatic2_batch.png new file mode 100644 index 000000000..efa66adee Binary files /dev/null and b/graphics/64/dcpomatic2_batch.png differ diff --git a/graphics/64/dcpomatic2_kdm.png b/graphics/64/dcpomatic2_kdm.png new file mode 100644 index 000000000..b52930d5c Binary files /dev/null and b/graphics/64/dcpomatic2_kdm.png differ diff --git a/graphics/64/dcpomatic2_server.png b/graphics/64/dcpomatic2_server.png new file mode 100644 index 000000000..6bd4498e3 Binary files /dev/null and b/graphics/64/dcpomatic2_server.png differ diff --git a/graphics/bits/finish.jpg b/graphics/bits/finish.jpg new file mode 100644 index 000000000..3bfc27ab4 Binary files /dev/null and b/graphics/bits/finish.jpg differ diff --git a/graphics/bits/finish2.jpg b/graphics/bits/finish2.jpg new file mode 100644 index 000000000..f05a2e76e Binary files /dev/null and b/graphics/bits/finish2.jpg differ diff --git a/graphics/bits/finish3.jpg b/graphics/bits/finish3.jpg new file mode 100644 index 000000000..b1fc4753d Binary files /dev/null and b/graphics/bits/finish3.jpg differ diff --git a/graphics/bits/website-sidebar.svg b/graphics/bits/website-sidebar.svg new file mode 100644 index 000000000..1d67062f4 --- /dev/null +++ b/graphics/bits/website-sidebar.svg @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/colour_conversions.png b/graphics/colour_conversions.png index 5cd2b32bf..8ab6e020e 100644 Binary files a/graphics/colour_conversions.png and b/graphics/colour_conversions.png differ diff --git a/graphics/dcpomatic.bmp b/graphics/dcpomatic.bmp new file mode 100644 index 000000000..198f8c971 Binary files /dev/null and b/graphics/dcpomatic.bmp differ diff --git a/graphics/dcpomatic.icns b/graphics/dcpomatic.icns index a90244fc4..cb4887544 100644 Binary files a/graphics/dcpomatic.icns and b/graphics/dcpomatic.icns differ diff --git a/graphics/dcpomatic.iconset/icon_128.png b/graphics/dcpomatic.iconset/icon_128.png new file mode 100644 index 000000000..0470d3b78 Binary files /dev/null and b/graphics/dcpomatic.iconset/icon_128.png differ diff --git a/graphics/dcpomatic.iconset/icon_128@2x.png b/graphics/dcpomatic.iconset/icon_128@2x.png new file mode 100644 index 000000000..0470d3b78 Binary files /dev/null and b/graphics/dcpomatic.iconset/icon_128@2x.png differ diff --git a/graphics/dcpomatic.iconset/icon_128x128.png b/graphics/dcpomatic.iconset/icon_128x128.png deleted file mode 100644 index 9936b39af..000000000 Binary files a/graphics/dcpomatic.iconset/icon_128x128.png and /dev/null differ diff --git a/graphics/dcpomatic.iconset/icon_128x128@2x.png b/graphics/dcpomatic.iconset/icon_128x128@2x.png deleted file mode 100644 index 9936b39af..000000000 Binary files a/graphics/dcpomatic.iconset/icon_128x128@2x.png and /dev/null differ diff --git a/graphics/dcpomatic.iconset/icon_16.png b/graphics/dcpomatic.iconset/icon_16.png new file mode 100644 index 000000000..8d32717a9 Binary files /dev/null and b/graphics/dcpomatic.iconset/icon_16.png differ diff --git a/graphics/dcpomatic.iconset/icon_16@2x.png b/graphics/dcpomatic.iconset/icon_16@2x.png new file mode 100644 index 000000000..8d32717a9 Binary files /dev/null and b/graphics/dcpomatic.iconset/icon_16@2x.png differ diff --git a/graphics/dcpomatic.iconset/icon_16x16.png b/graphics/dcpomatic.iconset/icon_16x16.png deleted file mode 100644 index 3c5a10f2d..000000000 Binary files a/graphics/dcpomatic.iconset/icon_16x16.png and /dev/null differ diff --git a/graphics/dcpomatic.iconset/icon_16x16@2x.png b/graphics/dcpomatic.iconset/icon_16x16@2x.png deleted file mode 100644 index 3c5a10f2d..000000000 Binary files a/graphics/dcpomatic.iconset/icon_16x16@2x.png and /dev/null differ diff --git a/graphics/dcpomatic.iconset/icon_256.png b/graphics/dcpomatic.iconset/icon_256.png new file mode 100644 index 000000000..b80f9447a Binary files /dev/null and b/graphics/dcpomatic.iconset/icon_256.png differ diff --git a/graphics/dcpomatic.iconset/icon_256@2x.png b/graphics/dcpomatic.iconset/icon_256@2x.png new file mode 100644 index 000000000..b80f9447a Binary files /dev/null and b/graphics/dcpomatic.iconset/icon_256@2x.png differ diff --git a/graphics/dcpomatic.iconset/icon_256x256.png b/graphics/dcpomatic.iconset/icon_256x256.png deleted file mode 100644 index ea02e12c0..000000000 Binary files a/graphics/dcpomatic.iconset/icon_256x256.png and /dev/null differ diff --git a/graphics/dcpomatic.iconset/icon_256x256@2x.png b/graphics/dcpomatic.iconset/icon_256x256@2x.png deleted file mode 100644 index ea02e12c0..000000000 Binary files a/graphics/dcpomatic.iconset/icon_256x256@2x.png and /dev/null differ diff --git a/graphics/dcpomatic.iconset/icon_32.png b/graphics/dcpomatic.iconset/icon_32.png new file mode 100644 index 000000000..c7ef117d8 Binary files /dev/null and b/graphics/dcpomatic.iconset/icon_32.png differ diff --git a/graphics/dcpomatic.iconset/icon_32@2x.png b/graphics/dcpomatic.iconset/icon_32@2x.png new file mode 100644 index 000000000..c7ef117d8 Binary files /dev/null and b/graphics/dcpomatic.iconset/icon_32@2x.png differ diff --git a/graphics/dcpomatic.iconset/icon_32x32.png b/graphics/dcpomatic.iconset/icon_32x32.png deleted file mode 100644 index 8cecf08f8..000000000 Binary files a/graphics/dcpomatic.iconset/icon_32x32.png and /dev/null differ diff --git a/graphics/dcpomatic.iconset/icon_32x32@2x.png b/graphics/dcpomatic.iconset/icon_32x32@2x.png deleted file mode 100644 index 8cecf08f8..000000000 Binary files a/graphics/dcpomatic.iconset/icon_32x32@2x.png and /dev/null differ diff --git a/graphics/dcpomatic.iconset/icon_512.png b/graphics/dcpomatic.iconset/icon_512.png new file mode 100644 index 000000000..3ec37b943 Binary files /dev/null and b/graphics/dcpomatic.iconset/icon_512.png differ diff --git a/graphics/dcpomatic.iconset/icon_512@2x.png b/graphics/dcpomatic.iconset/icon_512@2x.png new file mode 100644 index 000000000..3ec37b943 Binary files /dev/null and b/graphics/dcpomatic.iconset/icon_512@2x.png differ diff --git a/graphics/dcpomatic.iconset/icon_512x512.png b/graphics/dcpomatic.iconset/icon_512x512.png deleted file mode 100644 index 65b5012de..000000000 Binary files a/graphics/dcpomatic.iconset/icon_512x512.png and /dev/null differ diff --git a/graphics/dcpomatic.iconset/icon_512x512@2x.png b/graphics/dcpomatic.iconset/icon_512x512@2x.png deleted file mode 100644 index 65b5012de..000000000 Binary files a/graphics/dcpomatic.iconset/icon_512x512@2x.png and /dev/null differ diff --git a/graphics/dcpomatic.png b/graphics/dcpomatic.png new file mode 100644 index 000000000..2264fb241 Binary files /dev/null and b/graphics/dcpomatic.png differ diff --git a/graphics/dcpomatic2.ico b/graphics/dcpomatic2.ico new file mode 100644 index 000000000..8dbc776e3 Binary files /dev/null and b/graphics/dcpomatic2.ico differ diff --git a/graphics/dcpomatic2_batch.ico b/graphics/dcpomatic2_batch.ico new file mode 100644 index 000000000..2eb3ee9b2 Binary files /dev/null and b/graphics/dcpomatic2_batch.ico differ diff --git a/graphics/dcpomatic2_batch.svg b/graphics/dcpomatic2_batch.svg new file mode 100644 index 000000000..12d8f3eec --- /dev/null +++ b/graphics/dcpomatic2_batch.svg @@ -0,0 +1,232 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/dcpomatic2_kdm.ico b/graphics/dcpomatic2_kdm.ico new file mode 100644 index 000000000..8b80c3c58 Binary files /dev/null and b/graphics/dcpomatic2_kdm.ico differ diff --git a/graphics/dcpomatic2_kdm.svg b/graphics/dcpomatic2_kdm.svg new file mode 100644 index 000000000..4000288e3 --- /dev/null +++ b/graphics/dcpomatic2_kdm.svg @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/dcpomatic2_server.ico b/graphics/dcpomatic2_server.ico new file mode 100644 index 000000000..46dcceb28 Binary files /dev/null and b/graphics/dcpomatic2_server.ico differ diff --git a/graphics/dcpomatic2_server.svg b/graphics/dcpomatic2_server.svg new file mode 100644 index 000000000..c1ab306ae --- /dev/null +++ b/graphics/dcpomatic2_server.svg @@ -0,0 +1,281 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/graphics/dcpomatic2_server_small.ico b/graphics/dcpomatic2_server_small.ico new file mode 100644 index 000000000..83d25ed3f Binary files /dev/null and b/graphics/dcpomatic2_server_small.ico differ diff --git a/graphics/dcpomatic2_server_small.png b/graphics/dcpomatic2_server_small.png new file mode 100644 index 000000000..fd6b6e968 Binary files /dev/null and b/graphics/dcpomatic2_server_small.png differ diff --git a/graphics/defaults.png b/graphics/defaults.png index 9fd41a935..4f457fee3 100644 Binary files a/graphics/defaults.png and b/graphics/defaults.png differ diff --git a/graphics/finish.jpg b/graphics/finish.jpg deleted file mode 100644 index 3bfc27ab4..000000000 Binary files a/graphics/finish.jpg and /dev/null differ diff --git a/graphics/finish2.jpg b/graphics/finish2.jpg deleted file mode 100644 index f05a2e76e..000000000 Binary files a/graphics/finish2.jpg and /dev/null differ diff --git a/graphics/finish3.jpg b/graphics/finish3.jpg deleted file mode 100644 index b1fc4753d..000000000 Binary files a/graphics/finish3.jpg and /dev/null differ diff --git a/graphics/keys.png b/graphics/keys.png index e76acbeff..33c0accbc 100644 Binary files a/graphics/keys.png and b/graphics/keys.png differ diff --git a/graphics/make_icns.sh b/graphics/make_icns.sh deleted file mode 100755 index 522e907a6..000000000 --- a/graphics/make_icns.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -iconutil --convert icns --output dcpomatic.icns dcpomatic.iconset/ - diff --git a/graphics/splash.png b/graphics/splash.png index 8a0ce53b1..3f798b1f8 100644 Binary files a/graphics/splash.png and b/graphics/splash.png differ diff --git a/graphics/taskbar_icon.png b/graphics/taskbar_icon.png deleted file mode 100644 index fd6b6e968..000000000 Binary files a/graphics/taskbar_icon.png and /dev/null differ diff --git a/graphics/tms.png b/graphics/tms.png index 60e3cc2ff..e7c2e7004 100644 Binary files a/graphics/tms.png and b/graphics/tms.png differ diff --git a/graphics/update b/graphics/update new file mode 100755 index 000000000..9a2c9190e --- /dev/null +++ b/graphics/update @@ -0,0 +1,52 @@ +#!/bin/bash +# +# Update generated stuff in graphics/ from the source files. +# +# It would be nice to do this with waf but: +# a) getting the wscript right is a complete pain in the arse +# b) running Inkscape from the command line on OS X is a complete pain in the arse + +pwd=`pwd` +if [ `basename $pwd` != "graphics" ]; then + echo "$0: run within graphics/" + exit 1 +fi + +if [ `uname -s` == "Darwin" ]; then + # Convert OS X icons using OS X-only iconutil + iconutil --convert icns --output dcpomatic.icns dcpomatic.iconset +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 + 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 + done + done + + # Windows application icons + for p in dcpomatic2 dcpomatic2_kdm dcpomatic2_server dcpomatic2_batch; do + icotool -c -o $p.ico 48/$p.png + done + 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 + $INKSCAPE $i.png $i.svg -w 32 -h 32 + done + + # Splash screen (all platforms) + $INKSCAPE splash.png splash.svg -w 400 -h 300 +fi diff --git a/graphics/website-sidebar.svg b/graphics/website-sidebar.svg deleted file mode 100644 index 1d67062f4..000000000 --- a/graphics/website-sidebar.svg +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/graphics/wscript b/graphics/wscript index 54b123379..88e11124f 100644 --- a/graphics/wscript +++ b/graphics/wscript @@ -16,7 +16,16 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # +import os + def build(bld): - for r in [16, 22, 32, 48, 64, 128, 256, 512]: - bld(rule='inkscape -C -z -e ${TGT} -w %d -h %d -D ${SRC}' % (r, r), source='dcpomatic2.svg', target='%d/dcpomatic2.png' % r) - bld.install_files('${PREFIX}/share/icons/hicolor/%dx%d/apps' % (r, r), '../build/graphics/%d/dcpomatic2.png' % r) + # Linux application icons + 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)) + + # 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', 'splash.png') diff --git a/platform/linux/dcpomatic_batch.desktop.in b/platform/linux/dcpomatic_batch.desktop.in index 23eb2e4a1..ad8e4adb0 100644 --- a/platform/linux/dcpomatic_batch.desktop.in +++ b/platform/linux/dcpomatic_batch.desktop.in @@ -5,6 +5,6 @@ Type=Application Terminal=false Exec=@INSTALL_PREFIX@/bin/dcpomatic2_batch Name=DCP-o-matic 2 Batch Converter -Icon=dcpomatic2 +Icon=dcpomatic2_batch Comment=DCP generator Categories=AudioVideo;Video diff --git a/platform/linux/dcpomatic_kdm.desktop.in b/platform/linux/dcpomatic_kdm.desktop.in new file mode 100644 index 000000000..439d036ca --- /dev/null +++ b/platform/linux/dcpomatic_kdm.desktop.in @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.0 +Type=Application +Terminal=false +Exec=@INSTALL_PREFIX@/bin/dcpomatic2_kdm +Name=DCP-o-matic 2 KDM Creator +Icon=dcpomatic2_kdm +Comment=DCP generator +Categories=AudioVideo;Video diff --git a/platform/linux/dcpomatic_server.desktop.in b/platform/linux/dcpomatic_server.desktop.in index f28ab052f..23a56d478 100644 --- a/platform/linux/dcpomatic_server.desktop.in +++ b/platform/linux/dcpomatic_server.desktop.in @@ -5,6 +5,6 @@ Type=Application Terminal=false Exec=@INSTALL_PREFIX@/bin/dcpomatic2_server Name=DCP-o-matic 2 Encode Server -Icon=dcpomatic2 +Icon=dcpomatic2_server Comment=DCP generator Categories=AudioVideo;Video diff --git a/platform/linux/wscript b/platform/linux/wscript index 5f1dc48a2..6e96f3f79 100644 --- a/platform/linux/wscript +++ b/platform/linux/wscript @@ -17,4 +17,10 @@ def build(bld): obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX obj.VERSION = bld.env.VERSION - bld.install_files('${PREFIX}/share/applications', ['dcpomatic2.desktop', 'dcpomatic2_batch.desktop', 'dcpomatic2_server.desktop']) + obj = bld(features='subst') + obj.source = 'dcpomatic_kdm.desktop.in' + obj.target = 'dcpomatic2_kdm.desktop' + obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX + obj.VERSION = bld.env.VERSION + + bld.install_files('${PREFIX}/share/applications', ['dcpomatic2.desktop', 'dcpomatic2_batch.desktop', 'dcpomatic2_server.desktop', 'dcpomatic2_kdm.desktop']) diff --git a/platform/windows/dcpomatic.bmp b/platform/windows/dcpomatic.bmp deleted file mode 100644 index 0a196f7a0..000000000 Binary files a/platform/windows/dcpomatic.bmp and /dev/null differ diff --git a/platform/windows/dcpomatic.ico b/platform/windows/dcpomatic.ico deleted file mode 100644 index 225008cfe..000000000 Binary files a/platform/windows/dcpomatic.ico and /dev/null differ diff --git a/platform/windows/dcpomatic.rc b/platform/windows/dcpomatic.rc index fe2746ad9..12747f539 100644 --- a/platform/windows/dcpomatic.rc +++ b/platform/windows/dcpomatic.rc @@ -1,3 +1,3 @@ -id ICON "dcpomatic.ico" -taskbar_icon ICON "dcpomatic_taskbar.ico" +id ICON "../../graphics/dcpomatic2.ico" +taskbar_icon ICON "../../graphics/dcpomatic2_server_small.ico" #include "wx-3.0/wx/msw/wx.rc" diff --git a/platform/windows/dcpomatic_batch.rc b/platform/windows/dcpomatic_batch.rc new file mode 100644 index 000000000..de68302de --- /dev/null +++ b/platform/windows/dcpomatic_batch.rc @@ -0,0 +1,3 @@ +id ICON "../../graphics/dcpomatic2_batch.ico" +taskbar_icon ICON "../../graphics/dcpomatic2_server_small.ico" +#include "wx-3.0/wx/msw/wx.rc" diff --git a/platform/windows/dcpomatic_kdm.rc b/platform/windows/dcpomatic_kdm.rc new file mode 100644 index 000000000..e641436c9 --- /dev/null +++ b/platform/windows/dcpomatic_kdm.rc @@ -0,0 +1,3 @@ +id ICON "../../graphics/dcpomatic2_kdm.ico" +taskbar_icon ICON "../../graphics/dcpomatic2_server_small.ico" +#include "wx-3.0/wx/msw/wx.rc" diff --git a/platform/windows/dcpomatic_server.rc b/platform/windows/dcpomatic_server.rc new file mode 100644 index 000000000..19da9cfd1 --- /dev/null +++ b/platform/windows/dcpomatic_server.rc @@ -0,0 +1,3 @@ +id ICON "../../graphics/dcpomatic2_server.ico" +taskbar_icon ICON "../../graphics/dcpomatic2_server_small.ico" +#include "wx-3.0/wx/msw/wx.rc" diff --git a/platform/windows/dcpomatic_taskbar.ico b/platform/windows/dcpomatic_taskbar.ico deleted file mode 100644 index f4489fa14..000000000 Binary files a/platform/windows/dcpomatic_taskbar.ico and /dev/null differ diff --git a/platform/windows/wscript b/platform/windows/wscript index 5d8a64b7b..f33aaaf62 100644 --- a/platform/windows/wscript +++ b/platform/windows/wscript @@ -25,9 +25,9 @@ def write_installer(bits, version, debug): print('outFile "DCP-o-matic %s %d-bit Installer.exe"' % (version, bits), file=f) print(""" -!define MUI_ICON "%resources%/dcpomatic.ico" -!define MUI_UNICON "%resources%/dcpomatic.ico" -!define MUI_SPECIALBITMAP "%resources%/dcpomatic.bmp" +!define MUI_ICON "%graphics%/dcpomatic2.ico" +!define MUI_UNICON "%graphics%/dcpomatic2.ico" +!define MUI_SPECIALBITMAP "%graphics%/dcpomatic.bmp" !include "Sections.nsh" """, file=f) diff --git a/run/dcpomatic_server b/run/dcpomatic_server index 5856221b3..7f2aaac3a 100755 --- a/run/dcpomatic_server +++ b/run/dcpomatic_server @@ -2,9 +2,9 @@ export LD_LIBRARY_PATH=build/src/lib:$LD_LIBRARY_PATH if [ "$1" == "--debug" ]; then - gdb --args build/src/tools/dcpomatic_server + gdb --args build/src/tools/dcpomatic2_server elif [ "$1" == "--valgrind" ]; then - valgrind --tool="memcheck" build/src/tools/dcpomatic_server + valgrind --tool="memcheck" build/src/tools/dcpomatic2_server else - build/src/tools/dcpomatic_server + build/src/tools/dcpomatic2_server fi diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc index 382f867ca..72ac66706 100644 --- a/src/tools/dcpomatic_server.cc +++ b/src/tools/dcpomatic_server.cc @@ -105,16 +105,16 @@ class TaskBarIcon : public wxTaskBarIcon public: TaskBarIcon () { -#ifdef __WXMSW__ +#ifdef DCPOMATIC_WINDOWS wxIcon icon (std_to_wx ("taskbar_icon")); #endif -#ifdef __WXGTK__ +#ifdef DCPOMATIC_LINUX wxInitAllImageHandlers(); - wxBitmap bitmap (wxString::Format (wxT ("%s/taskbar_icon.png"), LINUX_SHARE_PREFIX), wxBITMAP_TYPE_PNG); + wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic2_server_small.png"), LINUX_SHARE_PREFIX), wxBITMAP_TYPE_PNG); wxIcon icon; icon.CopyFromBitmap (bitmap); #endif -#ifndef __WXOSX__ +#ifndef DCPOMATIC_OSX /* XXX: fix this for OS X */ SetIcon (icon, std_to_wx ("DCP-o-matic encode server")); #endif diff --git a/src/tools/wscript b/src/tools/wscript index eab03f8fd..262f193e4 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -55,7 +55,7 @@ def build(bld): obj.use = ['libdcpomatic2', 'libdcpomatic2-wx'] obj.source = '%s.cc' % t if bld.env.TARGET_WINDOWS: - obj.source += ' ../../platform/windows/dcpomatic.rc' + obj.source += ' ../../platform/windows/%s.rc' % t obj.target = t.replace('dcpomatic', 'dcpomatic2') i18n.po_to_mo(os.path.join('src', 'tools'), 'dcpomatic2', bld) diff --git a/wscript b/wscript index 66bedf9e5..e07a915c7 100644 --- a/wscript +++ b/wscript @@ -421,6 +421,8 @@ def build(bld): create_version_cc(VERSION, bld.env.CXXFLAGS) bld.recurse('src') + bld.recurse('graphics') + if not bld.env.DISABLE_TESTS: bld.recurse('test') if bld.env.TARGET_WINDOWS: @@ -430,11 +432,7 @@ def build(bld): if bld.env.TARGET_OSX: bld.recurse('platform/osx') - bld.recurse('graphics') - if not bld.env.TARGET_WINDOWS: - bld.install_files('${PREFIX}/share/dcpomatic2', 'graphics/taskbar_icon.png') - bld.install_files('${PREFIX}/share/dcpomatic2', 'graphics/splash.png') bld.install_files('${PREFIX}/share/dcpomatic2', 'LiberationSans-Regular.ttf') bld.add_post_fun(post) @@ -502,13 +500,5 @@ def pot_merge(bld): def tags(bld): os.system('etags src/lib/*.cc src/lib/*.h src/wx/*.cc src/wx/*.h src/tools/*.cc') -def zanata_pull(bld): - os.system('zanata-cli -B -q pull -t .') - for f in glob.glob('src/lib/po/*.po'): - l = os.path.basename(f) - os.rename('dcpomatic_%s' % l, 'src/tools/po/%s' % l) - os.rename('libdcpomatic_%s' % l, 'src/lib/po/%s' % l) - os.rename('libdcpomatic-wx_%s' % l, 'src/wx/po/%s' % l) - def cppcheck(bld): os.system('cppcheck --enable=all --quiet .')