mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2024-11-27 23:19:13 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge main

Browse Source
This commit is contained in:
Aaron Junker 2024-09-22 11:00:30 +02:00
commit 3f1cc4f8e8
733 changed files with 3819 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/actions/spell-check/allow/names.txt vendored
View File

@ -64,6 +64,7 @@ Essey
ethanfangg ethanfangg
ferraridavide ferraridavide
frankychen frankychen
gaardmark
gabime gabime
Galaxi Galaxi
Garside Garside

24
.github/actions/spell-check/expect.txt vendored
View File

@ -81,6 +81,8 @@ asf
AShortcut AShortcut
ASingle ASingle
ASSOCCHANGED ASSOCCHANGED
ASSOCF
ASSOCSTR
ASYNCWINDOWPLACEMENT ASYNCWINDOWPLACEMENT
ASYNCWINDOWPOS ASYNCWINDOWPOS
atl atl
@ -320,6 +322,7 @@ Dedup
DEFAULTBOOTSTRAPPERINSTALLFOLDER DEFAULTBOOTSTRAPPERINSTALLFOLDER
DEFAULTCOLOR DEFAULTCOLOR
DEFAULTFLAGS DEFAULTFLAGS
DEFAULTICON
DEFAULTONLY DEFAULTONLY
DEFAULTTONEAREST DEFAULTTONEAREST
DEFAULTTONULL DEFAULTTONULL
@ -334,6 +337,7 @@ deletethis
DENORMAL DENORMAL
depersist depersist
deprioritized deprioritized
DESELECTOTHERS
DESKTOPABSOLUTEEDITING DESKTOPABSOLUTEEDITING
DESKTOPABSOLUTEPARSING DESKTOPABSOLUTEPARSING
desktopshorcutinstalled desktopshorcutinstalled
@ -430,6 +434,7 @@ encodedlaunch
encryptor encryptor
endpointvolume endpointvolume
ENDSESSION ENDSESSION
ENSUREVISIBLE
ENTERSIZEMOVE ENTERSIZEMOVE
ENU ENU
EOAC EOAC
@ -511,6 +516,7 @@ FOLDERID
folderpath folderpath
FORCEMINIMIZE FORCEMINIMIZE
formatetc formatetc
FORPARSING
FRAMECHANGED FRAMECHANGED
frm frm
Froml Froml
@ -565,6 +571,7 @@ Hashset
hashtag hashtag
HASHVAL HASHVAL
HASSTRINGS HASSTRINGS
HASSUBCOMMANDS
hbitmap hbitmap
hbm hbm
hbmp hbmp
@ -643,6 +650,7 @@ IBeam
ICapture ICapture
IClass IClass
ICONERROR ICONERROR
ICONLOCATION
IData IData
IDD IDD
IDesktop IDesktop
@ -660,6 +668,7 @@ IFACEMETHOD
IFACEMETHODIMP IFACEMETHODIMP
IFile IFile
IFilter IFilter
IGNOREUNKNOWN
IGraphics IGraphics
iid iid
Iindex Iindex
@ -721,6 +730,7 @@ ISettings
IShell IShell
isocpp isocpp
iss iss
ISSEPARATOR
ITask ITask
ith ith
ITHUMBNAIL ITHUMBNAIL
@ -997,6 +1007,8 @@ newdev
NEWDIALOGSTYLE NEWDIALOGSTYLE
newitem newitem
newpath newpath
newplus
NEWPLUSCONTEXTMENU
newrow newrow
newsgroups newsgroups
NIF NIF
@ -1009,7 +1021,10 @@ NOAGGREGATION
NOASYNC NOASYNC
NOCLOSEPROCESS NOCLOSEPROCESS
NOCOALESCE NOCOALESCE
NOCOMM
NOCONFIRMMKDIR
NOCOPYBITS NOCOPYBITS
NOCOPYSECURITYATTRIBS
nodeca nodeca
nodoc nodoc
NODRAWCAPTION NODRAWCAPTION
@ -1017,6 +1032,7 @@ NODRAWICON
NOINHERITLAYOUT NOINHERITLAYOUT
NOINTERFACE NOINTERFACE
NOLINKINFO NOLINKINFO
NOMCX
NOMINMAX NOMINMAX
NOMIRRORBITMAP NOMIRRORBITMAP
NOMOVE NOMOVE
@ -1421,6 +1437,8 @@ SHELLEXECUTEINFO
SHELLEXECUTEINFOW SHELLEXECUTEINFOW
shellscalingapi shellscalingapi
SHFILEINFO SHFILEINFO
SHFILEOPSTRUCT
SHGDN
SHGDNF SHGDNF
SHGFI SHGFI
shinfo shinfo
@ -1428,6 +1446,7 @@ shldisp
shlobj shlobj
shlwapi shlwapi
shmem shmem
SHNAMEMAPPING
shobjidl shobjidl
SHORTCUTATLEAST SHORTCUTATLEAST
shortcutcontrol shortcutcontrol
@ -1532,7 +1551,7 @@ stringtable
stringval stringval
Strm Strm
Strmiids Strmiids
Strret strret
strsafe strsafe
strutil strutil
sttngs sttngs
@ -1548,6 +1567,7 @@ svchost
SVGIn SVGIn
SVGIO SVGIO
svgz svgz
SVSI
SWC SWC
SWFO SWFO
SWP SWP
@ -1754,6 +1774,7 @@ VSTHRD
VSTT VSTT
vswhere vswhere
Vtbl Vtbl
WANTMAPPINGHANDLE
WANTPALM WANTPALM
Wagnerp Wagnerp
wbem wbem
@ -1766,6 +1787,7 @@ WCE
wcex wcex
WClass WClass
wcsicmp wcsicmp
wcsncpy
wcsnicmp wcsnicmp
WDA WDA
wdp wdp

3
.pipelines/ESRPSigning_core.json
View File

@ -192,6 +192,9 @@
"PowerToys.MouseWithoutBordersHelper.dll", "PowerToys.MouseWithoutBordersHelper.dll",
"PowerToys.MouseWithoutBordersHelper.exe", "PowerToys.MouseWithoutBordersHelper.exe",
"WinUI3Apps\\PowerToys.NewPlus.ShellExtension.dll",
"WinUI3Apps\\NewPlusPackage.msix",
"PowerAccent.Core.dll", "PowerAccent.Core.dll",
"PowerToys.PowerAccent.dll", "PowerToys.PowerAccent.dll",
"PowerToys.PowerAccent.exe", "PowerToys.PowerAccent.exe",

16
PowerToys.sln
View File

