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 0000000000..428ce4e377 Binary files /dev/null and b/src/modules/peek/Peek.UI/Assets/AppList.scale-100.png differ 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 0000000000..b0e19d9925 Binary files /dev/null and b/src/modules/peek/Peek.UI/Assets/AppList.scale-125.png differ diff --git a/src/modules/peek/Peek.UI/Assets/AppList.scale-150.png b/src/modules/peek/Peek.UI/Assets/AppList.scale-150.png new file mode 100644 index 0000000000..3f8bdda9c3 Binary files /dev/null and b/src/modules/peek/Peek.UI/Assets/AppList.scale-150.png differ diff --git a/src/modules/peek/Peek.UI/Assets/AppList.scale-200.png b/src/modules/peek/Peek.UI/Assets/AppList.scale-200.png new file mode 100644 index 0000000000..5469e32791 Binary files /dev/null and b/src/modules/peek/Peek.UI/Assets/AppList.scale-200.png differ 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 0000000000..7d6ad44d29 Binary files /dev/null and b/src/modules/peek/Peek.UI/Assets/AppList.scale-400.png differ 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 0000000000..1e0474d666 Binary files /dev/null and b/src/modules/peek/Peek.UI/Assets/Icon.ico differ 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 7440f0d4bf..0000000000 Binary files a/src/modules/peek/Peek.UI/Assets/LockScreenLogo.scale-200.png and /dev/null differ 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 daf81fdeb3..0000000000 Binary files a/src/modules/peek/Peek.UI/Assets/Peek.ico and /dev/null differ 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 32f486a867..0000000000 Binary files a/src/modules/peek/Peek.UI/Assets/SplashScreen.scale-200.png and /dev/null differ diff --git a/src/modules/peek/Peek.UI/Assets/Square150x150Logo.scale-200.png b/src/modules/peek/Peek.UI/Assets/Square150x150Logo.scale-200.png deleted file mode 100644 index 53ee3777ea..0000000000 Binary files a/src/modules/peek/Peek.UI/Assets/Square150x150Logo.scale-200.png and /dev/null differ 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 f713bba67f..0000000000 Binary files a/src/modules/peek/Peek.UI/Assets/Square44x44Logo.scale-200.png and /dev/null differ diff --git a/src/modules/peek/Peek.UI/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/src/modules/peek/Peek.UI/Assets/Square44x44Logo.targetsize-24_altform-unplated.png deleted file mode 100644 index dc9f5bea0c..0000000000 Binary files a/src/modules/peek/Peek.UI/Assets/Square44x44Logo.targetsize-24_altform-unplated.png and /dev/null differ 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 a4586f26bd..0000000000 Binary files a/src/modules/peek/Peek.UI/Assets/StoreLogo.png and /dev/null differ diff --git a/src/modules/peek/Peek.UI/Assets/Wide310x150Logo.scale-200.png b/src/modules/peek/Peek.UI/Assets/Wide310x150Logo.scale-200.png deleted file mode 100644 index 8b4a5d0dd5..0000000000 Binary files a/src/modules/peek/Peek.UI/Assets/Wide310x150Logo.scale-200.png and /dev/null differ 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