mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-03 09:46:54 +02:00
Temporarily disable PowerDisplay module across PowerToys (#45802)
Icon and New name still pending for final decision. We cannot ship in this release, still need enough time to consider new name and icon. <!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? --> ## Summary of the Pull Request <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist - [ ] Closes: #xxx <!-- - [ ] Closes: #yyy (add separate lines for additional resolved issues) --> - [ ] **Communication:** I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected - [ ] **Tests:** Added/updated and all pass - [ ] **Localization:** All end-user-facing strings can be localized - [ ] **Dev docs:** Added/updated - [ ] **New binaries:** Added on the required places - [ ] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries - [ ] [WXS for installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs) for new binaries and localization folder - [ ] [YML for CI pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml) for new test projects - [ ] [YML for signed pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml) - [ ] **Documentation updated:** If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys) and link it here: #xxx <!-- Provide a more detailed description of the PR, other things fixed, or any additional comments/features here --> ## Detailed Description of the Pull Request / Additional comments <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed --------- Co-authored-by: Yu Leng (from Dev Box) <yuleng@microsoft.com>
This commit is contained in:
@@ -211,9 +211,6 @@
|
|||||||
"PowerToys.PowerAccentModuleInterface.dll",
|
"PowerToys.PowerAccentModuleInterface.dll",
|
||||||
"PowerToys.PowerAccentKeyboardService.dll",
|
"PowerToys.PowerAccentKeyboardService.dll",
|
||||||
|
|
||||||
"PowerToys.PowerDisplayModuleInterface.dll",
|
|
||||||
"WinUI3Apps\\PowerToys.PowerDisplay.dll",
|
|
||||||
"WinUI3Apps\\PowerToys.PowerDisplay.exe",
|
|
||||||
"PowerDisplay.Lib.dll",
|
"PowerDisplay.Lib.dll",
|
||||||
|
|
||||||
"WinUI3Apps\\PowerToys.PowerRenameExt.dll",
|
"WinUI3Apps\\PowerToys.PowerRenameExt.dll",
|
||||||
|
|||||||
@@ -688,11 +688,13 @@
|
|||||||
<Platform Solution="*|ARM64" Project="ARM64" />
|
<Platform Solution="*|ARM64" Project="ARM64" />
|
||||||
<Platform Solution="*|x64" Project="x64" />
|
<Platform Solution="*|x64" Project="x64" />
|
||||||
</Project>
|
</Project>
|
||||||
|
<!-- TEMPORARILY_DISABLED: PowerDisplay
|
||||||
<Project Path="src/modules/powerdisplay/PowerDisplay/PowerDisplay.csproj">
|
<Project Path="src/modules/powerdisplay/PowerDisplay/PowerDisplay.csproj">
|
||||||
<Platform Solution="*|ARM64" Project="ARM64" />
|
<Platform Solution="*|ARM64" Project="ARM64" />
|
||||||
<Platform Solution="*|x64" Project="x64" />
|
<Platform Solution="*|x64" Project="x64" />
|
||||||
</Project>
|
</Project>
|
||||||
<Project Path="src/modules/powerdisplay/PowerDisplayModuleInterface/PowerDisplayModuleInterface.vcxproj" Id="d1234567-8901-2345-6789-abcdef012345" />
|
<Project Path="src/modules/powerdisplay/PowerDisplayModuleInterface/PowerDisplayModuleInterface.vcxproj" Id="d1234567-8901-2345-6789-abcdef012345" />
|
||||||
|
-->
|
||||||
</Folder>
|
</Folder>
|
||||||
<Folder Name="/modules/PowerDisplay/Tests/">
|
<Folder Name="/modules/PowerDisplay/Tests/">
|
||||||
<Project Path="src/modules/powerdisplay/PowerDisplay.Lib.UnitTests/PowerDisplay.Lib.UnitTests.csproj">
|
<Project Path="src/modules/powerdisplay/PowerDisplay.Lib.UnitTests/PowerDisplay.Lib.UnitTests.csproj">
|
||||||
|
|||||||
@@ -1565,7 +1565,6 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
|
|||||||
L"PowerToys.PowerRename.exe",
|
L"PowerToys.PowerRename.exe",
|
||||||
L"PowerToys.ImageResizer.exe",
|
L"PowerToys.ImageResizer.exe",
|
||||||
L"PowerToys.LightSwitchService.exe",
|
L"PowerToys.LightSwitchService.exe",
|
||||||
L"PowerToys.PowerDisplay.exe",
|
|
||||||
L"PowerToys.GcodeThumbnailProvider.exe",
|
L"PowerToys.GcodeThumbnailProvider.exe",
|
||||||
L"PowerToys.BgcodeThumbnailProvider.exe",
|
L"PowerToys.BgcodeThumbnailProvider.exe",
|
||||||
L"PowerToys.PdfThumbnailProvider.exe",
|
L"PowerToys.PdfThumbnailProvider.exe",
|
||||||
|
|||||||
@@ -47,7 +47,6 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
|
|||||||
call move /Y ..\..\..\NewPlus.wxs.bk ..\..\..\NewPlus.wxs
|
call move /Y ..\..\..\NewPlus.wxs.bk ..\..\..\NewPlus.wxs
|
||||||
call move /Y ..\..\..\Peek.wxs.bk ..\..\..\Peek.wxs
|
call move /Y ..\..\..\Peek.wxs.bk ..\..\..\Peek.wxs
|
||||||
call move /Y ..\..\..\PowerRename.wxs.bk ..\..\..\PowerRename.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 ..\..\..\Product.wxs.bk ..\..\..\Product.wxs
|
||||||
call move /Y ..\..\..\RegistryPreview.wxs.bk ..\..\..\RegistryPreview.wxs
|
call move /Y ..\..\..\RegistryPreview.wxs.bk ..\..\..\RegistryPreview.wxs
|
||||||
call move /Y ..\..\..\Resources.wxs.bk ..\..\..\Resources.wxs
|
call move /Y ..\..\..\Resources.wxs.bk ..\..\..\Resources.wxs
|
||||||
@@ -124,7 +123,6 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
|
|||||||
<Compile Include="KeyboardManager.wxs" />
|
<Compile Include="KeyboardManager.wxs" />
|
||||||
<Compile Include="Peek.wxs" />
|
<Compile Include="Peek.wxs" />
|
||||||
<Compile Include="PowerRename.wxs" />
|
<Compile Include="PowerRename.wxs" />
|
||||||
<Compile Include="PowerDisplay.wxs" />
|
|
||||||
<Compile Include="DscResources.wxs" />
|
<Compile Include="DscResources.wxs" />
|
||||||
<Compile Include="RegistryPreview.wxs" />
|
<Compile Include="RegistryPreview.wxs" />
|
||||||
<Compile Include="Run.wxs" />
|
<Compile Include="Run.wxs" />
|
||||||
|
|||||||
@@ -53,7 +53,6 @@
|
|||||||
<ComponentGroupRef Id="LightSwitchComponentGroup" />
|
<ComponentGroupRef Id="LightSwitchComponentGroup" />
|
||||||
<ComponentGroupRef Id="PeekComponentGroup" />
|
<ComponentGroupRef Id="PeekComponentGroup" />
|
||||||
<ComponentGroupRef Id="PowerRenameComponentGroup" />
|
<ComponentGroupRef Id="PowerRenameComponentGroup" />
|
||||||
<ComponentGroupRef Id="PowerDisplayComponentGroup" />
|
|
||||||
<ComponentGroupRef Id="RegistryPreviewComponentGroup" />
|
<ComponentGroupRef Id="RegistryPreviewComponentGroup" />
|
||||||
<ComponentGroupRef Id="RunComponentGroup" />
|
<ComponentGroupRef Id="RunComponentGroup" />
|
||||||
<ComponentGroupRef Id="SettingsComponentGroup" />
|
<ComponentGroupRef Id="SettingsComponentGroup" />
|
||||||
|
|||||||
@@ -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-FileList -fileDepsJson "" -fileListName LightSwitchFiles -wxsFilePath $PSScriptRoot\LightSwitch.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\LightSwitchService"
|
||||||
Generate-FileComponents -fileListName "LightSwitchFiles" -wxsFilePath $PSScriptRoot\LightSwitch.wxs
|
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+
|
#New+
|
||||||
Generate-FileList -fileDepsJson "" -fileListName NewPlusAssetsFiles -wxsFilePath $PSScriptRoot\NewPlus.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\NewPlus"
|
Generate-FileList -fileDepsJson "" -fileListName NewPlusAssetsFiles -wxsFilePath $PSScriptRoot\NewPlus.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\NewPlus"
|
||||||
Generate-FileComponents -fileListName "NewPlusAssetsFiles" -wxsFilePath $PSScriptRoot\NewPlus.wxs
|
Generate-FileComponents -fileListName "NewPlusAssetsFiles" -wxsFilePath $PSScriptRoot\NewPlus.wxs
|
||||||
|
|||||||
@@ -149,6 +149,7 @@
|
|||||||
<decimal value="0" />
|
<decimal value="0" />
|
||||||
</disabledValue>
|
</disabledValue>
|
||||||
</policy>
|
</policy>
|
||||||
|
<!-- TEMPORARILY_DISABLED: PowerDisplay
|
||||||
<policy name="ConfigureEnabledUtilityPowerDisplay" class="Both" displayName="$(string.ConfigureEnabledUtilityPowerDisplay)" explainText="$(string.ConfigureEnabledUtilityDescription)" key="Software\Policies\PowerToys" valueName="ConfigureEnabledUtilityPowerDisplay">
|
<policy name="ConfigureEnabledUtilityPowerDisplay" class="Both" displayName="$(string.ConfigureEnabledUtilityPowerDisplay)" explainText="$(string.ConfigureEnabledUtilityDescription)" key="Software\Policies\PowerToys" valueName="ConfigureEnabledUtilityPowerDisplay">
|
||||||
<parentCategory ref="PowerToys" />
|
<parentCategory ref="PowerToys" />
|
||||||
<supportedOn ref="SUPPORTED_POWERTOYS_0_95_0" />
|
<supportedOn ref="SUPPORTED_POWERTOYS_0_95_0" />
|
||||||
@@ -159,6 +160,7 @@
|
|||||||
<decimal value="0" />
|
<decimal value="0" />
|
||||||
</disabledValue>
|
</disabledValue>
|
||||||
</policy>
|
</policy>
|
||||||
|
-->
|
||||||
<policy name="ConfigureEnabledUtilityEnvironmentVariables" class="Both" displayName="$(string.ConfigureEnabledUtilityEnvironmentVariables)" explainText="$(string.ConfigureEnabledUtilityDescription)" key="Software\Policies\PowerToys" valueName="ConfigureEnabledUtilityEnvironmentVariables">
|
<policy name="ConfigureEnabledUtilityEnvironmentVariables" class="Both" displayName="$(string.ConfigureEnabledUtilityEnvironmentVariables)" explainText="$(string.ConfigureEnabledUtilityDescription)" key="Software\Policies\PowerToys" valueName="ConfigureEnabledUtilityEnvironmentVariables">
|
||||||
<parentCategory ref="PowerToys" />
|
<parentCategory ref="PowerToys" />
|
||||||
<supportedOn ref="SUPPORTED_POWERTOYS_0_75_0" />
|
<supportedOn ref="SUPPORTED_POWERTOYS_0_75_0" />
|
||||||
|
|||||||
@@ -248,7 +248,7 @@ If you don't configure this policy, the user will be able to control the setting
|
|||||||
<string id="ConfigureEnabledUtilityCmdPal">CmdPal: Configure enabled state</string>
|
<string id="ConfigureEnabledUtilityCmdPal">CmdPal: Configure enabled state</string>
|
||||||
<string id="ConfigureEnabledUtilityCropAndLock">Crop And Lock: Configure enabled state</string>
|
<string id="ConfigureEnabledUtilityCropAndLock">Crop And Lock: Configure enabled state</string>
|
||||||
<string id="ConfigureEnabledUtilityLightSwitch">Light Switch: Configure enabled state</string>
|
<string id="ConfigureEnabledUtilityLightSwitch">Light Switch: Configure enabled state</string>
|
||||||
<string id="ConfigureEnabledUtilityPowerDisplay">PowerDisplay: Configure enabled state</string>
|
<!-- <string id="ConfigureEnabledUtilityPowerDisplay">PowerDisplay: Configure enabled state</string> --><!-- TEMPORARILY_DISABLED: PowerDisplay -->
|
||||||
<string id="ConfigureEnabledUtilityEnvironmentVariables">Environment Variables: Configure enabled state</string>
|
<string id="ConfigureEnabledUtilityEnvironmentVariables">Environment Variables: Configure enabled state</string>
|
||||||
<string id="ConfigureEnabledUtilityFancyZones">FancyZones: Configure enabled state</string>
|
<string id="ConfigureEnabledUtilityFancyZones">FancyZones: Configure enabled state</string>
|
||||||
<string id="ConfigureEnabledUtilityFileLocksmith">File Locksmith: Configure enabled state</string>
|
<string id="ConfigureEnabledUtilityFileLocksmith">File Locksmith: Configure enabled state</string>
|
||||||
|
|||||||
@@ -286,7 +286,7 @@ int runner(bool isProcessElevated, bool openSettings, std::string settingsWindow
|
|||||||
L"PowerToys.CmdPalModuleInterface.dll",
|
L"PowerToys.CmdPalModuleInterface.dll",
|
||||||
L"PowerToys.ZoomItModuleInterface.dll",
|
L"PowerToys.ZoomItModuleInterface.dll",
|
||||||
L"PowerToys.LightSwitchModuleInterface.dll",
|
L"PowerToys.LightSwitchModuleInterface.dll",
|
||||||
L"PowerToys.PowerDisplayModuleInterface.dll",
|
// L"PowerToys.PowerDisplayModuleInterface.dll", // TEMPORARILY_DISABLED: PowerDisplay
|
||||||
};
|
};
|
||||||
|
|
||||||
for (auto moduleSubdir : knownModules)
|
for (auto moduleSubdir : knownModules)
|
||||||
|
|||||||
@@ -77,6 +77,12 @@ public sealed class AllAppsViewModel : Observable
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TEMPORARILY_DISABLED: PowerDisplay
|
||||||
|
if (moduleType == ModuleType.PowerDisplay)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
_allFlyoutMenuItems.Add(new FlyoutMenuItem
|
_allFlyoutMenuItems.Add(new FlyoutMenuItem
|
||||||
{
|
{
|
||||||
Tag = moduleType,
|
Tag = moduleType,
|
||||||
|
|||||||
@@ -68,7 +68,8 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
|
|||||||
AddFlyoutMenuItem(ModuleType.FancyZones);
|
AddFlyoutMenuItem(ModuleType.FancyZones);
|
||||||
AddFlyoutMenuItem(ModuleType.Hosts);
|
AddFlyoutMenuItem(ModuleType.Hosts);
|
||||||
AddFlyoutMenuItem(ModuleType.LightSwitch);
|
AddFlyoutMenuItem(ModuleType.LightSwitch);
|
||||||
AddFlyoutMenuItem(ModuleType.PowerDisplay);
|
|
||||||
|
// AddFlyoutMenuItem(ModuleType.PowerDisplay); // TEMPORARILY_DISABLED: PowerDisplay
|
||||||
AddFlyoutMenuItem(ModuleType.PowerLauncher);
|
AddFlyoutMenuItem(ModuleType.PowerLauncher);
|
||||||
AddFlyoutMenuItem(ModuleType.PowerOCR);
|
AddFlyoutMenuItem(ModuleType.PowerOCR);
|
||||||
AddFlyoutMenuItem(ModuleType.RegistryPreview);
|
AddFlyoutMenuItem(ModuleType.RegistryPreview);
|
||||||
|
|||||||
@@ -126,10 +126,12 @@
|
|||||||
x:Uid="Shell_Peek"
|
x:Uid="Shell_Peek"
|
||||||
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Peek.png}"
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Peek.png}"
|
||||||
Tag="Peek" />
|
Tag="Peek" />
|
||||||
|
<!-- TEMPORARILY_DISABLED: PowerDisplay
|
||||||
<NavigationViewItem
|
<NavigationViewItem
|
||||||
x:Uid="Shell_PowerDisplay"
|
x:Uid="Shell_PowerDisplay"
|
||||||
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PowerDisplay.png}"
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PowerDisplay.png}"
|
||||||
Tag="PowerDisplay" />
|
Tag="PowerDisplay" />
|
||||||
|
-->
|
||||||
<NavigationViewItem
|
<NavigationViewItem
|
||||||
x:Uid="Shell_PowerRename"
|
x:Uid="Shell_PowerRename"
|
||||||
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PowerRename.png}"
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PowerRename.png}"
|
||||||
|
|||||||
@@ -212,6 +212,7 @@
|
|||||||
helpers:NavHelper.NavigateTo="views:LightSwitchPage"
|
helpers:NavHelper.NavigateTo="views:LightSwitchPage"
|
||||||
AutomationProperties.AutomationId="LightSwitchNavItem"
|
AutomationProperties.AutomationId="LightSwitchNavItem"
|
||||||
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/LightSwitch.png}" />
|
Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/LightSwitch.png}" />
|
||||||
|
<!-- TEMPORARILY_DISABLED: PowerDisplay
|
||||||
<NavigationViewItem
|
<NavigationViewItem
|
||||||
x:Name="PowerDisplayNavigationItem"
|
x:Name="PowerDisplayNavigationItem"
|
||||||
x:Uid="Shell_PowerDisplay"
|
x:Uid="Shell_PowerDisplay"
|
||||||
@@ -222,6 +223,7 @@
|
|||||||
<InfoBadge Style="{StaticResource NewInfoBadge}" />
|
<InfoBadge Style="{StaticResource NewInfoBadge}" />
|
||||||
</NavigationViewItem.InfoBadge>
|
</NavigationViewItem.InfoBadge>
|
||||||
</NavigationViewItem>
|
</NavigationViewItem>
|
||||||
|
-->
|
||||||
<NavigationViewItem
|
<NavigationViewItem
|
||||||
x:Name="PowerLauncherNavigationItem"
|
x:Name="PowerLauncherNavigationItem"
|
||||||
x:Uid="Shell_PowerLauncher"
|
x:Uid="Shell_PowerLauncher"
|
||||||
|
|||||||
@@ -213,6 +213,12 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TEMPORARILY_DISABLED: PowerDisplay
|
||||||
|
if (moduleType == ModuleType.PowerDisplay)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
GpoRuleConfigured gpo = ModuleGpoHelper.GetModuleGpoConfiguration(moduleType);
|
GpoRuleConfigured gpo = ModuleGpoHelper.GetModuleGpoConfiguration(moduleType);
|
||||||
var newItem = new DashboardListItem()
|
var newItem = new DashboardListItem()
|
||||||
{
|
{
|
||||||
@@ -221,7 +227,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
|||||||
IsEnabled = gpo == GpoRuleConfigured.Enabled || (gpo != GpoRuleConfigured.Disabled && ModuleHelper.GetIsModuleEnabled(generalSettingsConfig, moduleType)),
|
IsEnabled = gpo == GpoRuleConfigured.Enabled || (gpo != GpoRuleConfigured.Disabled && ModuleHelper.GetIsModuleEnabled(generalSettingsConfig, moduleType)),
|
||||||
IsLocked = gpo == GpoRuleConfigured.Enabled || gpo == GpoRuleConfigured.Disabled,
|
IsLocked = gpo == GpoRuleConfigured.Enabled || gpo == GpoRuleConfigured.Disabled,
|
||||||
Icon = ModuleHelper.GetModuleTypeFluentIconName(moduleType),
|
Icon = ModuleHelper.GetModuleTypeFluentIconName(moduleType),
|
||||||
IsNew = moduleType == ModuleType.CursorWrap || moduleType == ModuleType.PowerDisplay,
|
IsNew = moduleType == ModuleType.CursorWrap, // TEMPORARILY_DISABLED: removed PowerDisplay from IsNew
|
||||||
DashboardModuleItems = GetModuleItems(moduleType),
|
DashboardModuleItems = GetModuleItems(moduleType),
|
||||||
ClickCommand = new RelayCommand<object>(DashboardListItemClick),
|
ClickCommand = new RelayCommand<object>(DashboardListItemClick),
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user