Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-14 18:57:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

code clean

Browse Source
This commit is contained in:
Shawn Yuan (from Dev Box)
2025-12-11 18:39:57 +08:00
parent 1211e2c92f
commit 346c99543a
5 changed files with 27 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
src/settings-ui/QuickAccess.UI/Services/QuickAccessLauncher.cs
View File

@@ -10,118 +10,19 @@ using PowerToys.Interop;
namespace Microsoft.PowerToys.QuickAccess.Services
{
public class QuickAccessLauncher : IQuickAccessLauncher
public class QuickAccessLauncher : Microsoft.PowerToys.Settings.UI.Controls.QuickAccessLauncher
{
private readonly IQuickAccessCoordinator _coordinator;
private readonly IQuickAccessCoordinator? _coordinator;
public QuickAccessLauncher(IQuickAccessCoordinator coordinator)
public QuickAccessLauncher(IQuickAccessCoordinator? coordinator)
: base(coordinator?.IsRunnerElevated ?? false)
{
_coordinator = coordinator;
}
public void Launch(ModuleType moduleType)
public override bool Launch(ModuleType moduleType)
{
bool moduleRun = true;
switch (moduleType)
{
case ModuleType.ColorPicker:
using (var eventHandle = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.ShowColorPickerSharedEvent()))
{
eventHandle.Set();
}
break;
case ModuleType.EnvironmentVariables:
{
bool launchAdmin = SettingsRepository<EnvironmentVariablesSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.LaunchAdministrator;
bool isElevated = _coordinator?.IsRunnerElevated ?? false;
string eventName = !isElevated && launchAdmin
? Constants.ShowEnvironmentVariablesAdminSharedEvent()
: Constants.ShowEnvironmentVariablesSharedEvent();
using (var eventHandle = new EventWaitHandle(false, EventResetMode.AutoReset, eventName))
{
eventHandle.Set();
}
}
break;
case ModuleType.FancyZones:
using (var eventHandle = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.FZEToggleEvent()))
{
eventHandle.Set();
}
break;
case ModuleType.Hosts:
{
bool launchAdmin = SettingsRepository<HostsSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.LaunchAdministrator;
bool isElevated = _coordinator?.IsRunnerElevated ?? false;
string eventName = !isElevated && launchAdmin
? Constants.ShowHostsAdminSharedEvent()
: Constants.ShowHostsSharedEvent();
using (var eventHandle = new EventWaitHandle(false, EventResetMode.AutoReset, eventName))
{
eventHandle.Set();
}
}
break;
case ModuleType.PowerLauncher:
using (var eventHandle = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.PowerLauncherSharedEvent()))
{
eventHandle.Set();
}
break;
case ModuleType.PowerOCR:
using (var eventHandle = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.ShowPowerOCRSharedEvent()))
{
eventHandle.Set();
}
break;
case ModuleType.RegistryPreview:
using (var eventHandle = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.RegistryPreviewTriggerEvent()))
{
eventHandle.Set();
}
break;
case ModuleType.MeasureTool:
using (var eventHandle = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.MeasureToolTriggerEvent()))
{
eventHandle.Set();
}
break;
case ModuleType.ShortcutGuide:
using (var eventHandle = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.ShortcutGuideTriggerEvent()))
{
eventHandle.Set();
}
break;
case ModuleType.CmdPal:
using (var eventHandle = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.ShowCmdPalEvent()))
{
eventHandle.Set();
}
break;
case ModuleType.Workspaces:
using (var eventHandle = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.WorkspacesLaunchEditorEvent()))
{
eventHandle.Set();
}
break;
default:
moduleRun = false;
break;
}
bool moduleRun = base.Launch(moduleType);
if (moduleRun)
{
@@ -129,6 +30,8 @@ namespace Microsoft.PowerToys.QuickAccess.Services
}
_coordinator?.HideFlyout();
return moduleRun;
}
}
}

2
src/settings-ui/QuickAccess.UI/ViewModels/LauncherViewModel.cs
View File