@ -613,6 +613,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerToys.Settings.DSC.Sche
{020A7474-3601-4160-A159-D7B70B77B15F} = {020A7474-3601-4160-A159-D7B70B77B15F} {020A7474-3601-4160-A159-D7B70B77B15F} = {020A7474-3601-4160-A159-D7B70B77B15F}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewPlus.ShellExtension", "src\modules\NewPlus\NewShellExtensionContextMenu\NewShellExtensionContextMenu.vcxproj", "{8ACB33D9-C95B-47D4-8363-9731EE0930A0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "New+", "New+", "{CA716AE6-FE5C-40AC-BB8F-2C87912687AC}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerToys.Interop", "src\common\interop\PowerToys.Interop.vcxproj", "{F055103B-F80B-4D0C-BF48-057C55620033}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerToys.Interop", "src\common\interop\PowerToys.Interop.vcxproj", "{F055103B-F80B-4D0C-BF48-057C55620033}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Workspaces", "Workspaces", "{A2221D7E-55E7-4BEA-90D1-4F162D670BBF}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Workspaces", "Workspaces", "{A2221D7E-55E7-4BEA-90D1-4F162D670BBF}"
@ -2808,6 +2812,16 @@ Global
{1D6893CB-BC0C-46A8-A76C-9728706CA51A}.Release|x64.Build.0 = Release|x64 {1D6893CB-BC0C-46A8-A76C-9728706CA51A}.Release|x64.Build.0 = Release|x64
{1D6893CB-BC0C-46A8-A76C-9728706CA51A}.Release|x86.ActiveCfg = Release|x64 {1D6893CB-BC0C-46A8-A76C-9728706CA51A}.Release|x86.ActiveCfg = Release|x64
{1D6893CB-BC0C-46A8-A76C-9728706CA51A}.Release|x86.Build.0 = Release|x64 {1D6893CB-BC0C-46A8-A76C-9728706CA51A}.Release|x86.Build.0 = Release|x64
{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Debug|ARM64.ActiveCfg = Debug|ARM64
{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Debug|ARM64.Build.0 = Debug|ARM64
{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Debug|x64.ActiveCfg = Debug|x64
{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Debug|x64.Build.0 = Debug|x64
{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Debug|x86.ActiveCfg = Debug|x64
{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Release|ARM64.ActiveCfg = Release|ARM64
{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Release|ARM64.Build.0 = Release|ARM64
{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Release|x64.ActiveCfg = Release|x64
{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Release|x64.Build.0 = Release|x64
{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Release|x86.ActiveCfg = Release|x64
{F055103B-F80B-4D0C-BF48-057C55620033}.Debug|ARM64.ActiveCfg = Debug|ARM64 {F055103B-F80B-4D0C-BF48-057C55620033}.Debug|ARM64.ActiveCfg = Debug|ARM64
{F055103B-F80B-4D0C-BF48-057C55620033}.Debug|ARM64.Build.0 = Debug|ARM64 {F055103B-F80B-4D0C-BF48-057C55620033}.Debug|ARM64.Build.0 = Debug|ARM64
{F055103B-F80B-4D0C-BF48-057C55620033}.Debug|x64.ActiveCfg = Debug|x64 {F055103B-F80B-4D0C-BF48-057C55620033}.Debug|x64.ActiveCfg = Debug|x64
@ -3122,6 +3136,8 @@ Global
{3A9A791E-94A9-49F8-8401-C11CE288D5FB} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD} {3A9A791E-94A9-49F8-8401-C11CE288D5FB} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
{C0974915-8A1D-4BF0-977B-9587D3807AB7} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD} {C0974915-8A1D-4BF0-977B-9587D3807AB7} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
{1D6893CB-BC0C-46A8-A76C-9728706CA51A} = {557C4636-D7E1-4838-A504-7D19B725EE95} {1D6893CB-BC0C-46A8-A76C-9728706CA51A} = {557C4636-D7E1-4838-A504-7D19B725EE95}
{8ACB33D9-C95B-47D4-8363-9731EE0930A0} = {CA716AE6-FE5C-40AC-BB8F-2C87912687AC}
{CA716AE6-FE5C-40AC-BB8F-2C87912687AC} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
{F055103B-F80B-4D0C-BF48-057C55620033} = {5A7818A8-109C-4E1C-850D-1A654E234B0E} {F055103B-F80B-4D0C-BF48-057C55620033} = {5A7818A8-109C-4E1C-850D-1A654E234B0E}
{A2221D7E-55E7-4BEA-90D1-4F162D670BBF} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC} {A2221D7E-55E7-4BEA-90D1-4F162D670BBF} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
{BE126CBB-AE12-406A-9837-A05ACFCA57A7} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF} {BE126CBB-AE12-406A-9837-A05ACFCA57A7} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}

73
installer/PowerToysSetup/NewPlus.wxs Normal file
View File

@ -0,0 +1,73 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
<?include $(sys.CURRENTDIR)\Common.wxi?>
<?define NewPlusAssetsFiles=?>
<?define NewPlusAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\NewPlus\?>
<?define NewPlusTemplateFilesPath=$(var.BinDir)WinUI3Apps\Assets\NewPlus\Templates\?>
<?define NewPlusTemplateSubFilesPath=$(var.BinDir)WinUI3Apps\Assets\NewPlus\Templates\Example folder\?>
<Fragment>
<!-- Assets -->
<DirectoryRef Id="WinUI3AppsAssetsFolder">
<Directory Id="NewPlusAssetsInstallFolder" Name="NewPlus" />
</DirectoryRef>
<DirectoryRef Id="NewPlusAssetsInstallFolder" FileSource="$(var.NewPlusAssetsFilesPath)">
<!-- Generated by generateFileComponents.ps1 -->
<!--NewPlusAssetsFiles_Component_Def-->
</DirectoryRef>
<ComponentGroup Id="NewPlusComponentGroup">
<Component Id="RemoveNewPlusFolder" Guid="4189C789-56EB-409D-912E-3F4F3F4F1FFA" Directory="NewPlusAssetsInstallFolder" >
<RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
<RegistryValue Type="string" Name="RemoveNewPlusFolder" Value="" KeyPath="yes"/>
</RegistryKey>
<RemoveFolder Id="RemoveFolderNewPlusAssetsFolder" Directory="NewPlusAssetsInstallFolder" On="uninstall"/>
</Component>
</ComponentGroup>
<!-- Example templates -->
<DirectoryRef Id="WinUI3AppsAssetsFolder">
<Directory Id="NewPlusInstallFolder" Name="NewPlus">
<Directory Id="NewPlusTemplatesInstallFolder" Name="Templates">
<Directory Id="NewPlusTemplatesSubInstallFolder" Name="Example folder"/>
</Directory>
</Directory>
</DirectoryRef>
<DirectoryRef Id="NewPlusTemplatesInstallFolder" FileSource="$(var.NewPlusTemplateFilesPath)">
<Component Id="NewPlusTemplateFiles_Component" Win64="yes" Guid="39264075-4B7F-40E3-A76F-21E68576D43E">
<RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
<RegistryValue Type="string" Name="NewPlusTemplateFiles_Component" Value="" KeyPath="yes"/>
</RegistryKey>
<File Id="NewPlusTemplateFiles_File_1.md" Source="$(var.NewPlusTemplateFilesPath)Any files or folders placed in the template folder are available via New+.txt" />
</Component>
</DirectoryRef>
<DirectoryRef Id="NewPlusTemplatesSubInstallFolder" FileSource="$(var.NewPlusTemplateSubFilesPath)">
<Component Id="NewPlusTemplateSubFiles_Component" Win64="yes" Guid="7618E61C-CCB8-492F-B284-E1AE2954AF0B">
<RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
<RegistryValue Type="string" Name="NewPlusTemplateSubFiles_Component" Value="" KeyPath="yes"/>
</RegistryKey>
<File Id="NewPlusTemplateSubFiles_File_1.md" Source="$(var.NewPlusTemplateSubFilesPath)Example txt file.txt" />
<File Id="NewPlusTemplateSubFiles_File_2.md" Source="$(var.NewPlusTemplateSubFilesPath)Another example txt file.txt" />
</Component>
</DirectoryRef>
<ComponentGroup Id="NewPlusTemplatesComponentGroup">
<Component Id="RemoveNewPlusTemplateFolder" Guid="3E9B15CA-A50C-42DA-977F-5E9914562FE7" Directory="NewPlusInstallFolder" >
<RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
<RegistryValue Type="string" Name="RemoveNewPlusTemplateFolder" Value="" KeyPath="yes"/>
</RegistryKey>
<RemoveFolder Id="RemoveFolderNewPlusInstallFolder" Directory="NewPlusInstallFolder" On="uninstall"/>
<RemoveFolder Id="RemoveFolderNewPlusTemplatesInstallFolder" Directory="NewPlusTemplatesInstallFolder" On="uninstall"/>
<RemoveFolder Id="RemoveFolderNewPlusTemplatesSubInstallFolder" Directory="NewPlusTemplatesSubInstallFolder" On="uninstall"/>
</Component>
<ComponentRef Id="NewPlusTemplateFiles_Component" />
<ComponentRef Id="NewPlusTemplateSubFiles_Component" />
</ComponentGroup>
</Fragment>
</Wix>

59
installer/PowerToysSetup/PowerToysInstaller.wixproj
View File

@ -1,9 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureNuGetPackageBuildImports" <Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureNuGetPackageBuildImports" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\src\Version.props" Condition="Exists('..\..\src\Version.props')" /> <Import Project="..\..\src\Version.props" Condition="Exists('..\..\src\Version.props')" />
<Import Project="..\wix.props" Condition="Exists('..\wix.props')" /> <Import Project="..\wix.props" Condition="Exists('..\wix.props')" />
<PropertyGroup Condition="'$(Platform)' == 'x64'"> <PropertyGroup Condition="'$(Platform)' == 'x64'">
<DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\x64\$(Configuration)\Assets\Monaco\monacoSRC</DefineConstants> <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\x64\$(Configuration)\Assets\Monaco\monacoSRC</DefineConstants>
<!-- THIS IS AN INNER LOOP OPTIMIZATION <!-- THIS IS AN INNER LOOP OPTIMIZATION
@ -31,32 +29,33 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
<PropertyGroup> <PropertyGroup>
<RunPostBuildEvent>Always</RunPostBuildEvent> <RunPostBuildEvent>Always</RunPostBuildEvent>
<PostBuildEvent> <PostBuildEvent>
call move /Y ..\..\..\AdvancedPaste.wxs.bk ..\..\..\AdvancedPaste.wxs call move /Y ..\..\..\AdvancedPaste.wxs.bk ..\..\..\AdvancedPaste.wxs
call move /Y ..\..\..\Awake.wxs.bk ..\..\..\Awake.wxs call move /Y ..\..\..\Awake.wxs.bk ..\..\..\Awake.wxs
call move /Y ..\..\..\BaseApplications.wxs.bk ..\..\..\BaseApplications.wxs call move /Y ..\..\..\BaseApplications.wxs.bk ..\..\..\BaseApplications.wxs
call move /Y ..\..\..\ColorPicker.wxs.bk ..\..\..\ColorPicker.wxs call move /Y ..\..\..\ColorPicker.wxs.bk ..\..\..\ColorPicker.wxs
call move /Y ..\..\..\Core.wxs.bk ..\..\..\Core.wxs call move /Y ..\..\..\Core.wxs.bk ..\..\..\Core.wxs
call move /Y ..\..\..\EnvironmentVariables.wxs.bk ..\..\..\EnvironmentVariables.wxs call move /Y ..\..\..\EnvironmentVariables.wxs.bk ..\..\..\EnvironmentVariables.wxs
call move /Y ..\..\..\FileExplorerPreview.wxs.bk ..\..\..\FileExplorerPreview.wxs call move /Y ..\..\..\FileExplorerPreview.wxs.bk ..\..\..\FileExplorerPreview.wxs
call move /Y ..\..\..\FileLocksmith.wxs.bk ..\..\..\FileLocksmith.wxs call move /Y ..\..\..\FileLocksmith.wxs.bk ..\..\..\FileLocksmith.wxs
call move /Y ..\..\..\FileActionsMenu.wxs.bk ..\..\..\FileActionsMenu.wxs call move /Y ..\..\..\Hosts.wxs.bk ..\..\..\Hosts.wxs
call move /Y ..\..\..\Hosts.wxs.bk ..\..\..\Hosts.wxs call move /Y ..\..\..\FileActionsMenu.wxs.bk ..\..\..\FileActionsMenu.wxs
call move /Y ..\..\..\ImageResizer.wxs.bk ..\..\..\ImageResizer.wxs call move /Y ..\..\..\ImageResizer.wxs.bk ..\..\..\ImageResizer.wxs
call move /Y ..\..\..\KeyboardManager.wxs.bk ..\..\..\KeyboardManager.wxs call move /Y ..\..\..\KeyboardManager.wxs.bk ..\..\..\KeyboardManager.wxs
call move /Y ..\..\..\MouseWithoutBorders.wxs.bk ..\..\..\MouseWithoutBorders.wxs call move /Y ..\..\..\MouseWithoutBorders.wxs.bk ..\..\..\MouseWithoutBorders.wxs
call move /Y ..\..\..\Peek.wxs.bk ..\..\..\Peek.wxs call move /Y ..\..\..\NewPlus.wxs.bk ..\..\..\NewPlus.wxs
call move /Y ..\..\..\PowerRename.wxs.bk ..\..\..\PowerRename.wxs call move /Y ..\..\..\Peek.wxs.bk ..\..\..\Peek.wxs
call move /Y ..\..\..\Product.wxs.bk ..\..\..\Product.wxs call move /Y ..\..\..\PowerRename.wxs.bk ..\..\..\PowerRename.wxs
call move /Y ..\..\..\RegistryPreview.wxs.bk ..\..\..\RegistryPreview.wxs call move /Y ..\..\..\Product.wxs.bk ..\..\..\Product.wxs
call move /Y ..\..\..\Resources.wxs.bk ..\..\..\Resources.wxs call move /Y ..\..\..\RegistryPreview.wxs.bk ..\..\..\RegistryPreview.wxs
call move /Y ..\..\..\Run.wxs.bk ..\..\..\Run.wxs call move /Y ..\..\..\Resources.wxs.bk ..\..\..\Resources.wxs
call move /Y ..\..\..\Settings.wxs.bk ..\..\..\Settings.wxs call move /Y ..\..\..\Run.wxs.bk ..\..\..\Run.wxs
call move /Y ..\..\..\ShortcutGuide.wxs.bk ..\..\..\ShortcutGuide.wxs call move /Y ..\..\..\Settings.wxs.bk ..\..\..\Settings.wxs
call move /Y ..\..\..\Tools.wxs.bk ..\..\..\Tools.wxs call move /Y ..\..\..\ShortcutGuide.wxs.bk ..\..\..\ShortcutGuide.wxs
call move /Y ..\..\..\VideoConference.wxs.bk ..\..\..\VideoConference.wxs call move /Y ..\..\..\Tools.wxs.bk ..\..\..\Tools.wxs
call move /Y ..\..\..\WinAppSDK.wxs.bk ..\..\..\WinAppSDK.wxs call move /Y ..\..\..\VideoConference.wxs.bk ..\..\..\VideoConference.wxs
call move /Y ..\..\..\WinUI3Applications.wxs.bk ..\..\..\WinUI3Applications.wxs call move /Y ..\..\..\WinAppSDK.wxs.bk ..\..\..\WinAppSDK.wxs
</PostBuildEvent> call move /Y ..\..\..\WinUI3Applications.wxs.bk ..\..\..\WinUI3Applications.wxs
</PostBuildEvent>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<Name>PowerToysInstaller</Name> <Name>PowerToysInstaller</Name>
@ -102,6 +101,7 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
<Compile Include="CustomDialogs\PTLicenseDlg.wxs" /> <Compile Include="CustomDialogs\PTLicenseDlg.wxs" />
<Compile Include="CustomDialogs\WixUI_PTInstallDir.wxs" /> <Compile Include="CustomDialogs\WixUI_PTInstallDir.wxs" />
<Compile Include="FileActionsMenu.wxs" /> <Compile Include="FileActionsMenu.wxs" />
<Compile Include="NewPlus.wxs" />
<Compile Include="Product.wxs" /> <Compile Include="Product.wxs" />
<Compile Include="AdvancedPaste.wxs" /> <Compile Include="AdvancedPaste.wxs" />
<Compile Include="Awake.wxs" /> <Compile Include="Awake.wxs" />
@ -183,7 +183,6 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">
<HeatDirectory Directory="..\..\src\common\FilePreviewCommon\Assets\Monaco\monacoSRC" PreprocessorVariable="var.MonacoSRCHarvestPath" OutputFile="MonacoSRC.wxs" ComponentGroupName="MonacoSRCHeatGenerated" DirectoryRefId="MonacoPreviewHandlerMonacoSRCFolder" AutogenerateGuids="false" GenerateGuidsNow="true" ToolPath="$(WixToolPath)" RunAsSeparateProcess="true" SuppressFragments="false" SuppressRegistry="false" SuppressRootDirectory="true" /> <HeatDirectory Directory="..\..\src\common\FilePreviewCommon\Assets\Monaco\monacoSRC" PreprocessorVariable="var.MonacoSRCHarvestPath" OutputFile="MonacoSRC.wxs" ComponentGroupName="MonacoSRCHeatGenerated" DirectoryRefId="MonacoPreviewHandlerMonacoSRCFolder" AutogenerateGuids="false" GenerateGuidsNow="true" ToolPath="$(WixToolPath)" RunAsSeparateProcess="true" SuppressFragments="false" SuppressRegistry="false" SuppressRootDirectory="true" />
</Target> </Target>
<!-- Prevents NU1503 --> <!-- Prevents NU1503 -->
<Target Name="_IsProjectRestoreSupported" Returns="@(_ValidProjectsForRestore)"> <Target Name="_IsProjectRestoreSupported" Returns="@(_ValidProjectsForRestore)">
<ItemGroup> <ItemGroup>

2
installer/PowerToysSetup/Product.wxs
View File

@ -74,6 +74,8 @@
<ComponentGroupRef Id="MouseWithoutBordersComponentGroup" /> <ComponentGroupRef Id="MouseWithoutBordersComponentGroup" />
<ComponentGroupRef Id="EnvironmentVariablesComponentGroup" /> <ComponentGroupRef Id="EnvironmentVariablesComponentGroup" />
<ComponentGroupRef Id="AdvancedPasteComponentGroup" /> <ComponentGroupRef Id="AdvancedPasteComponentGroup" />
<ComponentGroupRef Id="NewPlusComponentGroup" />
<ComponentGroupRef Id="NewPlusTemplatesComponentGroup" />
<ComponentGroupRef Id="ResourcesComponentGroup" /> <ComponentGroupRef Id="ResourcesComponentGroup" />
<ComponentGroupRef Id="WindowsAppSDKComponentGroup" /> <ComponentGroupRef Id="WindowsAppSDKComponentGroup" />
<ComponentGroupRef Id="ToolComponentGroup" /> <ComponentGroupRef Id="ToolComponentGroup" />

4
installer/PowerToysSetup/generateAllFileComponents.ps1
View File

@ -86,6 +86,10 @@ Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListNa
Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ImageResizerAssetsFiles -wxsFilePath $PSScriptRoot\ImageResizer.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Assets\ImageResizer""" Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ImageResizerAssetsFiles -wxsFilePath $PSScriptRoot\ImageResizer.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Assets\ImageResizer"""
Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ImageResizerAssetsFiles"" -wxsFilePath $PSScriptRoot\ImageResizer.wxs -regroot $registryroot" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ImageResizerAssetsFiles"" -wxsFilePath $PSScriptRoot\ImageResizer.wxs -regroot $registryroot"
#New+
Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName NewPlusAssetsFiles -wxsFilePath $PSScriptRoot\NewPlus.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\NewPlus"""
Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""NewPlusAssetsFiles"" -wxsFilePath $PSScriptRoot\NewPlus.wxs -regroot $registryroot"
#Peek #Peek
Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName PeekAssetsFiles -wxsFilePath $PSScriptRoot\Peek.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Peek\""" Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName PeekAssetsFiles -wxsFilePath $PSScriptRoot\Peek.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Peek\"""
Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""PeekAssetsFiles"" -wxsFilePath $PSScriptRoot\Peek.wxs -regroot $registryroot" Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""PeekAssetsFiles"" -wxsFilePath $PSScriptRoot\Peek.wxs -regroot $registryroot"

2
installer/PowerToysSetupCustomActions/CustomAction.cpp
View File

@ -1148,7 +1148,7 @@ UINT __stdcall UnRegisterContextMenuPackagesCA(MSIHANDLE hInstall)
try try
{ {
// Packages to unregister // Packages to unregister
const std::vector<std::wstring> packagesToRemoveDisplayName{ { L"PowerRenameContextMenu" }, { L"ImageResizerContextMenu" }, { L"FileLocksmithContextMenu" } }; const std::vector<std::wstring> packagesToRemoveDisplayName{ { L"PowerRenameContextMenu" }, { L"ImageResizerContextMenu" }, { L"FileLocksmithContextMenu" }, { L"NewPlusContextMenu" } };
PackageManager packageManager; PackageManager packageManager;

1
installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj
View File

@ -61,6 +61,7 @@
call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\ImageResizer.wxs"" ""$(ProjectDir)..\PowerToysSetup\ImageResizer.wxs.bk"""" call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\ImageResizer.wxs"" ""$(ProjectDir)..\PowerToysSetup\ImageResizer.wxs.bk""""
call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\KeyboardManager.wxs"" ""$(ProjectDir)..\PowerToysSetup\KeyboardManager.wxs.bk"""" call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\KeyboardManager.wxs"" ""$(ProjectDir)..\PowerToysSetup\KeyboardManager.wxs.bk""""
call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\MouseWithoutBorders.wxs"" ""$(ProjectDir)..\PowerToysSetup\MouseWithoutBorders.wxs.bk"""" call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\MouseWithoutBorders.wxs"" ""$(ProjectDir)..\PowerToysSetup\MouseWithoutBorders.wxs.bk""""
call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\NewPlus.wxs"" ""$(ProjectDir)..\PowerToysSetup\NewPlus.wxs.bk""""
call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Peek.wxs"" ""$(ProjectDir)..\PowerToysSetup\Peek.wxs.bk"""" call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Peek.wxs"" ""$(ProjectDir)..\PowerToysSetup\Peek.wxs.bk""""
call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\PowerRename.wxs"" ""$(ProjectDir)..\PowerToysSetup\PowerRename.wxs.bk"""" call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\PowerRename.wxs"" ""$(ProjectDir)..\PowerToysSetup\PowerRename.wxs.bk""""
call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Product.wxs"" ""$(ProjectDir)..\PowerToysSetup\Product.wxs.bk"""" call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Product.wxs"" ""$(ProjectDir)..\PowerToysSetup\Product.wxs.bk""""

1
src/common/AllExperiments/Experiments.cs
View File

@ -4,6 +4,7 @@
using System.Globalization; using System.Globalization;
using System.Text.Json; using System.Text.Json;
using Microsoft.PowerToys.Settings.UI.Library.Telemetry.Events; using Microsoft.PowerToys.Settings.UI.Library.Telemetry.Events;
using Microsoft.PowerToys.Telemetry; using Microsoft.PowerToys.Telemetry;
using Microsoft.VariantAssignment.Client; using Microsoft.VariantAssignment.Client;

1
src/common/Common.UI/ThemeManager.cs
View File

@ -5,6 +5,7 @@
using System; using System;
using System.Linq; using System.Linq;
using System.Windows; using System.Windows;
using ManagedCommon; using ManagedCommon;
using Microsoft.Win32; using Microsoft.Win32;

1
src/common/FilePreviewCommon/MarkdownHelper.cs
View File

@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information. // See the LICENSE file in the project root for more information.
using System.IO; using System.IO;
using Markdig; using Markdig;
namespace Microsoft.PowerToys.FilePreviewCommon namespace Microsoft.PowerToys.FilePreviewCommon

1
src/common/FilePreviewCommon/MonacoHelper.cs
View File

@ -8,6 +8,7 @@ using System.Globalization;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
using System.Text.Json; using System.Text.Json;
using Microsoft.PowerToys.FilePreviewCommon.Monaco.Formatters; using Microsoft.PowerToys.FilePreviewCommon.Monaco.Formatters;
namespace Microsoft.PowerToys.FilePreviewCommon namespace Microsoft.PowerToys.FilePreviewCommon

4
src/common/GPOWrapper/GPOWrapper.cpp
View File

@ -180,6 +180,10 @@ namespace winrt::PowerToys::GPOWrapper::implementation
{ {
return static_cast<GpoRuleConfigured>(powertoys_gpo::getAllowedAdvancedPasteOnlineAIModelsValue()); return static_cast<GpoRuleConfigured>(powertoys_gpo::getAllowedAdvancedPasteOnlineAIModelsValue());
} }
GpoRuleConfigured GPOWrapper::GetConfiguredNewPlusEnabledValue()
{
return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredNewPlusEnabledValue());
}
GpoRuleConfigured GPOWrapper::GetConfiguredWorkspacesEnabledValue() GpoRuleConfigured GPOWrapper::GetConfiguredWorkspacesEnabledValue()
{ {
return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredWorkspacesEnabledValue()); return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredWorkspacesEnabledValue());

1
src/common/GPOWrapper/GPOWrapper.h
View File

@ -51,6 +51,7 @@ namespace winrt::PowerToys::GPOWrapper::implementation
static GpoRuleConfigured GetConfiguredQoiThumbnailsEnabledValue(); static GpoRuleConfigured GetConfiguredQoiThumbnailsEnabledValue();
static GpoRuleConfigured GetConfiguredFileActionsMenuEnabledValue(); static GpoRuleConfigured GetConfiguredFileActionsMenuEnabledValue();
static GpoRuleConfigured GetAllowedAdvancedPasteOnlineAIModelsValue(); static GpoRuleConfigured GetAllowedAdvancedPasteOnlineAIModelsValue();
static GpoRuleConfigured GetConfiguredNewPlusEnabledValue();
static GpoRuleConfigured GetConfiguredWorkspacesEnabledValue(); static GpoRuleConfigured GetConfiguredWorkspacesEnabledValue();
static GpoRuleConfigured GetConfiguredMwbClipboardSharingEnabledValue(); static GpoRuleConfigured GetConfiguredMwbClipboardSharingEnabledValue();
static GpoRuleConfigured GetConfiguredMwbFileTransferEnabledValue(); static GpoRuleConfigured GetConfiguredMwbFileTransferEnabledValue();

1
src/common/GPOWrapper/GPOWrapper.idl
View File

@ -55,6 +55,7 @@ namespace PowerToys
static GpoRuleConfigured GetConfiguredQoiThumbnailsEnabledValue(); static GpoRuleConfigured GetConfiguredQoiThumbnailsEnabledValue();
static GpoRuleConfigured GetConfiguredFileActionsMenuEnabledValue(); static GpoRuleConfigured GetConfiguredFileActionsMenuEnabledValue();
static GpoRuleConfigured GetAllowedAdvancedPasteOnlineAIModelsValue(); static GpoRuleConfigured GetAllowedAdvancedPasteOnlineAIModelsValue();
static GpoRuleConfigured GetConfiguredNewPlusEnabledValue();
static GpoRuleConfigured GetConfiguredWorkspacesEnabledValue(); static GpoRuleConfigured GetConfiguredWorkspacesEnabledValue();
static GpoRuleConfigured GetConfiguredMwbClipboardSharingEnabledValue(); static GpoRuleConfigured GetConfiguredMwbClipboardSharingEnabledValue();
static GpoRuleConfigured GetConfiguredMwbFileTransferEnabledValue(); static GpoRuleConfigured GetConfiguredMwbFileTransferEnabledValue();

1
src/common/ManagedCommon/Logger.cs
View File

@ -7,6 +7,7 @@ using System.Diagnostics;
using System.Globalization; using System.Globalization;
using System.IO.Abstractions; using System.IO.Abstractions;
using System.Reflection; using System.Reflection;
using PowerToys.Interop; using PowerToys.Interop;
namespace ManagedCommon namespace ManagedCommon

1
src/common/ManagedCommon/ModuleType.cs
View File

@ -23,6 +23,7 @@ namespace ManagedCommon
MouseJump, MouseJump,
MousePointerCrosshairs, MousePointerCrosshairs,
MouseWithoutBorders, MouseWithoutBorders,
NewPlus,
Peek, Peek,
PowerRename, PowerRename,
PowerLauncher, PowerLauncher,

1
src/common/ManagedCommon/RunnerHelper.cs
View File

@ -6,6 +6,7 @@ using System;
using System.Diagnostics; using System.Diagnostics;
using System.Reflection; using System.Reflection;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.PowerToys.Telemetry; using Microsoft.PowerToys.Telemetry;
using Microsoft.PowerToys.Telemetry.Events; using Microsoft.PowerToys.Telemetry.Events;

1
src/common/ManagedCommon/ThemeHelpers.cs
View File

@ -4,6 +4,7 @@
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using Microsoft.Win32; using Microsoft.Win32;
namespace ManagedCommon namespace ManagedCommon

1
src/common/ManagedTelemetry/Telemetry/PowerToysTelemetry.cs
View File

@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information. // See the LICENSE file in the project root for more information.
using System.Diagnostics.Tracing; using System.Diagnostics.Tracing;
using Microsoft.PowerToys.Telemetry.Events; using Microsoft.PowerToys.Telemetry.Events;
namespace Microsoft.PowerToys.Telemetry namespace Microsoft.PowerToys.Telemetry

23
src/common/Themes/theme_helpers.cpp
View File

@ -3,13 +3,23 @@
#include "dwmapi.h" #include "dwmapi.h"
#include <windows.h> #include <windows.h>
#include <vector> #include <vector>
#pragma comment (lib,"Dwmapi.lib") #pragma comment(lib, "Dwmapi.lib")
#define DWMWA_USE_IMMERSIVE_DARK_MODE 20 #define DWMWA_USE_IMMERSIVE_DARK_MODE 20
#define HKEY_WINDOWS_THEME L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize" #define HKEY_WINDOWS_THEME L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"
// based on https://stackoverflow.com/questions/51334674/how-to-detect-windows-10-light-dark-mode-in-win32-application // based on https://stackoverflow.com/questions/51334674/how-to-detect-windows-10-light-dark-mode-in-win32-application
AppTheme ThemeHelpers::GetAppTheme() Theme ThemeHelpers::GetAppTheme()
{
return ThemeRegistryHelper(L"AppsUseLightTheme");
}
Theme ThemeHelpers::GetSystemTheme()
{
return ThemeRegistryHelper(L"SystemUsesLightTheme");
}
Theme ThemeHelpers::ThemeRegistryHelper(LPCWSTR theme_key)
{ {
// The value is expected to be a REG_DWORD, which is a signed 32-bit little-endian // The value is expected to be a REG_DWORD, which is a signed 32-bit little-endian
auto buffer = std::vector<char>(4); auto buffer = std::vector<char>(4);
@ -17,21 +27,22 @@ AppTheme ThemeHelpers::GetAppTheme()
auto res = RegGetValueW( auto res = RegGetValueW(
HKEY_CURRENT_USER, HKEY_CURRENT_USER,
HKEY_WINDOWS_THEME, HKEY_WINDOWS_THEME,
L"AppsUseLightTheme", theme_key,
RRF_RT_REG_DWORD, // expected value type RRF_RT_REG_DWORD,
nullptr, nullptr,
buffer.data(), buffer.data(),
&cbData); &cbData);
if (res != ERROR_SUCCESS) if (res != ERROR_SUCCESS)
{ {
return AppTheme::Light; // Defaulting to Light
return Theme::Light;
} }
// convert bytes written to our buffer to an int, assuming little-endian // convert bytes written to our buffer to an int, assuming little-endian
auto i = static_cast<int>(buffer[3] << 24 | buffer[2] << 16 | buffer[1] << 8 | buffer[0]); auto i = static_cast<int>(buffer[3] << 24 | buffer[2] << 16 | buffer[1] << 8 | buffer[0]);
return AppTheme(i); return Theme(i);
} }
void ThemeHelpers::SetImmersiveDarkMode(HWND window, bool enabled) void ThemeHelpers::SetImmersiveDarkMode(HWND window, bool enabled)

10
src/common/Themes/theme_helpers.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <windows.h> #include <windows.h>
enum class AppTheme enum class Theme
{ {
Dark = 0, Dark = 0,
Light = 1 Light = 1
@ -9,6 +9,10 @@ enum class AppTheme
struct ThemeHelpers struct ThemeHelpers
{ {
static AppTheme GetAppTheme(); static Theme GetAppTheme();
static void ThemeHelpers::SetImmersiveDarkMode(HWND window, bool enabled); static Theme GetSystemTheme();
static void SetImmersiveDarkMode(HWND window, bool enabled);
protected:
static Theme ThemeRegistryHelper(LPCWSTR theme_key);
}; };

2
src/common/Themes/theme_listener.h
View File

@ -22,7 +22,7 @@ public:
dwThreadId = 0; dwThreadId = 0;
} }
AppTheme AppTheme; Theme AppTheme;
void ThemeListener::AddChangedHandler(THEME_HANDLE handle); void ThemeListener::AddChangedHandler(THEME_HANDLE handle);
void ThemeListener::DelChangedHandler(THEME_HANDLE handle); void ThemeListener::DelChangedHandler(THEME_HANDLE handle);
void CheckTheme(); void CheckTheme();

2
src/common/Themes/windows_colors.cpp
View File

@ -66,7 +66,7 @@ WindowsColors::Color WindowsColors::get_background_color()
bool WindowsColors::is_dark_mode() bool WindowsColors::is_dark_mode()
{ {
return ThemeHelpers::GetAppTheme() == AppTheme::Dark; return ThemeHelpers::GetAppTheme() == Theme::Dark;
} }
bool WindowsColors::update() bool WindowsColors::update()

1
src/common/interop/interop-tests/InteropTests.cs
View File

@ -4,6 +4,7 @@
using System; using System;
using System.Threading; using System.Threading;
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestTools.UnitTesting;
using PowerToys.Interop; using PowerToys.Interop;

1
src/common/logger/logger_settings.h
View File

@ -69,6 +69,7 @@ struct LogSettings
inline const static std::string environmentVariablesLoggerName = "environment-variables"; inline const static std::string environmentVariablesLoggerName = "environment-variables";
inline const static std::wstring cmdNotFoundLogPath = L"Logs\\cmd-not-found-log.txt"; inline const static std::wstring cmdNotFoundLogPath = L"Logs\\cmd-not-found-log.txt";
inline const static std::string cmdNotFoundLoggerName = "cmd-not-found"; inline const static std::string cmdNotFoundLoggerName = "cmd-not-found";
inline const static std::string newLoggerName = "NewPlus";
inline const static std::string workspacesLauncherLoggerName = "workspaces-launcher"; inline const static std::string workspacesLauncherLoggerName = "workspaces-launcher";
inline const static std::wstring workspacesLauncherLogPath = L"workspaces-launcher-log.txt"; inline const static std::wstring workspacesLauncherLogPath = L"workspaces-launcher-log.txt";
inline const static std::string workspacesSnapshotToolLoggerName = "workspaces-snapshot-tool"; inline const static std::string workspacesSnapshotToolLoggerName = "workspaces-snapshot-tool";

6
src/common/utils/gpo.h
View File

@ -61,6 +61,7 @@ namespace powertoys_gpo {
const std::wstring POLICY_CONFIGURE_ENABLED_ENVIRONMENT_VARIABLES = L"ConfigureEnabledUtilityEnvironmentVariables"; const std::wstring POLICY_CONFIGURE_ENABLED_ENVIRONMENT_VARIABLES = L"ConfigureEnabledUtilityEnvironmentVariables";
const std::wstring POLICY_CONFIGURE_ENABLED_QOI_PREVIEW = L"ConfigureEnabledUtilityFileExplorerQOIPreview"; const std::wstring POLICY_CONFIGURE_ENABLED_QOI_PREVIEW = L"ConfigureEnabledUtilityFileExplorerQOIPreview";
const std::wstring POLICY_CONFIGURE_ENABLED_QOI_THUMBNAILS = L"ConfigureEnabledUtilityFileExplorerQOIThumbnails"; const std::wstring POLICY_CONFIGURE_ENABLED_QOI_THUMBNAILS = L"ConfigureEnabledUtilityFileExplorerQOIThumbnails";
const std::wstring POLICY_CONFIGURE_ENABLED_NEWPLUS = L"ConfigureEnabledUtilityNewPlus";
const std::wstring POLICY_CONFIGURE_ENABLED_WORKSPACES = L"ConfigureEnabledUtilityWorkspaces"; const std::wstring POLICY_CONFIGURE_ENABLED_WORKSPACES = L"ConfigureEnabledUtilityWorkspaces";
// The registry value names for PowerToys installer and update policies. // The registry value names for PowerToys installer and update policies.
@ -521,6 +522,11 @@ namespace powertoys_gpo {
return getUtilityEnabledValue(POLICY_ALLOW_ADVANCED_PASTE_ONLINE_AI_MODELS); return getUtilityEnabledValue(POLICY_ALLOW_ADVANCED_PASTE_ONLINE_AI_MODELS);
} }
inline gpo_rule_configured_t getConfiguredNewPlusEnabledValue()
{
return getUtilityEnabledValue(POLICY_CONFIGURE_ENABLED_NEWPLUS);
}
inline gpo_rule_configured_t getConfiguredMwbClipboardSharingEnabledValue() inline gpo_rule_configured_t getConfiguredMwbClipboardSharingEnabledValue()
{ {
return getUtilityEnabledValue(POLICY_MWB_CLIPBOARD_SHARING_ENABLED); return getUtilityEnabledValue(POLICY_MWB_CLIPBOARD_SHARING_ENABLED);

2
src/dsc/Microsoft.PowerToys.Configure/examples/disableAllModules.dsc.yaml
View File

@ -35,6 +35,8 @@ properties:
Enabled: false Enabled: false
MouseWithoutBorders: MouseWithoutBorders:
Enabled: false Enabled: false
NewPlus:
Enabled: false
Peek: Peek:
Enabled: false Enabled: false
PowerRename: PowerRename:

2
src/dsc/Microsoft.PowerToys.Configure/examples/enableAllModules.dsc.yaml
View File

@ -35,6 +35,8 @@ properties:
Enabled: true Enabled: true
MouseWithoutBorders: MouseWithoutBorders:
Enabled: true Enabled: true
NewPlus:
Enabled: true
Peek: Peek:
Enabled: true Enabled: true
PowerRename: PowerRename:

1
src/dsc/PowerToys.Settings.DSC.Schema.Generator/DSCGeneration.cs
View File

@ -6,6 +6,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.Linq; using System.Linq;
using static PowerToys.Settings.DSC.Schema.Introspection; using static PowerToys.Settings.DSC.Schema.Introspection;
namespace PowerToys.Settings.DSC.Schema; namespace PowerToys.Settings.DSC.Schema;

1
src/dsc/PowerToys.Settings.DSC.Schema.Generator/DocumentationGeneration.cs
View File

@ -4,6 +4,7 @@
using System; using System;
using System.Linq; using System.Linq;
using static PowerToys.Settings.DSC.Schema.Introspection; using static PowerToys.Settings.DSC.Schema.Introspection;
namespace PowerToys.Settings.DSC.Schema; namespace PowerToys.Settings.DSC.Schema;

1
src/dsc/PowerToys.Settings.DSC.Schema.Generator/Introspection.cs
View File

@ -6,6 +6,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
using Settings.UI.Library.Attributes; using Settings.UI.Library.Attributes;
namespace PowerToys.Settings.DSC.Schema; namespace PowerToys.Settings.DSC.Schema;

1
src/dsc/PowerToys.Settings.DSC.Schema.Generator/SampleGeneration.cs
View File

@ -5,6 +5,7 @@
using System; using System;
using System.Globalization; using System.Globalization;
using System.Linq; using System.Linq;
using static PowerToys.Settings.DSC.Schema.Introspection; using static PowerToys.Settings.DSC.Schema.Introspection;
namespace PowerToys.Settings.DSC.Schema; namespace PowerToys.Settings.DSC.Schema;

15
src/gpo/assets/PowerToys.admx
View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) Microsoft Corporation. <!-- Copyright (c) Microsoft Corporation.
Licensed under the MIT License. --> Licensed under the MIT License. -->
<policyDefinitions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.12" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions"> <policyDefinitions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.13" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
<policyNamespaces> <policyNamespaces>
<target prefix="powertoys" namespace="Microsoft.Policies.PowerToys" /> <target prefix="powertoys" namespace="Microsoft.Policies.PowerToys" />
</policyNamespaces> </policyNamespaces>
<resources minRequiredRevision="1.12"/><!-- Last changed with PowerToys v0.84.0 --> <resources minRequiredRevision="1.13"/><!-- Last changed with PowerToys v0.85.0 -->
<supportedOn> <supportedOn>
<definitions> <definitions>
<definition name="SUPPORTED_POWERTOYS_0_64_0" displayName="$(string.SUPPORTED_POWERTOYS_0_64_0)"/> <definition name="SUPPORTED_POWERTOYS_0_64_0" displayName="$(string.SUPPORTED_POWERTOYS_0_64_0)"/>
@ -21,6 +21,7 @@
<definition name="SUPPORTED_POWERTOYS_0_81_1" displayName="$(string.SUPPORTED_POWERTOYS_0_81_1)"/> <definition name="SUPPORTED_POWERTOYS_0_81_1" displayName="$(string.SUPPORTED_POWERTOYS_0_81_1)"/>
<definition name="SUPPORTED_POWERTOYS_0_83_0" displayName="$(string.SUPPORTED_POWERTOYS_0_83_0)"/> <definition name="SUPPORTED_POWERTOYS_0_83_0" displayName="$(string.SUPPORTED_POWERTOYS_0_83_0)"/>
<definition name="SUPPORTED_POWERTOYS_0_84_0" displayName="$(string.SUPPORTED_POWERTOYS_0_84_0)"/> <definition name="SUPPORTED_POWERTOYS_0_84_0" displayName="$(string.SUPPORTED_POWERTOYS_0_84_0)"/>
<definition name="SUPPORTED_POWERTOYS_0_85_0" displayName="$(string.SUPPORTED_POWERTOYS_0_85_0)"/>
</definitions> </definitions>
</supportedOn> </supportedOn>
<categories> <categories>
@ -345,6 +346,16 @@
<decimal value="0" /> <decimal value="0" />
</disabledValue> </disabledValue>
</policy> </policy>
<policy name="ConfigureEnabledUtilityNewPlus" class="Both" displayName="$(string.ConfigureEnabledUtilityNewPlus)" explainText="$(string.ConfigureEnabledUtilityDescription)" key="Software\Policies\PowerToys" valueName="ConfigureEnabledUtilityNewPlus">
<parentCategory ref="PowerToys" />
<supportedOn ref="SUPPORTED_POWERTOYS_0_85_0" />
<enabledValue>
<decimal value="1" />
</enabledValue>
<disabledValue>
<decimal value="0" />
</disabledValue>
</policy>
<policy name="ConfigureEnabledUtilityPeek" class="Both" displayName="$(string.ConfigureEnabledUtilityPeek)" explainText="$(string.ConfigureEnabledUtilityDescription)" key="Software\Policies\PowerToys" valueName="ConfigureEnabledUtilityPeek"> <policy name="ConfigureEnabledUtilityPeek" class="Both" displayName="$(string.ConfigureEnabledUtilityPeek)" explainText="$(string.ConfigureEnabledUtilityDescription)" key="Software\Policies\PowerToys" valueName="ConfigureEnabledUtilityPeek">
<parentCategory ref="PowerToys" /> <parentCategory ref="PowerToys" />
<supportedOn ref="SUPPORTED_POWERTOYS_0_70_0" /> <supportedOn ref="SUPPORTED_POWERTOYS_0_70_0" />

4
src/gpo/assets/en-US/PowerToys.adml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) Microsoft Corporation. <!-- Copyright (c) Microsoft Corporation.
Licensed under the MIT License. --> Licensed under the MIT License. -->
<policyDefinitionResources xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.12" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions"> <policyDefinitionResources xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.13" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
<displayName>PowerToys</displayName> <displayName>PowerToys</displayName>
<description>PowerToys</description> <description>PowerToys</description>
<resources> <resources>
@ -26,6 +26,7 @@
<string id="SUPPORTED_POWERTOYS_0_81_1">PowerToys version 0.81.1 or later</string> <string id="SUPPORTED_POWERTOYS_0_81_1">PowerToys version 0.81.1 or later</string>
<string id="SUPPORTED_POWERTOYS_0_83_0">PowerToys version 0.83.0 or later</string> <string id="SUPPORTED_POWERTOYS_0_83_0">PowerToys version 0.83.0 or later</string>
<string id="SUPPORTED_POWERTOYS_0_84_0">PowerToys version 0.84.0 or later</string> <string id="SUPPORTED_POWERTOYS_0_84_0">PowerToys version 0.84.0 or later</string>
<string id="SUPPORTED_POWERTOYS_0_85_0">PowerToys version 0.85.0 or later</string>
<string id="ConfigureAllUtilityGlobalEnabledStateDescription">This policy configures the enabled state for all PowerToys utilities. <string id="ConfigureAllUtilityGlobalEnabledStateDescription">This policy configures the enabled state for all PowerToys utilities.
@ -218,6 +219,7 @@ If you disable or don't configure this policy, no predefined rules are applied.
<string id="ConfigureEnabledUtilityMouseJump">Mouse Jump: Configure enabled state</string> <string id="ConfigureEnabledUtilityMouseJump">Mouse Jump: Configure enabled state</string>
<string id="ConfigureEnabledUtilityMousePointerCrosshairs">Mouse Pointer Crosshairs: Configure enabled state</string> <string id="ConfigureEnabledUtilityMousePointerCrosshairs">Mouse Pointer Crosshairs: Configure enabled state</string>
<string id="ConfigureEnabledUtilityMouseWithoutBorders">Mouse Without Borders: Configure enabled state</string> <string id="ConfigureEnabledUtilityMouseWithoutBorders">Mouse Without Borders: Configure enabled state</string>
<string id="ConfigureEnabledUtilityNewPlus">New+: Configure enabled state</string>
<string id="ConfigureEnabledUtilityPeek">Peek: Configure enabled state</string> <string id="ConfigureEnabledUtilityPeek">Peek: Configure enabled state</string>
<string id="ConfigureEnabledUtilityPowerRename">Power Rename: Configure enabled state</string> <string id="ConfigureEnabledUtilityPowerRename">Power Rename: Configure enabled state</string>
<string id="ConfigureEnabledUtilityPowerLauncher">PowerToys Run: Configure enabled state</string> <string id="ConfigureEnabledUtilityPowerLauncher">PowerToys Run: Configure enabled state</string>

3
src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/App.xaml.cs
View File

@ -7,6 +7,7 @@ using System.Globalization;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using AdvancedPaste.Helpers; using AdvancedPaste.Helpers;
using AdvancedPaste.Settings; using AdvancedPaste.Settings;
using AdvancedPaste.ViewModels; using AdvancedPaste.ViewModels;
@ -17,7 +18,9 @@ using Microsoft.UI.Windowing;
using Microsoft.UI.Xaml; using Microsoft.UI.Xaml;
using Windows.Graphics; using Windows.Graphics;
using WinUIEx; using WinUIEx;
using static AdvancedPaste.Helpers.NativeMethods; using static AdvancedPaste.Helpers.NativeMethods;
using DispatcherQueue = Microsoft.UI.Dispatching.DispatcherQueue; using DispatcherQueue = Microsoft.UI.Dispatching.DispatcherQueue;
// To learn more about WinUI, the WinUI project structure, // To learn more about WinUI, the WinUI project structure,

1
src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/AnimatedContentControl/AnimatedBorderBrush.cs
View File

@ -4,6 +4,7 @@
using System; using System;
using System.Numerics; using System.Numerics;
using Microsoft.UI.Composition; using Microsoft.UI.Composition;
using Microsoft.UI.Xaml; using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media; using Microsoft.UI.Xaml.Media;

1
src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/PromptBox.xaml.cs
View File

@ -5,6 +5,7 @@
using System; using System;
using System.Net; using System.Net;
using System.Threading.Tasks; using System.Threading.Tasks;
using AdvancedPaste.Helpers; using AdvancedPaste.Helpers;
using AdvancedPaste.Settings; using AdvancedPaste.Settings;
using AdvancedPaste.ViewModels; using AdvancedPaste.ViewModels;

1
src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/CountToDoubleConverter.cs
View File

@ -4,6 +4,7 @@
using System; using System;
using System.Collections; using System.Collections;
using Microsoft.UI.Xaml.Data; using Microsoft.UI.Xaml.Data;
namespace AdvancedPaste.Converters; namespace AdvancedPaste.Converters;

1
src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/CountToVisibilityConverter.cs
View File

@ -4,6 +4,7 @@
using System; using System;
using System.Collections; using System.Collections;
using Microsoft.UI.Xaml; using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Data; using Microsoft.UI.Xaml.Data;

1
src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/MainWindow.xaml.cs
View File

@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information. // See the LICENSE file in the project root for more information.
using System; using System;
using AdvancedPaste.Helpers; using AdvancedPaste.Helpers;
using AdvancedPaste.Settings; using AdvancedPaste.Settings;
using ManagedCommon; using ManagedCommon;

1
src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml.cs
View File

@ -7,6 +7,7 @@ using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using AdvancedPaste.Helpers; using AdvancedPaste.Helpers;
using AdvancedPaste.Models; using AdvancedPaste.Models;
using AdvancedPaste.ViewModels; using AdvancedPaste.ViewModels;

1
src/modules/AdvancedPaste/AdvancedPaste/Helpers/AICompletionsHelper.cs
View File

@ -6,6 +6,7 @@ using System;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using System.Net; using System.Net;
using Azure; using Azure;
using Azure.AI.OpenAI; using Azure.AI.OpenAI;
using ManagedCommon; using ManagedCommon;

1
src/modules/AdvancedPaste/AdvancedPaste/Helpers/ClipboardHelper.cs
View File

@ -5,6 +5,7 @@
using System; using System;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using ManagedCommon; using ManagedCommon;
using Microsoft.UI.Xaml.Media.Imaging; using Microsoft.UI.Xaml.Media.Imaging;
using Windows.ApplicationModel.DataTransfer; using Windows.ApplicationModel.DataTransfer;

1
src/modules/AdvancedPaste/AdvancedPaste/Helpers/IUserSettings.cs
View File

@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information. // See the LICENSE file in the project root for more information.
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using Microsoft.PowerToys.Settings.UI.Library; using Microsoft.PowerToys.Settings.UI.Library;
namespace AdvancedPaste.Settings namespace AdvancedPaste.Settings

1
src/modules/AdvancedPaste/AdvancedPaste/Helpers/JsonHelper.cs
View File

@ -8,6 +8,7 @@ using System.Linq;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Xml; using System.Xml;
using ManagedCommon; using ManagedCommon;
using Newtonsoft.Json; using Newtonsoft.Json;
using Windows.ApplicationModel.DataTransfer; using Windows.ApplicationModel.DataTransfer;

1
src/modules/AdvancedPaste/AdvancedPaste/Helpers/MarkdownHelper.cs
View File

@ -6,6 +6,7 @@ using System;
using System.Linq; using System.Linq;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using HtmlAgilityPack; using HtmlAgilityPack;
using ManagedCommon; using ManagedCommon;
using Windows.ApplicationModel.DataTransfer; using Windows.ApplicationModel.DataTransfer;

1
src/modules/AdvancedPaste/AdvancedPaste/Helpers/UserSettings.cs
View File

@ -7,6 +7,7 @@ using System.Collections.ObjectModel;
using System.IO.Abstractions; using System.IO.Abstractions;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using ManagedCommon; using ManagedCommon;
using Microsoft.PowerToys.Settings.UI.Library; using Microsoft.PowerToys.Settings.UI.Library;
using Microsoft.PowerToys.Settings.UI.Library.Utilities; using Microsoft.PowerToys.Settings.UI.Library.Utilities;

1
src/modules/AdvancedPaste/AdvancedPaste/Models/CustomQuery.cs
View File

@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information. // See the LICENSE file in the project root for more information.
using System.Text.Json; using System.Text.Json;
using AdvancedPaste.Helpers; using AdvancedPaste.Helpers;
using Microsoft.PowerToys.Settings.UI.Library.Interfaces; using Microsoft.PowerToys.Settings.UI.Library.Interfaces;

1
src/modules/AdvancedPaste/AdvancedPaste/Program.cs
View File

@ -4,6 +4,7 @@
using System; using System;
using System.Threading; using System.Threading;
using ManagedCommon; using ManagedCommon;
using Microsoft.UI.Dispatching; using Microsoft.UI.Dispatching;
using Microsoft.Windows.AppLifecycle; using Microsoft.Windows.AppLifecycle;

1
src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteClipboardItemClicked.cs
View File

@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information. // See the LICENSE file in the project root for more information.
using System.Diagnostics.Tracing; using System.Diagnostics.Tracing;
using Microsoft.PowerToys.Telemetry; using Microsoft.PowerToys.Telemetry;
using Microsoft.PowerToys.Telemetry.Events; using Microsoft.PowerToys.Telemetry.Events;

1
src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteClipboardItemDeletedEvent.cs
View File

@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information. // See the LICENSE file in the project root for more information.
using System.Diagnostics.Tracing; using System.Diagnostics.Tracing;
using Microsoft.PowerToys.Telemetry; using Microsoft.PowerToys.Telemetry;
using Microsoft.PowerToys.Telemetry.Events; using Microsoft.PowerToys.Telemetry.Events;

1
src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteCustomFormatOutputThumbUpDownEvent.cs
View File

@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information. // See the LICENSE file in the project root for more information.
using System.Diagnostics.Tracing; using System.Diagnostics.Tracing;
using Microsoft.PowerToys.Telemetry; using Microsoft.PowerToys.Telemetry;
using Microsoft.PowerToys.Telemetry.Events; using Microsoft.PowerToys.Telemetry.Events;

1
src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteFormatClickedEvent.cs
View File

@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information. // See the LICENSE file in the project root for more information.
using System.Diagnostics.Tracing; using System.Diagnostics.Tracing;
using AdvancedPaste.Models; using AdvancedPaste.Models;
using Microsoft.PowerToys.Telemetry; using Microsoft.PowerToys.Telemetry;
using Microsoft.PowerToys.Telemetry.Events; using Microsoft.PowerToys.Telemetry.Events;

1
src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteGenerateCustomErrorEvent.cs
View File

@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information. // See the LICENSE file in the project root for more information.
using System.Diagnostics.Tracing; using System.Diagnostics.Tracing;
using Microsoft.PowerToys.Telemetry; using Microsoft.PowerToys.Telemetry;
using Microsoft.PowerToys.Telemetry.Events; using Microsoft.PowerToys.Telemetry.Events;

1
src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteGenerateCustomFormatEvent.cs
View File

@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information. // See the LICENSE file in the project root for more information.
using System.Diagnostics.Tracing; using System.Diagnostics.Tracing;
using Microsoft.PowerToys.Telemetry; using Microsoft.PowerToys.Telemetry;
using Microsoft.PowerToys.Telemetry.Events; using Microsoft.PowerToys.Telemetry.Events;

1
src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteInAppKeyboardShortcutEvent.cs
View File

@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information. // See the LICENSE file in the project root for more information.
using System.Diagnostics.Tracing; using System.Diagnostics.Tracing;
using AdvancedPaste.Models; using AdvancedPaste.Models;
using Microsoft.PowerToys.Telemetry; using Microsoft.PowerToys.Telemetry;
using Microsoft.PowerToys.Telemetry.Events; using Microsoft.PowerToys.Telemetry.Events;

2
src/modules/AdvancedPaste/AdvancedPaste/ViewModels/OptionsViewModel.cs
View File

@ -8,6 +8,7 @@ using System.Globalization;
using System.Linq; using System.Linq;
using System.Net; using System.Net;
using System.Threading.Tasks; using System.Threading.Tasks;
using AdvancedPaste.Helpers; using AdvancedPaste.Helpers;
using AdvancedPaste.Models; using AdvancedPaste.Models;
using AdvancedPaste.Settings; using AdvancedPaste.Settings;
@ -22,6 +23,7 @@ using Microsoft.Win32;
using Windows.ApplicationModel.DataTransfer; using Windows.ApplicationModel.DataTransfer;
using Windows.System; using Windows.System;
using WinUIEx; using WinUIEx;
using DispatcherQueue = Microsoft.UI.Dispatching.DispatcherQueue; using DispatcherQueue = Microsoft.UI.Dispatching.DispatcherQueue;
namespace AdvancedPaste.ViewModels namespace AdvancedPaste.ViewModels

6
src/modules/AdvancedPaste/AdvancedPasteModuleInterface/dllmain.cpp
View File

@ -749,8 +749,6 @@ public:
{ {
Logger::trace(L"Launching new process"); Logger::trace(L"Launching new process");
launch_process_and_named_pipe(); launch_process_and_named_pipe();
Trace::AdvancedPaste_Invoked(L"AdvancedPasteUI");
} }
// hotkeyId in same order as set by get_hotkeys // hotkeyId in same order as set by get_hotkeys
@ -774,18 +772,21 @@ public:
bring_process_to_front(); bring_process_to_front();
send_named_pipe_message(CommonSharedConstants::ADVANCED_PASTE_SHOW_UI_MESSAGE); send_named_pipe_message(CommonSharedConstants::ADVANCED_PASTE_SHOW_UI_MESSAGE);
Trace::AdvancedPaste_Invoked(L"AdvancedPasteUI");
return true; return true;
} }
if (hotkeyId == 2) if (hotkeyId == 2)
{ // m_paste_as_markdown_hotkey { // m_paste_as_markdown_hotkey
Logger::trace(L"Starting paste as markdown directly"); Logger::trace(L"Starting paste as markdown directly");
send_named_pipe_message(CommonSharedConstants::ADVANCED_PASTE_MARKDOWN_MESSAGE); send_named_pipe_message(CommonSharedConstants::ADVANCED_PASTE_MARKDOWN_MESSAGE);
Trace::AdvancedPaste_Invoked(L"MarkdownDirect");
return true; return true;
} }
if (hotkeyId == 3) if (hotkeyId == 3)
{ // m_paste_as_json_hotkey { // m_paste_as_json_hotkey
Logger::trace(L"Starting paste as json directly"); Logger::trace(L"Starting paste as json directly");
send_named_pipe_message(CommonSharedConstants::ADVANCED_PASTE_JSON_MESSAGE); send_named_pipe_message(CommonSharedConstants::ADVANCED_PASTE_JSON_MESSAGE);
Trace::AdvancedPaste_Invoked(L"JsonDirect");
return true; return true;
} }
@ -798,6 +799,7 @@ public:
Logger::trace(L"Starting custom action id={}", id); Logger::trace(L"Starting custom action id={}", id);
send_named_pipe_message(CommonSharedConstants::ADVANCED_PASTE_CUSTOM_ACTION_MESSAGE, std::to_wstring(id)); send_named_pipe_message(CommonSharedConstants::ADVANCED_PASTE_CUSTOM_ACTION_MESSAGE, std::to_wstring(id));
Trace::AdvancedPaste_Invoked(L"CustomActionDirect");
return true; return true;
} }
} }

