From: Carl Hetherington Date: Thu, 25 May 2017 08:13:28 +0000 (+0100) Subject: New OS X menu bar icon for server. X-Git-Tag: v2.11.8~10 X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=d81704ba871e048eca2f6a5428d22570ac9c24da New OS X menu bar icon for server. --- diff --git a/graphics/linux/128/dcpomatic2.png b/graphics/linux/128/dcpomatic2.png index c18c4ea12..79cbbef4f 100644 Binary files a/graphics/linux/128/dcpomatic2.png and b/graphics/linux/128/dcpomatic2.png differ diff --git a/graphics/linux/16/dcpomatic2.png b/graphics/linux/16/dcpomatic2.png index ebcb845f1..a11b8576e 100644 Binary files a/graphics/linux/16/dcpomatic2.png and b/graphics/linux/16/dcpomatic2.png differ diff --git a/graphics/linux/22/dcpomatic2.png b/graphics/linux/22/dcpomatic2.png index 2bca6e89f..7f2730f23 100644 Binary files a/graphics/linux/22/dcpomatic2.png and b/graphics/linux/22/dcpomatic2.png differ diff --git a/graphics/linux/256/dcpomatic2.png b/graphics/linux/256/dcpomatic2.png index fa767b829..b517b9da2 100644 Binary files a/graphics/linux/256/dcpomatic2.png and b/graphics/linux/256/dcpomatic2.png differ diff --git a/graphics/linux/32/dcpomatic2.png b/graphics/linux/32/dcpomatic2.png index 3dea8b696..794c01b58 100644 Binary files a/graphics/linux/32/dcpomatic2.png and b/graphics/linux/32/dcpomatic2.png differ diff --git a/graphics/linux/48/dcpomatic2.png b/graphics/linux/48/dcpomatic2.png index 886c4a22d..5edc416db 100644 Binary files a/graphics/linux/48/dcpomatic2.png and b/graphics/linux/48/dcpomatic2.png differ diff --git a/graphics/linux/512/dcpomatic2.png b/graphics/linux/512/dcpomatic2.png index 489650a0e..08c274dd8 100644 Binary files a/graphics/linux/512/dcpomatic2.png and b/graphics/linux/512/dcpomatic2.png differ diff --git a/graphics/linux/64/dcpomatic2.png b/graphics/linux/64/dcpomatic2.png index 524143c9c..139a70f15 100644 Binary files a/graphics/linux/64/dcpomatic2.png and b/graphics/linux/64/dcpomatic2.png differ diff --git a/graphics/osx/dcpomatic2.iconset/icon_128x128.png b/graphics/osx/dcpomatic2.iconset/icon_128x128.png index f3aaaaf69..0c2db5ef4 100644 Binary files a/graphics/osx/dcpomatic2.iconset/icon_128x128.png 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 index f3aaaaf69..0c2db5ef4 100644 Binary files a/graphics/osx/dcpomatic2.iconset/icon_128x128@2x.png 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 index 84c538de0..c27bef447 100644 Binary files a/graphics/osx/dcpomatic2.iconset/icon_16x16.png 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 index 84c538de0..c27bef447 100644 Binary files a/graphics/osx/dcpomatic2.iconset/icon_16x16@2x.png 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 index 9cd6b599c..66face3b8 100644 Binary files a/graphics/osx/dcpomatic2.iconset/icon_256x256.png 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 index 9cd6b599c..66face3b8 100644 Binary files a/graphics/osx/dcpomatic2.iconset/icon_256x256@2x.png 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 index d58ddb6e2..c738d48a7 100644 Binary files a/graphics/osx/dcpomatic2.iconset/icon_32x32.png 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 index d58ddb6e2..c738d48a7 100644 Binary files a/graphics/osx/dcpomatic2.iconset/icon_32x32@2x.png 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 index 19be4b7ac..52b205926 100644 Binary files a/graphics/osx/dcpomatic2.iconset/icon_512x512.png 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 index 19be4b7ac..a9ea27e93 100644 Binary files a/graphics/osx/dcpomatic2.iconset/icon_512x512@2x.png and b/graphics/osx/dcpomatic2.iconset/icon_512x512@2x.png differ diff --git a/graphics/osx/dcpomatic_small.png b/graphics/osx/dcpomatic_small.png new file mode 100644 index 000000000..6d1a85007 Binary files /dev/null and b/graphics/osx/dcpomatic_small.png differ diff --git a/graphics/src/dcpomatic_small.svg b/graphics/src/dcpomatic_small.svg new file mode 100644 index 000000000..e6b355c35 --- /dev/null +++ b/graphics/src/dcpomatic_small.svg @@ -0,0 +1,91 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + D + + + diff --git a/graphics/update b/graphics/update index 73436cb6a..fbd522597 100755 --- a/graphics/update +++ b/graphics/update @@ -22,7 +22,6 @@ else # OS X application icons mkdir -p osx - convert src/dcpomatic.png -resize 32x32 osx/dcpomatic2.png for r in 16 32 128 256 512; do for p in dcpomatic2; do mkdir -p osx/$p.iconset @@ -60,6 +59,9 @@ else $INKSCAPE osx/preferences/$i.png src/$i.svg -w 32 -h 32 done + # OS X menu bar icon for the server + $INKSCAPE osx/dcpomatic_small.png -w 22 -h 22 src/dcpomatic_small.svg + # Splash screen (all platforms) $INKSCAPE splash.png src/splash.svg -w 400 -h 300 diff --git a/graphics/web/favicon-128x128.png b/graphics/web/favicon-128x128.png index e50bee009..26cf94927 100644 Binary files a/graphics/web/favicon-128x128.png and b/graphics/web/favicon-128x128.png differ diff --git a/graphics/web/favicon-16x16.png b/graphics/web/favicon-16x16.png index eaa28899d..173ea64cd 100644 Binary files a/graphics/web/favicon-16x16.png and b/graphics/web/favicon-16x16.png differ diff --git a/graphics/web/favicon-256x256.png b/graphics/web/favicon-256x256.png index a923ba464..08b6cadd4 100644 Binary files a/graphics/web/favicon-256x256.png and b/graphics/web/favicon-256x256.png differ diff --git a/graphics/web/favicon-32x32.png b/graphics/web/favicon-32x32.png index 6b677b636..09e59cc9b 100644 Binary files a/graphics/web/favicon-32x32.png and b/graphics/web/favicon-32x32.png differ diff --git a/graphics/web/favicon-64x64.png b/graphics/web/favicon-64x64.png index 23d02aeb1..f6cabed99 100644 Binary files a/graphics/web/favicon-64x64.png and b/graphics/web/favicon-64x64.png differ diff --git a/graphics/web/logo.png b/graphics/web/logo.png index cfc8c163d..352fce11c 100644 Binary files a/graphics/web/logo.png and b/graphics/web/logo.png differ diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index 6a413f287..bccecfebc 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -113,7 +113,7 @@ function copy_libs { # @param #1 directory to copy to function copy_resources { local dest="$1" - cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic2.png "$dest" + cp $ROOT/32/src/dcpomatic/graphics/osx/dcpomatic_small.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" diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc index 8e9ce7537..9214d8385 100644 --- a/src/tools/dcpomatic_server.cc +++ b/src/tools/dcpomatic_server.cc @@ -208,7 +208,12 @@ public: wxIcon icon (std_to_wx ("id")); #else wxInitAllImageHandlers(); +#ifdef DCPOMATIC_LINUX wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic2.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG); +#endif +#ifdef DCPOMATIC_OSX + wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic_small.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG); +#endif wxIcon icon; icon.CopyFromBitmap (bitmap); #endif