From a983627b357e25478a524a20cafa4a68a4b9299f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 11 Aug 2015 01:07:35 +0100 Subject: [PATCH] Rename icons -> graphics. --- {icons => graphics}/128x128/dcpomatic2.png | Bin {icons => graphics}/16x16/dcpomatic2.png | Bin {icons => graphics}/22x22/dcpomatic2.png | Bin {icons => graphics}/256x256/dvdomatic.png | Bin {icons => graphics}/32x32/dcpomatic2.png | Bin {icons => graphics}/48x48/dcpomatic2.png | Bin {icons => graphics}/512x512/dvdomatic.png | Bin {icons => graphics}/64x64/dcpomatic2.png | Bin {icons => graphics}/colour_conversions.png | Bin {icons => graphics}/colour_conversions.svg | 0 {icons => graphics}/dcpomatic.icns | Bin .../dcpomatic.iconset/icon_128x128.png | Bin .../dcpomatic.iconset/icon_128x128@2x.png | Bin .../dcpomatic.iconset/icon_16x16.png | Bin .../dcpomatic.iconset/icon_16x16@2x.png | Bin .../dcpomatic.iconset/icon_256x256.png | Bin .../dcpomatic.iconset/icon_256x256@2x.png | Bin .../dcpomatic.iconset/icon_32x32.png | Bin .../dcpomatic.iconset/icon_32x32@2x.png | Bin .../dcpomatic.iconset/icon_512x512.png | Bin .../dcpomatic.iconset/icon_512x512@2x.png | Bin {icons => graphics}/defaults.png | Bin {icons => graphics}/defaults.svg | 0 {icons => graphics}/finish.jpg | Bin {icons => graphics}/finish2.jpg | Bin {icons => graphics}/finish3.jpg | Bin {icons => graphics}/kdm_email.png | Bin {icons => graphics}/kdm_email.svg | 0 {icons => graphics}/keys.png | Bin {icons => graphics}/keys.svg | 0 icons/finish-trace.svg => graphics/logo.svg | 0 {icons => graphics}/make.sh | 0 {icons => graphics}/make_icns.sh | 0 {icons => graphics}/servers.png | Bin graphics/splash.svg | 169 ++++++++++++++++++ {icons => graphics}/taskbar_icon.png | Bin {icons => graphics}/tms.png | Bin {icons => graphics}/tms.svg | 0 {icons => graphics}/website-sidebar.svg | 0 platform/osx/make_dmg.sh | 14 +- wscript | 4 +- 41 files changed, 178 insertions(+), 9 deletions(-) rename {icons => graphics}/128x128/dcpomatic2.png (100%) rename {icons => graphics}/16x16/dcpomatic2.png (100%) rename {icons => graphics}/22x22/dcpomatic2.png (100%) rename {icons => graphics}/256x256/dvdomatic.png (100%) rename {icons => graphics}/32x32/dcpomatic2.png (100%) rename {icons => graphics}/48x48/dcpomatic2.png (100%) rename {icons => graphics}/512x512/dvdomatic.png (100%) rename {icons => graphics}/64x64/dcpomatic2.png (100%) rename {icons => graphics}/colour_conversions.png (100%) rename {icons => graphics}/colour_conversions.svg (100%) rename {icons => graphics}/dcpomatic.icns (100%) rename {icons => graphics}/dcpomatic.iconset/icon_128x128.png (100%) rename {icons => graphics}/dcpomatic.iconset/icon_128x128@2x.png (100%) rename {icons => graphics}/dcpomatic.iconset/icon_16x16.png (100%) rename {icons => graphics}/dcpomatic.iconset/icon_16x16@2x.png (100%) rename {icons => graphics}/dcpomatic.iconset/icon_256x256.png (100%) rename {icons => graphics}/dcpomatic.iconset/icon_256x256@2x.png (100%) rename {icons => graphics}/dcpomatic.iconset/icon_32x32.png (100%) rename {icons => graphics}/dcpomatic.iconset/icon_32x32@2x.png (100%) rename {icons => graphics}/dcpomatic.iconset/icon_512x512.png (100%) rename {icons => graphics}/dcpomatic.iconset/icon_512x512@2x.png (100%) rename {icons => graphics}/defaults.png (100%) rename {icons => graphics}/defaults.svg (100%) rename {icons => graphics}/finish.jpg (100%) rename {icons => graphics}/finish2.jpg (100%) rename {icons => graphics}/finish3.jpg (100%) rename {icons => graphics}/kdm_email.png (100%) rename {icons => graphics}/kdm_email.svg (100%) rename {icons => graphics}/keys.png (100%) rename {icons => graphics}/keys.svg (100%) rename icons/finish-trace.svg => graphics/logo.svg (100%) rename {icons => graphics}/make.sh (100%) rename {icons => graphics}/make_icns.sh (100%) rename {icons => graphics}/servers.png (100%) create mode 100644 graphics/splash.svg rename {icons => graphics}/taskbar_icon.png (100%) rename {icons => graphics}/tms.png (100%) rename {icons => graphics}/tms.svg (100%) rename {icons => graphics}/website-sidebar.svg (100%) diff --git a/icons/128x128/dcpomatic2.png b/graphics/128x128/dcpomatic2.png similarity index 100% rename from icons/128x128/dcpomatic2.png rename to graphics/128x128/dcpomatic2.png diff --git a/icons/16x16/dcpomatic2.png b/graphics/16x16/dcpomatic2.png similarity index 100% rename from icons/16x16/dcpomatic2.png rename to graphics/16x16/dcpomatic2.png diff --git a/icons/22x22/dcpomatic2.png b/graphics/22x22/dcpomatic2.png similarity index 100% rename from icons/22x22/dcpomatic2.png rename to graphics/22x22/dcpomatic2.png diff --git a/icons/256x256/dvdomatic.png b/graphics/256x256/dvdomatic.png similarity index 100% rename from icons/256x256/dvdomatic.png rename to graphics/256x256/dvdomatic.png diff --git a/icons/32x32/dcpomatic2.png b/graphics/32x32/dcpomatic2.png similarity index 100% rename from icons/32x32/dcpomatic2.png rename to graphics/32x32/dcpomatic2.png diff --git a/icons/48x48/dcpomatic2.png b/graphics/48x48/dcpomatic2.png similarity index 100% rename from icons/48x48/dcpomatic2.png rename to graphics/48x48/dcpomatic2.png diff --git a/icons/512x512/dvdomatic.png b/graphics/512x512/dvdomatic.png similarity index 100% rename from icons/512x512/dvdomatic.png rename to graphics/512x512/dvdomatic.png diff --git a/icons/64x64/dcpomatic2.png b/graphics/64x64/dcpomatic2.png similarity index 100% rename from icons/64x64/dcpomatic2.png rename to graphics/64x64/dcpomatic2.png diff --git a/icons/colour_conversions.png b/graphics/colour_conversions.png similarity index 100% rename from icons/colour_conversions.png rename to graphics/colour_conversions.png diff --git a/icons/colour_conversions.svg b/graphics/colour_conversions.svg similarity index 100% rename from icons/colour_conversions.svg rename to graphics/colour_conversions.svg diff --git a/icons/dcpomatic.icns b/graphics/dcpomatic.icns similarity index 100% rename from icons/dcpomatic.icns rename to graphics/dcpomatic.icns diff --git a/icons/dcpomatic.iconset/icon_128x128.png b/graphics/dcpomatic.iconset/icon_128x128.png similarity index 100% rename from icons/dcpomatic.iconset/icon_128x128.png rename to graphics/dcpomatic.iconset/icon_128x128.png diff --git a/icons/dcpomatic.iconset/icon_128x128@2x.png b/graphics/dcpomatic.iconset/icon_128x128@2x.png similarity index 100% rename from icons/dcpomatic.iconset/icon_128x128@2x.png rename to graphics/dcpomatic.iconset/icon_128x128@2x.png diff --git a/icons/dcpomatic.iconset/icon_16x16.png b/graphics/dcpomatic.iconset/icon_16x16.png similarity index 100% rename from icons/dcpomatic.iconset/icon_16x16.png rename to graphics/dcpomatic.iconset/icon_16x16.png diff --git a/icons/dcpomatic.iconset/icon_16x16@2x.png b/graphics/dcpomatic.iconset/icon_16x16@2x.png similarity index 100% rename from icons/dcpomatic.iconset/icon_16x16@2x.png rename to graphics/dcpomatic.iconset/icon_16x16@2x.png diff --git a/icons/dcpomatic.iconset/icon_256x256.png b/graphics/dcpomatic.iconset/icon_256x256.png similarity index 100% rename from icons/dcpomatic.iconset/icon_256x256.png rename to graphics/dcpomatic.iconset/icon_256x256.png diff --git a/icons/dcpomatic.iconset/icon_256x256@2x.png b/graphics/dcpomatic.iconset/icon_256x256@2x.png similarity index 100% rename from icons/dcpomatic.iconset/icon_256x256@2x.png rename to graphics/dcpomatic.iconset/icon_256x256@2x.png diff --git a/icons/dcpomatic.iconset/icon_32x32.png b/graphics/dcpomatic.iconset/icon_32x32.png similarity index 100% rename from icons/dcpomatic.iconset/icon_32x32.png rename to graphics/dcpomatic.iconset/icon_32x32.png diff --git a/icons/dcpomatic.iconset/icon_32x32@2x.png b/graphics/dcpomatic.iconset/icon_32x32@2x.png similarity index 100% rename from icons/dcpomatic.iconset/icon_32x32@2x.png rename to graphics/dcpomatic.iconset/icon_32x32@2x.png diff --git a/icons/dcpomatic.iconset/icon_512x512.png b/graphics/dcpomatic.iconset/icon_512x512.png similarity index 100% rename from icons/dcpomatic.iconset/icon_512x512.png rename to graphics/dcpomatic.iconset/icon_512x512.png diff --git a/icons/dcpomatic.iconset/icon_512x512@2x.png b/graphics/dcpomatic.iconset/icon_512x512@2x.png similarity index 100% rename from icons/dcpomatic.iconset/icon_512x512@2x.png rename to graphics/dcpomatic.iconset/icon_512x512@2x.png diff --git a/icons/defaults.png b/graphics/defaults.png similarity index 100% rename from icons/defaults.png rename to graphics/defaults.png diff --git a/icons/defaults.svg b/graphics/defaults.svg similarity index 100% rename from icons/defaults.svg rename to graphics/defaults.svg diff --git a/icons/finish.jpg b/graphics/finish.jpg similarity index 100% rename from icons/finish.jpg rename to graphics/finish.jpg diff --git a/icons/finish2.jpg b/graphics/finish2.jpg similarity index 100% rename from icons/finish2.jpg rename to graphics/finish2.jpg diff --git a/icons/finish3.jpg b/graphics/finish3.jpg similarity index 100% rename from icons/finish3.jpg rename to graphics/finish3.jpg diff --git a/icons/kdm_email.png b/graphics/kdm_email.png similarity index 100% rename from icons/kdm_email.png rename to graphics/kdm_email.png diff --git a/icons/kdm_email.svg b/graphics/kdm_email.svg similarity index 100% rename from icons/kdm_email.svg rename to graphics/kdm_email.svg diff --git a/icons/keys.png b/graphics/keys.png similarity index 100% rename from icons/keys.png rename to graphics/keys.png diff --git a/icons/keys.svg b/graphics/keys.svg similarity index 100% rename from icons/keys.svg rename to graphics/keys.svg diff --git a/icons/finish-trace.svg b/graphics/logo.svg similarity index 100% rename from icons/finish-trace.svg rename to graphics/logo.svg diff --git a/icons/make.sh b/graphics/make.sh similarity index 100% rename from icons/make.sh rename to graphics/make.sh diff --git a/icons/make_icns.sh b/graphics/make_icns.sh similarity index 100% rename from icons/make_icns.sh rename to graphics/make_icns.sh diff --git a/icons/servers.png b/graphics/servers.png similarity index 100% rename from icons/servers.png rename to graphics/servers.png diff --git a/graphics/splash.svg b/graphics/splash.svg new file mode 100644 index 000000000..36e6b84a6 --- /dev/null +++ b/graphics/splash.svg @@ -0,0 +1,169 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + DCP-o-matic + Setting up... + + diff --git a/icons/taskbar_icon.png b/graphics/taskbar_icon.png similarity index 100% rename from icons/taskbar_icon.png rename to graphics/taskbar_icon.png diff --git a/icons/tms.png b/graphics/tms.png similarity index 100% rename from icons/tms.png rename to graphics/tms.png diff --git a/icons/tms.svg b/graphics/tms.svg similarity index 100% rename from icons/tms.svg rename to graphics/tms.svg diff --git a/icons/website-sidebar.svg b/graphics/website-sidebar.svg similarity index 100% rename from icons/website-sidebar.svg rename to graphics/website-sidebar.svg diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index 5e408814a..e0e029009 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -131,13 +131,13 @@ for obj in "$WORK/$macos/dcpomatic2" "$WORK/$macos/dcpomatic2_batch" "$WORK/$mac done cp $ROOT/32/src/dcpomatic2/build/platform/osx/Info.plist "$WORK/$approot" -cp $ROOT/32/src/dcpomatic2/icons/dcpomatic.icns "$WORK/$resources/DCP-o-matic.icns" -cp $ROOT/32/src/dcpomatic2/icons/colour_conversions.png "$WORK/$resources" -cp $ROOT/32/src/dcpomatic2/icons/defaults.png "$WORK/$resources" -cp $ROOT/32/src/dcpomatic2/icons/kdm_email.png "$WORK/$resources" -cp $ROOT/32/src/dcpomatic2/icons/servers.png "$WORK/$resources" -cp $ROOT/32/src/dcpomatic2/icons/tms.png "$WORK/$resources" -cp $ROOT/32/src/dcpomatic2/icons/keys.png "$WORK/$resources" +cp $ROOT/32/src/dcpomatic2/graphics/dcpomatic.icns "$WORK/$resources/DCP-o-matic.icns" +cp $ROOT/32/src/dcpomatic2/graphics/colour_conversions.png "$WORK/$resources" +cp $ROOT/32/src/dcpomatic2/graphics/defaults.png "$WORK/$resources" +cp $ROOT/32/src/dcpomatic2/graphics/kdm_email.png "$WORK/$resources" +cp $ROOT/32/src/dcpomatic2/graphics/servers.png "$WORK/$resources" +cp $ROOT/32/src/dcpomatic2/graphics/tms.png "$WORK/$resources" +cp $ROOT/32/src/dcpomatic2/graphics/keys.png "$WORK/$resources" cp $ROOT/32/src/dcpomatic2/LiberationSans-Regular.ttf "$WORK/$resources" # i18n: DCP-o-matic .mo files diff --git a/wscript b/wscript index 2c2e51d01..a5742eb7b 100644 --- a/wscript +++ b/wscript @@ -410,10 +410,10 @@ def build(bld): bld.recurse('platform/osx') for r in ['22x22', '32x32', '48x48', '64x64', '128x128']: - bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dcpomatic2.png' % r) + bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'graphics/%s/dcpomatic2.png' % r) if not bld.env.TARGET_WINDOWS: - bld.install_files('${PREFIX}/share/dcpomatic2', 'icons/taskbar_icon.png') + bld.install_files('${PREFIX}/share/dcpomatic2', 'graphics/taskbar_icon.png') bld.install_files('${PREFIX}/share/dcpomatic2', 'LiberationSans-Regular.ttf') bld.add_post_fun(post) -- 2.30.2