1
src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/App.xaml.cs
View File

@ -4,6 +4,7 @@
using System; using System;
using System.IO.Abstractions; using System.IO.Abstractions;
using EnvironmentVariables.Telemetry; using EnvironmentVariables.Telemetry;
using EnvironmentVariablesUILib; using EnvironmentVariablesUILib;
using EnvironmentVariablesUILib.Helpers; using EnvironmentVariablesUILib.Helpers;

1
src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/MainWindow.xaml.cs
View File

@ -4,6 +4,7 @@
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using EnvironmentVariables.Win32; using EnvironmentVariables.Win32;
using EnvironmentVariablesUILib; using EnvironmentVariablesUILib;
using EnvironmentVariablesUILib.Helpers; using EnvironmentVariablesUILib.Helpers;

1
src/modules/EnvironmentVariables/EnvironmentVariables/Helpers/LoggerWrapper.cs
View File

@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information. // See the LICENSE file in the project root for more information.
using System; using System;
using EnvironmentVariablesUILib.Helpers; using EnvironmentVariablesUILib.Helpers;
using ManagedCommon; using ManagedCommon;

1
src/modules/EnvironmentVariables/EnvironmentVariables/Program.cs
View File

@ -4,6 +4,7 @@
using System; using System;
using System.Threading; using System.Threading;
using ManagedCommon; using ManagedCommon;
using Microsoft.UI.Dispatching; using Microsoft.UI.Dispatching;
using Microsoft.Windows.AppLifecycle; using Microsoft.Windows.AppLifecycle;

