Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-02-24 04:00:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

address most diffray warnings

Browse Source
This commit is contained in:
Zach Teutsch
2026-01-26 19:27:13 -05:00
parent e8e99c413b
commit 08039a0530
8 changed files with 47 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/modules/keyboardmanager/KeyboardManagerEditorUI/App.xaml.cs
View File

@@ -39,7 +39,6 @@ namespace KeyboardManagerEditorUI
/// </summary>
public App()
{
global::System.Diagnostics.Debugger.Break();
this.InitializeComponent();
Task.Run(() =>

2
src/modules/keyboardmanager/KeyboardManagerEditorUI/Interop/KeyboardMappingService.cs
View File

@@ -185,7 +185,7 @@ namespace KeyboardManagerEditorUI.Interop
return KeyboardManagerInterop.AddShortcutRemap(_configHandle, originalKeys, targetKeys, targetApp, (int)operationType);
}
public bool AddShorcutMapping(ShortcutKeyMapping shortcutKeyMapping)
public bool AddShortcutMapping(ShortcutKeyMapping shortcutKeyMapping)
{
if (string.IsNullOrEmpty(shortcutKeyMapping.OriginalKeys) || string.IsNullOrEmpty(shortcutKeyMapping.TargetKeys))
{

10
src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/Programs.xaml
View File

@@ -172,5 +172,15 @@
<controls:AppPageInputControl x:Name="AppShortcutControl" />
</Grid>
</ContentDialog>
<TeachingTip
x:Name="ValidationTip"
x:Uid="ProgramsPageValidationTip"
IsLightDismissEnabled="True"
PreferredPlacement="Center">
<TeachingTip.IconSource>
<SymbolIconSource Symbol="Important" />
</TeachingTip.IconSource>
</TeachingTip>
</Grid>
</Page>

22
src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/Programs.xaml.cs
View File

@@ -165,12 +165,6 @@ namespace KeyboardManagerEditorUI.Pages
// Shortcut to text mapping
string originalKeysString = string.Join(";", keys.Select(k => _mappingService.GetKeyCodeFromName(k).ToString(CultureInfo.InvariantCulture)));
// if (isAppSpecific && !string.IsNullOrEmpty(appName))
// {
// saved = _mappingService.AddShortcutMapping(originalKeysString, programPath, appName, ShortcutOperationType.RemapText);
// }
// else
// {
ShortcutKeyMapping shortcutKeyMapping = new ShortcutKeyMapping()
{
OperationType = ShortcutOperationType.RunProgram,
@@ -183,7 +177,7 @@ namespace KeyboardManagerEditorUI.Pages
Elevation = elevationLevel,
};
saved = _mappingService.AddShorcutMapping(shortcutKeyMapping);
saved = _mappingService.AddShortcutMapping(shortcutKeyMapping);
if (saved)
{
@@ -239,13 +233,13 @@ namespace KeyboardManagerEditorUI.Pages
private void ShowValidationError(ValidationErrorType errorType, ContentDialogButtonClickEventArgs args)
{
// if (ValidationHelper.ValidationMessages.TryGetValue(errorType, out (string Title, string Message) error))
// {
// ValidationTip.Title = error.Title;
// ValidationTip.Subtitle = error.Message;
// ValidationTip.IsOpen = true;
// args.Cancel = true;
// }
if (ValidationHelper.ValidationMessages.TryGetValue(errorType, out (string Title, string Message) error))
{
ValidationTip.Title = error.Title;
ValidationTip.Subtitle = error.Message;
ValidationTip.IsOpen = true;
args.Cancel = true;
}
}
public void Dispose()

2
src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/Remappings.xaml
View File

@@ -194,7 +194,7 @@
</ContentDialog>
<TeachingTip
x:Name="OrphanedKeysTeachingTip"
x:Uid="RemmapingsPageOrphanedKeysTeachingTip"
x:Uid="RemapingsPageOrphanedKeysTeachingTip"
ActionButtonClick="OrphanedKeysTeachingTip_ActionButtonClick"
ActionButtonStyle="{StaticResource AccentButtonStyle}"
CloseButtonClick="OrphanedKeysTeachingTip_CloseButtonClick"

10
src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/URLs.xaml
View File

@@ -155,5 +155,15 @@
<controls:UrlPageInputControl x:Name="UrlShortcutControl" />
</Grid>
</ContentDialog>
<TeachingTip
x:Name="ValidationTip"
x:Uid="UrlPageValidationTip"
IsLightDismissEnabled="True"
PreferredPlacement="Center">
<TeachingTip.IconSource>
<SymbolIconSource Symbol="Important" />
</TeachingTip.IconSource>
</TeachingTip>
</Grid>
</Page>

22
src/modules/keyboardmanager/KeyboardManagerEditorUI/Pages/URLs.xaml.cs
View File

@@ -179,12 +179,6 @@ namespace KeyboardManagerEditorUI.Pages
// Shortcut to text mapping
string originalKeysString = string.Join(";", keys.Select(k => _mappingService.GetKeyCodeFromName(k).ToString(CultureInfo.InvariantCulture)));
// if (isAppSpecific && !string.IsNullOrEmpty(appName))
// {
// saved = _mappingService.AddShortcutMapping(originalKeysString, programPath, appName, ShortcutOperationType.RemapText);
// }
// else
// {
ShortcutKeyMapping shortcutKeyMapping = new ShortcutKeyMapping()
{
OperationType = ShortcutOperationType.OpenUri,
@@ -193,7 +187,7 @@ namespace KeyboardManagerEditorUI.Pages
UriToOpen = urlPath,
};
saved = _mappingService.AddShorcutMapping(shortcutKeyMapping);
saved = _mappingService.AddShortcutMapping(shortcutKeyMapping);
if (saved)
{
@@ -210,13 +204,13 @@ namespace KeyboardManagerEditorUI.Pages
private void ShowValidationError(ValidationErrorType errorType, ContentDialogButtonClickEventArgs args)
{
// if (ValidationHelper.ValidationMessages.TryGetValue(errorType, out (string Title, string Message) error))
// {
// ValidationTip.Title = error.Title;
// ValidationTip.Subtitle = error.Message;
// ValidationTip.IsOpen = true;
// args.Cancel = true;
// }
if (ValidationHelper.ValidationMessages.TryGetValue(errorType, out (string Title, string Message) error))
{
ValidationTip.Title = error.Title;
ValidationTip.Subtitle = error.Message;
ValidationTip.IsOpen = true;
args.Cancel = true;
}
}
private void DeleteButton_Click(object sender, RoutedEventArgs e)

12
src/modules/keyboardmanager/KeyboardManagerEditorUI/Strings/en-US/Resources.resw
View File

@@ -141,13 +141,13 @@
<data name="RemappingsPageOriginalKeysTextBlock.Text" xml:space="preserve">
<value>Original key(s)</value>
</data>
<data name="RemmapingsPageOrphanedKeysTeachingTip.ActionButtonContent" xml:space="preserve">
<data name="RemapingsPageOrphanedKeysTeachingTip.ActionButtonContent" xml:space="preserve">
<value>Continue anyway</value>
</data>
<data name="RemmapingsPageOrphanedKeysTeachingTip.CloseButtonContent" xml:space="preserve">
<data name="RemapingsPageOrphanedKeysTeachingTip.CloseButtonContent" xml:space="preserve">
<value>Cancel</value>
</data>
<data name="RemmapingsPageOrphanedKeysTeachingTip.Title" xml:space="preserve">
<data name="RemapingsPageOrphanedKeysTeachingTip.Title" xml:space="preserve">
<value>Orphaned Keys Warning</value>
</data>
<data name="RemappingsPageValidationTeachingTip.CloseButtonContent" xml:space="preserve">
@@ -309,4 +309,10 @@
<data name="AppPageInputControlExtraOptionsTextBlock.Text" xml:space="preserve">
<value>More options</value>
</data>
<data name="ProgramsPageValidationTip.CloseButtonContent" xml:space="preserve">
<value>OK</value>
</data>
<data name="UrlPageValidationTip.CloseButtonContent" xml:space="preserve">
<value>OK</value>
</data>
</root>