From c3477bc326f8d30d9d02df912fb2e1ff6302eb0f Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <phil@parolu.io>
Date: Mon, 18 Nov 2019 20:06:33 +0100
Subject: [PATCH] PICARD-1669: Use "unplated" taskbar icon for MSIX package

This will Windows use the unmodified Picard icon in the taskbar instead of automatically adding a padding and background. This does not affect the appearance of the start menu tiles.

See https://docs.microsoft.com/en-us/windows/msix/desktop/desktop-to-uwp-manual-conversion#optional-add-target-based-unplated-assets
---
 .../win10/Square44x44Logo.targetsize-44.png     | Bin 0 -> 1464 bytes
 ...44x44Logo.targetsize-44_altform-unplated.png | Bin 0 -> 1464 bytes
 scripts/package/win-package-appx.ps1            |  16 +++++++++++++---
 3 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 resources/win10/Square44x44Logo.targetsize-44.png
 create mode 100644 resources/win10/Square44x44Logo.targetsize-44_altform-unplated.png

diff --git a/resources/win10/Square44x44Logo.targetsize-44.png b/resources/win10/Square44x44Logo.targetsize-44.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ed30687617799a27fec0ed46f5b8408b66dbeb4
GIT binary patch
literal 1464
zcmXw32~d+)5Dw4^BD7l3(h$@ZEpo_|#tta~L=8$TQUno|su%>VoN7pd90nx;<i^N-
zL%4#300x0@LkI|RC?*`r5J0&Cgai_D_NT2g-|qYNdpkQj`;HhV$Ftg+U`-GRq>Z#k
zI0LKcwrQvV-soxt6a-Rz@8odN4hTUYr4lea$Q4wfbalmp@ZQi2CEjGh4~Ylkd43l6
zAozK-<wAf((4nUf4-$CyZE%pNWekk>z#0dR;@yYiAWtxQ1OPbjlf@vbr64OTI1-~r
z#OXx>;UXH20|NxU9Ap&(OTa-0OAoBD5W+IrYMmM`sEOEC&{nO_YA|5JBHFT#+$d&c
z<G@590jRlzw#4cI9FE=QZ~*@iK*WNH|0+Pj_SXM?yV@82MaKcXK?pc~Vladld?4!K
z!RUvFVnPnZg#P$6+#ojmaBTRIIQ-A?5r&BoM-v|#B}JMf6QBuEW~8WJo<D`A#acd(
z`z<5hA}axwm1LQdVw0DG$V#zKeP)wSvMo$KRg{JxXPzz1MwaI~P;$>x@*FD*oL&?;
zQ;S@vWLH{=TTO{iQR(H{a(8-p0J-8`$qSFhs+)~eR1+1&pn5WBUd=SGmKyJtny`vm
z@0QxzZFPUQ(|tPX{W|LXJK7#~cSZGd$Mi5`dwSwo{b{`e8GQp3#xSjAq_%a8(KXq@
zoMH@3H4jbqv*!ATw`a0_3f4;)>m}@orT6caakk5$h~-eb<uE&5#5vv*hm~mOl{mN6
zgv+amS67qV*U~)K(!JI)y!csn_&Im^dA|I7e?Is9dhvtx611QUE1-l3X?Wphws4*;
zTpZna6|>1m+-y$XY)Rg1Pu=WH6?LYGm{}rLj;J?R++QdjC>9TwiuoMzI(uuRZ0j9m
zi(R!P7?X_AB$IWLk93J(Ogi;SI^7`UHcGio(iw(ywnaMEA{CFx<~wAIT{6+QOfoKC
z>6Nec$@%?q!5jJ3xME{Su`#UJ1Tdlyy;X=u6%w{WHm;COC}m?x`M6R(p;SyrT+_^e
zd+mUBc60%$sHm!`ef9MYb<J<S+yA}p5Bi6VjLl)TCr=~n9nN2Lb-m=~cKwF8cK|jx
z1dor5j!sHSPR=N-sHmxF>g*eN#~Gjgw6w|>iX<|5m&OJScsX`R#L0`W*W}R+H=PSQ
z>T55XnyTT|)lD;+C{IJq2SSXES`*c*%)=wUj1!N-=A-g;qq*{Lv!|E)-%N-&W7eUM
z6xmP_qv0lvmGXOR_vox>{peIN{*UACFCCo<e!^7cbWW!FYUiW6=;ZTv+L<8m8Q<%i
zodZ`WyL8Ple(5IKnFYRZ&;bKFH52I_TL;>0j(T0FI`AQ1k7bStAf**up`bzby9_Xu
zxgY#v>s14ZdnQODm8A)x>Z)4T8vL;OXX7rjiCN=!sCY7k>A!_QY#=7%I-3nmJx#?s
zo2ME*{_@h#3&*XJqQjnWN}!?>Be}`U%pw=kYWCi>-E_rZtGW=yD-7QOQA!cBQ!o{2
zZBE_LZFN5n11*?&J9u3li!ZIdcAOmo_q!$6hNWI_CF`mTdbaoWrY($Q&Ji<3*3Rd`
zLx=W=G*G^R?tp?NjxU_f9Qs@|&3(INe(YIL=)BR9Gpvunq=X*M+O!W+I1?=_br|7$
z>|;lVoxaO`)3;_iP_<Idl^~GygEy46XtpueR(tSIUSp<3QKt^gV$q~IB*-AHCv3yG
zWc?Vpe7_*Or!xrBHbX(rwLvYJ(|pSV%o%qb0(Kr2RccPZCDGa^n&u-V8^0d8c_PYC
zA~o_BYSKCPD$QiYVvT~WQLS{SOL}`!U~h3TGbAb0gU8w1=G(|q^D+9wG!6{tO@BeP
zTDTH-w~uwnpB%Sv<5LRs0&BK{6etHZ1do$u1?xvYbBEFQ6O?L5Ji>A>L#e<010(Gm
K5ml!=9{&U7$tIHk

literal 0
HcmV?d00001

diff --git a/resources/win10/Square44x44Logo.targetsize-44_altform-unplated.png b/resources/win10/Square44x44Logo.targetsize-44_altform-unplated.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ed30687617799a27fec0ed46f5b8408b66dbeb4
GIT binary patch
literal 1464
zcmXw32~d+)5Dw4^BD7l3(h$@ZEpo_|#tta~L=8$TQUno|su%>VoN7pd90nx;<i^N-
zL%4#300x0@LkI|RC?*`r5J0&Cgai_D_NT2g-|qYNdpkQj`;HhV$Ftg+U`-GRq>Z#k
zI0LKcwrQvV-soxt6a-Rz@8odN4hTUYr4lea$Q4wfbalmp@ZQi2CEjGh4~Ylkd43l6
zAozK-<wAf((4nUf4-$CyZE%pNWekk>z#0dR;@yYiAWtxQ1OPbjlf@vbr64OTI1-~r
z#OXx>;UXH20|NxU9Ap&(OTa-0OAoBD5W+IrYMmM`sEOEC&{nO_YA|5JBHFT#+$d&c
z<G@590jRlzw#4cI9FE=QZ~*@iK*WNH|0+Pj_SXM?yV@82MaKcXK?pc~Vladld?4!K
z!RUvFVnPnZg#P$6+#ojmaBTRIIQ-A?5r&BoM-v|#B}JMf6QBuEW~8WJo<D`A#acd(
z`z<5hA}axwm1LQdVw0DG$V#zKeP)wSvMo$KRg{JxXPzz1MwaI~P;$>x@*FD*oL&?;
zQ;S@vWLH{=TTO{iQR(H{a(8-p0J-8`$qSFhs+)~eR1+1&pn5WBUd=SGmKyJtny`vm
z@0QxzZFPUQ(|tPX{W|LXJK7#~cSZGd$Mi5`dwSwo{b{`e8GQp3#xSjAq_%a8(KXq@
zoMH@3H4jbqv*!ATw`a0_3f4;)>m}@orT6caakk5$h~-eb<uE&5#5vv*hm~mOl{mN6
zgv+amS67qV*U~)K(!JI)y!csn_&Im^dA|I7e?Is9dhvtx611QUE1-l3X?Wphws4*;
zTpZna6|>1m+-y$XY)Rg1Pu=WH6?LYGm{}rLj;J?R++QdjC>9TwiuoMzI(uuRZ0j9m
zi(R!P7?X_AB$IWLk93J(Ogi;SI^7`UHcGio(iw(ywnaMEA{CFx<~wAIT{6+QOfoKC
z>6Nec$@%?q!5jJ3xME{Su`#UJ1Tdlyy;X=u6%w{WHm;COC}m?x`M6R(p;SyrT+_^e
zd+mUBc60%$sHm!`ef9MYb<J<S+yA}p5Bi6VjLl)TCr=~n9nN2Lb-m=~cKwF8cK|jx
z1dor5j!sHSPR=N-sHmxF>g*eN#~Gjgw6w|>iX<|5m&OJScsX`R#L0`W*W}R+H=PSQ
z>T55XnyTT|)lD;+C{IJq2SSXES`*c*%)=wUj1!N-=A-g;qq*{Lv!|E)-%N-&W7eUM
z6xmP_qv0lvmGXOR_vox>{peIN{*UACFCCo<e!^7cbWW!FYUiW6=;ZTv+L<8m8Q<%i
zodZ`WyL8Ple(5IKnFYRZ&;bKFH52I_TL;>0j(T0FI`AQ1k7bStAf**up`bzby9_Xu
zxgY#v>s14ZdnQODm8A)x>Z)4T8vL;OXX7rjiCN=!sCY7k>A!_QY#=7%I-3nmJx#?s
zo2ME*{_@h#3&*XJqQjnWN}!?>Be}`U%pw=kYWCi>-E_rZtGW=yD-7QOQA!cBQ!o{2
zZBE_LZFN5n11*?&J9u3li!ZIdcAOmo_q!$6hNWI_CF`mTdbaoWrY($Q&Ji<3*3Rd`
zLx=W=G*G^R?tp?NjxU_f9Qs@|&3(INe(YIL=)BR9Gpvunq=X*M+O!W+I1?=_br|7$
z>|;lVoxaO`)3;_iP_<Idl^~GygEy46XtpueR(tSIUSp<3QKt^gV$q~IB*-AHCv3yG
zWc?Vpe7_*Or!xrBHbX(rwLvYJ(|pSV%o%qb0(Kr2RccPZCDGa^n&u-V8^0d8c_PYC
zA~o_BYSKCPD$QiYVvT~WQLS{SOL}`!U~h3TGbAb0gU8w1=G(|q^D+9wG!6{tO@BeP
zTDTH-w~uwnpB%Sv<5LRs0&BK{6etHZ1do$u1?xvYbBEFQ6O?L5Ji>A>L#e<010(Gm
K5ml!=9{&U7$tIHk

literal 0
HcmV?d00001

diff --git a/scripts/package/win-package-appx.ps1 b/scripts/package/win-package-appx.ps1
index fceef3b15..4496ab86a 100644
--- a/scripts/package/win-package-appx.ps1
+++ b/scripts/package/win-package-appx.ps1
@@ -29,13 +29,23 @@ ThrowOnExeError "setup.py build_ext -i failed"
 Write-Output "Building Windows installer..."
 pyinstaller --noconfirm --clean picard.spec 2>&1 | %{ "$_" }
 ThrowOnExeError "PyInstaller failed"
-FinalizePackage dist\picard
+$PackageDir = (Resolve-Path dist\picard)
+FinalizePackage $PackageDir
+
+# Generate resource files
+Copy-Item appxmanifest.xml $PackageDir
+$PriConfigFile = (Join-Path (Resolve-Path .\build) priconfig.xml)
+Push-Location $PackageDir
+MakePri createconfig /ConfigXml $PriConfigFile /Default en-US /Overwrite
+ThrowOnExeError "MakePri createconfig failed"
+MakePri new /ProjectRoot $PackageDir /ConfigXml $PriConfigFile
+ThrowOnExeError "MakePri new failed"
+Pop-Location
 
 # Generate msix package
 $PicardVersion = (python -c "import picard; print(picard.__version__)")
 $PackageFile = "dist\MusicBrainz Picard $PicardVersion.msix"
-Copy-Item appxmanifest.xml dist\picard
-MakeAppx pack /o /h SHA256 /d dist\picard\ /p $PackageFile
+MakeAppx pack /o /h SHA256 /d $PackageDir /p $PackageFile
 ThrowOnExeError "MakeAppx failed"
 
 # Sign package