Compare commits

...

3 Commits

Author SHA1 Message Date
Niels Laute
5604c1de6f Update ShortcutConflictControl.xaml 2025-11-06 17:41:28 +01:00
Niels Laute
0d161e28bf Changes 2025-11-06 17:32:37 +01:00
Niels Laute
da0fe7a888 Resolve merge: keep ours for ShortcutConflictControl.xaml 2025-11-06 17:30:41 +01:00
3 changed files with 4 additions and 11 deletions

View File

@@ -10,7 +10,7 @@
<Grid>
<Button
AutomationProperties.Name="{x:Bind AccessibleName, Mode=OneWay}"
x:Uid="ShortcutConflictControl_Automation"
Click="ShortcutConflictBtn_Click"
Style="{StaticResource SubtleButtonStyle}">
<Grid ColumnSpacing="16">

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

View File

@@ -5580,6 +5580,9 @@ 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">
<value>Shortcut conflicts</value>
</data>
<data name="ShortcutConflictControl_NoConflictsFound" xml:space="preserve">
<value>No conflicts found</value>
</data>