1
src/modules/EnvironmentVariables/EnvironmentVariables/Telemetry/EnvironmentVariablesOpenedEvent.cs
View File

@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information. // See the LICENSE file in the project root for more information.
using System.Diagnostics.Tracing; using System.Diagnostics.Tracing;
using Microsoft.PowerToys.Telemetry; using Microsoft.PowerToys.Telemetry;
using Microsoft.PowerToys.Telemetry.Events; using Microsoft.PowerToys.Telemetry.Events;

1
src/modules/EnvironmentVariables/EnvironmentVariables/Telemetry/EnvironmentVariablesProfileEnabledEvent.cs
View File

@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information. // See the LICENSE file in the project root for more information.
using System.Diagnostics.Tracing; using System.Diagnostics.Tracing;
using Microsoft.PowerToys.Telemetry; using Microsoft.PowerToys.Telemetry;
using Microsoft.PowerToys.Telemetry.Events; using Microsoft.PowerToys.Telemetry.Events;

1
src/modules/EnvironmentVariables/EnvironmentVariables/Telemetry/EnvironmentVariablesVariableChangedEvent.cs
View File

@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information. // See the LICENSE file in the project root for more information.
using System.Diagnostics.Tracing; using System.Diagnostics.Tracing;
using EnvironmentVariablesUILib.Models; using EnvironmentVariablesUILib.Models;
using Microsoft.PowerToys.Telemetry; using Microsoft.PowerToys.Telemetry;
using Microsoft.PowerToys.Telemetry.Events; using Microsoft.PowerToys.Telemetry.Events;

