diff --git a/.pipelines/ESRPSigning_core.json b/.pipelines/ESRPSigning_core.json index 40a6d8c196..df3a610cf0 100644 --- a/.pipelines/ESRPSigning_core.json +++ b/.pipelines/ESRPSigning_core.json @@ -211,9 +211,6 @@ "PowerToys.PowerAccentModuleInterface.dll", "PowerToys.PowerAccentKeyboardService.dll", - "PowerToys.PowerDisplayModuleInterface.dll", - "WinUI3Apps\\PowerToys.PowerDisplay.dll", - "WinUI3Apps\\PowerToys.PowerDisplay.exe", "PowerDisplay.Lib.dll", "WinUI3Apps\\PowerToys.PowerRenameExt.dll", diff --git a/PowerToys.slnx b/PowerToys.slnx index 7c09e1500d..9b95ddac1d 100644 --- a/PowerToys.slnx +++ b/PowerToys.slnx @@ -688,11 +688,13 @@ + diff --git a/installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp b/installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp index 43919ecaf1..73af14ca0e 100644 --- a/installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp +++ b/installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp @@ -1565,7 +1565,6 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall) L"PowerToys.PowerRename.exe", L"PowerToys.ImageResizer.exe", L"PowerToys.LightSwitchService.exe", - L"PowerToys.PowerDisplay.exe", L"PowerToys.GcodeThumbnailProvider.exe", L"PowerToys.BgcodeThumbnailProvider.exe", L"PowerToys.PdfThumbnailProvider.exe", diff --git a/installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj b/installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj index 4000503edf..a7a9744e87 100644 --- a/installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj +++ b/installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj @@ -47,7 +47,6 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil call move /Y ..\..\..\NewPlus.wxs.bk ..\..\..\NewPlus.wxs call move /Y ..\..\..\Peek.wxs.bk ..\..\..\Peek.wxs call move /Y ..\..\..\PowerRename.wxs.bk ..\..\..\PowerRename.wxs - call move /Y ..\..\..\PowerDisplay.wxs.bk ..\..\..\PowerDisplay.wxs call move /Y ..\..\..\Product.wxs.bk ..\..\..\Product.wxs call move /Y ..\..\..\RegistryPreview.wxs.bk ..\..\..\RegistryPreview.wxs call move /Y ..\..\..\Resources.wxs.bk ..\..\..\Resources.wxs @@ -124,7 +123,6 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil - diff --git a/installer/PowerToysSetupVNext/Product.wxs b/installer/PowerToysSetupVNext/Product.wxs index 1a5f8010f7..7e89a35ac4 100644 --- a/installer/PowerToysSetupVNext/Product.wxs +++ b/installer/PowerToysSetupVNext/Product.wxs @@ -53,7 +53,6 @@ - diff --git a/installer/PowerToysSetupVNext/generateAllFileComponents.ps1 b/installer/PowerToysSetupVNext/generateAllFileComponents.ps1 index 2ada2b17d1..6724d95170 100644 --- a/installer/PowerToysSetupVNext/generateAllFileComponents.ps1 +++ b/installer/PowerToysSetupVNext/generateAllFileComponents.ps1 @@ -176,10 +176,6 @@ Generate-FileComponents -fileListName "ImageResizerAssetsFiles" -wxsFilePath $PS Generate-FileList -fileDepsJson "" -fileListName LightSwitchFiles -wxsFilePath $PSScriptRoot\LightSwitch.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\LightSwitchService" Generate-FileComponents -fileListName "LightSwitchFiles" -wxsFilePath $PSScriptRoot\LightSwitch.wxs -#PowerDisplay -Generate-FileList -fileDepsJson "" -fileListName PowerDisplayAssetsFiles -wxsFilePath $PSScriptRoot\PowerDisplay.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\PowerDisplay" -Generate-FileComponents -fileListName "PowerDisplayAssetsFiles" -wxsFilePath $PSScriptRoot\PowerDisplay.wxs - #New+ Generate-FileList -fileDepsJson "" -fileListName NewPlusAssetsFiles -wxsFilePath $PSScriptRoot\NewPlus.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\NewPlus" Generate-FileComponents -fileListName "NewPlusAssetsFiles" -wxsFilePath $PSScriptRoot\NewPlus.wxs diff --git a/src/gpo/assets/PowerToys.admx b/src/gpo/assets/PowerToys.admx index ddef3d95eb..be7d07fabd 100644 --- a/src/gpo/assets/PowerToys.admx +++ b/src/gpo/assets/PowerToys.admx @@ -149,6 +149,7 @@ + diff --git a/src/gpo/assets/en-US/PowerToys.adml b/src/gpo/assets/en-US/PowerToys.adml index ccd38d9934..fa5db5ed09 100644 --- a/src/gpo/assets/en-US/PowerToys.adml +++ b/src/gpo/assets/en-US/PowerToys.adml @@ -248,7 +248,7 @@ If you don't configure this policy, the user will be able to control the setting CmdPal: Configure enabled state Crop And Lock: Configure enabled state Light Switch: Configure enabled state - PowerDisplay: Configure enabled state + Environment Variables: Configure enabled state FancyZones: Configure enabled state File Locksmith: Configure enabled state diff --git a/src/runner/main.cpp b/src/runner/main.cpp index 973cee4ba5..626bddc47f 100644 --- a/src/runner/main.cpp +++ b/src/runner/main.cpp @@ -286,7 +286,7 @@ int runner(bool isProcessElevated, bool openSettings, std::string settingsWindow L"PowerToys.CmdPalModuleInterface.dll", L"PowerToys.ZoomItModuleInterface.dll", L"PowerToys.LightSwitchModuleInterface.dll", - L"PowerToys.PowerDisplayModuleInterface.dll", + // L"PowerToys.PowerDisplayModuleInterface.dll", // TEMPORARILY_DISABLED: PowerDisplay }; for (auto moduleSubdir : knownModules) diff --git a/src/settings-ui/QuickAccess.UI/ViewModels/AllAppsViewModel.cs b/src/settings-ui/QuickAccess.UI/ViewModels/AllAppsViewModel.cs index eb00296263..3a02459c57 100644 --- a/src/settings-ui/QuickAccess.UI/ViewModels/AllAppsViewModel.cs +++ b/src/settings-ui/QuickAccess.UI/ViewModels/AllAppsViewModel.cs @@ -77,6 +77,12 @@ public sealed class AllAppsViewModel : Observable continue; } + // TEMPORARILY_DISABLED: PowerDisplay + if (moduleType == ModuleType.PowerDisplay) + { + continue; + } + _allFlyoutMenuItems.Add(new FlyoutMenuItem { Tag = moduleType, diff --git a/src/settings-ui/Settings.UI.Controls/QuickAccess/QuickAccessViewModel.cs b/src/settings-ui/Settings.UI.Controls/QuickAccess/QuickAccessViewModel.cs index 004f554640..d24edf2d0d 100644 --- a/src/settings-ui/Settings.UI.Controls/QuickAccess/QuickAccessViewModel.cs +++ b/src/settings-ui/Settings.UI.Controls/QuickAccess/QuickAccessViewModel.cs @@ -68,7 +68,8 @@ namespace Microsoft.PowerToys.Settings.UI.Controls AddFlyoutMenuItem(ModuleType.FancyZones); AddFlyoutMenuItem(ModuleType.Hosts); AddFlyoutMenuItem(ModuleType.LightSwitch); - AddFlyoutMenuItem(ModuleType.PowerDisplay); + + // AddFlyoutMenuItem(ModuleType.PowerDisplay); // TEMPORARILY_DISABLED: PowerDisplay AddFlyoutMenuItem(ModuleType.PowerLauncher); AddFlyoutMenuItem(ModuleType.PowerOCR); AddFlyoutMenuItem(ModuleType.RegistryPreview); diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OobeWindow.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OobeWindow.xaml index 1d352758d0..ca57121de2 100644 --- a/src/settings-ui/Settings.UI/SettingsXAML/OobeWindow.xaml +++ b/src/settings-ui/Settings.UI/SettingsXAML/OobeWindow.xaml @@ -126,10 +126,12 @@ x:Uid="Shell_Peek" Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Peek.png}" Tag="Peek" /> + + (DashboardListItemClick), };