From 2a02a0170988144ec89c2da9f97d326413ebe12a Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Fri, 9 Jan 2015 15:48:50 +0100 Subject: [PATCH] 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 --- .../assets/{logo_large.png => logo_150x150.png} | Bin .../assets/{logo_small.png => logo_30x30.png} | Bin .../winrt_winphone/assets/logo_310x150.png | Bin 0 -> 2655 bytes .../winrt_winphone/assets/logo_310x310.png | Bin 0 -> 2903 bytes .../assets/{logo_splash.png => logo_620x300.png} | Bin .../common/winrt_winphone/assets/logo_70x70.png | Bin 0 -> 2024 bytes .../manifests/8.1/AppxManifest.xml.in | 12 ++++++++---- .../manifests/8.1_wp/AppxManifest.xml.in | 6 ++++-- mkspecs/features/winrt/package_manifest.prf | 12 ++++++++++++ 9 files changed, 24 insertions(+), 6 deletions(-) rename mkspecs/common/winrt_winphone/assets/{logo_large.png => logo_150x150.png} (100%) rename mkspecs/common/winrt_winphone/assets/{logo_small.png => logo_30x30.png} (100%) create mode 100644 mkspecs/common/winrt_winphone/assets/logo_310x150.png create mode 100644 mkspecs/common/winrt_winphone/assets/logo_310x310.png rename mkspecs/common/winrt_winphone/assets/{logo_splash.png => logo_620x300.png} (100%) create mode 100644 mkspecs/common/winrt_winphone/assets/logo_70x70.png diff --git a/mkspecs/common/winrt_winphone/assets/logo_large.png b/mkspecs/common/winrt_winphone/assets/logo_150x150.png similarity index 100% rename from mkspecs/common/winrt_winphone/assets/logo_large.png rename to mkspecs/common/winrt_winphone/assets/logo_150x150.png diff --git a/mkspecs/common/winrt_winphone/assets/logo_small.png b/mkspecs/common/winrt_winphone/assets/logo_30x30.png similarity index 100% rename from mkspecs/common/winrt_winphone/assets/logo_small.png rename to mkspecs/common/winrt_winphone/assets/logo_30x30.png 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 0000000000000000000000000000000000000000..1a794829479a61153730163651620c6af1b41000 GIT binary patch literal 2655 zcma)8i$BxrAD`P?M-wsE!qLg4WLhqhpUjXm*K$di$%KhG49O*wE+UuJ8kNYU=F%^l zF_*7nqjIZgW+<)D@iU53$YKg+|;+7b|vk9Q4Bgg_2l`Pn247C+nsLD}Ek zaL%$HB;@6l^%HNUmV(gT?AwCLLXMQni zFv9+&vb-jOo4S)3_Qv6>pEJkfscB9u;fi1*oBQeO<5(HLzZBcM zUI)S9lMNk8%x~J!zS*+bTgI;k-b>IwKMp-@CPi`KD0Z1Dp$fL}b}Fo~`;dnk0rvly zF~5;tkX+bP^K3WCLE;$RQ)wCpv|j=K$6jAUu>0}8VwuTK;Pwy9fL@#&JJf}f#^&Nj zzvKzdUVq>yBF4201sMvV?6AeOykLttU1FUZbTTFJVenoA=~IFJepe{XCvu4tqX~UiFP9G$uXpg&U;izrDy7XP5+H^WKeH^8> zRprIBXB2(9bpCEr((Prl+DBSDJc%0y!U+!@v_Y3tdQD!fZCP1Q4JCLNypX&i4gVHA zvvAKdC_2h&mqWNOk}TOxw_!}lSXU6{*Y##p)WwJ`i?76)8HLzZ$;?)?C4cPt2ybG~ zA*6%K8OY$Gc${XrdO4rf@v=@t9o#gEzm(@YJ^LP-VDiLo^Ps``26%L&PrAF!^N$Z| zAa}~d%|~d(+j^`IQFThFq*sM8xq=>b!OmVJxhbCIu7pC67IHPRYzM+a5?%K+_x?r=d zTv=QoOfw`nVd&TMuhMR=WvIbrojEO*u43~Xu|0){ALV>^#h_1BZGAgZm`QpLoo&$R z-Hvd?kP7p6Fr0*$W9~7{QNo4#i44b~AFHO!Ai{yO&Go^Qccf6V#^1fj#M61nDgg=z zl2!wJvgMvACpr{GZ&8cRbEtpYj3rSKfS!4Ic#}e`pD&$fSHD^R&KRGFITLXWJf(5= zh`^(gfuq%0>GGUO1A|F`BOunsraR?{YO_|e3e;ND(V^QD-2E^V&a3lCTt>xPVd@V$ z|NJQgDaj=#(R`LO8%c^jNuF5t%V}6x)oV2Z*?dMjhWSA75kE__MyQ z2juQ8KFIlA7}F!Ok2z8N0zVpGFm^}Q!#SckinDn7`PQ&6m+pzi{icf6HQo2+;6y8ZgY?zPEqn0s z{JF_c8Yp4kFL_6j#hJgK%RSo7{ogVpw=4T`c6k6J3`3XYF%mfxs;t*?M*H@CW;&E+ zRa6qgY(nZbSQ0Ld@2VVMytGj|i{w{lmlsi+>fdxNEG?2ToJ`Y}i_5!qek>S|bne!u zvjW$NcY*%smTuLxm=cs-w&%&aSM>T`e;CvoI~%>J8Gr1nW;2YX&e~yK*=)muEVs}_D=%$Fm#S@Nszv{@rfmoe(_d5C`H+FW7`;#{cIoHM5E zmsi7%eZ5^ss*ri&+#6kGMj-GG__+9sW%X3a~u zl?m$QsTTcaBc!KETMCT=a^_`Pn51bzk=F2pFyq&Q7oDHEQWK(~3(gchvX@l}=fm*l$|hI`Hw+CONn#F@EdTH8&cg6yuXIW=u55X`a2}rovh>W^-W4f?xfN zh~&O%S1B#r$fg+zW!QcAlJ@C6*BiF~{^RMP7d#9`U=O8@4KaTxHg6YR9Vl}GH6l1h zn|p#?Ai*>-NEXhyZN=_FyM#fD6?Illbn`Y!qvz2?VGk_FEhpWns^mwPVzuq zazZ!v0vHXY8>`k1jGmj6rweEGg-!YSv3~A9(}+oLpa6J^{ZiTq^h(_XC~U7P@W&#j zLfoH)k7bL{X55j7T2dsc`0`6obMhw3EvG`pk7wCix@N^PBSD#J>5bhJFU8G}lnS&1 zu@*6?E41ENt>(Lg*6-W;LNSK3`lIMyCsD;l^%dK)?o)^c!AI8#FcpNjIeTClkK-@@ EA3%lzXaE2J literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..02144a9f39556b0dc8827c78be5d179320ba8703 GIT binary patch literal 2903 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 - + 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)