1
src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToBoolConverter.cs
View File

@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information. // See the LICENSE file in the project root for more information.
using System; using System;
using EnvironmentVariablesUILib.Models; using EnvironmentVariablesUILib.Models;
using Microsoft.UI.Xaml.Data; using Microsoft.UI.Xaml.Data;

1
src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToMessageConverter.cs
View File

@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information. // See the LICENSE file in the project root for more information.
using System; using System;
using EnvironmentVariablesUILib.Helpers; using EnvironmentVariablesUILib.Helpers;
using EnvironmentVariablesUILib.Models; using EnvironmentVariablesUILib.Models;
using Microsoft.UI.Xaml.Data; using Microsoft.UI.Xaml.Data;

1
src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToTitleConverter.cs
View File

@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information. // See the LICENSE file in the project root for more information.
using System; using System;
using EnvironmentVariablesUILib.Helpers; using EnvironmentVariablesUILib.Helpers;
using EnvironmentVariablesUILib.Models; using EnvironmentVariablesUILib.Models;
using Microsoft.UI.Xaml.Data; using Microsoft.UI.Xaml.Data;

1
src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/EnvironmentStateToVisibilityConverter.cs
View File

@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information. // See the LICENSE file in the project root for more information.
using System; using System;
using EnvironmentVariablesUILib.Models; using EnvironmentVariablesUILib.Models;
using Microsoft.UI.Xaml; using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Data; using Microsoft.UI.Xaml.Data;

