From 899b5016b9494973e24152739fb708f7bfcf882f Mon Sep 17 00:00:00 2001 From: Samuel Chapleau Date: Tue, 6 Dec 2022 18:14:57 -0800 Subject: [PATCH] [Peek] Fix installer builds, project configs and update assets (#22540) * Update installer * Fix installer errors * Fix peek vcxproj * Add package signing * Add peek to arm64 * Add back ARM64 toMeasureToolUI * Add versions to project * Update assets and icons * Add correct icon --- .pipelines/ESRPSigning_core.json | 7 ++ PowerToys.sln | 8 +- installer/PowerToysSetup/Product.wxs | 111 +++++++++++------- .../peek/Peek.Common/Peek.Common.csproj | 1 + .../Peek.FilePreviewer/FilePreview.xaml.cs | 1 - .../Peek.FilePreviewer.csproj | 2 +- .../peek/Peek.UI.WPF/Peek.UI.WPF.csproj | 2 +- .../peek/Peek.UI/Assets/AppList.scale-100.png | Bin 0 -> 513 bytes .../peek/Peek.UI/Assets/AppList.scale-125.png | Bin 0 -> 638 bytes .../peek/Peek.UI/Assets/AppList.scale-150.png | Bin 0 -> 745 bytes .../peek/Peek.UI/Assets/AppList.scale-200.png | Bin 0 -> 1034 bytes .../peek/Peek.UI/Assets/AppList.scale-400.png | Bin 0 -> 2278 bytes src/modules/peek/Peek.UI/Assets/Icon.ico | Bin 0 -> 67646 bytes .../Assets/LockScreenLogo.scale-200.png | Bin 432 -> 0 bytes src/modules/peek/Peek.UI/Assets/Peek.ico | Bin 152126 -> 0 bytes .../Peek.UI/Assets/SplashScreen.scale-200.png | Bin 5372 -> 0 bytes .../Assets/Square150x150Logo.scale-200.png | Bin 1755 -> 0 bytes .../Assets/Square44x44Logo.scale-200.png | Bin 637 -> 0 bytes ...x44Logo.targetsize-24_altform-unplated.png | Bin 283 -> 0 bytes src/modules/peek/Peek.UI/Assets/StoreLogo.png | Bin 456 -> 0 bytes .../Assets/Wide310x150Logo.scale-200.png | Bin 2097 -> 0 bytes src/modules/peek/Peek.UI/Peek.UI.csproj | 22 ++-- src/modules/peek/Peek.UI/Views/TitleBar.xaml | 2 +- .../peek/Peek.UI/Views/TitleBar.xaml.cs | 2 +- src/modules/peek/WIC/WIC.csproj | 11 +- src/modules/peek/peek/dllmain.cpp | 6 +- src/modules/peek/peek/peek.vcxproj | 86 ++------------ 27 files changed, 111 insertions(+), 150 deletions(-) create mode 100644 src/modules/peek/Peek.UI/Assets/AppList.scale-100.png create mode 100644 src/modules/peek/Peek.UI/Assets/AppList.scale-125.png create mode 100644 src/modules/peek/Peek.UI/Assets/AppList.scale-150.png create mode 100644 src/modules/peek/Peek.UI/Assets/AppList.scale-200.png create mode 100644 src/modules/peek/Peek.UI/Assets/AppList.scale-400.png create mode 100644 src/modules/peek/Peek.UI/Assets/Icon.ico delete mode 100644 src/modules/peek/Peek.UI/Assets/LockScreenLogo.scale-200.png delete mode 100644 src/modules/peek/Peek.UI/Assets/Peek.ico delete mode 100644 src/modules/peek/Peek.UI/Assets/SplashScreen.scale-200.png delete mode 100644 src/modules/peek/Peek.UI/Assets/Square150x150Logo.scale-200.png delete mode 100644 src/modules/peek/Peek.UI/Assets/Square44x44Logo.scale-200.png delete mode 100644 src/modules/peek/Peek.UI/Assets/Square44x44Logo.targetsize-24_altform-unplated.png delete mode 100644 src/modules/peek/Peek.UI/Assets/StoreLogo.png delete mode 100644 src/modules/peek/Peek.UI/Assets/Wide310x150Logo.scale-200.png diff --git a/.pipelines/ESRPSigning_core.json b/.pipelines/ESRPSigning_core.json index a769e488e6..bf369c4890 100644 --- a/.pipelines/ESRPSigning_core.json +++ b/.pipelines/ESRPSigning_core.json @@ -76,6 +76,13 @@ "modules\\FileLocksmith\\PowerToys.FileLocksmithUI.exe", "modules\\FileLocksmith\\PowerToys.FileLocksmithUI.dll", + "modules\\Peek\\Peek.Common.dll", + "modules\\Peek\\Peek.FilePreviewer.dll", + "modules\\Peek\\Powertoys.Peek.UI.dll", + "modules\\Peek\\Powertoys.Peek.UI.exe", + "modules\\Peek\\WIC.dll", + "modules\\Peek\\Powertoys.Peek.dll", + "modules\\ImageResizer\\PowerToys.ImageResizer.exe", "modules\\ImageResizer\\PowerToys.ImageResizer.dll", "modules\\ImageResizer\\PowerToys.ImageResizerExt.dll", diff --git a/PowerToys.sln b/PowerToys.sln index 80f5b0adbb..46aae32f23 100644 --- a/PowerToys.sln +++ b/PowerToys.sln @@ -1935,14 +1935,14 @@ Global {C0240BC3-95AF-4B38-811A-76E3FD56B576}.Release|x64.Build.0 = Release|x64 {C0240BC3-95AF-4B38-811A-76E3FD56B576}.Release|x86.ActiveCfg = Release|x64 {C0240BC3-95AF-4B38-811A-76E3FD56B576}.Release|x86.Build.0 = Release|x64 - {A1425B53-3D61-4679-8623-E64A0D3D0A48}.Debug|ARM64.ActiveCfg = Debug|x64 - {A1425B53-3D61-4679-8623-E64A0D3D0A48}.Debug|ARM64.Build.0 = Debug|x64 + {A1425B53-3D61-4679-8623-E64A0D3D0A48}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {A1425B53-3D61-4679-8623-E64A0D3D0A48}.Debug|ARM64.Build.0 = Debug|ARM64 {A1425B53-3D61-4679-8623-E64A0D3D0A48}.Debug|x64.ActiveCfg = Debug|x64 {A1425B53-3D61-4679-8623-E64A0D3D0A48}.Debug|x64.Build.0 = Debug|x64 {A1425B53-3D61-4679-8623-E64A0D3D0A48}.Debug|x86.ActiveCfg = Debug|x64 {A1425B53-3D61-4679-8623-E64A0D3D0A48}.Debug|x86.Build.0 = Debug|x64 - {A1425B53-3D61-4679-8623-E64A0D3D0A48}.Release|ARM64.ActiveCfg = Release|x64 - {A1425B53-3D61-4679-8623-E64A0D3D0A48}.Release|ARM64.Build.0 = Release|x64 + {A1425B53-3D61-4679-8623-E64A0D3D0A48}.Release|ARM64.ActiveCfg = Release|ARM64 + {A1425B53-3D61-4679-8623-E64A0D3D0A48}.Release|ARM64.Build.0 = Release|ARM64 {A1425B53-3D61-4679-8623-E64A0D3D0A48}.Release|x64.ActiveCfg = Release|x64 {A1425B53-3D61-4679-8623-E64A0D3D0A48}.Release|x64.Build.0 = Release|x64 {A1425B53-3D61-4679-8623-E64A0D3D0A48}.Release|x86.ActiveCfg = Release|x64 diff --git a/installer/PowerToysSetup/Product.wxs b/installer/PowerToysSetup/Product.wxs index 5b9491858f..6c95beabf6 100644 --- a/installer/PowerToysSetup/Product.wxs +++ b/installer/PowerToysSetup/Product.wxs @@ -9,6 +9,7 @@ + @@ -17,7 +18,6 @@ - @@ -122,6 +122,10 @@ + + + + @@ -543,12 +547,6 @@ - - - - - - @@ -571,8 +569,13 @@ - - + + + + + + + @@ -1039,30 +1042,42 @@ - - - - - - - - - + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1339,6 +1354,18 @@ + + + + + + + + + + + + @@ -1364,9 +1391,6 @@ - - - @@ -1442,7 +1466,7 @@ - + @@ -1596,12 +1620,6 @@ Guid="$(var.CompGUIDPrefix)03"> - - - - + @@ -2089,6 +2107,13 @@ + + + + diff --git a/src/modules/peek/Peek.Common/Peek.Common.csproj b/src/modules/peek/Peek.Common/Peek.Common.csproj index 5b9c5a0938..e39cc6f5bd 100644 --- a/src/modules/peek/Peek.Common/Peek.Common.csproj +++ b/src/modules/peek/Peek.Common/Peek.Common.csproj @@ -1,4 +1,5 @@  + net7.0-windows10.0.19041.0 10.0.19041.0 diff --git a/src/modules/peek/Peek.FilePreviewer/FilePreview.xaml.cs b/src/modules/peek/Peek.FilePreviewer/FilePreview.xaml.cs index 6515f5076d..8df57b146c 100644 --- a/src/modules/peek/Peek.FilePreviewer/FilePreview.xaml.cs +++ b/src/modules/peek/Peek.FilePreviewer/FilePreview.xaml.cs @@ -7,7 +7,6 @@ namespace Peek.FilePreviewer using System; using System.Threading.Tasks; using CommunityToolkit.Mvvm.ComponentModel; - using CommunityToolkit.WinUI.UI.Media.Pipelines; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Media.Imaging; diff --git a/src/modules/peek/Peek.FilePreviewer/Peek.FilePreviewer.csproj b/src/modules/peek/Peek.FilePreviewer/Peek.FilePreviewer.csproj index 3b13b288c1..fc84850427 100644 --- a/src/modules/peek/Peek.FilePreviewer/Peek.FilePreviewer.csproj +++ b/src/modules/peek/Peek.FilePreviewer/Peek.FilePreviewer.csproj @@ -1,4 +1,5 @@  + net7.0-windows10.0.19041.0 10.0.19041.0 @@ -13,7 +14,6 @@ - diff --git a/src/modules/peek/Peek.UI.WPF/Peek.UI.WPF.csproj b/src/modules/peek/Peek.UI.WPF/Peek.UI.WPF.csproj index 42d2f14957..7647a9aeac 100644 --- a/src/modules/peek/Peek.UI.WPF/Peek.UI.WPF.csproj +++ b/src/modules/peek/Peek.UI.WPF/Peek.UI.WPF.csproj @@ -3,7 +3,7 @@ WinExe net7.0-windows10.0.19041.0 - PowerToys.Peek.UI + PowerToys.Peek.UI.WPF enable true false diff --git a/src/modules/peek/Peek.UI/Assets/AppList.scale-100.png b/src/modules/peek/Peek.UI/Assets/AppList.scale-100.png new file mode 100644 index 0000000000000000000000000000000000000000..428ce4e377fd3edc25bdbc1662051adac913f20c GIT binary patch literal 513 zcmV+c0{;DpP)OR^y-Y$%!}2e*u-h+JCC`U7%{AacyfpfzZhB3iP|CfibqsH`DS z2th+lDKY)JKFwcAM2i;=?|$#zbM7yo)5f?TMhFPBiKS4&BAdtaZvrC0N-(yKsFr26R=!Xl()dX$>Dm*FIW zp*YmNkFZ&E7}lxUHVDpXdVG*ms9|US3O;`XlcsT?YXBR&A;jX8!xSwbszL#=F2|^H z0-0<9-t7e<4-$r8niwOIQylGC8cP!d*%Q#PoFEC9XGSXOg#?hhf!Sh z{T}u>jVb)W1f`JbG3j0MLy{z~UaxoKzeWO6=#+f{%CwPwxxP_300000NkvXXu0mjf DKg-x# literal 0 HcmV?d00001 diff --git a/src/modules/peek/Peek.UI/Assets/AppList.scale-125.png b/src/modules/peek/Peek.UI/Assets/AppList.scale-125.png new file mode 100644 index 0000000000000000000000000000000000000000..b0e19d99250fa264c8c4800156b6db9dac3bfd82 GIT binary patch literal 638 zcmV-^0)hRBP)AS+@86UNoLw4v~*MY!FSJ`d%yY4xes8cgE<3#hYJ+c zHkuFYG7N0ikQWih68?11{H3yKb`d%@fe>smlsanS=uwOO`wbocEw2wE4@L%^rC#J1 zZC6G2{z_ZB$YJ0>8d#ZbvFI7r!D|B{q%`_k^@(^xJTtcp(=?%UO+k)^d?pAQdB(iU z*>V+-xK9X})dl26KjZ7Sf5K?;myO$*0X)d2C=b`oq;*ZWxjQlnj5V0ajp6u_UX)*6 zNBR9@e0-IqA~x=i>UE9OIyTF&2J;0Iz0q!Hxin-s3e1f|89aq2kM5$RPZOtn`ryA< z*SA1P|BXv$57BzKIXV9Y@?HhQ=TvbVogg*Oz@>9WGxKbt(yox%EOj3W=!5hOxpPA` z5r@z8A^&y)lRswze&!DYrB4=)4a#+W3&MHW0yTJ@_9r4D&)j>Bky|IB9E@R%jGpDk z>6VYudQU*_e;rPLWN6d;9=D6?A~GXo+_|Qrzb}IP8(rM4LPefGJb}|g`$)Tr_E>W5 z7YkR4hP5!1eQLzdD`7*+s@N(xgAu)2NQ)$qNT|tVvO?6bO^Ch5VzHZyu?fqvH0*k; Y0mO*A#6vP^r>)KCMx?jl9daYR1@YcrHo3%!0A-Di||JpDC~kfHFO{a6<#gwA-GD-@_8|zBRMf~w06p2X?O3wv>lwh>MrRcWEG4;wVEkIp3 z7JN8KG2r-k-ng6(aTEoLHg)}nX-HyhVy=YW^u!7Kte38#{K>SMJaJ? zxc#UMhB|ru1V0mSP1A0e4_~ z3=BKQv7?#R`K4Uk!XJPlpd6RUJCWv2zqAX7FhN+vFQW=b>20Jvh3pYMSKmC3_QyyQ zUDA4g7k88jJcJ)66d+xAjsVl=0nzYqD4`5V*|5aVmVB9S*X9C%qDC-c}7bPfD=Oj(CY^*>Ep(4QQ0!-s8 zM$eBy^n9p+J!_gU!6ZqEamP-GX$8o!F?R&YLkLua5Ul$aAM>u8i~L*<@_inp53K-g z_F5g3Tu<*Hiq2FEVtb|qx!ZCuE6ajVd%qatR^JrC`D3dL_v_k{%&!XI|0H9PMQ2_L zlB4_FC@Iu1^*QY$XKkCu1Z|sJ5Z8qEs7Z@*y)KG*Bc(-hV+i4TkN)6-p z(v*4u6Mcm=O|evn5vj$Nf{=|OMwzpW3?$zkZif}E?R^*(yb5v@J&`C@Ewv%}$g>o_ z0;K{npJO8i<>}itpI*0K1Z&%n5_Bd4_uo*p21tNi-7l+rY$RK)pCmw0khIvh-6dv= zFI1v695Lh%(fFn7{ARS!tGak(Ka({+)BAi*mbC()7oeKkF;fKQBzed0A@JZGm3ly| z=1)$%tMHBxS6Z-w*3U4EliK2EfUA*Ir4V;}h_1&A$WQF0>$hMDCJsF* ziw?nLL7`=H;8r~CmeS?B-*>Uyr=Ii`gnJoQ&NcgQ`!YY_FM!TpmFH4Jm2S}Ca4d4U zTp!68**W}cIGxVQ|3PjZc5F6VH)E_k91dT>6ebgX0ZJ2t9qVg$_5c6?07*qoM6N<$ Ef?WI3`2YX_ literal 0 HcmV?d00001 diff --git a/src/modules/peek/Peek.UI/Assets/AppList.scale-400.png b/src/modules/peek/Peek.UI/Assets/AppList.scale-400.png new file mode 100644 index 0000000000000000000000000000000000000000..7d6ad44d299c7acac3a531c474ec3a39dc027791 GIT binary patch literal 2278 zcmV-cYH?^Es!Cz2iU+%u=!+|ngtoL&A7UP= zwo(!(QeQBz@Pb&3xJh6~NCrd_aglHW3Bi!qV8?L?2*;P;#NHkLIoCNebJmAVoLJ6& z()i5vpa1{npa0AmFHk}WC6rJ?2_;;qFyspM9BNU8dyzvUE*2O*rN0^DP7Gs-AwU4z zixztHlft!F3>e5@2HTC_VggG9K?3?PM2|)+E(UNGw=WeEOgF<`K?;j+JVy&E(Qj?F zB>+>%H{#M^$&gTn%ZCGBa^Rs!GqTMNwj z$1!~bh%qcGVzkXa?8so2g79q_FaBH}0%Bx*)8B#eHNXrlN^XY2vHV8nWoADa3lu$A zWv4;MpWEj5@4(g8R=?e?GI6P48UGKUqJfM*NXDOa6qOVFr(xQv%KbdjoHj3+dYQJI z6nR1;{E?RsD^@wi)5=dDv{&AO;izJ2@^UgGw7XA0PpX-6Ra*Qlz*oFtEl_m}a9x|d z3e$(|m6umK09R?*@5Az9o$L1U`nvTouf`{!g$tl;j@7~?#R zu=#WWGNjGWc$G`4p)RUVz}#t4Qs+`p5biOP({olD8UNZU$E&VF^SZb+R(wX2TO4HX zRbqf{&wX3rw$YC~dmIM_zO<4Ktt~5&Zc8G)C5fnVi`PwtmVlTrfyz`+A*LxCj^W49 z-7{q63&AC4_Y;HI(SDOdM3`)`EIt7>_5k`gCARxp-3-(TS@FOVRwanap#i~{6o6owd+WZmQ#0!_UQQxz(9GzthcXr+#NBe~l@&`HPL z@&q+W?)&A7!0Bgz@yF?)2fJAbwYP^g&Iu}gz184TxzrJ_+0t2&BJZ zITi~A2w)*)`zgNn8&^S&J!&3Oy`lDHPSU_s#=D)pyigCn?RRa# zi;P{}@8UwhSAW-|zKkSoF^lAY9HiO{?SbZ#R~Y}fIxwe%g=d%gJT zJ@WJ+6pP(t{OC!4|LSys zhxQjm0$=&;%O82=Wc}52LzF=HHe^t(ViEeg$!8!W2FL@T6_}(`+m_9%0une0+@Q%R z`E{m(yZzSA7p>J7(X(fhMu&w`P&d6D>Y|361H?{z1Lffd7r!mrH;U}uQ;@+8dWKf? zF8V&$^7BSI-33YF+okvQA-WJ5REXlA(+To`aLBqbNjKg70SlE@R(JwH#~MerZv@-_ z9q#UYbvY64>bhrqai5Fe@BFULTOHSTUsLkCKI~u<=K2dmAb|D-GYU+~Je{(=qjZrO zH2%K!8|kCyT5O~G(NkY56NMSh!N)y#{|4tS(DgQ9&VW7;7FpBIugA1)B77SodVmkx z`1b>K_qDI1sJ+h0zx7ng>eKz~Fb*FJH=2VRZV|`t4g+)PbTER&(6%TZ;2(s10+=zO z``3{;QMPZafbss=^p*xI@&5)Lp&R25hzR%NDY?3mqI`w*j<=7xKs2`%$uUCObYpaP z0p_rq^N$Gcb=0E57^0e5-C(`(P2S3fPb>x|-3Lt+#hr3Mlq@%7jLt)5QRn_jB%sCT zdw#mDa&6rnV?_-9T|4l?!D;;E{~rfb>`c{R+wU83!B~ikiwJf;$8xjt57gZK>Q1*# znfl~kZ|-1V_mc7aN0WHz_#C?S2ZP$5Hk4awi6C0oXLyYn`TsTickp?!x*+!r4Gry# zv5ZvRH8wW36Uzjl1Y8Nmb7%>;QjF(N2uLInseC@)ALwKle>idCL>9 A*#H0l literal 0 HcmV?d00001 diff --git a/src/modules/peek/Peek.UI/Assets/Icon.ico b/src/modules/peek/Peek.UI/Assets/Icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..1e0474d666eb4545013a3cd2d7bc52a6ed52b1be GIT binary patch literal 67646 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 A-T(jq literal 0 HcmV?d00001 diff --git a/src/modules/peek/Peek.UI/Assets/LockScreenLogo.scale-200.png b/src/modules/peek/Peek.UI/Assets/LockScreenLogo.scale-200.png deleted file mode 100644 index 7440f0d4bf7c7e26e4e36328738c68e624ee851e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 432 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezr3(FqV6|IEGZ*x-#9g>~Mkr+x6^F zy~CDX2QIMs&Gcs3RnRBoxBA!*(Mfw0KTCYuYk0WlEIV>qBmPl! zq4ukrvfADX@#p8fbLY(H47N+k`FZ(FZh?cDro7>{8mkBO3>^oaIx`3!Jl)Qq)HI!+ z(S=1{o~eT)&W^=Ea8C`-17(Jv5(nHFJ{dOjGdxLVkY_y6&S1whfuFI4MM0kF0f&cO zPDVpV%nz;Id$>+0Ga5e9625-JcI)oq=#Pa3p^>8BB}21BUw@eN!-6@w%X+^`+Vn?! zryu|3T>kVWNBYyBc=7Y6H#s1Ah!OI_nezW zXTqOdkv2Az6KKBV=$yHdF^R3Fqw(TZEoNSZX>reXJ#bwX42%f|Pgg&ebxsLQ010xn AssI20 diff --git a/src/modules/peek/Peek.UI/Assets/Peek.ico b/src/modules/peek/Peek.UI/Assets/Peek.ico deleted file mode 100644 index daf81fdeb3fa4e733ee2bf715e29ba6472131199..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 152126 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 diff --git a/src/modules/peek/Peek.UI/Assets/SplashScreen.scale-200.png b/src/modules/peek/Peek.UI/Assets/SplashScreen.scale-200.png deleted file mode 100644 index 32f486a86792a5e34cd9a8261b394c49b48f86be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5372 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 diff --git a/src/modules/peek/Peek.UI/Assets/Square44x44Logo.scale-200.png b/src/modules/peek/Peek.UI/Assets/Square44x44Logo.scale-200.png deleted file mode 100644 index f713bba67f551ef91020b75716a4dc8ebd744b1c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 637 zcmeAS@N?(olHy`uVBq!ia0vp^5g^RL1|$oo8kjIJFu8cTIEGZ*dUI*J;2{SImxtDO zm%3!R$UazoY}x{$j0P5ABYXWr(l=jxJ6ps1W{tV=^>{Dl><3nv3A}sm=EZ)#l3`NR zpZda3^rNox*D1%NC98Z~L*6zipLw~Gxn&(Y-;KmJ+aR6eLabU-L#y8HW%7P-E_-VlLqIabbHPHKT*)fT@9iWJ7iWgOT9%0}Lrj>lztPxWq6sPw3pi z#-<=#$jjrP_DD*i!RLsn0mIA=>4~N)IMYWIf=j%-zuKCdMG%tHYot70D1| zvWa0wMhauW#S>1CnI_;>!1Q3zMA17@DOVq{MQ+{U7^a&yA+%dMCG;WNPV0i;w$tu; zX^b}UKziPM)(<;)ruW;-`)bBN+rQNM*Zs_>?n$|FVFo-e*PZb*@U7VAd+tHb4e?=Blc~}S6K)wL}r*Gf`BM#QB z+y>N$mCswb4d{^{S9v_!eQj4fTRMOwOCi?lSk9%<=vAz}jM-*PQtH@Odn1LZcd^j#o> hW$4xn+CT+ep9lJ{OAO?njobhL002ovPDHLkV1nYebbkN< diff --git a/src/modules/peek/Peek.UI/Assets/StoreLogo.png b/src/modules/peek/Peek.UI/Assets/StoreLogo.png deleted file mode 100644 index a4586f26bdf7841cad10f39cdffe2aca3af252c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 456 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2o;fF!p=8IEGZ*dUM0H=rDtTTVkd2 z(%lbKn@VS_lUaADVB&;Z6F#LM+mPsa?e>FnHo;HND^!P`-lX%BH~FOg%y&x+t*x!? zg$#_1A1kgsSvO(fw`bOmo;lrJX8byO1j^gf7qohR%mmt z@L)WX;>gqgK|tWJvQ5j;4;=gt4HXVKSMYRv5RhY5vS~TqfK_NAP*r{h!!g^BZ;w4r z7CGdsai)y;fJQc`7{Zc2b==h%o`Op$|bg6a&nL{*m7-=0>k4M4-PXlU;G-?%*(*g>iFt^ U$m#7DfHB12>FVdQ&MBb@0G`#n8vpc0sq%A~kJcD9FY~qQRMt?ZR3YyDZt}Od;|mgpc{2dv9AHF){kXU%k({ z=Y8JidEayHTkG@twPZ|U3_^%3ct-OgLSiFAqDN!|tbCX@c@?4P`2x*TMK!+Q4b?k0 ziW7!!KF6dPWcF<%I|iznM~`QJ_V7sHGV_D`dhgpA9Vd@&X}ErK+j~_rdv;Bp?OA@a zFXOk7eWOJe5NcK;6h$FaM&7JxNc#-@QTwzW6x#d_zmQNkz5) zPI;kh;3d;5UCJU+9a(cOxX(|edWoOiAEdGU#kPJ&xnc2||3vDbuhBCkj-pb0as$Zl z5;}4n=**n6(1g`JEtSy;SG6X;#-F~Oz3lESG2b5`j@wAwY4Yp<=4Xeb>iH=6aicF?DxD&q{`!&}ct zBI)aycwuobQAf&678Uf+Mmh-@9RUhyH~>?w0dixO0#jZjEc9R^=5NZw=|a(kcB?9^ zfnTiEFXp-q#B;Tn>(O%$A*ud^Rg&eVH6Y_5Y%!E39RR&s?XpG`gKwU!6FE1 z7X)DC7)*(5g}lh`4`{i~DZcWupZI`K)_4P)VE{@gc7@Xsd^86zl~_mOYH?I4!aGeX z^E(_=L6?PgveDQ+r%P@UISEXrkn`LHJZ##+!-anV>6h)IkKp;E@p8+3&(5%kS2)ld*J*rJccZM0iyaAx7+F~GW1UWFK&3X$PE1^}NH zgAG9ck5K!{07OwU@j@Do>TbH=CDEo#4m0cEyAuXy_<&jlzJVcKweSJ5 z&=q~iIn18$w8yb=rmEmHxVEUA^?RwnB?6Qlp1os8@*dWTGL2bhzZ!s*xqScR?EPL` zo(JwNdKUUYy7GtvZ3asXm)cgFvCx9EmAi;|w=a0iGiv%%VYKh`P0Wma4y`Xyx|T~( zAmfGbgbEEC7)j8b@WA@+5W3a61HJXC1dX@6_T|Czk0I0zBk%tnW~()VWITGI!`$c< gARL?UBrYYkwoDw4eo*CrzXGTrZ@;GF>596)00d&n@&Et; diff --git a/src/modules/peek/Peek.UI/Peek.UI.csproj b/src/modules/peek/Peek.UI/Peek.UI.csproj index 0c35f686bc..e79067b394 100644 --- a/src/modules/peek/Peek.UI/Peek.UI.csproj +++ b/src/modules/peek/Peek.UI/Peek.UI.csproj @@ -1,4 +1,5 @@  + PowerToys.Peek.UI PowerToys.Peek.UI @@ -21,12 +22,17 @@ true 10.0.19041.0 Enable + Assets\Icon.ico - + - + + + + + @@ -50,16 +56,6 @@ - - - - - - - - - - all @@ -87,7 +83,7 @@ - + diff --git a/src/modules/peek/Peek.UI/Views/TitleBar.xaml b/src/modules/peek/Peek.UI/Views/TitleBar.xaml index eb1da3b5e8..51fb817eb5 100644 --- a/src/modules/peek/Peek.UI/Views/TitleBar.xaml +++ b/src/modules/peek/Peek.UI/Views/TitleBar.xaml @@ -15,7 +15,7 @@ Margin="16,8,8,8" VerticalAlignment="Top" Orientation="Horizontal"> - + + - net7.0-windows10.0.19041.0 - 10.0.19041.0 - win10-x86;win10-x64;win10-arm64 - enable - false + net7.0-windows10.0.19041.0 + 10.0.19041.0 + win10-x86;win10-x64;win10-arm64 + enable + false diff --git a/src/modules/peek/peek/dllmain.cpp b/src/modules/peek/peek/dllmain.cpp index bf334fe977..958c7ca8bb 100644 --- a/src/modules/peek/peek/dllmain.cpp +++ b/src/modules/peek/peek/dllmain.cpp @@ -9,9 +9,9 @@ extern "C" IMAGE_DOS_HEADER __ImageBase; -BOOL APIENTRY DllMain(HMODULE hModule, +BOOL APIENTRY DllMain(HMODULE /*hModule*/, DWORD ul_reason_for_call, - LPVOID lpReserved) + LPVOID /*lpReserved*/) { switch (ul_reason_for_call) { @@ -358,7 +358,7 @@ public: } } - virtual bool on_hotkey(size_t hotkeyId) override + virtual bool on_hotkey(size_t /*hotkeyId*/) override { if (m_enabled) { diff --git a/src/modules/peek/peek/peek.vcxproj b/src/modules/peek/peek/peek.vcxproj index b30da554d9..bbc9490600 100644 --- a/src/modules/peek/peek/peek.vcxproj +++ b/src/modules/peek/peek/peek.vcxproj @@ -1,16 +1,6 @@ - - - Debug - x64 - - - Release - x64 - - 15.0 {a1425b53-3d61-4679-8623-e64a0d3d0a48} @@ -20,86 +10,31 @@ Peek - + DynamicLibrary - true v143 - Unicode - - - DynamicLibrary - false - v142 - true - Unicode - - - - + - - true - PowerToys.Peek - - - false - PowerToys.Peek - $(SolutionDir)$(Platform)\$(Configuration)\modules\$(ProjectName)\ + PowerToys.Peek - - - Use - Level3 - Disabled - true - _DEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - pch.h - MultiThreadedDebug - stdcpplatest - - - Windows - true - $(OutDir)$(TargetName)$(TargetExt) - - - - - Use - Level3 - MaxSpeed - true - true - true - NDEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - pch.h - MultiThreaded - stdcpplatest - - - Windows - true - true - true - $(OutDir)$(TargetName)$(TargetExt) - - - $(SolutionDir)src\;$(SolutionDir)src\modules;$(SolutionDir)src\common\Telemetry;$(SolutionDir)src\modules\peek;%(AdditionalIncludeDirectories) + EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + ..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories) + + $(OutDir)$(TargetName)$(TargetExt) + @@ -109,10 +44,7 @@ - Create - Create - pch.h - pch.h + Create