Free, open-source file converter. Convert 263 formats offline by drag & drop — images, PDF, Word, Excel, PowerPoint, HWP/HWPX, video, audio, e-books and archives. No upload, no Office needed.
C# audio-converteravaloniabatch-conversionconvertercsharpdocument-converterdocx-to-pdfdotnetdrag-and-dropfile-conversionfile-converterheic-converterhwphwpximage-converterlinuxmacospdf-convertervideo-converterwindows
Name icon buttons and fields for screen readers; Watch folders switch no longer reads "On" when off
cre8ive-marketingf710837aebe9
diff --git a/src/Filee.App/Styles/TagEditor.axaml b/src/Filee.App/Styles/TagEditor.axamlindex 45880cb1..ea6c326a 100644--- a/src/Filee.App/Styles/TagEditor.axaml+++ b/src/Filee.App/Styles/TagEditor.axaml@@ -41,7 +41,7 @@<PathIcon Classes="tagchip-flag" Data="{StaticResource Icon.Alert}" IsVisible="{Binding IsWarning}" /><!-- Extensions, name patterns and app names read left to right, also in Arabic (else "*.jpg" shows as "jpg.*"). --><TextBlock Classes="tagchip-text" Text="{Binding Text}" FlowDirection="LeftToRight" />- <Button Classes="tagchip-remove" Focusable="False" ToolTip.Tip="{DynamicResource tags.remove}">+ <Button Classes="tagchip-remove" Focusable="False" ToolTip.Tip="{DynamicResource tags.remove}" AutomationProperties.Name="{DynamicResource tags.remove}"><PathIcon Width="8" Height="8" Data="{StaticResource Icon.Close}" /></Button></StackPanel>diff --git a/src/Filee.App/Views/ElevationNoticeWindow.axaml b/src/Filee.App/Views/ElevationNoticeWindow.axamlindex 6eaa795a..4a024a86 100644--- a/src/Filee.App/Views/ElevationNoticeWindow.axaml+++ b/src/Filee.App/Views/ElevationNoticeWindow.axaml@@ -19,7 +19,8 @@VerticalAlignment="Top" Margin="0,2,12,0" /><StackPanel Spacing="8"><DockPanel>- <Button DockPanel.Dock="Right" Classes="icon" Padding="4" VerticalAlignment="Top" Click="OnClose">+ <Button DockPanel.Dock="Right" Classes="icon" Padding="4" VerticalAlignment="Top" Click="OnClose"+ AutomationProperties.Name="{DynamicResource common.close}"><PathIcon Width="12" Height="12" Data="{StaticResource Icon.Close}" /></Button><TextBlock FontWeight="SemiBold" TextWrapping="Wrap" VerticalAlignment="Center"diff --git a/src/Filee.App/Views/EngineUpdateNoticeWindow.axaml b/src/Filee.App/Views/EngineUpdateNoticeWindow.axamlindex 01a1fa8b..8ce4ea23 100644--- a/src/Filee.App/Views/EngineUpdateNoticeWindow.axaml+++ b/src/Filee.App/Views/EngineUpdateNoticeWindow.axaml@@ -21,7 +21,8 @@</Border><StackPanel Spacing="8"><DockPanel>- <Button DockPanel.Dock="Right" Classes="icon" Padding="4" VerticalAlignment="Top" Click="OnClose">+ <Button DockPanel.Dock="Right" Classes="icon" Padding="4" VerticalAlignment="Top" Click="OnClose"+ AutomationProperties.Name="{DynamicResource common.close}"><PathIcon Width="12" Height="12" Data="{StaticResource Icon.Close}" /></Button><TextBlock FontWeight="SemiBold" TextWrapping="Wrap" VerticalAlignment="Center" Text="{DynamicResource engines.update_notice_title}" />diff --git a/src/Filee.App/Views/FeedbackNoticeWindow.axaml b/src/Filee.App/Views/FeedbackNoticeWindow.axamlindex d85fab38..5e4192df 100644--- a/src/Filee.App/Views/FeedbackNoticeWindow.axaml+++ b/src/Filee.App/Views/FeedbackNoticeWindow.axaml@@ -19,7 +19,8 @@VerticalAlignment="Top" Margin="0,2,12,0" /><StackPanel Spacing="8"><DockPanel>- <Button DockPanel.Dock="Right" Classes="icon" Padding="4" VerticalAlignment="Top" Click="OnClose">+ <Button DockPanel.Dock="Right" Classes="icon" Padding="4" VerticalAlignment="Top" Click="OnClose"+ AutomationProperties.Name="{DynamicResource common.close}"><PathIcon Width="12" Height="12" Data="{StaticResource Icon.Close}" /></Button><TextBlock FontWeight="SemiBold" TextWrapping="Wrap" VerticalAlignment="Center"diff --git a/src/Filee.App/Views/FormatRequestNoticeWindow.axaml b/src/Filee.App/Views/FormatRequestNoticeWindow.axamlindex 1c563bdf..a80d0c96 100644--- a/src/Filee.App/Views/FormatRequestNoticeWindow.axaml+++ b/src/Filee.App/Views/FormatRequestNoticeWindow.axaml@@ -19,7 +19,8 @@VerticalAlignment="Top" Margin="0,2,12,0" /><StackPanel Spacing="8"><DockPanel>- <Button DockPanel.Dock="Right" Classes="icon" Padding="4" VerticalAlignment="Top" Click="OnClose">+ <Button DockPanel.Dock="Right" Classes="icon" Padding="4" VerticalAlignment="Top" Click="OnClose"+ AutomationProperties.Name="{DynamicResource common.close}"><PathIcon Width="12" Height="12" Data="{StaticResource Icon.Close}" /></Button><TextBlock x:Name="TitleText" FontWeight="SemiBold" TextWrapping="Wrap" VerticalAlignment="Center" />diff --git a/src/Filee.App/Views/GroupEditorWindow.axaml b/src/Filee.App/Views/GroupEditorWindow.axamlindex 82ce9245..5e01792a 100644--- a/src/Filee.App/Views/GroupEditorWindow.axaml+++ b/src/Filee.App/Views/GroupEditorWindow.axaml@@ -34,7 +34,7 @@<StackPanel><TextBlock Classes="label" Text="{DynamicResource presets.name}" />- <TextBox x:Name="NameBox" Text="{Binding Name}" />+ <TextBox x:Name="NameBox" Text="{Binding Name}" AutomationProperties.Name="{DynamicResource presets.name}" /><TextBlock Classes="caption danger" Text="{Binding NameError}" Margin="2,4,0,0"IsVisible="{Binding NameError, Converter={x:Static ObjectConverters.IsNotNull}}" /></StackPanel>@@ -54,15 +54,15 @@<Border Classes="chip" HorizontalAlignment="Stretch"><DockPanel><StackPanel DockPanel.Dock="Right" Orientation="Horizontal" Spacing="2">- <Button Classes="icon" ToolTip.Tip="{DynamicResource group.move_up}"+ <Button Classes="icon" ToolTip.Tip="{DynamicResource group.move_up}" AutomationProperties.Name="{DynamicResource group.move_up}"Command="{Binding $parent[ItemsControl].((vm:GroupEditorViewModel)DataContext).MoveUpCommand}" CommandParameter="{Binding}"><PathIcon Width="12" Height="12" Data="{StaticResource Icon.ArrowUp}" /></Button>- <Button Classes="icon" ToolTip.Tip="{DynamicResource group.move_down}"+ <Button Classes="icon" ToolTip.Tip="{DynamicResource group.move_down}" AutomationProperties.Name="{DynamicResource group.move_down}"Command="{Binding $parent[ItemsControl].((vm:GroupEditorViewModel)DataContext).MoveDownCommand}" CommandParameter="{Binding}"><PathIcon Width="12" Height="12" Data="{StaticResource Icon.ArrowDown}" /></Button>- <Button Classes="icon" ToolTip.Tip="{DynamicResource group.remove}"+ <Button Classes="icon" ToolTip.Tip="{DynamicResource group.remove}" AutomationProperties.Name="{DynamicResource group.remove}"Command="{Binding $parent[ItemsControl].((vm:GroupEditorViewModel)DataContext).RemoveCommand}" CommandParameter="{Binding}"><PathIcon Width="12" Height="12" Data="{StaticResource Icon.Close}" /></Button>diff --git a/src/Filee.App/Views/LibreOfficeOptionsWindow.axaml b/src/Filee.App/Views/LibreOfficeOptionsWindow.axamlindex 5551a88b..0d043fcd 100644--- a/src/Filee.App/Views/LibreOfficeOptionsWindow.axaml+++ b/src/Filee.App/Views/LibreOfficeOptionsWindow.axaml@@ -18,19 +18,23 @@<TextBlock Classes="caption" TextWrapping="Wrap" Text="{DynamicResource engines.lo_description}" /></StackPanel><StackPanel Spacing="2">- <ToggleSwitch IsChecked="{Binding LibreOfficeForSlides}" OnContent="{DynamicResource engines.lo_slides}" OffContent="{DynamicResource engines.lo_slides}" />+ <ToggleSwitch IsChecked="{Binding LibreOfficeForSlides}" OnContent="{DynamicResource engines.lo_slides}" OffContent="{DynamicResource engines.lo_slides}"+ AutomationProperties.Name="{DynamicResource engines.lo_slides}" /><TextBlock Classes="caption" TextWrapping="Wrap" Text="{DynamicResource engines.lo_slides_hint}" /></StackPanel><StackPanel Spacing="2">- <ToggleSwitch IsChecked="{Binding LibreOfficeForDocuments}" OnContent="{DynamicResource engines.lo_documents}" OffContent="{DynamicResource engines.lo_documents}" />+ <ToggleSwitch IsChecked="{Binding LibreOfficeForDocuments}" OnContent="{DynamicResource engines.lo_documents}" OffContent="{DynamicResource engines.lo_documents}"+ AutomationProperties.Name="{DynamicResource engines.lo_documents}" /><TextBlock Classes="caption" TextWrapping="Wrap" Text="{DynamicResource engines.lo_documents_hint}" /></StackPanel><StackPanel Spacing="2">- <ToggleSwitch IsChecked="{Binding LibreOfficeForSheets}" OnContent="{DynamicResource engines.lo_sheets}" OffContent="{DynamicResource engines.lo_sheets}" />+ <ToggleSwitch IsChecked="{Binding LibreOfficeForSheets}" OnContent="{DynamicResource engines.lo_sheets}" OffContent="{DynamicResource engines.lo_sheets}"+ AutomationProperties.Name="{DynamicResource engines.lo_sheets}" /><TextBlock Classes="caption" TextWrapping="Wrap" Text="{DynamicResource engines.lo_sheets_hint}" /></StackPanel><StackPanel Spacing="2">- <ToggleSwitch IsChecked="{Binding LibreOfficeForHwp}" OnContent="{DynamicResource engines.lo_hwp}" OffContent="{DynamicResource engines.lo_hwp}" />+ <ToggleSwitch IsChecked="{Binding LibreOfficeForHwp}" OnContent="{DynamicResource engines.lo_hwp}" OffContent="{DynamicResource engines.lo_hwp}"+ AutomationProperties.Name="{DynamicResource engines.lo_hwp}" /><TextBlock Classes="caption" TextWrapping="Wrap" Text="{DynamicResource engines.lo_hwp_hint}" /></StackPanel><Button Classes="accent" HorizontalAlignment="Right" Margin="0,6,0,0" MinWidth="88" HorizontalContentAlignment="Center"diff --git a/src/Filee.App/Views/Pages/EnginesPage.axaml b/src/Filee.App/Views/Pages/EnginesPage.axamlindex 0d1b562c..f9aab756 100644--- a/src/Filee.App/Views/Pages/EnginesPage.axaml+++ b/src/Filee.App/Views/Pages/EnginesPage.axaml@@ -109,11 +109,11 @@<StackPanel Spacing="10"><DockPanel><StackPanel DockPanel.Dock="Right" Orientation="Horizontal" Spacing="4">- <Button Classes="icon" ToolTip.Tip="{DynamicResource engines.move_up}"+ <Button Classes="icon" ToolTip.Tip="{DynamicResource engines.move_up}" AutomationProperties.Name="{DynamicResource engines.move_up}"Command="{Binding $parent[ItemsControl].((vm:EnginesPageViewModel)DataContext).MoveUpCommand}" CommandParameter="{Binding}"><PathIcon Width="14" Height="14" Data="{StaticResource Icon.ArrowUp}" /></Button>- <Button Classes="icon" ToolTip.Tip="{DynamicResource engines.move_down}"+ <Button Classes="icon" ToolTip.Tip="{DynamicResource engines.move_down}" AutomationProperties.Name="{DynamicResource engines.move_down}"Command="{Binding $parent[ItemsControl].((vm:EnginesPageViewModel)DataContext).MoveDownCommand}" CommandParameter="{Binding}"><PathIcon Width="14" Height="14" Data="{StaticResource Icon.ArrowDown}" /></Button>diff --git a/src/Filee.App/Views/Pages/GeneralPage.axaml b/src/Filee.App/Views/Pages/GeneralPage.axamlindex d3503d89..0d30079c 100644--- a/src/Filee.App/Views/Pages/GeneralPage.axaml+++ b/src/Filee.App/Views/Pages/GeneralPage.axaml@@ -10,7 +10,7 @@<StackPanel Spacing="14"><StackPanel><TextBlock Classes="label" Text="{DynamicResource general.language}" />- <ComboBox ItemsSource="{Binding Languages}" SelectedItem="{Binding Language}" MinWidth="240" />+ <ComboBox ItemsSource="{Binding Languages}" SelectedItem="{Binding Language}" MinWidth="240" AutomationProperties.Name="{DynamicResource general.language}" /></StackPanel><ToggleSwitch Content="{DynamicResource general.start_with_system}" IsChecked="{Binding StartWithSystem}" /><ToggleSwitch x:Name="ShowInDockSwitch" Content="{DynamicResource general.show_in_dock}"@@ -21,7 +21,7 @@IsVisible="{Binding DockStatus, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" /><StackPanel><TextBlock Classes="label" Text="{DynamicResource general.close_action}" />- <ComboBox ItemsSource="{Binding CloseChoices}" SelectedItem="{Binding CloseChoice}" MinWidth="240" />+ <ComboBox ItemsSource="{Binding CloseChoices}" SelectedItem="{Binding CloseChoice}" MinWidth="240" AutomationProperties.Name="{DynamicResource general.close_action}" /></StackPanel><ToggleSwitch Content="{Binding ContextMenuText}" IsChecked="{Binding ContextMenu}" IsVisible="{Binding HasSystemIntegration}" /><TextBlock Classes="caption" TextWrapping="Wrap" Text="{Binding IntegrationMessage}"@@ -42,16 +42,17 @@<StackPanel Spacing="10"><TextBlock Classes="h2" Text="{DynamicResource general.default_output}" /><TextBlock Classes="caption" TextWrapping="Wrap" Text="{DynamicResource general.default_output_hint}" />- <ComboBox ItemsSource="{Binding OutputLocations}" SelectedItem="{Binding DefaultLocation}" MinWidth="240" />+ <ComboBox ItemsSource="{Binding OutputLocations}" SelectedItem="{Binding DefaultLocation}" MinWidth="240" AutomationProperties.Name="{DynamicResource general.default_output}" /><StackPanel IsVisible="{Binding ShowDefaultSubfolder}"><TextBlock Classes="label" Text="{DynamicResource presets.subfolder}" />- <TextBox Text="{Binding DefaultSubfolder}" PlaceholderText="converted" MaxWidth="420" HorizontalAlignment="Left" MinWidth="240" />+ <TextBox Text="{Binding DefaultSubfolder}" PlaceholderText="converted" MaxWidth="420" HorizontalAlignment="Left" MinWidth="240"+ AutomationProperties.Name="{DynamicResource presets.subfolder}" /></StackPanel><StackPanel IsVisible="{Binding ShowDefaultFolder}"><TextBlock Classes="label" Text="{DynamicResource presets.custom_folder}" /><DockPanel MaxWidth="560" HorizontalAlignment="Stretch"><Button DockPanel.Dock="Right" Margin="8,0,0,0" Content="{DynamicResource presets.browse}" Click="OnBrowseDefaultFolder" />- <TextBox Text="{Binding DefaultFolder}" />+ <TextBox Text="{Binding DefaultFolder}" AutomationProperties.Name="{DynamicResource presets.custom_folder}" /></DockPanel></StackPanel><ToggleSwitch Content="{DynamicResource general.keep_dates}" IsChecked="{Binding KeepFileDates}" />@@ -85,7 +86,7 @@<StackPanel IsVisible="{Binding !NoHistory}"><TextBlock Classes="label" Text="{DynamicResource general.history_limit}" /><NumericUpDown Value="{Binding HistoryLimit}" Minimum="50" Maximum="2000" Increment="50" FormatString="0"- HorizontalAlignment="Left" MinWidth="160" />+ HorizontalAlignment="Left" MinWidth="160" AutomationProperties.Name="{DynamicResource general.history_limit}" /></StackPanel><StackPanel Orientation="Horizontal" Spacing="10"><Button Content="{DynamicResource general.clear_history}" Command="{Binding ClearHistoryCommand}" />diff --git a/src/Filee.App/Views/Pages/PresetsPage.axaml b/src/Filee.App/Views/Pages/PresetsPage.axamlindex 316a0b8c..0bedecc7 100644--- a/src/Filee.App/Views/Pages/PresetsPage.axaml+++ b/src/Filee.App/Views/Pages/PresetsPage.axaml@@ -16,10 +16,10 @@<TextBlock Text="{DynamicResource presets.add}" /></StackPanel></Button>- <Button Command="{Binding DuplicateCommand}" Margin="0,0,6,6" ToolTip.Tip="{DynamicResource presets.duplicate}">+ <Button Command="{Binding DuplicateCommand}" Margin="0,0,6,6" ToolTip.Tip="{DynamicResource presets.duplicate}" AutomationProperties.Name="{DynamicResource presets.duplicate}"><PathIcon Width="14" Height="14" Data="{StaticResource Icon.Copy}" /></Button>- <Button Command="{Binding DeleteCommand}" Margin="0,0,6,6" ToolTip.Tip="{DynamicResource presets.delete}">+ <Button Command="{Binding DeleteCommand}" Margin="0,0,6,6" ToolTip.Tip="{DynamicResource presets.delete}" AutomationProperties.Name="{DynamicResource presets.delete}"><PathIcon Width="14" Height="14" Data="{StaticResource Icon.Delete}" /></Button></WrapPanel>diff --git a/src/Filee.App/Views/Pages/ThemePage.axaml b/src/Filee.App/Views/Pages/ThemePage.axamlindex b70f066d..1e63e852 100644--- a/src/Filee.App/Views/Pages/ThemePage.axaml+++ b/src/Filee.App/Views/Pages/ThemePage.axaml@@ -135,7 +135,7 @@<Border Classes="card"><StackPanel Spacing="8"><TextBlock Classes="label" Text="{DynamicResource theme.mode}" />- <ComboBox ItemsSource="{Binding Modes}" SelectedItem="{Binding Mode}" MinWidth="220" />+ <ComboBox ItemsSource="{Binding Modes}" SelectedItem="{Binding Mode}" MinWidth="220" AutomationProperties.Name="{DynamicResource theme.mode}" /></StackPanel></Border>@@ -236,7 +236,7 @@<TextBlock DockPanel.Dock="Right" FontWeight="SemiBold" Text="{Binding CornerRadius, StringFormat={}{0:0}}" /><TextBlock Classes="label" Text="{DynamicResource theme.corner_radius}" /></DockPanel>- <Slider Minimum="0" Maximum="28" Value="{Binding CornerRadius}" TickFrequency="1" IsSnapToTickEnabled="True" />+ <Slider Minimum="0" Maximum="28" Value="{Binding CornerRadius}" TickFrequency="1" IsSnapToTickEnabled="True" AutomationProperties.Name="{DynamicResource theme.corner_radius}" /></StackPanel></Border>@@ -248,7 +248,7 @@<TextBlock Classes="label" Text="{DynamicResource theme.donut_opacity}" /></DockPanel><Slider x:Name="DonutOpacitySlider" Minimum="10" Maximum="100" Value="{Binding DonutOpacity}"- TickFrequency="1" IsSnapToTickEnabled="True" />+ TickFrequency="1" IsSnapToTickEnabled="True" AutomationProperties.Name="{DynamicResource theme.donut_opacity}" /></StackPanel></Border>diff --git a/src/Filee.App/Views/Pages/ToolbarPage.axaml b/src/Filee.App/Views/Pages/ToolbarPage.axamlindex dbd3310b..491cd93e 100644--- a/src/Filee.App/Views/Pages/ToolbarPage.axaml+++ b/src/Filee.App/Views/Pages/ToolbarPage.axaml@@ -244,7 +244,7 @@<StackPanel Spacing="12"><StackPanel><TextBlock Classes="label" Text="{DynamicResource toolbar.name}" />- <TextBox Text="{Binding ProfileName}" />+ <TextBox Text="{Binding ProfileName}" AutomationProperties.Name="{DynamicResource toolbar.name}" /></StackPanel><!-- The label wraps (a ToggleSwitch header doesn't), so it sits next to a bare switch. -->@@ -350,15 +350,15 @@<TextBlock Classes="h2" Text="{DynamicResource toolbar.appearance}" /><Grid ColumnDefinitions="90,*"><TextBlock Classes="label" VerticalAlignment="Center" Text="{DynamicResource toolbar.size}" />- <Slider Grid.Column="1" Minimum="110" Maximum="220" Value="{Binding OuterRadius}" />+ <Slider Grid.Column="1" Minimum="110" Maximum="220" Value="{Binding OuterRadius}" AutomationProperties.Name="{DynamicResource toolbar.size}" /></Grid><Grid ColumnDefinitions="90,*"><TextBlock Classes="label" VerticalAlignment="Center" Text="{DynamicResource toolbar.hole}" />- <Slider Grid.Column="1" Minimum="25" Maximum="65" Value="{Binding HoleRatio}" />+ <Slider Grid.Column="1" Minimum="25" Maximum="65" Value="{Binding HoleRatio}" AutomationProperties.Name="{DynamicResource toolbar.hole}" /></Grid><Grid ColumnDefinitions="90,*"><TextBlock Classes="label" VerticalAlignment="Center" Text="{DynamicResource toolbar.opacity}" />- <Slider Grid.Column="1" Minimum="10" Maximum="100" Value="{Binding SliceOpacity}" />+ <Slider Grid.Column="1" Minimum="10" Maximum="100" Value="{Binding SliceOpacity}" AutomationProperties.Name="{DynamicResource toolbar.opacity}" /></Grid></StackPanel></Border>diff --git a/src/Filee.App/Views/Pages/TriggersPage.axaml b/src/Filee.App/Views/Pages/TriggersPage.axamlindex b88bec07..8faaabb3 100644--- a/src/Filee.App/Views/Pages/TriggersPage.axaml+++ b/src/Filee.App/Views/Pages/TriggersPage.axaml@@ -45,10 +45,11 @@<DockPanel><Button DockPanel.Dock="Right" Classes="icon"Command="{Binding $parent[ItemsControl].((vm:TriggersPageViewModel)DataContext).RemoveCommand}"- CommandParameter="{Binding}" ToolTip.Tip="{DynamicResource triggers.remove}">+ CommandParameter="{Binding}" ToolTip.Tip="{DynamicResource triggers.remove}" AutomationProperties.Name="{DynamicResource triggers.remove}"><PathIcon Width="15" Height="15" Data="{StaticResource Icon.Delete}" /></Button>- <ToggleSwitch DockPanel.Dock="Left" IsChecked="{Binding Enabled}" OnContent="" OffContent="" Margin="0,0,8,0" />+ <ToggleSwitch DockPanel.Dock="Left" IsChecked="{Binding Enabled}" OnContent="" OffContent="" Margin="0,0,8,0"+ AutomationProperties.Name="{Binding Summary}" /><Border Classes="badge ok" VerticalAlignment="Center" HorizontalAlignment="Left"><TextBlock Text="{Binding Summary}" FontWeight="SemiBold" Foreground="{DynamicResource AccentStrongBrush}" /></Border>@@ -57,11 +58,11 @@<Grid ColumnDefinitions="*,16,*" RowDefinitions="Auto,14,Auto"><StackPanel><TextBlock Classes="label" Text="{DynamicResource triggers.kind}" />- <ComboBox ItemsSource="{Binding Kinds}" SelectedItem="{Binding Kind}" HorizontalAlignment="Stretch" />+ <ComboBox ItemsSource="{Binding Kinds}" SelectedItem="{Binding Kind}" HorizontalAlignment="Stretch" AutomationProperties.Name="{DynamicResource triggers.kind}" /></StackPanel><StackPanel Grid.Column="2"><TextBlock Classes="label" Text="{DynamicResource triggers.scope}" />- <ComboBox ItemsSource="{Binding Scopes}" SelectedItem="{Binding Scope}" HorizontalAlignment="Stretch" />+ <ComboBox ItemsSource="{Binding Scopes}" SelectedItem="{Binding Scope}" HorizontalAlignment="Stretch" AutomationProperties.Name="{DynamicResource triggers.scope}" /></StackPanel><StackPanel Grid.Row="2">@@ -77,7 +78,7 @@<StackPanel Grid.Row="2" Grid.Column="2" Spacing="10"><StackPanel IsVisible="{Binding UsesMouse}"><TextBlock Classes="label" Text="{DynamicResource triggers.button}" />- <ComboBox ItemsSource="{Binding Buttons}" SelectedItem="{Binding Button}" HorizontalAlignment="Stretch" />+ <ComboBox ItemsSource="{Binding Buttons}" SelectedItem="{Binding Button}" HorizontalAlignment="Stretch" AutomationProperties.Name="{DynamicResource triggers.button}" /></StackPanel><StackPanel IsVisible="{Binding UsesKey}"><TextBlock Classes="label" Text="{DynamicResource triggers.key}" />@@ -102,7 +103,7 @@<TextBlock DockPanel.Dock="Right" Text="{Binding ThresholdText}" FontWeight="SemiBold" /><TextBlock Classes="label" Text="{DynamicResource triggers.threshold}" /></DockPanel>- <Slider Minimum="0" Maximum="80" Value="{Binding DragThreshold}" TickFrequency="1" IsSnapToTickEnabled="True" />+ <Slider Minimum="0" Maximum="80" Value="{Binding DragThreshold}" TickFrequency="1" IsSnapToTickEnabled="True" AutomationProperties.Name="{DynamicResource triggers.threshold}" /></StackPanel><StackPanel IsVisible="{Binding UsesHold}"><DockPanel>@@ -111,7 +112,7 @@</TextBlock><TextBlock Classes="label" Text="{DynamicResource triggers.hold_ms}" /></DockPanel>- <Slider Minimum="150" Maximum="2000" Value="{Binding HoldMilliseconds}" TickFrequency="50" IsSnapToTickEnabled="True" />+ <Slider Minimum="150" Maximum="2000" Value="{Binding HoldMilliseconds}" TickFrequency="50" IsSnapToTickEnabled="True" AutomationProperties.Name="{DynamicResource triggers.hold_ms}" /></StackPanel></StackPanel></Border>diff --git a/src/Filee.App/Views/Pages/WatchFoldersPage.axaml b/src/Filee.App/Views/Pages/WatchFoldersPage.axamlindex 279b37fc..964e180a 100644--- a/src/Filee.App/Views/Pages/WatchFoldersPage.axaml+++ b/src/Filee.App/Views/Pages/WatchFoldersPage.axaml@@ -37,10 +37,11 @@<Border Classes="card"><StackPanel Spacing="12"><DockPanel>- <Button DockPanel.Dock="Right" Command="{Binding RemoveCommand}" ToolTip.Tip="{DynamicResource watch.remove}">+ <Button DockPanel.Dock="Right" Command="{Binding RemoveCommand}" ToolTip.Tip="{DynamicResource watch.remove}" AutomationProperties.Name="{DynamicResource watch.remove}"><PathIcon Width="14" Height="14" Data="{StaticResource Icon.Delete}" /></Button>- <ToggleSwitch IsChecked="{Binding Enabled}" OnContent="{DynamicResource watch.enabled}" OffContent="{DynamicResource watch.enabled}" />+ <!-- No label of its own: the status beside it says whether the folder is watched. -->+ <ToggleSwitch IsChecked="{Binding Enabled}" OnContent="" OffContent="" AutomationProperties.Name="{Binding Folder}" /><TextBlock Classes="muted" VerticalAlignment="Center" Margin="12,0" Text="{Binding Status}" TextTrimming="CharacterEllipsis" /></DockPanel>@@ -55,12 +56,12 @@<Grid ColumnDefinitions="*,16,*"><StackPanel Spacing="4"><TextBlock Classes="label" Text="{DynamicResource watch.preset}" />- <ComboBox ItemsSource="{Binding Presets}" SelectedItem="{Binding Preset}" HorizontalAlignment="Stretch" />+ <ComboBox ItemsSource="{Binding Presets}" SelectedItem="{Binding Preset}" HorizontalAlignment="Stretch" AutomationProperties.Name="{DynamicResource watch.preset}" /></StackPanel><StackPanel Grid.Column="2" Spacing="4"><TextBlock Classes="label" Text="{DynamicResource watch.originals}" /><ComboBox ItemsSource="{Binding OriginalsChoices}" SelectedItem="{Binding Originals}" HorizontalAlignment="Stretch"- ToolTip.Tip="{DynamicResource watch.originals_hint}" />+ ToolTip.Tip="{DynamicResource watch.originals_hint}" AutomationProperties.Name="{DynamicResource watch.originals}" /></StackPanel></Grid>diff --git a/src/Filee.App/Views/PdfPageEditorWindow.axaml b/src/Filee.App/Views/PdfPageEditorWindow.axamlindex 7cb4708b..0ff7a80e 100644--- a/src/Filee.App/Views/PdfPageEditorWindow.axaml+++ b/src/Filee.App/Views/PdfPageEditorWindow.axaml@@ -40,10 +40,10 @@<TextBlock Text="{DynamicResource pdf_editor.add}" /></StackPanel></Button>- <Button Margin="0,0,6,6" Command="{Binding MoveUpCommand}" ToolTip.Tip="{DynamicResource group.move_up}">+ <Button Margin="0,0,6,6" Command="{Binding MoveUpCommand}" ToolTip.Tip="{DynamicResource group.move_up}" AutomationProperties.Name="{DynamicResource group.move_up}"><PathIcon Width="14" Height="14" Data="{StaticResource Icon.ArrowUp}" /></Button>- <Button Margin="0,0,6,6" Command="{Binding MoveDownCommand}" ToolTip.Tip="{DynamicResource group.move_down}">+ <Button Margin="0,0,6,6" Command="{Binding MoveDownCommand}" ToolTip.Tip="{DynamicResource group.move_down}" AutomationProperties.Name="{DynamicResource group.move_down}"><PathIcon Width="14" Height="14" Data="{StaticResource Icon.ArrowDown}" /></Button><Button Margin="0,0,6,6" Command="{Binding RotateLeftCommand}" Content="{DynamicResource preset.rotate_left.short}" />diff --git a/src/Filee.App/Views/PresetEditorView.axaml b/src/Filee.App/Views/PresetEditorView.axamlindex 372a50f1..08b54485 100644--- a/src/Filee.App/Views/PresetEditorView.axaml+++ b/src/Filee.App/Views/PresetEditorView.axaml@@ -18,14 +18,14 @@<Grid ColumnDefinitions="*,12,*"><StackPanel><TextBlock Classes="label" Text="{DynamicResource presets.name}" />- <TextBox Text="{Binding Name}" />+ <TextBox Text="{Binding Name}" AutomationProperties.Name="{DynamicResource presets.name}" /><TextBlock Classes="caption danger" Text="{Binding NameError}" IsVisible="{Binding NameError, Converter={x:Static ObjectConverters.IsNotNull}}" Margin="2,4,0,0" /></StackPanel><StackPanel Grid.Column="2"><TextBlock Classes="label" Text="{DynamicResource presets.target}" /><ComboBox x:Name="TargetBox" Classes="targets" ItemsSource="{Binding Targets}" SelectedItem="{Binding Target}"IsEnabled="{Binding CanChangeTarget}"- HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" MaxDropDownHeight="420">+ HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" MaxDropDownHeight="420" AutomationProperties.Name="{DynamicResource presets.target}"><ComboBox.ItemTemplate><DataTemplate x:DataType="vm:IChoice"><DockPanel>@@ -44,22 +44,22 @@<TextBlock Classes="h2" Text="{DynamicResource presets.group.live_photo}" /><StackPanel><TextBlock Classes="label" TextWrapping="Wrap" Text="{DynamicResource presets.live_photo}" />- <ComboBox ItemsSource="{Binding LivePhotoKinds}" SelectedItem="{Binding LivePhotoChoice}" HorizontalAlignment="Stretch" />+ <ComboBox ItemsSource="{Binding LivePhotoKinds}" SelectedItem="{Binding LivePhotoChoice}" HorizontalAlignment="Stretch" AutomationProperties.Name="{DynamicResource presets.live_photo}" /></StackPanel><StackPanel Spacing="10" IsVisible="{Binding IsLivePhoto}"><TextBlock Classes="caption" TextWrapping="Wrap" Text="{Binding LivePhotoHint}" /><UniformGrid Columns="3" ColumnSpacing="12"><StackPanel><TextBlock Classes="label" TextWrapping="Wrap" Text="{DynamicResource presets.live_photo_start}" />- <NumericUpDown Value="{Binding LivePhotoStart}" Minimum="0" Maximum="86400" Increment="0.5" FormatString="0.##" />+ <NumericUpDown Value="{Binding LivePhotoStart}" Minimum="0" Maximum="86400" Increment="0.5" FormatString="0.##" AutomationProperties.Name="{DynamicResource presets.live_photo_start}" /></StackPanel><StackPanel><TextBlock Classes="label" TextWrapping="Wrap" Text="{DynamicResource presets.live_photo_length}" />- <NumericUpDown Value="{Binding LivePhotoLength}" Minimum="0.5" Maximum="5" Increment="0.5" FormatString="0.##" />+ <NumericUpDown Value="{Binding LivePhotoLength}" Minimum="0.5" Maximum="5" Increment="0.5" FormatString="0.##" AutomationProperties.Name="{DynamicResource presets.live_photo_length}" /></StackPanel><StackPanel><TextBlock Classes="label" TextWrapping="Wrap" Text="{DynamicResource presets.live_photo_cover}" />- <NumericUpDown Value="{Binding LivePhotoCover}" Minimum="0" Maximum="5" Increment="0.1" FormatString="0.##" />+ <NumericUpDown Value="{Binding LivePhotoCover}" Minimum="0" Maximum="5" Increment="0.1" FormatString="0.##" AutomationProperties.Name="{DynamicResource presets.live_photo_cover}" /></StackPanel></UniformGrid><StackPanel>@@ -67,20 +67,20 @@<TextBlock DockPanel.Dock="Right" Text="{Binding Quality}" FontWeight="SemiBold" /><TextBlock Classes="label" Text="{DynamicResource presets.live_photo_quality}" /></DockPanel>- <Slider Minimum="1" Maximum="100" Value="{Binding Quality}" TickFrequency="1" IsSnapToTickEnabled="True" />+ <Slider Minimum="1" Maximum="100" Value="{Binding Quality}" TickFrequency="1" IsSnapToTickEnabled="True" AutomationProperties.Name="{DynamicResource presets.live_photo_quality}" /></StackPanel><UniformGrid Columns="2" ColumnSpacing="12" RowSpacing="10"><StackPanel><TextBlock Classes="label" Text="{DynamicResource presets.live_photo_video_quality}" />- <ComboBox ItemsSource="{Binding MediaQualities}" SelectedItem="{Binding MediaQuality}" HorizontalAlignment="Stretch" />+ <ComboBox ItemsSource="{Binding MediaQualities}" SelectedItem="{Binding MediaQuality}" HorizontalAlignment="Stretch" AutomationProperties.Name="{DynamicResource presets.live_photo_video_quality}" /></StackPanel><StackPanel><TextBlock Classes="label" Text="{DynamicResource presets.max_height}" />- <ComboBox ItemsSource="{Binding MaxHeights}" SelectedItem="{Binding MaxHeight}" HorizontalAlignment="Stretch" />+ <ComboBox ItemsSource="{Binding MaxHeights}" SelectedItem="{Binding MaxHeight}" HorizontalAlignment="Stretch" AutomationProperties.Name="{DynamicResource presets.max_height}" /></StackPanel><StackPanel><TextBlock Classes="label" Text="{DynamicResource presets.video_codec}" />- <ComboBox ItemsSource="{Binding LivePhotoCodecs}" SelectedItem="{Binding LivePhotoCodecChoice}" HorizontalAlignment="Stretch" />+ <ComboBox ItemsSource="{Binding LivePhotoCodecs}" SelectedItem="{Binding LivePhotoCodecChoice}" HorizontalAlignment="Stretch" AutomationProperties.Name="{DynamicResource presets.video_codec}" /></StackPanel><CheckBox VerticalAlignment="Bottom" Content="{DynamicResource presets.remove_audio}" IsChecked="{Binding RemoveAudio}" /></UniformGrid>@@ -97,39 +97,40 @@<TextBlock DockPanel.Dock="Right" Text="{Binding Quality}" FontWeight="SemiBold" /><TextBlock Classes="label" Text="{DynamicResource presets.quality}" /></DockPanel>- <Slider Minimum="1" Maximum="100" Value="{Binding Quality}" TickFrequency="1" IsSnapToTickEnabled="True" />+ <Slider Minimum="1" Maximum="100" Value="{Binding Quality}" TickFrequency="1" IsSnapToTickEnabled="True" AutomationProperties.Name="{DynamicResource presets.quality}" /></StackPanel><Grid ColumnDefinitions="*,12,*"><StackPanel><TextBlock Classes="label" Text="{DynamicResource presets.resize}" />- <ComboBox ItemsSource="{Binding ResizeModes}" SelectedItem="{Binding Resize}" HorizontalAlignment="Stretch" />+ <ComboBox ItemsSource="{Binding ResizeModes}" SelectedItem="{Binding Resize}" HorizontalAlignment="Stretch" AutomationProperties.Name="{DynamicResource presets.resize}" /></StackPanel><StackPanel Grid.Column="2" IsVisible="{Binding ShowPercent}"><TextBlock Classes="label" Text="{DynamicResource presets.percent}" />- <NumericUpDown Value="{Binding ResizePercent}" Minimum="1" Maximum="1000" Increment="5" FormatString="0" />+ <NumericUpDown Value="{Binding ResizePercent}" Minimum="1" Maximum="1000" Increment="5" FormatString="0" AutomationProperties.Name="{DynamicResource presets.percent}" /></StackPanel><StackPanel Grid.Column="2" IsVisible="{Binding ShowLongEdge}"><TextBlock Classes="label" Text="{DynamicResource presets.long_edge}" />- <NumericUpDown Value="{Binding LongEdge}" Minimum="16" Maximum="20000" Increment="100" FormatString="0" />+ <NumericUpDown Value="{Binding LongEdge}" Minimum="16" Maximum="20000" Increment="100" FormatString="0" AutomationProperties.Name="{DynamicResource presets.long_edge}" /></StackPanel><StackPanel Grid.Column="2" IsVisible="{Binding ShowWidth}"><TextBlock Classes="label" Text="{DynamicResource presets.width}" />- <NumericUpDown Value="{Binding Width}" Minimum="16" Maximum="20000" Increment="100" FormatString="0" />+ <NumericUpDown Value="{Binding Width}" Minimum="16" Maximum="20000" Increment="100" FormatString="0" AutomationProperties.Name="{DynamicResource presets.width}" /></StackPanel></Grid><Grid ColumnDefinitions="*,12,*"><StackPanel><TextBlock Classes="label" Text="{DynamicResource presets.rotation}" />- <ComboBox ItemsSource="{Binding Rotations}" SelectedItem="{Binding Rotation}" HorizontalAlignment="Stretch" />+ <ComboBox ItemsSource="{Binding Rotations}" SelectedItem="{Binding Rotation}" HorizontalAlignment="Stretch" AutomationProperties.Name="{DynamicResource presets.rotation}" /></StackPanel><StackPanel Grid.Column="2"><TextBlock Classes="label" Text="{DynamicResource presets.flip}" />- <ComboBox ItemsSource="{Binding Flips}" SelectedItem="{Binding Flip}" HorizontalAlignment="Stretch" />+ <ComboBox ItemsSource="{Binding Flips}" SelectedItem="{Binding Flip}" HorizontalAlignment="Stretch" AutomationProperties.Name="{DynamicResource presets.flip}" /></StackPanel></Grid><Grid ColumnDefinitions="Auto,12,*"><CheckBox Content="{DynamicResource presets.dpi}" IsChecked="{Binding SetDpi}" />- <NumericUpDown Grid.Column="2" Value="{Binding Dpi}" Minimum="36" Maximum="2400" Increment="50" FormatString="0" IsEnabled="{Binding SetDpi}" />+ <NumericUpDown Grid.Column="2" Value="{Binding Dpi}" Minimum="36" Maximum="2400" Increment="50" FormatString="0" IsEnabled="{Binding SetDpi}"+ AutomationProperties.Name="{DynamicResource presets.dpi}" /></Grid><WrapPanel><CheckBox Content="{DynamicResource presets.keep_metadata}" IsChecked="{Binding KeepMetadata}" Margin="0,0,18,0" />@@ -146,7 +147,7 @@<TextBlock Classes="label" Text="{DynamicResource presets.background_tolerance}" /></DockPanel><Slider Minimum="0" Maximum="100" Value="{Binding BackgroundTolerance}" TickFrequency="1" IsSnapToTickEnabled="True"- ToolTip.Tip="{DynamicResource presets.background_tolerance_hint}" />+ ToolTip.Tip="{DynamicResource presets.background_tolerance_hint}" AutomationProperties.Name="{DynamicResource presets.background_tolerance}" /><CheckBox Content="{DynamicResource presets.keep_enclosed_background}" IsChecked="{Binding KeepEnclosedBackground}"ToolTip.Tip="{DynamicResource presets.keep_enclosed_background_hint}" /></StackPanel>@@ -157,7 +158,7 @@</StackPanel><StackPanel Grid.Column="2" IsVisible="{Binding ShowTiff}"><TextBlock Classes="label" Text="{DynamicResource presets.tiff_compression}" />- <ComboBox ItemsSource="{Binding TiffCompressions}" SelectedItem="{Binding TiffCompression}" HorizontalAlignment="Stretch" />+ <ComboBox ItemsSource="{Binding TiffCompressions}" SelectedItem="{Binding TiffCompression}" HorizontalAlignment="Stretch" AutomationProperties.Name="{DynamicResource presets.tiff_compression}" /></StackPanel><StackPanel Grid.Column="2" IsVisible="{Binding ShowIco}"><TextBlock Classes="label" Text="{DynamicResource presets.ico_sizes}" />@@ -168,7 +169,7 @@<StackPanel><TextBlock Classes="label" Text="{DynamicResource presets.animation_speed}" /><ComboBox ItemsSource="{Binding AnimationSpeeds}" SelectedItem="{Binding AnimationSpeed}" HorizontalAlignment="Stretch"- ToolTip.Tip="{DynamicResource presets.animation_speed_hint}" />+ ToolTip.Tip="{DynamicResource presets.animation_speed_hint}" AutomationProperties.Name="{DynamicResource presets.animation_speed}" /></StackPanel></Grid><CheckBox Content="{DynamicResource presets.multipage_tiff}" IsChecked="{Binding MultiPageTiff}" IsVisible="{Binding ShowMultiPageTiff}"@@ -177,7 +178,7 @@<StackPanel><TextBlock Classes="label" Text="{DynamicResource presets.fits_tiff}" /><ComboBox ItemsSource="{Binding FitsTiffModes}" SelectedItem="{Binding FitsTiffMode}" HorizontalAlignment="Stretch"- ToolTip.Tip="{DynamicResource presets.fits_tiff_hint}" />+ ToolTip.Tip="{DynamicResource presets.fits_tiff_hint}" AutomationProperties.Name="{DynamicResource presets.fits_tiff}" /></StackPanel></Grid><CheckBox Content="{DynamicResource presets.fits_debayer}" IsChecked="{Binding FitsDebayer}" IsVisible="{Binding ShowFitsDebayer}"@@ -188,7 +189,7 @@<StackPanel Spacing="4" Margin="28,0,0,0" IsVisible="{Binding SaveEveryFrame}"><Grid ColumnDefinitions="Auto,12,120"><TextBlock Classes="label" VerticalAlignment="Center" Text="{DynamicResource presets.frame_interval}" />- <NumericUpDown Grid.Column="2" Value="{Binding FrameInterval}" Minimum="1" Maximum="1000" Increment="1" FormatString="0" />+ <NumericUpDown Grid.Column="2" Value="{Binding FrameInterval}" Minimum="1" Maximum="1000" Increment="1" FormatString="0" AutomationProperties.Name="{DynamicResource presets.frame_interval}" /></Grid><TextBlock Classes="caption" TextWrapping="Wrap" Text="{Binding FrameEstimate}" /></StackPanel>@@ -205,7 +206,7 @@<StackPanel Spacing="6" IsVisible="{Binding ShowSlideshow}"><Grid ColumnDefinitions="Auto,12,120"><TextBlock Classes="label" VerticalAlignment="Center" Text="{DynamicResource presets.slide_seconds}" />- <NumericUpDown Grid.Column="2" Value="{Binding SlideSeconds}" Minimum="0.5" Maximum="60" Increment="0.5" FormatString="0.#" />+ <NumericUpDown Grid.Column="2" Value="{Binding SlideSeconds}" Minimum="0.5" Maximum="60" Increment="0.5" FormatString="0.#" AutomationProperties.Name="{DynamicResource presets.slide_seconds}" /></Grid><CheckBox Content="{DynamicResource presets.crossfade}" IsChecked="{Binding Crossfade}"ToolTip.Tip="{DynamicResource presets.crossfade_hint}" />@@ -214,11 +215,11 @@<StackPanel><TextBlock Classes="label" Text="{DynamicResource presets.media_quality}" /><ComboBox ItemsSource="{Binding MediaQualities}" SelectedItem="{Binding MediaQuality}" HorizontalAlignment="Stretch"- ToolTip.Tip="{DynamicResource presets.media_quality_hint}" />+ ToolTip.Tip="{DynamicResource presets.media_quality_hint}" AutomationProperties.Name="{DynamicResource presets.media_quality}" /></StackPanel><StackPanel Grid.Column="2" IsVisible="{Binding ShowMaxHeight}"><TextBlock Classes="label" Text="{DynamicResource presets.max_height}" />- <ComboBox ItemsSource="{Binding MaxHeights}" SelectedItem="{Binding MaxHeight}" HorizontalAlignment="Stretch" />+ <ComboBox ItemsSource="{Binding MaxHeights}" SelectedItem="{Binding MaxHeight}" HorizontalAlignment="Stretch" AutomationProperties.Name="{DynamicResource presets.max_height}" /></StackPanel></Grid><!-- Two per row, whichever apply to the target: hidden ones leave no gap. -->@@ -226,29 +227,29 @@<StackPanel IsVisible="{Binding ShowVideoCodec}"><TextBlock Classes="label" Text="{DynamicResource presets.video_codec}" /><ComboBox ItemsSource="{Binding VideoCodecs}" SelectedItem="{Binding VideoCodecChoice}" HorizontalAlignment="Stretch"- ToolTip.Tip="{DynamicResource presets.video_codec_hint}" />+ ToolTip.Tip="{DynamicResource presets.video_codec_hint}" AutomationProperties.Name="{DynamicResource presets.video_codec}" /></StackPanel><StackPanel IsVisible="{Binding ShowAudioCodec}"><TextBlock Classes="label" Text="{DynamicResource presets.audio_codec}" />- <ComboBox ItemsSource="{Binding AudioCodecs}" SelectedItem="{Binding AudioCodecChoice}" HorizontalAlignment="Stretch" />+ <ComboBox ItemsSource="{Binding AudioCodecs}" SelectedItem="{Binding AudioCodecChoice}" HorizontalAlignment="Stretch" AutomationProperties.Name="{DynamicResource presets.audio_codec}" /></StackPanel><StackPanel IsVisible="{Binding ShowAudioBitrate}"><TextBlock Classes="label" Text="{DynamicResource presets.audio_bitrate}" />- <ComboBox ItemsSource="{Binding AudioBitrates}" SelectedItem="{Binding AudioBitrate}" HorizontalAlignment="Stretch" />+ <ComboBox ItemsSource="{Binding AudioBitrates}" SelectedItem="{Binding AudioBitrate}" HorizontalAlignment="Stretch" AutomationProperties.Name="{DynamicResource presets.audio_bitrate}" /></StackPanel><CheckBox VerticalAlignment="Bottom" Content="{DynamicResource presets.remove_audio}"IsChecked="{Binding RemoveAudio}" IsVisible="{Binding ShowRemoveAudio}" /><StackPanel IsVisible="{Binding ShowAudioChannels}"><TextBlock Classes="label" Text="{DynamicResource presets.audio_channels}" />- <ComboBox ItemsSource="{Binding AudioChannelChoices}" SelectedItem="{Binding AudioChannels}" HorizontalAlignment="Stretch" />+ <ComboBox ItemsSource="{Binding AudioChannelChoices}" SelectedItem="{Binding AudioChannels}" HorizontalAlignment="Stretch" AutomationProperties.Name="{DynamicResource presets.audio_channels}" /></StackPanel><StackPanel IsVisible="{Binding ShowWav}"><TextBlock Classes="label" Text="{DynamicResource presets.sample_rate}" />- <ComboBox ItemsSource="{Binding SampleRates}" SelectedItem="{Binding SampleRate}" HorizontalAlignment="Stretch" />+ <ComboBox ItemsSource="{Binding SampleRates}" SelectedItem="{Binding SampleRate}" HorizontalAlignment="Stretch" AutomationProperties.Name="{DynamicResource presets.sample_rate}" /></StackPanel><StackPanel IsVisible="{Binding ShowWav}"><TextBlock Classes="label" Text="{DynamicResource presets.wav_format}" />- <ComboBox ItemsSource="{Binding WavFormats}" SelectedItem="{Binding WavFormat}" HorizontalAlignment="Stretch" />+ <ComboBox ItemsSource="{Binding WavFormats}" SelectedItem="{Binding WavFormat}" HorizontalAlignment="Stretch" AutomationProperties.Name="{DynamicResource presets.wav_format}" /></StackPanel></UniformGrid><StackPanel Spacing="2" IsVisible="{Binding ShowHardwareEncoding}">@@ -265,7 +266,7 @@<Grid ColumnDefinitions="*,12,*" IsVisible="{Binding ShowArchiveOptions}"><StackPanel><TextBlock Classes="label" Text="{DynamicResource presets.archive_level}" />- <ComboBox ItemsSource="{Binding ArchiveLevels}" SelectedItem="{Binding ArchiveLevel}" HorizontalAlignment="Stretch" />+ <ComboBox ItemsSource="{Binding ArchiveLevels}" SelectedItem="{Binding ArchiveLevel}" HorizontalAlignment="Stretch" AutomationProperties.Name="{DynamicResource presets.archive_level}" /></StackPanel></Grid><CheckBox Content="{DynamicResource presets.combine}" IsChecked="{Binding CombineIntoOne}" IsVisible="{Binding ShowArchiveOptions}" />@@ -281,14 +282,14 @@<Grid ColumnDefinitions="*,12,*"><StackPanel><TextBlock Classes="label" Text="{DynamicResource presets.trace_mode}" />- <ComboBox ItemsSource="{Binding TraceModes}" SelectedItem="{Binding TraceMode}" HorizontalAlignment="Stretch" />+ <ComboBox ItemsSource="{Binding TraceModes}" SelectedItem="{Binding TraceMode}" HorizontalAlignment="Stretch" AutomationProperties.Name="{DynamicResource presets.trace_mode}" /></StackPanel><StackPanel Grid.Column="2" IsVisible="{Binding ShowTraceColors}"><DockPanel><TextBlock DockPanel.Dock="Right" Text="{Binding TraceColors}" FontWeight="SemiBold" /><TextBlock Classes="label" Text="{DynamicResource presets.trace_colors}" /></DockPanel>- <Slider Minimum="2" Maximum="64" Value="{Binding TraceColors}" TickFrequency="1" IsSnapToTickEnabled="True" />+ <Slider Minimum="2" Maximum="64" Value="{Binding TraceColors}" TickFrequency="1" IsSnapToTickEnabled="True" AutomationProperties.Name="{DynamicResource presets.trace_colors}" /></StackPanel></Grid><StackPanel>@@ -297,7 +298,7 @@<TextBlock Classes="label" Text="{DynamicResource presets.trace_detail}" /></DockPanel><Slider Minimum="0" Maximum="100" Value="{Binding TraceDetail}" TickFrequency="1" IsSnapToTickEnabled="True"- ToolTip.Tip="{DynamicResource presets.trace_detail_hint}" />+ ToolTip.Tip="{DynamicResource presets.trace_detail_hint}" AutomationProperties.Name="{DynamicResource presets.trace_detail}" /></StackPanel></StackPanel></Border>@@ -309,7 +310,7 @@<Grid ColumnDefinitions="*,12,*"><StackPanel><TextBlock Classes="label" Text="{DynamicResource presets.cad_version}" />- <ComboBox ItemsSource="{Binding CadVersions}" SelectedItem="{Binding CadVersion}" HorizontalAlignment="Stretch" />+ <ComboBox ItemsSource="{Binding CadVersions}" SelectedItem="{Binding CadVersion}" HorizontalAlignment="Stretch" AutomationProperties.Name="{DynamicResource presets.cad_version}" /></StackPanel></Grid><TextBlock Classes="caption" Text="{DynamicResource presets.cad_version_hint}" TextWrapping="Wrap" />@@ -339,7 +340,7 @@<Grid ColumnDefinitions="*,12,*"><StackPanel><TextBlock Classes="label" Text="{DynamicResource presets.pdf_compression}" />- <ComboBox ItemsSource="{Binding CompressionLevels}" SelectedItem="{Binding CompressionLevel}" HorizontalAlignment="Stretch" />+ <ComboBox ItemsSource="{Binding CompressionLevels}" SelectedItem="{Binding CompressionLevel}" HorizontalAlignment="Stretch" AutomationProperties.Name="{DynamicResource presets.pdf_compression}" /></StackPanel></Grid><TextBlock Classes="caption" TextWrapping="Wrap" Text="{DynamicResource presets.pdf_compression_hint}" />@@ -357,7 +358,7 @@<StackPanel><TextBlock Classes="label" Text="{DynamicResource presets.ocr_language}" /><ComboBox ItemsSource="{Binding OcrLanguageChoices}" SelectedItem="{Binding OcrLanguage}" HorizontalAlignment="Stretch"- HorizontalContentAlignment="Stretch" MaxDropDownHeight="420">+ HorizontalContentAlignment="Stretch" MaxDropDownHeight="420" AutomationProperties.Name="{DynamicResource presets.ocr_language}"><ComboBox.ItemTemplate><DataTemplate x:DataType="vm:IChoice"><DockPanel>@@ -382,28 +383,28 @@<Grid ColumnDefinitions="*,12,*" IsVisible="{Binding ShowPageSize}"><StackPanel><TextBlock Classes="label" Text="{DynamicResource presets.page_size}" />- <ComboBox ItemsSource="{Binding PageSizes}" SelectedItem="{Binding PageSize}" HorizontalAlignment="Stretch" />+ <ComboBox ItemsSource="{Binding PageSizes}" SelectedItem="{Binding PageSize}" HorizontalAlignment="Stretch" AutomationProperties.Name="{DynamicResource presets.page_size}" /></StackPanel><StackPanel Grid.Column="2" IsVisible="{Binding ShowMargin}"><TextBlock Classes="label" Text="{DynamicResource presets.margin}" />- <NumericUpDown Value="{Binding MarginMm}" Minimum="0" Maximum="100" Increment="1" FormatString="0" />+ <NumericUpDown Value="{Binding MarginMm}" Minimum="0" Maximum="100" Increment="1" FormatString="0" AutomationProperties.Name="{DynamicResource presets.margin}" /></StackPanel></Grid><!-- Pictures placed on the pages are turned too; a PDF target has no image card to show this in --><Grid ColumnDefinitions="*,12,*" IsVisible="{Binding ShowTurnForPdf}"><StackPanel><TextBlock Classes="label" Text="{DynamicResource presets.rotation}" />- <ComboBox ItemsSource="{Binding Rotations}" SelectedItem="{Binding Rotation}" HorizontalAlignment="Stretch" />+ <ComboBox ItemsSource="{Binding Rotations}" SelectedItem="{Binding Rotation}" HorizontalAlignment="Stretch" AutomationProperties.Name="{DynamicResource presets.rotation}" /></StackPanel><StackPanel Grid.Column="2"><TextBlock Classes="label" Text="{DynamicResource presets.flip}" />- <ComboBox ItemsSource="{Binding Flips}" SelectedItem="{Binding Flip}" HorizontalAlignment="Stretch" />+ <ComboBox ItemsSource="{Binding Flips}" SelectedItem="{Binding Flip}" HorizontalAlignment="Stretch" AutomationProperties.Name="{DynamicResource presets.flip}" /></StackPanel></Grid><Grid ColumnDefinitions="*,12,*"><StackPanel><TextBlock Classes="label" Text="{DynamicResource presets.render_dpi}" />- <NumericUpDown Value="{Binding RenderDpi}" Minimum="36" Maximum="1200" Increment="25" FormatString="0" />+ <NumericUpDown Value="{Binding RenderDpi}" Minimum="36" Maximum="1200" Increment="25" FormatString="0" AutomationProperties.Name="{DynamicResource presets.render_dpi}" /></StackPanel><StackPanel Grid.Column="2"><TextBlock Classes="label" Text="{DynamicResource presets.page_range}" />@@ -421,7 +422,7 @@<StackPanel Grid.Column="2"><TextBlock Classes="label" Text="{DynamicResource presets.pdf_password}" /><TextBox Text="{Binding PdfPassword}" PasswordChar="•" Classes="revealPasswordButton" MaxLength="64"- IsEnabled="{Binding !PdfA}" />+ IsEnabled="{Binding !PdfA}" AutomationProperties.Name="{DynamicResource presets.pdf_password}" /></StackPanel></Grid><TextBlock Classes="caption" TextWrapping="Wrap" Text="{DynamicResource presets.pdf_password_hint}" />@@ -437,16 +438,16 @@<Grid ColumnDefinitions="*,12,*"><StackPanel><TextBlock Classes="label" Text="{DynamicResource presets.location}" />- <ComboBox ItemsSource="{Binding Locations}" SelectedItem="{Binding Location}" HorizontalAlignment="Stretch" />+ <ComboBox ItemsSource="{Binding Locations}" SelectedItem="{Binding Location}" HorizontalAlignment="Stretch" AutomationProperties.Name="{DynamicResource presets.location}" /></StackPanel><StackPanel Grid.Column="2"><TextBlock Classes="label" Text="{DynamicResource presets.conflict}" />- <ComboBox ItemsSource="{Binding Conflicts}" SelectedItem="{Binding Conflict}" HorizontalAlignment="Stretch" />+ <ComboBox ItemsSource="{Binding Conflicts}" SelectedItem="{Binding Conflict}" HorizontalAlignment="Stretch" AutomationProperties.Name="{DynamicResource presets.conflict}" /></StackPanel></Grid><StackPanel IsVisible="{Binding ShowSubfolder}"><TextBlock Classes="label" Text="{DynamicResource presets.subfolder}" />- <TextBox Text="{Binding SubfolderName}" PlaceholderText="converted" />+ <TextBox Text="{Binding SubfolderName}" PlaceholderText="converted" AutomationProperties.Name="{DynamicResource presets.subfolder}" /><CheckBox Content="{DynamicResource presets.subfolder_only_several}" IsChecked="{Binding SubfolderOnlyForSeveralFiles}"ToolTip.Tip="{DynamicResource presets.subfolder_only_several_hint}" Margin="0,6,0,0" /></StackPanel>@@ -454,7 +455,7 @@<TextBlock Classes="label" Text="{DynamicResource presets.custom_folder}" /><DockPanel><Button DockPanel.Dock="Right" Margin="8,0,0,0" Content="{DynamicResource presets.browse}" Click="OnBrowseFolder" />- <TextBox Text="{Binding CustomFolder}" />+ <TextBox Text="{Binding CustomFolder}" AutomationProperties.Name="{DynamicResource presets.custom_folder}" /></DockPanel></StackPanel><StackPanel>diff --git a/src/Filee.App/Views/RenameToolWindow.axaml b/src/Filee.App/Views/RenameToolWindow.axamlindex 892b52e1..f41978f7 100644--- a/src/Filee.App/Views/RenameToolWindow.axaml+++ b/src/Filee.App/Views/RenameToolWindow.axaml@@ -50,7 +50,7 @@<DataTemplate x:DataType="vm:RenameRecipeViewModel"><Border Classes="recipe" Padding="10,7" DoubleTapped="OnRecipeDoubleTapped"><DockPanel>- <Button DockPanel.Dock="Right" Classes="icon" Command="{Binding AddCommand}" ToolTip.Tip="{DynamicResource watch.recipe_add}"+ <Button DockPanel.Dock="Right" Classes="icon" Command="{Binding AddCommand}" ToolTip.Tip="{DynamicResource watch.recipe_add}" AutomationProperties.Name="{DynamicResource watch.recipe_add}"VerticalAlignment="Center" Margin="6,0,0,0"><PathIcon Width="12" Height="12" Data="{StaticResource Icon.Plus}" /></Button>@@ -113,10 +113,10 @@<DataTemplate x:DataType="vm:RenameStepViewModel"><StackPanel Spacing="2"><DockPanel>- <Button DockPanel.Dock="Right" Classes="icon" Margin="2,0,0,0" Command="{Binding RemoveCommand}" ToolTip.Tip="{DynamicResource watch.remove_step}">+ <Button DockPanel.Dock="Right" Classes="icon" Margin="2,0,0,0" Command="{Binding RemoveCommand}" ToolTip.Tip="{DynamicResource watch.remove_step}" AutomationProperties.Name="{DynamicResource watch.remove_step}"><PathIcon Width="12" Height="12" Data="{StaticResource Icon.Close}" /></Button>- <Button DockPanel.Dock="Right" Classes="icon" Margin="6,0,0,0" Command="{Binding MoveUpCommand}" ToolTip.Tip="{DynamicResource watch.step_up}">+ <Button DockPanel.Dock="Right" Classes="icon" Margin="6,0,0,0" Command="{Binding MoveUpCommand}" ToolTip.Tip="{DynamicResource watch.step_up}" AutomationProperties.Name="{DynamicResource watch.step_up}"><PathIcon Width="12" Height="12" Data="{StaticResource Icon.ChevronRight}" RenderTransform="rotate(-90deg)" /></Button><!-- What the rule does, then only the boxes that kind needs -->diff --git a/src/Filee.App/Views/ToastWindow.axaml b/src/Filee.App/Views/ToastWindow.axamlindex 2a0c6bfa..6f5a9cc0 100644--- a/src/Filee.App/Views/ToastWindow.axaml+++ b/src/Filee.App/Views/ToastWindow.axaml@@ -83,7 +83,8 @@<Border Classes="card" Padding="14,12"><StackPanel Spacing="8"><DockPanel>- <Button DockPanel.Dock="Right" Classes="icon" Command="{Binding DismissCommand}" Padding="4" VerticalAlignment="Top">+ <Button DockPanel.Dock="Right" Classes="icon" Command="{Binding DismissCommand}" Padding="4" VerticalAlignment="Top"+ AutomationProperties.Name="{DynamicResource common.close}"><PathIcon Width="12" Height="12" Data="{StaticResource Icon.Close}" /></Button><TextBlock Text="{Binding Title}" FontWeight="SemiBold" TextTrimming="CharacterEllipsis" VerticalAlignment="Center" />diff --git a/src/Filee.App/Views/UpdateNoticeWindow.axaml b/src/Filee.App/Views/UpdateNoticeWindow.axamlindex 51d20247..6d6f193f 100644--- a/src/Filee.App/Views/UpdateNoticeWindow.axaml+++ b/src/Filee.App/Views/UpdateNoticeWindow.axaml@@ -19,7 +19,8 @@VerticalAlignment="Top" Margin="0,2,12,0" /><StackPanel Spacing="8"><DockPanel>- <Button DockPanel.Dock="Right" Classes="icon" Padding="4" VerticalAlignment="Top" Click="OnClose">+ <Button DockPanel.Dock="Right" Classes="icon" Padding="4" VerticalAlignment="Top" Click="OnClose"+ AutomationProperties.Name="{DynamicResource common.close}"><PathIcon Width="12" Height="12" Data="{StaticResource Icon.Close}" /></Button><TextBlock x:Name="TitleText" FontWeight="SemiBold" TextWrapping="Wrap" VerticalAlignment="Center" />diff --git a/src/Filee.App/Views/WhatsNewWindow.axaml b/src/Filee.App/Views/WhatsNewWindow.axamlindex 6acef122..ddf9f9fa 100644--- a/src/Filee.App/Views/WhatsNewWindow.axaml+++ b/src/Filee.App/Views/WhatsNewWindow.axaml@@ -18,7 +18,7 @@<!-- Header: drag here to move the window --><DockPanel x:Name="Header" Background="Transparent" Margin="0,0,0,12"><Button x:Name="CloseButton" DockPanel.Dock="Right" Classes="icon" Padding="6" VerticalAlignment="Center"- Click="OnClose" ToolTip.Tip="{DynamicResource common.close}">+ Click="OnClose" ToolTip.Tip="{DynamicResource common.close}" AutomationProperties.Name="{DynamicResource common.close}"><PathIcon Width="12" Height="12" Data="{StaticResource Icon.Close}" /></Button><StackPanel Orientation="Horizontal" Spacing="8" VerticalAlignment="Center">diff --git a/tests/Filee.App.Tests/AutomationNameTests.cs b/tests/Filee.App.Tests/AutomationNameTests.csnew file mode 100644index 00000000..e79333aa--- /dev/null+++ b/tests/Filee.App.Tests/AutomationNameTests.cs@@ -0,0 +1,98 @@+// Screen readers announce a control by its accessible name (#524): icon-only buttons and fields whose label is a+// separate TextBlock need AutomationProperties.Name, or they are read as just "button" / "combo box".++using Avalonia.Automation;+using Avalonia.Controls;+using Avalonia.Controls.Primitives;+using Avalonia.Headless.XUnit;+using Avalonia.VisualTree;+using Filee.App.Services;+using Filee.App.ViewModels;+using Filee.App.ViewModels.Pages;+using Filee.App.Views;+using Filee.Core.Localization;+using Filee.Core.Settings;+using Filee.Core.Watching;++namespace Filee.App.Tests;++public class AutomationNameTests+{+ [AvaloniaTheory]+ [InlineData("home")]+ [InlineData("general")]+ [InlineData("triggers")]+ [InlineData("toolbar")]+ [InlineData("presets")]+ [InlineData("theme")]+ [InlineData("engines")]+ [InlineData("about")]+ [InlineData("watch")]+ public void Every_icon_button_and_field_on_a_page_has_a_name(string page)+ {+ TestServices.EnsureInitialized("en");+ var store = AppHost.Get<UserDataStore>();+ var rule = new WatchRule { Folder = @"C:\Scans\Inbox", PresetId = "to-pdf", Enabled = false };+ store.Settings.WatchFolders.Add(rule);+ try+ {+ using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>());+ vm.Navigate(page);+ var window = new MainWindow { DataContext = vm, Width = 1080, Height = 820 };+ window.Show();+ RenderTests.Pump();++ var unnamed = window.GetVisualDescendants().OfType<Control>()+ .Where(c => c.TemplatedParent is null && c.IsEffectivelyVisible && NeedsName(c)+ && string.IsNullOrWhiteSpace(AutomationProperties.GetName(c)))+ .Select(c => $"{c.GetType().Name} {c.Name} (in {c.DataContext?.GetType().Name})")+ .ToList();+ window.Close();++ Assert.Empty(unnamed);+ }+ finally+ {+ store.Settings.WatchFolders.Remove(rule);+ }+ }++ [AvaloniaFact]+ public void A_watch_folder_switch_is_named_after_its_folder_and_shows_no_on_label()+ {+ TestServices.EnsureInitialized("en");+ var store = AppHost.Get<UserDataStore>();+ var rule = new WatchRule { Folder = @"C:\Scans\Inbox", PresetId = "to-pdf", Enabled = false };+ store.Settings.WatchFolders.Add(rule);+ try+ {+ using var vm = new MainWindowViewModel(AppHost.Services, AppHost.Get<ILocalizer>(), AppHost.Get<UpdateService>());+ vm.Navigate("watch");+ var window = new MainWindow { DataContext = vm, Width = 1080, Height = 820 };+ window.Show();+ RenderTests.Pump();++ var toggle = Assert.Single(window.GetVisualDescendants().OfType<ToggleSwitch>(), t => t.DataContext is WatchRuleViewModel);+ // An off rule read "On Off": the switch's own label, then the status.+ Assert.Equal("", toggle.OffContent);+ Assert.Equal("", toggle.OnContent);+ Assert.Equal(@"C:\Scans\Inbox", AutomationProperties.GetName(toggle));+ window.Close();+ }+ finally+ {+ store.Settings.WatchFolders.Remove(rule);+ }+ }++ private static bool NeedsName(Control c) => c switch+ {+ ToggleSwitch t => t.Content is null,+ TextBox t => string.IsNullOrEmpty(t.PlaceholderText),+ ComboBox b => string.IsNullOrEmpty(b.PlaceholderText),+ Slider or NumericUpDown => true,+ // A button with text says what it does; one with only an icon doesn't.+ Button b => b.Content is not string && !b.GetVisualDescendants().OfType<TextBlock>().Any(t => !string.IsNullOrWhiteSpace(t.Text)),+ _ => false,+ };+}