1
src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Converters/VariableTypeToGlyphConverter.cs
View File

@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information. // See the LICENSE file in the project root for more information.
using System; using System;
using EnvironmentVariablesUILib.Models; using EnvironmentVariablesUILib.Models;
using Microsoft.UI.Xaml.Data; using Microsoft.UI.Xaml.Data;

1
src/modules/EnvironmentVariables/EnvironmentVariablesUILib/EnvironmentVariablesMainPage.xaml.cs
View File

@ -6,6 +6,7 @@ using System;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Input; using System.Windows.Input;
using CommunityToolkit.Mvvm.Input; using CommunityToolkit.Mvvm.Input;
using EnvironmentVariablesUILib.Models; using EnvironmentVariablesUILib.Models;
using EnvironmentVariablesUILib.ViewModels; using EnvironmentVariablesUILib.ViewModels;

1
src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Helpers/EnvironmentVariablesHelper.cs
View File

@ -5,6 +5,7 @@
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using EnvironmentVariablesUILib.Helpers.Win32; using EnvironmentVariablesUILib.Helpers.Win32;
using EnvironmentVariablesUILib.Models; using EnvironmentVariablesUILib.Models;
using Microsoft.Win32; using Microsoft.Win32;

1
src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Helpers/EnvironmentVariablesService.cs
View File