@@ -38,7 +38,7 @@ public sealed class LauncherViewModel : Observable
_quickAccessViewModel = new QuickAccessViewModel(
_settingsRepository,
new QuickAccessLauncher(_coordinator),
new Microsoft.PowerToys.QuickAccess.Services.QuickAccessLauncher(_coordinator),
moduleType => Helpers.ModuleGpoHelper.GetModuleGpoConfiguration(moduleType) == GpoRuleConfigured.Disabled,
_resourceLoader);
var updatingSettings = UpdatingSettings.LoadSettings() ?? new UpdatingSettings();

2
src/settings-ui/Settings.UI.Controls/QuickAccess/IQuickAccessLauncher.cs
View File

@@ -8,6 +8,6 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
{
public interface IQuickAccessLauncher
{
void Launch(ModuleType moduleType);
bool Launch(ModuleType moduleType);
}
}

33
src/settings-ui/Settings.UI/Services/DashboardLauncher.cs → src/settings-ui/Settings.UI.Controls/QuickAccess/QuickAccessLauncher.cs
View File

@@ -4,22 +4,21 @@
using System.Threading;
using ManagedCommon;
using Microsoft.PowerToys.Settings.UI.Controls;
using Microsoft.PowerToys.Settings.UI.Library;
using PowerToys.Interop;
namespace Microsoft.PowerToys.Settings.UI.Services
namespace Microsoft.PowerToys.Settings.UI.Controls
{
public class DashboardLauncher : IQuickAccessLauncher
public class QuickAccessLauncher : IQuickAccessLauncher
{
private readonly bool _isElevated;
public DashboardLauncher(bool isElevated)
public QuickAccessLauncher(bool isElevated)
{
_isElevated = isElevated;
}
public void Launch(ModuleType moduleType)
public virtual bool Launch(ModuleType moduleType)
{
switch (moduleType)
{
@@ -29,7 +28,7 @@ namespace Microsoft.PowerToys.Settings.UI.Services
eventHandle.Set();
}
break;
return true;
case ModuleType.EnvironmentVariables:
{
bool launchAdmin = SettingsRepository<EnvironmentVariablesSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.LaunchAdministrator;
@@ -43,14 +42,14 @@ namespace Microsoft.PowerToys.Settings.UI.Services
}
}
break;
return true;
case ModuleType.FancyZones:
using (var eventHandle = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.FZEToggleEvent()))
{
eventHandle.Set();
}
break;
return true;
case ModuleType.Hosts:
{
bool launchAdmin = SettingsRepository<HostsSettings>.GetInstance(SettingsUtils.Default).SettingsConfig.Properties.LaunchAdministrator;
@@ -64,58 +63,58 @@ namespace Microsoft.PowerToys.Settings.UI.Services
}
}
break;
return true;
case ModuleType.PowerLauncher:
using (var eventHandle = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.PowerLauncherSharedEvent()))
{
eventHandle.Set();
}
break;
return true;
case ModuleType.PowerOCR:
using (var eventHandle = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.ShowPowerOCRSharedEvent()))
{
eventHandle.Set();
}
break;
return true;
case ModuleType.RegistryPreview:
using (var eventHandle = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.RegistryPreviewTriggerEvent()))
{
eventHandle.Set();
}
break;
return true;
case ModuleType.MeasureTool:
using (var eventHandle = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.MeasureToolTriggerEvent()))
{
eventHandle.Set();
}
break;
return true;
case ModuleType.ShortcutGuide:
using (var eventHandle = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.ShortcutGuideTriggerEvent()))
{
eventHandle.Set();
}
break;
return true;
case ModuleType.CmdPal:
using (var eventHandle = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.ShowCmdPalEvent()))
{
eventHandle.Set();
}
break;
return true;
case ModuleType.Workspaces:
using (var eventHandle = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.WorkspacesLaunchEditorEvent()))
{
eventHandle.Set();
}
break;
return true;
default:
break;
return false;
}
}
}

2
src/settings-ui/Settings.UI/ViewModels/DashboardViewModel.cs
View File

@@ -115,7 +115,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
_quickAccessViewModel = new QuickAccessViewModel(
_settingsRepository,
new DashboardLauncher(App.IsElevated),
new Microsoft.PowerToys.Settings.UI.Controls.QuickAccessLauncher(App.IsElevated),
moduleType => Helpers.ModuleGpoHelper.GetModuleGpoConfiguration(moduleType) == global::PowerToys.GPOWrapper.GpoRuleConfigured.Disabled,
resourceLoader);