From 0ca15ba785b18a01b3422a801f9c533b7960b207 Mon Sep 17 00:00:00 2001 From: da-anda Date: Fri, 21 Nov 2014 18:13:07 +0100 Subject: [rebrand][win] new app icon --- project/Win32BuildSetup/genNsisInstaller.nsi | 2 +- tools/windows/packaging/media/application.ico | Bin 0 -> 187097 bytes tools/windows/packaging/media/xbmc.ico | Bin 167082 -> 0 bytes xbmc/win32/XBMC_PC.rc.in | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 tools/windows/packaging/media/application.ico delete mode 100644 tools/windows/packaging/media/xbmc.ico diff --git a/project/Win32BuildSetup/genNsisInstaller.nsi b/project/Win32BuildSetup/genNsisInstaller.nsi index b9659cd79e..796fd90590 100644 --- a/project/Win32BuildSetup/genNsisInstaller.nsi +++ b/project/Win32BuildSetup/genNsisInstaller.nsi @@ -41,7 +41,7 @@ ;Interface Settings !define MUI_HEADERIMAGE - !define MUI_ICON "..\..\tools\windows\packaging\media\xbmc.ico" + !define MUI_ICON "..\..\tools\windows\packaging\media\application.ico" ;!define MUI_HEADERIMAGE_BITMAP "..\..\tools\windows\packaging\media\installer\header.bmp" ;!define MUI_WELCOMEFINISHPAGE_BITMAP "..\..\tools\windows\packaging\media\installer\welcome-left.bmp" !define MUI_COMPONENTSPAGE_SMALLDESC diff --git a/tools/windows/packaging/media/application.ico b/tools/windows/packaging/media/application.ico new file mode 100644 index 0000000000..c63582724d Binary files /dev/null and b/tools/windows/packaging/media/application.ico differ diff --git a/tools/windows/packaging/media/xbmc.ico b/tools/windows/packaging/media/xbmc.ico deleted file mode 100644 index b5caca122f..0000000000 Binary files a/tools/windows/packaging/media/xbmc.ico and /dev/null differ diff --git a/xbmc/win32/XBMC_PC.rc.in b/xbmc/win32/XBMC_PC.rc.in index 00194064e8..7f215abbaf 100644 --- a/xbmc/win32/XBMC_PC.rc.in +++ b/xbmc/win32/XBMC_PC.rc.in @@ -96,7 +96,7 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_MAIN_ICON ICON "xbmc.ico" +IDI_MAIN_ICON ICON "application.ico" -- cgit v1.2.3 From 7e473941518f3647bcedb01beb66646501f0f973 Mon Sep 17 00:00:00 2001 From: da-anda Date: Fri, 21 Nov 2014 18:19:12 +0100 Subject: [rebrand][win32] new installer artwork --- project/Win32BuildSetup/genNsisInstaller.nsi | 4 ++-- tools/windows/packaging/media/installer/header.bmp | Bin 26272 -> 26272 bytes .../packaging/media/installer/welcome-left.bmp | Bin 154544 -> 154544 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project/Win32BuildSetup/genNsisInstaller.nsi b/project/Win32BuildSetup/genNsisInstaller.nsi index 796fd90590..1577d11ec2 100644 --- a/project/Win32BuildSetup/genNsisInstaller.nsi +++ b/project/Win32BuildSetup/genNsisInstaller.nsi @@ -42,8 +42,8 @@ !define MUI_HEADERIMAGE !define MUI_ICON "..\..\tools\windows\packaging\media\application.ico" - ;!define MUI_HEADERIMAGE_BITMAP "..\..\tools\windows\packaging\media\installer\header.bmp" - ;!define MUI_WELCOMEFINISHPAGE_BITMAP "..\..\tools\windows\packaging\media\installer\welcome-left.bmp" + !define MUI_HEADERIMAGE_BITMAP "..\..\tools\windows\packaging\media\installer\header.bmp" + !define MUI_WELCOMEFINISHPAGE_BITMAP "..\..\tools\windows\packaging\media\installer\welcome-left.bmp" !define MUI_COMPONENTSPAGE_SMALLDESC !define MUI_FINISHPAGE_LINK "Please visit ${WEBSITE} for more information." !define MUI_FINISHPAGE_LINK_LOCATION "${WEBSITE}" diff --git a/tools/windows/packaging/media/installer/header.bmp b/tools/windows/packaging/media/installer/header.bmp index 5b802a8ea6..e0ac21fa29 100644 Binary files a/tools/windows/packaging/media/installer/header.bmp and b/tools/windows/packaging/media/installer/header.bmp differ diff --git a/tools/windows/packaging/media/installer/welcome-left.bmp b/tools/windows/packaging/media/installer/welcome-left.bmp index 56e8340092..121dbf96b5 100644 Binary files a/tools/windows/packaging/media/installer/welcome-left.bmp and b/tools/windows/packaging/media/installer/welcome-left.bmp differ -- cgit v1.2.3 From a590e82d8240f68d051439d9b95c6e2638bad2b7 Mon Sep 17 00:00:00 2001 From: da-anda Date: Fri, 21 Nov 2014 18:15:16 +0100 Subject: [rebrand][linux|upnp] new icons --- media/icon120x120.png | Bin 8693 -> 9132 bytes media/icon16x16.png | Bin 1081 -> 236 bytes media/icon256x256.png | Bin 31497 -> 40670 bytes media/icon32x32.png | Bin 1580 -> 334 bytes media/icon48x48.png | Bin 2622 -> 482 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/media/icon120x120.png b/media/icon120x120.png index 41781ad38b..5fa623f818 100644 Binary files a/media/icon120x120.png and b/media/icon120x120.png differ diff --git a/media/icon16x16.png b/media/icon16x16.png index bf1753bc24..e8d52fbac9 100644 Binary files a/media/icon16x16.png and b/media/icon16x16.png differ diff --git a/media/icon256x256.png b/media/icon256x256.png index 85fbeab20b..4df7886f55 100644 Binary files a/media/icon256x256.png and b/media/icon256x256.png differ diff --git a/media/icon32x32.png b/media/icon32x32.png index c12a228225..fceb835ce1 100644 Binary files a/media/icon32x32.png and b/media/icon32x32.png differ diff --git a/media/icon48x48.png b/media/icon48x48.png index e0a5a8850f..31d073c591 100644 Binary files a/media/icon48x48.png and b/media/icon48x48.png differ -- cgit v1.2.3 From 5da766b338098896418e02ce257bdd199165cf74 Mon Sep 17 00:00:00 2001 From: da-anda Date: Fri, 21 Nov 2014 18:16:22 +0100 Subject: [rebrand][android] new icons --- .../packaging/media/drawable-hdpi/ic_launcher.png | Bin 8337 -> 10011 bytes .../packaging/media/drawable-ldpi/ic_launcher.png | Bin 5417 -> 6344 bytes .../packaging/media/drawable-mdpi/ic_launcher.png | Bin 6306 -> 7269 bytes .../packaging/media/drawable-xhdpi/ic_launcher.png | Bin 11008 -> 12604 bytes .../media/drawable-xxhdpi/ic_launcher.png | Bin 17582 -> 21407 bytes .../media/drawable-xxxhdpi/ic_launcher.png | Bin 26902 -> 34078 bytes tools/android/packaging/media/playstore.png | Bin 76539 -> 209732 bytes 7 files changed, 0 insertions(+), 0 deletions(-) diff --git a/tools/android/packaging/media/drawable-hdpi/ic_launcher.png b/tools/android/packaging/media/drawable-hdpi/ic_launcher.png index 62f2673cdb..5577fcb74f 100644 Binary files a/tools/android/packaging/media/drawable-hdpi/ic_launcher.png and b/tools/android/packaging/media/drawable-hdpi/ic_launcher.png differ diff --git a/tools/android/packaging/media/drawable-ldpi/ic_launcher.png b/tools/android/packaging/media/drawable-ldpi/ic_launcher.png index 9fc808858b..55f85e0476 100644 Binary files a/tools/android/packaging/media/drawable-ldpi/ic_launcher.png and b/tools/android/packaging/media/drawable-ldpi/ic_launcher.png differ diff --git a/tools/android/packaging/media/drawable-mdpi/ic_launcher.png b/tools/android/packaging/media/drawable-mdpi/ic_launcher.png index 9fc1d9bd21..670e2aa8cb 100644 Binary files a/tools/android/packaging/media/drawable-mdpi/ic_launcher.png and b/tools/android/packaging/media/drawable-mdpi/ic_launcher.png differ diff --git a/tools/android/packaging/media/drawable-xhdpi/ic_launcher.png b/tools/android/packaging/media/drawable-xhdpi/ic_launcher.png index a6631ce55b..9ec4a9a1bd 100644 Binary files a/tools/android/packaging/media/drawable-xhdpi/ic_launcher.png and b/tools/android/packaging/media/drawable-xhdpi/ic_launcher.png differ diff --git a/tools/android/packaging/media/drawable-xxhdpi/ic_launcher.png b/tools/android/packaging/media/drawable-xxhdpi/ic_launcher.png index 30035fff77..f0fcb169a6 100644 Binary files a/tools/android/packaging/media/drawable-xxhdpi/ic_launcher.png and b/tools/android/packaging/media/drawable-xxhdpi/ic_launcher.png differ diff --git a/tools/android/packaging/media/drawable-xxxhdpi/ic_launcher.png b/tools/android/packaging/media/drawable-xxxhdpi/ic_launcher.png index 09d9993005..429420c2a7 100644 Binary files a/tools/android/packaging/media/drawable-xxxhdpi/ic_launcher.png and b/tools/android/packaging/media/drawable-xxxhdpi/ic_launcher.png differ diff --git a/tools/android/packaging/media/playstore.png b/tools/android/packaging/media/playstore.png index 8ffb8b8527..c51b2a7fe3 100644 Binary files a/tools/android/packaging/media/playstore.png and b/tools/android/packaging/media/playstore.png differ -- cgit v1.2.3 From 2556676d6555ae96153f5150dcc791d11c10f79f Mon Sep 17 00:00:00 2001 From: da-anda Date: Fri, 21 Nov 2014 20:23:51 +0100 Subject: [android] add Android-TV banner --- tools/android/packaging/Makefile.in | 1 + tools/android/packaging/media/drawable-xhdpi/banner.png | Bin 0 -> 12067 bytes tools/android/packaging/xbmc/AndroidManifest.xml.in | 5 ++++- 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 tools/android/packaging/media/drawable-xhdpi/banner.png diff --git a/tools/android/packaging/Makefile.in b/tools/android/packaging/Makefile.in index 121b515a05..7838362fc4 100644 --- a/tools/android/packaging/Makefile.in +++ b/tools/android/packaging/Makefile.in @@ -105,6 +105,7 @@ res: cp -fp media/drawable-mdpi/ic_launcher.png xbmc/res/drawable-mdpi/ic_launcher.png cp -fp media/drawable-xhdpi/ic_launcher.png xbmc/res/drawable-xhdpi/ic_launcher.png cp -fp media/drawable-xxhdpi/ic_launcher.png xbmc/res/drawable-xxhdpi/ic_launcher.png + cp -fp media/drawable-xhdpi/banner.png xbmc/res/drawable-xhdpi/banner.png cp xbmc/strings.xml xbmc/res/values/ mkdir -p tmp/res; $(AAPT) c -S xbmc/res -C tmp/res; cp -r -n xbmc/res tmp/ || true $(AAPT) p -f -I $(SDKROOT)/platforms/$(SDK_PLATFORM)/android.jar -S tmp/res/ -M xbmc/AndroidManifest.xml -F images/@APP_NAME_LC@app-debug-skeleton.apk -J xbmc/src diff --git a/tools/android/packaging/media/drawable-xhdpi/banner.png b/tools/android/packaging/media/drawable-xhdpi/banner.png new file mode 100644 index 0000000000..7bf98b2945 Binary files /dev/null and b/tools/android/packaging/media/drawable-xhdpi/banner.png differ diff --git a/tools/android/packaging/xbmc/AndroidManifest.xml.in b/tools/android/packaging/xbmc/AndroidManifest.xml.in index e185665507..36e44405b0 100644 --- a/tools/android/packaging/xbmc/AndroidManifest.xml.in +++ b/tools/android/packaging/xbmc/AndroidManifest.xml.in @@ -20,7 +20,10 @@ - + Date: Fri, 21 Nov 2014 18:17:23 +0100 Subject: [rebrand][ios] new icons with iOS8 support --- tools/darwin/packaging/media/ios/iTunesArtwork.png | Bin 76539 -> 170637 bytes .../packaging/media/ios/iTunesArtwork@2x.png | Bin 206499 -> 786904 bytes .../packaging/media/ios/rounded/AppIcon29x29.png | Bin 7215 -> 30118 bytes .../media/ios/rounded/AppIcon29x29@2x.png | Bin 9250 -> 31866 bytes .../media/ios/rounded/AppIcon29x29l@3x.png | Bin 0 -> 34419 bytes .../packaging/media/ios/rounded/AppIcon40x40.png | Bin 7863 -> 30708 bytes .../media/ios/rounded/AppIcon40x40@2x.png | Bin 11415 -> 33538 bytes .../media/ios/rounded/AppIcon40x40@3x.png | Bin 0 -> 39595 bytes .../packaging/media/ios/rounded/AppIcon50x50.png | Bin 8709 -> 31224 bytes .../media/ios/rounded/AppIcon50x50@2x.png | Bin 13498 -> 35210 bytes .../packaging/media/ios/rounded/AppIcon57x57.png | Bin 8900 -> 31678 bytes .../media/ios/rounded/AppIcon57x57@2x.png | Bin 14844 -> 37793 bytes .../packaging/media/ios/rounded/AppIcon60x60.png | Bin 9309 -> 31942 bytes .../media/ios/rounded/AppIcon60x60@2x.png | Bin 15794 -> 39653 bytes .../media/ios/rounded/AppIcon60x60@3x.png | Bin 0 -> 49124 bytes .../packaging/media/ios/rounded/AppIcon72x72.png | Bin 10086 -> 32625 bytes .../media/ios/rounded/AppIcon72x72@2x.png | Bin 19614 -> 43220 bytes .../packaging/media/ios/rounded/AppIcon76x76.png | Bin 10606 -> 32936 bytes .../media/ios/rounded/AppIcon76x76@2x.png | Bin 21136 -> 44496 bytes .../packaging/media/ios/squared/AppIcon29x29.png | Bin 6976 -> 29813 bytes .../media/ios/squared/AppIcon29x29@2x.png | Bin 8740 -> 31227 bytes .../media/ios/squared/AppIcon29x29l@3x.png | Bin 0 -> 33494 bytes .../packaging/media/ios/squared/AppIcon40x40.png | Bin 7535 -> 30284 bytes .../media/ios/squared/AppIcon40x40@2x.png | Bin 10771 -> 32680 bytes .../media/ios/squared/AppIcon40x40@3x.png | Bin 0 -> 38138 bytes .../packaging/media/ios/squared/AppIcon50x50.png | Bin 8368 -> 30797 bytes .../media/ios/squared/AppIcon50x50@2x.png | Bin 12813 -> 34289 bytes .../packaging/media/ios/squared/AppIcon57x57.png | Bin 8438 -> 31215 bytes .../media/ios/squared/AppIcon57x57@2x.png | Bin 14090 -> 36691 bytes .../packaging/media/ios/squared/AppIcon60x60.png | Bin 8686 -> 31353 bytes .../media/ios/squared/AppIcon60x60@2x.png | Bin 14637 -> 38112 bytes .../media/ios/squared/AppIcon60x60@3x.png | Bin 0 -> 46651 bytes .../packaging/media/ios/squared/AppIcon72x72.png | Bin 9561 -> 32001 bytes .../media/ios/squared/AppIcon72x72@2x.png | Bin 18370 -> 41579 bytes .../packaging/media/ios/squared/AppIcon76x76.png | Bin 9887 -> 32185 bytes .../media/ios/squared/AppIcon76x76@2x.png | Bin 19493 -> 42428 bytes 36 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 tools/darwin/packaging/media/ios/rounded/AppIcon29x29l@3x.png create mode 100644 tools/darwin/packaging/media/ios/rounded/AppIcon40x40@3x.png create mode 100644 tools/darwin/packaging/media/ios/rounded/AppIcon60x60@3x.png create mode 100644 tools/darwin/packaging/media/ios/squared/AppIcon29x29l@3x.png create mode 100644 tools/darwin/packaging/media/ios/squared/AppIcon40x40@3x.png create mode 100644 tools/darwin/packaging/media/ios/squared/AppIcon60x60@3x.png diff --git a/tools/darwin/packaging/media/ios/iTunesArtwork.png b/tools/darwin/packaging/media/ios/iTunesArtwork.png index 8ffb8b8527..f0bdfac2d5 100644 Binary files a/tools/darwin/packaging/media/ios/iTunesArtwork.png and b/tools/darwin/packaging/media/ios/iTunesArtwork.png differ diff --git a/tools/darwin/packaging/media/ios/iTunesArtwork@2x.png b/tools/darwin/packaging/media/ios/iTunesArtwork@2x.png index 0501cac248..41843766db 100644 Binary files a/tools/darwin/packaging/media/ios/iTunesArtwork@2x.png and b/tools/darwin/packaging/media/ios/iTunesArtwork@2x.png differ diff --git a/tools/darwin/packaging/media/ios/rounded/AppIcon29x29.png b/tools/darwin/packaging/media/ios/rounded/AppIcon29x29.png index 5bfca1b321..4fec2dc64c 100644 Binary files a/tools/darwin/packaging/media/ios/rounded/AppIcon29x29.png and b/tools/darwin/packaging/media/ios/rounded/AppIcon29x29.png differ diff --git a/tools/darwin/packaging/media/ios/rounded/AppIcon29x29@2x.png b/tools/darwin/packaging/media/ios/rounded/AppIcon29x29@2x.png index af149b61c2..ee7a61db4c 100644 Binary files a/tools/darwin/packaging/media/ios/rounded/AppIcon29x29@2x.png and b/tools/darwin/packaging/media/ios/rounded/AppIcon29x29@2x.png differ diff --git a/tools/darwin/packaging/media/ios/rounded/AppIcon29x29l@3x.png b/tools/darwin/packaging/media/ios/rounded/AppIcon29x29l@3x.png new file mode 100644 index 0000000000..395e4b1555 Binary files /dev/null and b/tools/darwin/packaging/media/ios/rounded/AppIcon29x29l@3x.png differ diff --git a/tools/darwin/packaging/media/ios/rounded/AppIcon40x40.png b/tools/darwin/packaging/media/ios/rounded/AppIcon40x40.png index 89d3ea7b75..9dffd095ad 100644 Binary files a/tools/darwin/packaging/media/ios/rounded/AppIcon40x40.png and b/tools/darwin/packaging/media/ios/rounded/AppIcon40x40.png differ diff --git a/tools/darwin/packaging/media/ios/rounded/AppIcon40x40@2x.png b/tools/darwin/packaging/media/ios/rounded/AppIcon40x40@2x.png index 09d18c955f..5b00082cd6 100644 Binary files a/tools/darwin/packaging/media/ios/rounded/AppIcon40x40@2x.png and b/tools/darwin/packaging/media/ios/rounded/AppIcon40x40@2x.png differ diff --git a/tools/darwin/packaging/media/ios/rounded/AppIcon40x40@3x.png b/tools/darwin/packaging/media/ios/rounded/AppIcon40x40@3x.png new file mode 100644 index 0000000000..dfe55067a9 Binary files /dev/null and b/tools/darwin/packaging/media/ios/rounded/AppIcon40x40@3x.png differ diff --git a/tools/darwin/packaging/media/ios/rounded/AppIcon50x50.png b/tools/darwin/packaging/media/ios/rounded/AppIcon50x50.png index 2e60ad04b1..5083a1442d 100644 Binary files a/tools/darwin/packaging/media/ios/rounded/AppIcon50x50.png and b/tools/darwin/packaging/media/ios/rounded/AppIcon50x50.png differ diff --git a/tools/darwin/packaging/media/ios/rounded/AppIcon50x50@2x.png b/tools/darwin/packaging/media/ios/rounded/AppIcon50x50@2x.png index 59bef0a90c..276a993747 100644 Binary files a/tools/darwin/packaging/media/ios/rounded/AppIcon50x50@2x.png and b/tools/darwin/packaging/media/ios/rounded/AppIcon50x50@2x.png differ diff --git a/tools/darwin/packaging/media/ios/rounded/AppIcon57x57.png b/tools/darwin/packaging/media/ios/rounded/AppIcon57x57.png index fafbb41deb..a751f39264 100644 Binary files a/tools/darwin/packaging/media/ios/rounded/AppIcon57x57.png and b/tools/darwin/packaging/media/ios/rounded/AppIcon57x57.png differ diff --git a/tools/darwin/packaging/media/ios/rounded/AppIcon57x57@2x.png b/tools/darwin/packaging/media/ios/rounded/AppIcon57x57@2x.png index d748b7e7a5..8b5d1b7829 100644 Binary files a/tools/darwin/packaging/media/ios/rounded/AppIcon57x57@2x.png and b/tools/darwin/packaging/media/ios/rounded/AppIcon57x57@2x.png differ diff --git a/tools/darwin/packaging/media/ios/rounded/AppIcon60x60.png b/tools/darwin/packaging/media/ios/rounded/AppIcon60x60.png index ecd4662209..cf82ba74f0 100644 Binary files a/tools/darwin/packaging/media/ios/rounded/AppIcon60x60.png and b/tools/darwin/packaging/media/ios/rounded/AppIcon60x60.png differ diff --git a/tools/darwin/packaging/media/ios/rounded/AppIcon60x60@2x.png b/tools/darwin/packaging/media/ios/rounded/AppIcon60x60@2x.png index 81beebfc12..106b37b361 100644 Binary files a/tools/darwin/packaging/media/ios/rounded/AppIcon60x60@2x.png and b/tools/darwin/packaging/media/ios/rounded/AppIcon60x60@2x.png differ diff --git a/tools/darwin/packaging/media/ios/rounded/AppIcon60x60@3x.png b/tools/darwin/packaging/media/ios/rounded/AppIcon60x60@3x.png new file mode 100644 index 0000000000..5aa9be78cb Binary files /dev/null and b/tools/darwin/packaging/media/ios/rounded/AppIcon60x60@3x.png differ diff --git a/tools/darwin/packaging/media/ios/rounded/AppIcon72x72.png b/tools/darwin/packaging/media/ios/rounded/AppIcon72x72.png index 3bcec43296..8e2ff8369c 100644 Binary files a/tools/darwin/packaging/media/ios/rounded/AppIcon72x72.png and b/tools/darwin/packaging/media/ios/rounded/AppIcon72x72.png differ diff --git a/tools/darwin/packaging/media/ios/rounded/AppIcon72x72@2x.png b/tools/darwin/packaging/media/ios/rounded/AppIcon72x72@2x.png index 654edcb25a..253dc9145c 100644 Binary files a/tools/darwin/packaging/media/ios/rounded/AppIcon72x72@2x.png and b/tools/darwin/packaging/media/ios/rounded/AppIcon72x72@2x.png differ diff --git a/tools/darwin/packaging/media/ios/rounded/AppIcon76x76.png b/tools/darwin/packaging/media/ios/rounded/AppIcon76x76.png index e14a5f31f5..ecf65387ed 100644 Binary files a/tools/darwin/packaging/media/ios/rounded/AppIcon76x76.png and b/tools/darwin/packaging/media/ios/rounded/AppIcon76x76.png differ diff --git a/tools/darwin/packaging/media/ios/rounded/AppIcon76x76@2x.png b/tools/darwin/packaging/media/ios/rounded/AppIcon76x76@2x.png index 74507a0fac..4ab16a4b24 100644 Binary files a/tools/darwin/packaging/media/ios/rounded/AppIcon76x76@2x.png and b/tools/darwin/packaging/media/ios/rounded/AppIcon76x76@2x.png differ diff --git a/tools/darwin/packaging/media/ios/squared/AppIcon29x29.png b/tools/darwin/packaging/media/ios/squared/AppIcon29x29.png index 088a668b31..5d4c0f4049 100644 Binary files a/tools/darwin/packaging/media/ios/squared/AppIcon29x29.png and b/tools/darwin/packaging/media/ios/squared/AppIcon29x29.png differ diff --git a/tools/darwin/packaging/media/ios/squared/AppIcon29x29@2x.png b/tools/darwin/packaging/media/ios/squared/AppIcon29x29@2x.png index 4b99efe5c3..be6b3aae3b 100644 Binary files a/tools/darwin/packaging/media/ios/squared/AppIcon29x29@2x.png and b/tools/darwin/packaging/media/ios/squared/AppIcon29x29@2x.png differ diff --git a/tools/darwin/packaging/media/ios/squared/AppIcon29x29l@3x.png b/tools/darwin/packaging/media/ios/squared/AppIcon29x29l@3x.png new file mode 100644 index 0000000000..f132b8314e Binary files /dev/null and b/tools/darwin/packaging/media/ios/squared/AppIcon29x29l@3x.png differ diff --git a/tools/darwin/packaging/media/ios/squared/AppIcon40x40.png b/tools/darwin/packaging/media/ios/squared/AppIcon40x40.png index 9bd93ee185..285d03daa6 100644 Binary files a/tools/darwin/packaging/media/ios/squared/AppIcon40x40.png and b/tools/darwin/packaging/media/ios/squared/AppIcon40x40.png differ diff --git a/tools/darwin/packaging/media/ios/squared/AppIcon40x40@2x.png b/tools/darwin/packaging/media/ios/squared/AppIcon40x40@2x.png index b3ec2304c2..7561d9b2cb 100644 Binary files a/tools/darwin/packaging/media/ios/squared/AppIcon40x40@2x.png and b/tools/darwin/packaging/media/ios/squared/AppIcon40x40@2x.png differ diff --git a/tools/darwin/packaging/media/ios/squared/AppIcon40x40@3x.png b/tools/darwin/packaging/media/ios/squared/AppIcon40x40@3x.png new file mode 100644 index 0000000000..06d3ada142 Binary files /dev/null and b/tools/darwin/packaging/media/ios/squared/AppIcon40x40@3x.png differ diff --git a/tools/darwin/packaging/media/ios/squared/AppIcon50x50.png b/tools/darwin/packaging/media/ios/squared/AppIcon50x50.png index b4aa7b6f9c..e9bbb81be6 100644 Binary files a/tools/darwin/packaging/media/ios/squared/AppIcon50x50.png and b/tools/darwin/packaging/media/ios/squared/AppIcon50x50.png differ diff --git a/tools/darwin/packaging/media/ios/squared/AppIcon50x50@2x.png b/tools/darwin/packaging/media/ios/squared/AppIcon50x50@2x.png index 4a127e42b1..a907072304 100644 Binary files a/tools/darwin/packaging/media/ios/squared/AppIcon50x50@2x.png and b/tools/darwin/packaging/media/ios/squared/AppIcon50x50@2x.png differ diff --git a/tools/darwin/packaging/media/ios/squared/AppIcon57x57.png b/tools/darwin/packaging/media/ios/squared/AppIcon57x57.png index 6c124fce71..6e33ea2e1d 100644 Binary files a/tools/darwin/packaging/media/ios/squared/AppIcon57x57.png and b/tools/darwin/packaging/media/ios/squared/AppIcon57x57.png differ diff --git a/tools/darwin/packaging/media/ios/squared/AppIcon57x57@2x.png b/tools/darwin/packaging/media/ios/squared/AppIcon57x57@2x.png index 02ea9ef96d..cadd7f5a34 100644 Binary files a/tools/darwin/packaging/media/ios/squared/AppIcon57x57@2x.png and b/tools/darwin/packaging/media/ios/squared/AppIcon57x57@2x.png differ diff --git a/tools/darwin/packaging/media/ios/squared/AppIcon60x60.png b/tools/darwin/packaging/media/ios/squared/AppIcon60x60.png index cf359c35ba..16f0fb5016 100644 Binary files a/tools/darwin/packaging/media/ios/squared/AppIcon60x60.png and b/tools/darwin/packaging/media/ios/squared/AppIcon60x60.png differ diff --git a/tools/darwin/packaging/media/ios/squared/AppIcon60x60@2x.png b/tools/darwin/packaging/media/ios/squared/AppIcon60x60@2x.png index 2af506bff1..105e7961ee 100644 Binary files a/tools/darwin/packaging/media/ios/squared/AppIcon60x60@2x.png and b/tools/darwin/packaging/media/ios/squared/AppIcon60x60@2x.png differ diff --git a/tools/darwin/packaging/media/ios/squared/AppIcon60x60@3x.png b/tools/darwin/packaging/media/ios/squared/AppIcon60x60@3x.png new file mode 100644 index 0000000000..a5a5afac04 Binary files /dev/null and b/tools/darwin/packaging/media/ios/squared/AppIcon60x60@3x.png differ diff --git a/tools/darwin/packaging/media/ios/squared/AppIcon72x72.png b/tools/darwin/packaging/media/ios/squared/AppIcon72x72.png index a7805eb79f..87d52de5c1 100644 Binary files a/tools/darwin/packaging/media/ios/squared/AppIcon72x72.png and b/tools/darwin/packaging/media/ios/squared/AppIcon72x72.png differ diff --git a/tools/darwin/packaging/media/ios/squared/AppIcon72x72@2x.png b/tools/darwin/packaging/media/ios/squared/AppIcon72x72@2x.png index b04715b699..1b695184e2 100644 Binary files a/tools/darwin/packaging/media/ios/squared/AppIcon72x72@2x.png and b/tools/darwin/packaging/media/ios/squared/AppIcon72x72@2x.png differ diff --git a/tools/darwin/packaging/media/ios/squared/AppIcon76x76.png b/tools/darwin/packaging/media/ios/squared/AppIcon76x76.png index 00182a51d8..c76cc57845 100644 Binary files a/tools/darwin/packaging/media/ios/squared/AppIcon76x76.png and b/tools/darwin/packaging/media/ios/squared/AppIcon76x76.png differ diff --git a/tools/darwin/packaging/media/ios/squared/AppIcon76x76@2x.png b/tools/darwin/packaging/media/ios/squared/AppIcon76x76@2x.png index 70115c7d50..b9211612bb 100644 Binary files a/tools/darwin/packaging/media/ios/squared/AppIcon76x76@2x.png and b/tools/darwin/packaging/media/ios/squared/AppIcon76x76@2x.png differ -- cgit v1.2.3 From 76453ca70b0bf3f6f65d1e36e3c7a88369dd065d Mon Sep 17 00:00:00 2001 From: da-anda Date: Fri, 21 Nov 2014 18:18:21 +0100 Subject: [rebrand][atv] new icons --- tools/darwin/packaging/media/atv2/AppIcon.png | Bin 14143 -> 12041 bytes tools/darwin/packaging/media/atv2/TopShelf.png | Bin 16784 -> 26587 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/tools/darwin/packaging/media/atv2/AppIcon.png b/tools/darwin/packaging/media/atv2/AppIcon.png index 5542b74c3b..7826660029 100644 Binary files a/tools/darwin/packaging/media/atv2/AppIcon.png and b/tools/darwin/packaging/media/atv2/AppIcon.png differ diff --git a/tools/darwin/packaging/media/atv2/TopShelf.png b/tools/darwin/packaging/media/atv2/TopShelf.png index fb7f58fac6..85a90c0f04 100644 Binary files a/tools/darwin/packaging/media/atv2/TopShelf.png and b/tools/darwin/packaging/media/atv2/TopShelf.png differ -- cgit v1.2.3 From 9049fe5fe7fcb707009f8028ba1df2321d741a3b Mon Sep 17 00:00:00 2001 From: da-anda Date: Fri, 21 Nov 2014 18:17:56 +0100 Subject: [rebrand][osx] new app icon --- .../media/osx/icon.iconset/icon_128x128.png | Bin 8856 -> 9156 bytes .../media/osx/icon.iconset/icon_128x128@2x.png | Bin 21747 -> 25955 bytes .../media/osx/icon.iconset/icon_16x16.png | Bin 686 -> 622 bytes .../media/osx/icon.iconset/icon_16x16@2x.png | Bin 745 -> 1425 bytes .../media/osx/icon.iconset/icon_256x256.png | Bin 27662 -> 25945 bytes .../media/osx/icon.iconset/icon_256x256@2x.png | Bin 76539 -> 96445 bytes .../media/osx/icon.iconset/icon_32x32.png | Bin 2328 -> 1425 bytes .../media/osx/icon.iconset/icon_32x32@2x.png | Bin 3772 -> 3466 bytes .../media/osx/icon.iconset/icon_512x512.png | Bin 76539 -> 96445 bytes .../media/osx/icon.iconset/icon_512x512@2x.png | Bin 206499 -> 351065 bytes 10 files changed, 0 insertions(+), 0 deletions(-) diff --git a/tools/darwin/packaging/media/osx/icon.iconset/icon_128x128.png b/tools/darwin/packaging/media/osx/icon.iconset/icon_128x128.png index baa9a6e239..62c42a65ce 100644 Binary files a/tools/darwin/packaging/media/osx/icon.iconset/icon_128x128.png and b/tools/darwin/packaging/media/osx/icon.iconset/icon_128x128.png differ diff --git a/tools/darwin/packaging/media/osx/icon.iconset/icon_128x128@2x.png b/tools/darwin/packaging/media/osx/icon.iconset/icon_128x128@2x.png index 280fd6fe3c..d0afe0f56e 100644 Binary files a/tools/darwin/packaging/media/osx/icon.iconset/icon_128x128@2x.png and b/tools/darwin/packaging/media/osx/icon.iconset/icon_128x128@2x.png differ diff --git a/tools/darwin/packaging/media/osx/icon.iconset/icon_16x16.png b/tools/darwin/packaging/media/osx/icon.iconset/icon_16x16.png index 6df79830e0..659ac40d90 100644 Binary files a/tools/darwin/packaging/media/osx/icon.iconset/icon_16x16.png and b/tools/darwin/packaging/media/osx/icon.iconset/icon_16x16.png differ diff --git a/tools/darwin/packaging/media/osx/icon.iconset/icon_16x16@2x.png b/tools/darwin/packaging/media/osx/icon.iconset/icon_16x16@2x.png index 745c260946..3bf2494ebf 100644 Binary files a/tools/darwin/packaging/media/osx/icon.iconset/icon_16x16@2x.png and b/tools/darwin/packaging/media/osx/icon.iconset/icon_16x16@2x.png differ diff --git a/tools/darwin/packaging/media/osx/icon.iconset/icon_256x256.png b/tools/darwin/packaging/media/osx/icon.iconset/icon_256x256.png index 5cc7e2d32b..eb9a2fca45 100644 Binary files a/tools/darwin/packaging/media/osx/icon.iconset/icon_256x256.png and b/tools/darwin/packaging/media/osx/icon.iconset/icon_256x256.png differ diff --git a/tools/darwin/packaging/media/osx/icon.iconset/icon_256x256@2x.png b/tools/darwin/packaging/media/osx/icon.iconset/icon_256x256@2x.png index 8ffb8b8527..2245551faf 100644 Binary files a/tools/darwin/packaging/media/osx/icon.iconset/icon_256x256@2x.png and b/tools/darwin/packaging/media/osx/icon.iconset/icon_256x256@2x.png differ diff --git a/tools/darwin/packaging/media/osx/icon.iconset/icon_32x32.png b/tools/darwin/packaging/media/osx/icon.iconset/icon_32x32.png index 4a16472a7c..3bf2494ebf 100644 Binary files a/tools/darwin/packaging/media/osx/icon.iconset/icon_32x32.png and b/tools/darwin/packaging/media/osx/icon.iconset/icon_32x32.png differ diff --git a/tools/darwin/packaging/media/osx/icon.iconset/icon_32x32@2x.png b/tools/darwin/packaging/media/osx/icon.iconset/icon_32x32@2x.png index 097e8f9baa..97c6dcbf8f 100644 Binary files a/tools/darwin/packaging/media/osx/icon.iconset/icon_32x32@2x.png and b/tools/darwin/packaging/media/osx/icon.iconset/icon_32x32@2x.png differ diff --git a/tools/darwin/packaging/media/osx/icon.iconset/icon_512x512.png b/tools/darwin/packaging/media/osx/icon.iconset/icon_512x512.png index 8ffb8b8527..d34a89fcd8 100644 Binary files a/tools/darwin/packaging/media/osx/icon.iconset/icon_512x512.png and b/tools/darwin/packaging/media/osx/icon.iconset/icon_512x512.png differ diff --git a/tools/darwin/packaging/media/osx/icon.iconset/icon_512x512@2x.png b/tools/darwin/packaging/media/osx/icon.iconset/icon_512x512@2x.png index 0501cac248..944153e75f 100644 Binary files a/tools/darwin/packaging/media/osx/icon.iconset/icon_512x512@2x.png and b/tools/darwin/packaging/media/osx/icon.iconset/icon_512x512@2x.png differ -- cgit v1.2.3 From 10d1ffd9f2313f8b2a8c2207a10e6959d82851e0 Mon Sep 17 00:00:00 2001 From: da-anda Date: Sat, 22 Nov 2014 19:49:08 +0100 Subject: [rebrand][osx] new DMG volume icon and background artwork --- .../media/osx/background/DiskImageBackgroundKodi.png | Bin 0 -> 15064 bytes .../media/osx/volumeIcon.iconset/icon_128x128.png | Bin 0 -> 10578 bytes .../media/osx/volumeIcon.iconset/icon_128x128@2x.png | Bin 0 -> 25206 bytes .../media/osx/volumeIcon.iconset/icon_16x16.png | Bin 0 -> 790 bytes .../media/osx/volumeIcon.iconset/icon_16x16@2x.png | Bin 0 -> 1893 bytes .../media/osx/volumeIcon.iconset/icon_256x256.png | Bin 0 -> 25209 bytes .../media/osx/volumeIcon.iconset/icon_256x256@2x.png | Bin 0 -> 58906 bytes .../media/osx/volumeIcon.iconset/icon_32x32.png | Bin 0 -> 1907 bytes .../media/osx/volumeIcon.iconset/icon_32x32@2x.png | Bin 0 -> 4547 bytes .../media/osx/volumeIcon.iconset/icon_512x512.png | Bin 0 -> 58906 bytes .../media/osx/volumeIcon.iconset/icon_512x512@2x.png | Bin 0 -> 102258 bytes tools/darwin/packaging/osx/VolumeIcon.icns | Bin 219878 -> 0 bytes .../packaging/osx/background/DiskImageBackground.png | Bin 22292 -> 0 bytes .../osx/background/DiskImageBackgroundDebug.png | Bin 22292 -> 0 bytes 14 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 tools/darwin/packaging/media/osx/background/DiskImageBackgroundKodi.png create mode 100644 tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_128x128.png create mode 100644 tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_128x128@2x.png create mode 100644 tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_16x16.png create mode 100644 tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_16x16@2x.png create mode 100644 tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_256x256.png create mode 100644 tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_256x256@2x.png create mode 100644 tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_32x32.png create mode 100644 tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_32x32@2x.png create mode 100644 tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_512x512.png create mode 100644 tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_512x512@2x.png delete mode 100644 tools/darwin/packaging/osx/VolumeIcon.icns delete mode 100644 tools/darwin/packaging/osx/background/DiskImageBackground.png delete mode 100644 tools/darwin/packaging/osx/background/DiskImageBackgroundDebug.png diff --git a/tools/darwin/packaging/media/osx/background/DiskImageBackgroundKodi.png b/tools/darwin/packaging/media/osx/background/DiskImageBackgroundKodi.png new file mode 100644 index 0000000000..a41c8f26f2 Binary files /dev/null and b/tools/darwin/packaging/media/osx/background/DiskImageBackgroundKodi.png differ diff --git a/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_128x128.png b/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_128x128.png new file mode 100644 index 0000000000..048b684525 Binary files /dev/null and b/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_128x128.png differ diff --git a/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_128x128@2x.png b/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_128x128@2x.png new file mode 100644 index 0000000000..25dcc1f80a Binary files /dev/null and b/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_128x128@2x.png differ diff --git a/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_16x16.png b/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_16x16.png new file mode 100644 index 0000000000..dd3408b575 Binary files /dev/null and b/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_16x16.png differ diff --git a/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_16x16@2x.png b/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_16x16@2x.png new file mode 100644 index 0000000000..4f2fd1a353 Binary files /dev/null and b/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_16x16@2x.png differ diff --git a/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_256x256.png b/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_256x256.png new file mode 100644 index 0000000000..728039ebda Binary files /dev/null and b/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_256x256.png differ diff --git a/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_256x256@2x.png b/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_256x256@2x.png new file mode 100644 index 0000000000..dcfbf65a85 Binary files /dev/null and b/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_256x256@2x.png differ diff --git a/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_32x32.png b/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_32x32.png new file mode 100644 index 0000000000..1be6666379 Binary files /dev/null and b/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_32x32.png differ diff --git a/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_32x32@2x.png b/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_32x32@2x.png new file mode 100644 index 0000000000..358c02aaf6 Binary files /dev/null and b/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_32x32@2x.png differ diff --git a/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_512x512.png b/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_512x512.png new file mode 100644 index 0000000000..dcfbf65a85 Binary files /dev/null and b/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_512x512.png differ diff --git a/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_512x512@2x.png b/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_512x512@2x.png new file mode 100644 index 0000000000..ba6d9e1935 Binary files /dev/null and b/tools/darwin/packaging/media/osx/volumeIcon.iconset/icon_512x512@2x.png differ diff --git a/tools/darwin/packaging/osx/VolumeIcon.icns b/tools/darwin/packaging/osx/VolumeIcon.icns deleted file mode 100644 index 75215701b6..0000000000 Binary files a/tools/darwin/packaging/osx/VolumeIcon.icns and /dev/null differ diff --git a/tools/darwin/packaging/osx/background/DiskImageBackground.png b/tools/darwin/packaging/osx/background/DiskImageBackground.png deleted file mode 100644 index 2299a1ac75..0000000000 Binary files a/tools/darwin/packaging/osx/background/DiskImageBackground.png and /dev/null differ diff --git a/tools/darwin/packaging/osx/background/DiskImageBackgroundDebug.png b/tools/darwin/packaging/osx/background/DiskImageBackgroundDebug.png deleted file mode 100644 index 2299a1ac75..0000000000 Binary files a/tools/darwin/packaging/osx/background/DiskImageBackgroundDebug.png and /dev/null differ -- cgit v1.2.3 From b4861cb8fc82175b5f3fc64f35ab6b363fb7a626 Mon Sep 17 00:00:00 2001 From: Memphiz Date: Mon, 24 Nov 2014 00:17:36 +0100 Subject: [osx/packaging] - generate the volumeicon.icns in the packaging script and fixup some pathes - remove some unneeded checks and do a sanity clean of the rw dmg during packaging --- tools/darwin/packaging/osx/dmgmaker.pl | 19 ++++++++----------- tools/darwin/packaging/osx/mkdmg-osx.sh.in | 7 +++++++ 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/tools/darwin/packaging/osx/dmgmaker.pl b/tools/darwin/packaging/osx/dmgmaker.pl index 4720bf047a..a24614d538 100755 --- a/tools/darwin/packaging/osx/dmgmaker.pl +++ b/tools/darwin/packaging/osx/dmgmaker.pl @@ -38,6 +38,10 @@ sub make_dmg { $dev_handle = $1 if $dev_handle =~ /^\/dev\/(disk.)/; die("Could not obtain device handle\n") if !$dev_handle; print "Got device handle \"$dev_handle\"\n"; + #clear the volume - we will copy stuff on it with ditto later + #this removes crap which might have come in via the srcfolder + #parameter of hdiutil above + `rm -r /Volumes/$volname/*`; print "Ignore \"No space left on device\" warnings from ditto, they are an autosize artifact\n"; `ditto "$mpkg" "/Volumes/$volname/$pkgname.$ext"`; @@ -48,17 +52,10 @@ sub make_dmg { # make symlink to /Applications `ln -s /Applications "/Volumes/$volname/Applications"`; - if ( -d "background" ) { - `mkdir "/Volumes/$volname/background"`; - `ditto background "/Volumes/$volname/background/"`; - } - if ( -f "VolumeDSStore" ) { - `ditto VolumeDSStore "/Volumes/$volname/.DS_Store"` if $ext ne "app"; - `ditto VolumeDSStoreApp "/Volumes/$volname/.DS_Store"` if $ext eq "app"; - } - if ( -d "background" ) { - `xcrun SetFile -a V "/Volumes/$volname/background"`; - } + `mkdir "/Volumes/$volname/background"`; + `ditto ../media/osx/background "/Volumes/$volname/background/"`; + `ditto VolumeDSStoreApp "/Volumes/$volname/.DS_Store"`; + `xcrun SetFile -a V "/Volumes/$volname/background"`; `xcrun SetFile -a C "/Volumes/$volname/"`; `hdiutil detach $dev_handle`; `hdiutil convert "$volname.dmg" -format UDZO -imagekey zlib-level=9 -o "$volname.udzo.dmg"`; diff --git a/tools/darwin/packaging/osx/mkdmg-osx.sh.in b/tools/darwin/packaging/osx/mkdmg-osx.sh.in index 8a4dfe6a7b..33c13dd45a 100755 --- a/tools/darwin/packaging/osx/mkdmg-osx.sh.in +++ b/tools/darwin/packaging/osx/mkdmg-osx.sh.in @@ -36,6 +36,13 @@ then umount /Volumes/$ARCHIVE fi +#generate volume iconset +if [ `which iconutil` ] +then + echo "Generating volumeIcon.icns" + iconutil -c icns --output "VolumeIcon.icns" "../media/osx/volumeIcon.iconset" +fi + $DIRNAME/dmgmaker.pl $APP $ARCHIVE echo "done" -- cgit v1.2.3 From d5656eeff0bcc024d56fa9fb1898cb49affe0fa4 Mon Sep 17 00:00:00 2001 From: Memphiz Date: Mon, 24 Nov 2014 00:18:45 +0100 Subject: [osx] - new DSStore template for the dmg folder (uses the new background and has properly aligned icons) --- tools/darwin/packaging/osx/VolumeDSStore | Bin 12292 -> 0 bytes tools/darwin/packaging/osx/VolumeDSStoreApp | Bin 12292 -> 15364 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 tools/darwin/packaging/osx/VolumeDSStore diff --git a/tools/darwin/packaging/osx/VolumeDSStore b/tools/darwin/packaging/osx/VolumeDSStore deleted file mode 100644 index 387b6e21eb..0000000000 Binary files a/tools/darwin/packaging/osx/VolumeDSStore and /dev/null differ diff --git a/tools/darwin/packaging/osx/VolumeDSStoreApp b/tools/darwin/packaging/osx/VolumeDSStoreApp index f1a82a4bbb..2a9c3edc72 100644 Binary files a/tools/darwin/packaging/osx/VolumeDSStoreApp and b/tools/darwin/packaging/osx/VolumeDSStoreApp differ -- cgit v1.2.3 From 0ae30cb7514ae207a15d370ad4437b66c41adc6f Mon Sep 17 00:00:00 2001 From: da-anda Date: Fri, 21 Nov 2014 18:54:55 +0100 Subject: [rebrand] new splash --- media/Splash.png | Bin 83696 -> 132409 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/Splash.png b/media/Splash.png index ac8ad4aab4..2b01a863a0 100644 Binary files a/media/Splash.png and b/media/Splash.png differ -- cgit v1.2.3 From f59c5eca137495d41ea903abd0514c6f04b74776 Mon Sep 17 00:00:00 2001 From: da-anda Date: Fri, 21 Nov 2014 21:53:39 +0100 Subject: [rebrand][confluence] new logo --- addons/skin.confluence/720p/Home.xml | 6 +++--- addons/skin.confluence/media/kodi-logo.png | Bin 12154 -> 4499 bytes 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/skin.confluence/720p/Home.xml b/addons/skin.confluence/720p/Home.xml index 93faff9319..3646412526 100644 --- a/addons/skin.confluence/720p/Home.xml +++ b/addons/skin.confluence/720p/Home.xml @@ -18,9 +18,9 @@ LOGO 10 - 10 - 100 - 50 + 5 + 120 + 49 keep kodi-logo.png VisibleFadeEffect diff --git a/addons/skin.confluence/media/kodi-logo.png b/addons/skin.confluence/media/kodi-logo.png index cd9906d02b..011bf1c6d8 100644 Binary files a/addons/skin.confluence/media/kodi-logo.png and b/addons/skin.confluence/media/kodi-logo.png differ -- cgit v1.2.3 From f4904ce1fdf7a09c7aa61b9281151ce1a1ac2228 Mon Sep 17 00:00:00 2001 From: da-anda Date: Fri, 21 Nov 2014 22:38:57 +0100 Subject: [rebrand][addons] new addon icons --- addons/repository.pvr-android.xbmc.org/icon.png | Bin 26829 -> 11304 bytes addons/repository.pvr-ios.xbmc.org/icon.png | Bin 26829 -> 11304 bytes addons/repository.pvr-osx32.xbmc.org/icon.png | Bin 26829 -> 11304 bytes addons/repository.pvr-osx64.xbmc.org/icon.png | Bin 26829 -> 11304 bytes addons/repository.pvr-win32.xbmc.org/icon.png | Bin 26829 -> 11304 bytes addons/repository.xbmc.org/icon.png | Bin 26829 -> 10250 bytes addons/service.xbmc.versioncheck/icon.png | Bin 33618 -> 15866 bytes 7 files changed, 0 insertions(+), 0 deletions(-) diff --git a/addons/repository.pvr-android.xbmc.org/icon.png b/addons/repository.pvr-android.xbmc.org/icon.png index a7ad3ebb84..01149a50a8 100644 Binary files a/addons/repository.pvr-android.xbmc.org/icon.png and b/addons/repository.pvr-android.xbmc.org/icon.png differ diff --git a/addons/repository.pvr-ios.xbmc.org/icon.png b/addons/repository.pvr-ios.xbmc.org/icon.png index a7ad3ebb84..01149a50a8 100644 Binary files a/addons/repository.pvr-ios.xbmc.org/icon.png and b/addons/repository.pvr-ios.xbmc.org/icon.png differ diff --git a/addons/repository.pvr-osx32.xbmc.org/icon.png b/addons/repository.pvr-osx32.xbmc.org/icon.png index a7ad3ebb84..01149a50a8 100644 Binary files a/addons/repository.pvr-osx32.xbmc.org/icon.png and b/addons/repository.pvr-osx32.xbmc.org/icon.png differ diff --git a/addons/repository.pvr-osx64.xbmc.org/icon.png b/addons/repository.pvr-osx64.xbmc.org/icon.png index a7ad3ebb84..01149a50a8 100644 Binary files a/addons/repository.pvr-osx64.xbmc.org/icon.png and b/addons/repository.pvr-osx64.xbmc.org/icon.png differ diff --git a/addons/repository.pvr-win32.xbmc.org/icon.png b/addons/repository.pvr-win32.xbmc.org/icon.png index a7ad3ebb84..01149a50a8 100644 Binary files a/addons/repository.pvr-win32.xbmc.org/icon.png and b/addons/repository.pvr-win32.xbmc.org/icon.png differ diff --git a/addons/repository.xbmc.org/icon.png b/addons/repository.xbmc.org/icon.png index a7ad3ebb84..58a2772c26 100644 Binary files a/addons/repository.xbmc.org/icon.png and b/addons/repository.xbmc.org/icon.png differ diff --git a/addons/service.xbmc.versioncheck/icon.png b/addons/service.xbmc.versioncheck/icon.png index 8eb53e5994..02476a62b6 100644 Binary files a/addons/service.xbmc.versioncheck/icon.png and b/addons/service.xbmc.versioncheck/icon.png differ -- cgit v1.2.3 From 6bc8a37e17552c90d38a2150d40ef2d99e9b7b52 Mon Sep 17 00:00:00 2001 From: da-anda Date: Fri, 21 Nov 2014 23:05:04 +0100 Subject: [rebrand][visualization.vortex] remove XBMCrain preset and logo --- .../resources/Presets/XBMCRain.vtx | 95 --------------------- .../resources/Textures/splash_original.dds | Bin 34688 -> 0 bytes .../resources/Textures/xbmc_icon.png | Bin 40059 -> 0 bytes 3 files changed, 95 deletions(-) delete mode 100644 addons/visualization.vortex/resources/Presets/XBMCRain.vtx delete mode 100644 addons/visualization.vortex/resources/Textures/splash_original.dds delete mode 100644 addons/visualization.vortex/resources/Textures/xbmc_icon.png diff --git a/addons/visualization.vortex/resources/Presets/XBMCRain.vtx b/addons/visualization.vortex/resources/Presets/XBMCRain.vtx deleted file mode 100644 index 224b4e1891..0000000000 --- a/addons/visualization.vortex/resources/Presets/XBMCRain.vtx +++ /dev/null @@ -1,95 +0,0 @@ -// Author - MrC -// Based on R4Rain.r4 by Gordon Williams - -int x,y, t; -float c,tm,tn,td, s; -float[] c_x(64),c_y(64),c_z(64),c_vz(64),c_rx(64),c_ry(64),c_sx(64),c_sy(64),c_sz(64); -float d; - -Texture texture; -Texture sky; - -void MakeNew(int n) -{ - c_x[n]=c_y[n]=0; - while (Mag(c_x[n],c_y[n])<1) - { - c_x[n] = (Rand()*6.0)-3.0; - c_y[n] = (Rand()*6.0)-3.0; - } - - c_z[n] = 10; - c_vz[n] = (1.0+Rand())*4; - c_rx[n] = (1.0+Rand())*80; - c_ry[n] = (1.0+Rand())*80; - c_sx[n] = (0.5+Rand())*0.5; - c_sy[n] = (0.5+Rand())*0.5; - c_sz[n] = (1.0+Rand())*0.05; -} - - -void Init() -{ - texture.LoadTexture("splash_original.dds"); - sky.LoadTexture("skybox.dds"); - - for (x=0;x<64;x=x+1) - { - MakeNew(x); - c_z[x] = Rand()*10; - } - tm = tn = 0; -} - -void mything(float x,float y,float z) -{ - gfxBegin(PRIM_QUADLIST); - for (t=0; t<1; t++) - { - s = z*((t/2.0f)-1.0); - gfxTexCoord(0,0); - gfxVertex(-x,y,s); - gfxTexCoord(1,0); - gfxVertex(x,y,s); - gfxTexCoord(1,1); - gfxVertex(x,-y,s); - gfxTexCoord(0,1); - gfxVertex(-x,-y,s); - - } - gfxEnd(); -} - -void Render() -{ - td = ((TREBLE+1.5f)*TIMEPASS); - tm = tm + td; - tn = tn + ((BASS+1.0)*TIMEPASS*2); - - gfxTranslate(Cos(tn * 1.23f) * 0.5f, Sin(tn) * 0.5f, 0.0f); - gfxRotate(Cos(tn*0.6734f)*20.0f, 1.0f, 0.0f, 0.0f); - gfxRotate(Sin(tn*0.2143f)*20.0f, 0.0f, 1.0f, 0.0f); - - gfxSetTexture(sky); - gfxCube(-100,-100,-100,100,100,100); - - gfxSetTexture(texture); - - gfxSetBlendMode(BLEND_ADD); - - for (x=0;x<64;x++) - { - c_z[x] = c_z[x] - (td*c_vz[x]); - if (c_z[x]<0) MakeNew(x); - - c = (10.0-c_z[x])*0.11; - gfxColour(c,c,c,1); - gfxPushMatrix(); - gfxTranslate(c_x[x],c_y[x],c_z[x]); - gfxRotate(c_rx[x]*tm,1.0f,0.0f,0.0f); - gfxRotate(c_ry[x]*tm,0.0f,1.0f,0.0f); - mything(c_sx[x],c_sy[x],c_sz[x]); - gfxPopMatrix(); - } - -} \ No newline at end of file diff --git a/addons/visualization.vortex/resources/Textures/splash_original.dds b/addons/visualization.vortex/resources/Textures/splash_original.dds deleted file mode 100644 index bed53fafb9..0000000000 Binary files a/addons/visualization.vortex/resources/Textures/splash_original.dds and /dev/null differ diff --git a/addons/visualization.vortex/resources/Textures/xbmc_icon.png b/addons/visualization.vortex/resources/Textures/xbmc_icon.png deleted file mode 100644 index f011789ad4..0000000000 Binary files a/addons/visualization.vortex/resources/Textures/xbmc_icon.png and /dev/null differ -- cgit v1.2.3 From 1b3c67b1f893a8ee1296781ec3c6c10970c615bc Mon Sep 17 00:00:00 2001 From: da-anda Date: Sun, 23 Nov 2014 16:48:53 +0100 Subject: [android][ouya] added launcher icon --- tools/android/packaging/Makefile.in | 1 + .../packaging/media/drawable-xhdpi/ouya_icon.png | Bin 0 -> 28887 bytes tools/android/packaging/xbmc/AndroidManifest.xml.in | 1 + 3 files changed, 2 insertions(+) create mode 100644 tools/android/packaging/media/drawable-xhdpi/ouya_icon.png diff --git a/tools/android/packaging/Makefile.in b/tools/android/packaging/Makefile.in index 7838362fc4..cffb9edb28 100644 --- a/tools/android/packaging/Makefile.in +++ b/tools/android/packaging/Makefile.in @@ -106,6 +106,7 @@ res: cp -fp media/drawable-xhdpi/ic_launcher.png xbmc/res/drawable-xhdpi/ic_launcher.png cp -fp media/drawable-xxhdpi/ic_launcher.png xbmc/res/drawable-xxhdpi/ic_launcher.png cp -fp media/drawable-xhdpi/banner.png xbmc/res/drawable-xhdpi/banner.png + cp -fp media/drawable-xhdpi/ouya_icon.png xbmc/res/drawable-xhdpi/ouya_icon.png cp xbmc/strings.xml xbmc/res/values/ mkdir -p tmp/res; $(AAPT) c -S xbmc/res -C tmp/res; cp -r -n xbmc/res tmp/ || true $(AAPT) p -f -I $(SDKROOT)/platforms/$(SDK_PLATFORM)/android.jar -S tmp/res/ -M xbmc/AndroidManifest.xml -F images/@APP_NAME_LC@app-debug-skeleton.apk -J xbmc/src diff --git a/tools/android/packaging/media/drawable-xhdpi/ouya_icon.png b/tools/android/packaging/media/drawable-xhdpi/ouya_icon.png new file mode 100644 index 0000000000..48caf085f3 Binary files /dev/null and b/tools/android/packaging/media/drawable-xhdpi/ouya_icon.png differ diff --git a/tools/android/packaging/xbmc/AndroidManifest.xml.in b/tools/android/packaging/xbmc/AndroidManifest.xml.in index 36e44405b0..ba7ade529c 100644 --- a/tools/android/packaging/xbmc/AndroidManifest.xml.in +++ b/tools/android/packaging/xbmc/AndroidManifest.xml.in @@ -35,6 +35,7 @@ + -- cgit v1.2.3