@ -8,6 +8,7 @@ using System.IO;
using System.IO.Abstractions; using System.IO.Abstractions;
using System.Text.Json; using System.Text.Json;
using System.Threading.Tasks; using System.Threading.Tasks;
using EnvironmentVariablesUILib.Models; using EnvironmentVariablesUILib.Models;
namespace EnvironmentVariablesUILib.Helpers namespace EnvironmentVariablesUILib.Helpers

1
src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Helpers/IEnvironmentVariablesService.cs
View File

@ -5,6 +5,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
using EnvironmentVariablesUILib.Models; using EnvironmentVariablesUILib.Models;
namespace EnvironmentVariablesUILib.Helpers namespace EnvironmentVariablesUILib.Helpers

1
src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Models/ProfileVariablesSet.cs
View File

@ -5,6 +5,7 @@
using System; using System;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.Threading.Tasks; using System.Threading.Tasks;
using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.ComponentModel;
using EnvironmentVariablesUILib.Helpers; using EnvironmentVariablesUILib.Helpers;

1
src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Models/Variable.cs
View File

@ -9,6 +9,7 @@ using System.Collections.Specialized;
using System.Linq; using System.Linq;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
using System.Threading.Tasks; using System.Threading.Tasks;
using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.ComponentModel;
using EnvironmentVariablesUILib.Helpers; using EnvironmentVariablesUILib.Helpers;

