mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-05 10:46:33 +02:00
[MWB]Migrate to PowerToys-style shortcuts and better defaults(#27442)
* [MWB] Migrate to PowerToys-style shortcuts and disable Ctrlx3 for multiple mode * f: analyzer fixes * f: add Win to all default shortcuts * f: remove capture screen feature * f: add ability to disable shortcut * f: restrict disabling shortcuts only for MWB for now, because we don't explicitly support this feature anywhere else * handle downgrade->upgrade scenario * f: res loader * f: fix disabled state * f: fix L hotkey handling
This commit is contained in:
@@ -648,13 +648,24 @@ namespace MouseWithoutBorders.Class
|
||||
}
|
||||
}
|
||||
|
||||
internal int HotKeyToggleEasyMouse
|
||||
internal HotkeySettings HotKeySwitch2AllPC
|
||||
{
|
||||
get
|
||||
{
|
||||
lock (_loadingSettingsLock)
|
||||
{
|
||||
return _properties.HotKeyToggleEasyMouse.Value;
|
||||
return _properties.Switch2AllPCShortcut;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
internal HotkeySettings HotKeyToggleEasyMouse
|
||||
{
|
||||
get
|
||||
{
|
||||
lock (_loadingSettingsLock)
|
||||
{
|
||||
return _properties.ToggleEasyMouseShortcut;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -662,18 +673,18 @@ namespace MouseWithoutBorders.Class
|
||||
{
|
||||
lock (_loadingSettingsLock)
|
||||
{
|
||||
_properties.HotKeyToggleEasyMouse.Value = value;
|
||||
_properties.ToggleEasyMouseShortcut = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
internal int HotKeyLockMachine
|
||||
internal HotkeySettings HotKeyLockMachine
|
||||
{
|
||||
get
|
||||
{
|
||||
lock (_loadingSettingsLock)
|
||||
{
|
||||
return _properties.HotKeyLockMachine.Value;
|
||||
return _properties.LockMachineShortcut;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -681,18 +692,18 @@ namespace MouseWithoutBorders.Class
|
||||
{
|
||||
lock (_loadingSettingsLock)
|
||||
{
|
||||
_properties.HotKeyLockMachine.Value = value;
|
||||
_properties.LockMachineShortcut = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
internal int HotKeyReconnect
|
||||
internal HotkeySettings HotKeyReconnect
|
||||
{
|
||||
get
|
||||
{
|
||||
lock (_loadingSettingsLock)
|
||||
{
|
||||
return _properties.HotKeyReconnect.Value;
|
||||
return _properties.ReconnectShortcut;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -700,19 +711,11 @@ namespace MouseWithoutBorders.Class
|
||||
{
|
||||
lock (_loadingSettingsLock)
|
||||
{
|
||||
_properties.HotKeyReconnect.Value = value;
|
||||
_properties.ReconnectShortcut = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
internal int HotKeyCaptureScreen
|
||||
{
|
||||
get
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
internal int HotKeyExitMM
|
||||
{
|
||||
get
|
||||
@@ -721,25 +724,6 @@ namespace MouseWithoutBorders.Class
|
||||
}
|
||||
}
|
||||
|
||||
internal int HotKeySwitch2AllPC
|
||||
{
|
||||
get
|
||||
{
|
||||
lock (_loadingSettingsLock)
|
||||
{
|
||||
return _properties.HotKeySwitch2AllPC.Value;
|
||||
}
|
||||
}
|
||||
|
||||
set
|
||||
{
|
||||
lock (_loadingSettingsLock)
|
||||
{
|
||||
_properties.HotKeySwitch2AllPC.Value = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private int switchCount;
|
||||
|
||||
internal int SwitchCount
|
||||
|
||||
Reference in New Issue
Block a user