From 2a02a0170988144ec89c2da9f97d326413ebe12a Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Fri, 9 Jan 2015 15:48:50 +0100 Subject: WinRT: Refactor icon specification usage Naming for different logo sizes on WinRT has been varying in the past and evolved from using small/medium/large to some being explicit (71x71). Add new values introduced by 8.1 (310x150, 310x310,...) and clean up mixed usage. Detailed pixel versions overrule general specification and latter ones stay mostly for compatibility reasons. Still the preferred way is to use explicit pixel values. Task-number: QTBUG-43644 Change-Id: I9173ec2951a82e5eac9d8c9956bfb0bb4d1a2459 Reviewed-by: Oswald Buddenhagen Reviewed-by: Oliver Wolff --- mkspecs/common/winrt_winphone/assets/logo_150x150.png | Bin 0 -> 2638 bytes mkspecs/common/winrt_winphone/assets/logo_30x30.png | Bin 0 -> 737 bytes mkspecs/common/winrt_winphone/assets/logo_310x150.png | Bin 0 -> 2655 bytes mkspecs/common/winrt_winphone/assets/logo_310x310.png | Bin 0 -> 2903 bytes mkspecs/common/winrt_winphone/assets/logo_620x300.png | Bin 0 -> 5752 bytes mkspecs/common/winrt_winphone/assets/logo_70x70.png | Bin 0 -> 2024 bytes mkspecs/common/winrt_winphone/assets/logo_large.png | Bin 2638 -> 0 bytes mkspecs/common/winrt_winphone/assets/logo_small.png | Bin 737 -> 0 bytes mkspecs/common/winrt_winphone/assets/logo_splash.png | Bin 5752 -> 0 bytes .../winrt_winphone/manifests/8.1/AppxManifest.xml.in | 12 ++++++++---- .../winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in | 6 ++++-- mkspecs/features/winrt/package_manifest.prf | 12 ++++++++++++ 12 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 mkspecs/common/winrt_winphone/assets/logo_150x150.png create mode 100644 mkspecs/common/winrt_winphone/assets/logo_30x30.png create mode 100644 mkspecs/common/winrt_winphone/assets/logo_310x150.png create mode 100644 mkspecs/common/winrt_winphone/assets/logo_310x310.png create mode 100644 mkspecs/common/winrt_winphone/assets/logo_620x300.png create mode 100644 mkspecs/common/winrt_winphone/assets/logo_70x70.png delete mode 100644 mkspecs/common/winrt_winphone/assets/logo_large.png delete mode 100644 mkspecs/common/winrt_winphone/assets/logo_small.png delete mode 100644 mkspecs/common/winrt_winphone/assets/logo_splash.png diff --git a/mkspecs/common/winrt_winphone/assets/logo_150x150.png b/mkspecs/common/winrt_winphone/assets/logo_150x150.png new file mode 100644 index 0000000000..069171ca4d Binary files /dev/null and b/mkspecs/common/winrt_winphone/assets/logo_150x150.png differ diff --git a/mkspecs/common/winrt_winphone/assets/logo_30x30.png b/mkspecs/common/winrt_winphone/assets/logo_30x30.png new file mode 100644 index 0000000000..2acac59e73 Binary files /dev/null and b/mkspecs/common/winrt_winphone/assets/logo_30x30.png differ diff --git a/mkspecs/common/winrt_winphone/assets/logo_310x150.png b/mkspecs/common/winrt_winphone/assets/logo_310x150.png new file mode 100644 index 0000000000..1a79482947 Binary files /dev/null and b/mkspecs/common/winrt_winphone/assets/logo_310x150.png differ diff --git a/mkspecs/common/winrt_winphone/assets/logo_310x310.png b/mkspecs/common/winrt_winphone/assets/logo_310x310.png new file mode 100644 index 0000000000..02144a9f39 Binary files /dev/null and b/mkspecs/common/winrt_winphone/assets/logo_310x310.png differ diff --git a/mkspecs/common/winrt_winphone/assets/logo_620x300.png b/mkspecs/common/winrt_winphone/assets/logo_620x300.png new file mode 100644 index 0000000000..a2be79f5d7 Binary files /dev/null and b/mkspecs/common/winrt_winphone/assets/logo_620x300.png differ diff --git a/mkspecs/common/winrt_winphone/assets/logo_70x70.png b/mkspecs/common/winrt_winphone/assets/logo_70x70.png new file mode 100644 index 0000000000..334b2722b5 Binary files /dev/null and b/mkspecs/common/winrt_winphone/assets/logo_70x70.png differ diff --git a/mkspecs/common/winrt_winphone/assets/logo_large.png b/mkspecs/common/winrt_winphone/assets/logo_large.png deleted file mode 100644 index 069171ca4d..0000000000 Binary files a/mkspecs/common/winrt_winphone/assets/logo_large.png and /dev/null differ diff --git a/mkspecs/common/winrt_winphone/assets/logo_small.png b/mkspecs/common/winrt_winphone/assets/logo_small.png deleted file mode 100644 index 2acac59e73..0000000000 Binary files a/mkspecs/common/winrt_winphone/assets/logo_small.png and /dev/null differ diff --git a/mkspecs/common/winrt_winphone/assets/logo_splash.png b/mkspecs/common/winrt_winphone/assets/logo_splash.png deleted file mode 100644 index a2be79f5d7..0000000000 Binary files a/mkspecs/common/winrt_winphone/assets/logo_splash.png and /dev/null differ diff --git a/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in b/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in index a6fc9697f4..038184ee4d 100644 --- a/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in +++ b/mkspecs/common/winrt_winphone/manifests/8.1/AppxManifest.xml.in @@ -27,14 +27,18 @@ Description=\"$${WINRT_MANIFEST.description}\" BackgroundColor=\"$${WINRT_MANIFEST.background}\" ForegroundText=\"$${WINRT_MANIFEST.foreground}\" - Square150x150Logo=\"$${WINRT_MANIFEST.logo_large}\" - Square30x30Logo=\"$${WINRT_MANIFEST.logo_small}\"> - + Square150x150Logo=\"$${WINRT_MANIFEST.logo_150x150}\" + Square30x30Logo=\"$${WINRT_MANIFEST.logo_30x30}\"> + + + - $${WINRT_MANIFEST.rotation_preference} + $${WINRT_MANIFEST.rotation_preference} $${WINRT_MANIFEST.capabilities}$${WINRT_MANIFEST.dependencies} diff --git a/mkspecs/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in b/mkspecs/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in index b75570ad4e..67830bd4ad 100644 --- a/mkspecs/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in +++ b/mkspecs/common/winrt_winphone/manifests/8.1_wp/AppxManifest.xml.in @@ -30,11 +30,13 @@ Description=\"$${WINRT_MANIFEST.description}\" BackgroundColor=\"$${WINRT_MANIFEST.background}\" ForegroundText=\"$${WINRT_MANIFEST.foreground}\" - Square150x150Logo=\"$${WINRT_MANIFEST.logo_large}\" + Square150x150Logo=\"$${WINRT_MANIFEST.logo_150x150}\" Square44x44Logo=\"$${WINRT_MANIFEST.logo_44x44}\"> - + + $${WINRT_MANIFEST.rotation_preference} diff --git a/mkspecs/features/winrt/package_manifest.prf b/mkspecs/features/winrt/package_manifest.prf index 2ccb5db963..6726611f74 100644 --- a/mkspecs/features/winrt/package_manifest.prf +++ b/mkspecs/features/winrt/package_manifest.prf @@ -137,6 +137,18 @@ ICONS_FOUND ~= s/.*\\\$\\\$\\{WINRT_MANIFEST\\.((logo|tile)_[^\}]+)\\}.*/\\1/g for (ICON_NAME, ICONS_FOUND) { ICON_FILE = $$eval(WINRT_MANIFEST.$$ICON_NAME) + isEmpty(ICON_FILE) { + equals(ICON_NAME, "logo_310x150"): ICON_FILE = $$eval(WINRT_MANIFEST.logo_wide) + else: equals(ICON_NAME, "logo_150x150"): ICON_FILE = $$eval(WINRT_MANIFEST.logo_large) + # Windows Phone specifics + else: equals(ICON_NAME, "logo_480x800"): ICON_FILE = $$eval(WINRT_MANIFEST.logo_splash) + else: equals(ICON_NAME, "logo_71x71"): ICON_FILE = $$eval(WINRT_MANIFEST.logo_medium) + else: equals(ICON_NAME, "logo_44x44"): ICON_FILE = $$eval(WINRT_MANIFEST.logo_small) + # Windows RT specifics + else: equals(ICON_NAME, "logo_620x300"): ICON_FILE = $$eval(WINRT_MANIFEST.logo_splash) + else: equals(ICON_NAME, "logo_70x70"): ICON_FILE = $$eval(WINRT_MANIFEST.logo_medium) + else: equals(ICON_NAME, "logo_30x30"): ICON_FILE = $$eval(WINRT_MANIFEST.logo_small) + } isEmpty(ICON_FILE): ICON_FILE = $$WINRT_ASSETS_PATH/$${ICON_NAME}.png icon_$${ICON_NAME}.input = $$ICON_FILE icon_$${ICON_NAME}.output = $$BUILD_DIR/assets/$$basename(ICON_FILE) -- cgit v1.2.3