1
src/modules/EnvironmentVariables/EnvironmentVariablesUILib/Models/VariablesSet.cs
View File

@ -6,6 +6,7 @@ using System;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.Linq; using System.Linq;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.ComponentModel;
using EnvironmentVariablesUILib.ViewModels; using EnvironmentVariablesUILib.ViewModels;

1
src/modules/EnvironmentVariables/EnvironmentVariablesUILib/ViewModels/MainViewModel.cs
View File

@ -9,6 +9,7 @@ using System.ComponentModel;
using System.Globalization; using System.Globalization;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.ComponentModel;
using EnvironmentVariablesUILib.Helpers; using EnvironmentVariablesUILib.Helpers;
using EnvironmentVariablesUILib.Models; using EnvironmentVariablesUILib.Models;

1
src/modules/FileLocksmith/FileLocksmithUI/Converters/FileCountConverter.cs
View File

@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information. // See the LICENSE file in the project root for more information.
using System; using System;
using Microsoft.UI.Xaml.Data; using Microsoft.UI.Xaml.Data;
namespace PowerToys.FileLocksmithUI.Converters namespace PowerToys.FileLocksmithUI.Converters

1
src/modules/FileLocksmith/FileLocksmithUI/Converters/FileListToDescriptionConverter.cs
View File

@ -4,6 +4,7 @@
using System; using System;
using System.IO; using System.IO;
using Microsoft.UI.Xaml.Data; using Microsoft.UI.Xaml.Data;
namespace PowerToys.FileLocksmithUI.Converters namespace PowerToys.FileLocksmithUI.Converters

1
src/modules/FileLocksmith/FileLocksmithUI/Converters/PidToIconConverter.cs
View File

@ -5,6 +5,7 @@
using System; using System;
using System.Drawing; using System.Drawing;
using System.IO; using System.IO;
using Microsoft.UI.Xaml.Data; using Microsoft.UI.Xaml.Data;
using Microsoft.UI.Xaml.Media.Imaging; using Microsoft.UI.Xaml.Media.Imaging;

1
src/modules/FileLocksmith/FileLocksmithUI/Converters/UserToSystemWarningVisibilityConverter.cs
View File

@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information. // See the LICENSE file in the project root for more information.
using System; using System;
using Microsoft.UI.Xaml; using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Data; using Microsoft.UI.Xaml.Data;

1
src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/App.xaml.cs
View File

@ -4,6 +4,7 @@
using System; using System;
using System.Linq; using System.Linq;
using ManagedCommon; using ManagedCommon;
using Microsoft.UI.Dispatching; using Microsoft.UI.Dispatching;
using Microsoft.UI.Xaml; using Microsoft.UI.Xaml;

1
src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/MainWindow.xaml.cs
View File

@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information. // See the LICENSE file in the project root for more information.
using System; using System;
using Microsoft.UI.Windowing; using Microsoft.UI.Windowing;
using Microsoft.UI.Xaml; using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Media; using Microsoft.UI.Xaml.Media;

1
src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/Views/MainPage.xaml.cs
View File

@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information. // See the LICENSE file in the project root for more information.
using System; using System;
using Microsoft.UI.Xaml; using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Controls;
using PowerToys.FileLocksmithLib.Interop; using PowerToys.FileLocksmithLib.Interop;

1
src/modules/FileLocksmith/FileLocksmithUI/ViewModels/MainViewModel.cs
View File

@ -9,6 +9,7 @@ using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input; using CommunityToolkit.Mvvm.Input;
using ManagedCommon; using ManagedCommon;

1
src/modules/Hosts/Hosts.Tests/HostsServiceTest.cs
View File

@ -6,6 +6,7 @@ using System.IO;
using System.IO.Abstractions.TestingHelpers; using System.IO.Abstractions.TestingHelpers;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Hosts.Tests.Mocks; using Hosts.Tests.Mocks;
using HostsUILib.Exceptions; using HostsUILib.Exceptions;
using HostsUILib.Helpers; using HostsUILib.Helpers;

1
src/modules/Hosts/Hosts/Helpers/Host.cs
View File

@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information. // See the LICENSE file in the project root for more information.
using System; using System;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
namespace Hosts.Helpers namespace Hosts.Helpers

1
src/modules/Hosts/Hosts/Helpers/LoggerWrapper.cs
View File

@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information. // See the LICENSE file in the project root for more information.
using System; using System;
using HostsUILib.Helpers; using HostsUILib.Helpers;
using ManagedCommon; using ManagedCommon;

3
src/modules/Hosts/Hosts/HostsXAML/App.xaml.cs
View File

@ -5,6 +5,7 @@
using System; using System;
using System.IO.Abstractions; using System.IO.Abstractions;
using System.Threading; using System.Threading;
using Common.UI; using Common.UI;
using HostsUILib.Helpers; using HostsUILib.Helpers;
using HostsUILib.Settings; using HostsUILib.Settings;
@ -16,7 +17,9 @@ using Microsoft.Extensions.Hosting;
using Microsoft.PowerToys.Telemetry; using Microsoft.PowerToys.Telemetry;
using Microsoft.UI.Dispatching; using Microsoft.UI.Dispatching;
using Microsoft.UI.Xaml; using Microsoft.UI.Xaml;
using static HostsUILib.Settings.IUserSettings; using static HostsUILib.Settings.IUserSettings;
using Host = Hosts.Helpers.Host; using Host = Hosts.Helpers.Host;
// To learn more about WinUI, the WinUI project structure, // To learn more about WinUI, the WinUI project structure,

1
src/modules/Hosts/Hosts/Program.cs
View File

@ -4,6 +4,7 @@
using System; using System;
using System.Threading; using System.Threading;
using ManagedCommon; using ManagedCommon;
using Microsoft.UI.Dispatching; using Microsoft.UI.Dispatching;
using Microsoft.Windows.AppLifecycle; using Microsoft.Windows.AppLifecycle;

1
src/modules/Hosts/Hosts/Settings/UserSettings.cs
View File

@ -5,6 +5,7 @@
using System; using System;
using System.IO.Abstractions; using System.IO.Abstractions;
using System.Threading; using System.Threading;
using HostsUILib.Settings; using HostsUILib.Settings;
using ManagedCommon; using ManagedCommon;
using Microsoft.PowerToys.Settings.UI.Library; using Microsoft.PowerToys.Settings.UI.Library;

1
src/modules/Hosts/Hosts/Telemetry/HostsFileEditorOpenedEvent.cs
View File

@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information. // See the LICENSE file in the project root for more information.
using System.Diagnostics.Tracing; using System.Diagnostics.Tracing;
using Microsoft.PowerToys.Telemetry; using Microsoft.PowerToys.Telemetry;
using Microsoft.PowerToys.Telemetry.Events; using Microsoft.PowerToys.Telemetry.Events;

1
src/modules/Hosts/HostsUILib/Helpers/DuplicateService.cs
View File

@ -7,6 +7,7 @@ using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using HostsUILib.Models; using HostsUILib.Models;
using HostsUILib.Settings; using HostsUILib.Settings;
using Microsoft.UI.Dispatching; using Microsoft.UI.Dispatching;

1
src/modules/Hosts/HostsUILib/Helpers/HostsService.cs
View File

@ -13,6 +13,7 @@ using System.Net.NetworkInformation;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using HostsUILib.Exceptions; using HostsUILib.Exceptions;
using HostsUILib.Models; using HostsUILib.Models;
using HostsUILib.Settings; using HostsUILib.Settings;

1
src/modules/Hosts/HostsUILib/Helpers/IDuplicateService.cs
View File

@ -3,6 +3,7 @@
// See the LICENSE file in the project root for more information. // See the LICENSE file in the project root for more information.
using System.Collections.Generic; using System.Collections.Generic;
using HostsUILib.Models; using HostsUILib.Models;
namespace HostsUILib.Helpers namespace HostsUILib.Helpers

1
src/modules/Hosts/HostsUILib/Helpers/IHostsService.cs
View File

@ -5,6 +5,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
using HostsUILib.Models; using HostsUILib.Models;
namespace HostsUILib.Helpers namespace HostsUILib.Helpers

Some files were not shown because too many files have changed in this diff Show More