Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 11:48:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changes

Browse Source
This commit is contained in:
Niels Laute
2025-11-06 17:32:37 +01:00
parent da0fe7a888
commit 0d161e28bf
2 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/ShortcutConflictControl.xaml.cs
View File

@@ -88,15 +88,6 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
}
}
public string AccessibleName
{
get
{
var title = ResourceLoader.GetString("ShortcutConflictControl_Title");
return $"{title}, {ConflictText}";
}
}
public bool HasConflicts => ConflictCount > 0;
private static void OnAllHotkeyConflictsDataChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
@@ -113,7 +104,6 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
{
OnPropertyChanged(nameof(ConflictCount));
OnPropertyChanged(nameof(ConflictText));
OnPropertyChanged(nameof(AccessibleName));
OnPropertyChanged(nameof(HasConflicts));
// Update visibility based on conflict count

2
src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
View File

@@ -5580,7 +5580,7 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
<data name="ShortcutConflictControl_Title.Text" xml:space="preserve">
<value>Shortcut conflicts</value>
</data>
<data name="ShortcutConflictControl_Automation.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
<data name="ShortcutConflictControl_Automation.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
<value>Shortcut conflicts</value>
</data>
<data name="ShortcutConflictControl_NoConflictsFound" xml:space="preserve">