minor accessibility improvements

marticliment · Mar 16, 2024 · 850864c · 850864c
1 parent 6c6d407
commit 850864c
Show file tree

Hide file tree

Showing 12 changed files with 65 additions and 77 deletions.
diff --git a/src/wingetui/Interface/SoftwarePages/DiscoverPackages.xaml b/src/wingetui/Interface/SoftwarePages/DiscoverPackages.xaml
@@ -621,10 +621,10 @@
                     <ColumnDefinition Width="Auto"/>
                 </Grid.ColumnDefinitions>
                 <TextBox Grid.Column="0" x:Name="QueryBlock" Height="30" CornerRadius="4,0,0,4" Padding="7,5,5,5"
-                         VerticalContentAlignment="Center"
+                         VerticalContentAlignment="Center" 
                          />
                 <Button Grid.Column="1" x:Name="FindButton" CornerRadius="0,4,4,0"
-                        Height="32" Width="30" Padding="4">
+                        Height="32" Width="30" Padding="4" AutomationProperties.HelpText="Search">
                     <AnimatedIcon>
                         <AnimatedIcon.Source>
                             <animatedvisuals:AnimatedFindVisualSource/>
@@ -635,7 +635,7 @@
                     </AnimatedIcon>
                 </Button>
                 <Button Grid.Column="2" x:Name="ReloadButton" CornerRadius="4"
-                        Margin="6,0,4,0" Padding="0"
+                        Margin="6,0,4,0" Padding="0" AutomationProperties.HelpText="Reload packages"
                         Height="32" Width="32">
                     <FontIcon Glyph="&#xE72C;" FontSize="16"/>
                 </Button>
@@ -672,7 +672,8 @@
                     <!-- Sources Expander -->
                     <Expander Grid.Row="0" Grid.Column="0" HorizontalAlignment="Stretch" CornerRadius="8"
                         IsExpanded="True" Background="{ThemeResource SystemFillColorNeutralBackgroundBrush}"
-                        Padding="4,4,4,8" HorizontalContentAlignment="Stretch">
+                        Padding="4,4,4,8" HorizontalContentAlignment="Stretch"
+                        AutomationProperties.Name="Filter by source">
                         <Expander.Header>
                             <StackPanel Orientation="Horizontal" Spacing="8">
                                 <FontIcon Glyph="&#xE74C;" FontSize="20"/>
@@ -709,7 +710,8 @@
                     <!-- Filter Options Expander -->
                     <Expander Grid.Row="1" Grid.Column="0" HorizontalAlignment="Stretch" CornerRadius="8"
                         IsExpanded="True" Background="{ThemeResource SystemFillColorNeutralBackgroundBrush}"
-                        Padding="16,8,16,8" HorizontalContentAlignment="Stretch">
+                        Padding="16,8,16,8" HorizontalContentAlignment="Stretch"
+                              AutomationProperties.Name="Filter options">
                         <Expander.Header>
                             <StackPanel Orientation="Horizontal" Spacing="8">
                                 <FontIcon Glyph="&#xE71C;" FontSize="20"/>
@@ -739,7 +741,8 @@
                     <!-- Search Mode Expander -->
                     <Expander Grid.Row="2" Grid.Column="0" HorizontalAlignment="Stretch" CornerRadius="8"
     IsExpanded="True" Background="{ThemeResource SystemFillColorNeutralBackgroundBrush}"
-    Padding="16,8,16,8" HorizontalContentAlignment="Stretch">
+    Padding="16,8,16,8" HorizontalContentAlignment="Stretch"
+                              AutomationProperties.Name="Search mode">
                         <Expander.Header>
                             <StackPanel Orientation="Horizontal" Spacing="8">
                                 <FontIcon Glyph="&#xE773;" FontSize="20"/>

diff --git a/src/wingetui/Interface/SoftwarePages/DiscoverPackages.xaml.cs b/src/wingetui/Interface/SoftwarePages/DiscoverPackages.xaml.cs
@@ -165,6 +165,8 @@ public DiscoverPackagesPage()
             LoadInterface();
             _ = __load_packages();
 
+            QueryBlock.PlaceholderText = Tools.Translate("Search for packages");
+
         }
 
         protected async Task __load_packages()

diff --git a/src/wingetui/Interface/SoftwarePages/InstalledPackages.xaml b/src/wingetui/Interface/SoftwarePages/InstalledPackages.xaml
@@ -624,7 +624,7 @@
                          VerticalContentAlignment="Center"
                          />
                 <Button Grid.Column="1" x:Name="FindButton" CornerRadius="0,4,4,0"
-                        Height="32" Width="30" Padding="4">
+                        Height="32" Width="30" Padding="4" AutomationProperties.HelpText="Search">
                     <AnimatedIcon>
                         <AnimatedIcon.Source>
                             <animatedvisuals:AnimatedFindVisualSource/>
@@ -635,7 +635,7 @@
                     </AnimatedIcon>
                 </Button>
                 <Button Grid.Column="2" x:Name="ReloadButton" CornerRadius="4"
-                        Margin="6,0,4,0" Padding="0"
+                        Margin="6,0,4,0" Padding="0" AutomationProperties.HelpText="Reload packages"
                         Height="32" Width="32">
                     <FontIcon Glyph="&#xE72C;" FontSize="16"/>
                 </Button>
@@ -672,7 +672,8 @@
                     <!-- Sources Expander -->
                     <Expander Grid.Row="0" Grid.Column="0" HorizontalAlignment="Stretch" CornerRadius="8"
                         IsExpanded="True" Background="{ThemeResource SystemFillColorNeutralBackgroundBrush}"
-                        Padding="4,4,4,8" HorizontalContentAlignment="Stretch">
+                        Padding="4,4,4,8" HorizontalContentAlignment="Stretch"
+                              AutomationProperties.Name="Filter by source">
                         <Expander.Header>
                             <StackPanel Orientation="Horizontal" Spacing="8">
                                 <FontIcon Glyph="&#xE74C;" FontSize="20"/>
@@ -709,7 +710,8 @@
                     <!-- Filter Options Expander -->
                     <Expander Grid.Row="1" Grid.Column="0" HorizontalAlignment="Stretch" CornerRadius="8"
                         IsExpanded="False" Background="{ThemeResource SystemFillColorNeutralBackgroundBrush}"
-                        Padding="16,8,16,8" HorizontalContentAlignment="Stretch">
+                        Padding="16,8,16,8" HorizontalContentAlignment="Stretch"
+                              AutomationProperties.Name="Filter options">
                         <Expander.Header>
                             <StackPanel Orientation="Horizontal" Spacing="8">
                                 <FontIcon Glyph="&#xE71C;" FontSize="20"/>
@@ -739,7 +741,8 @@
                     <!-- Search mode Expander -->
                     <Expander Grid.Row="2" Grid.Column="0" HorizontalAlignment="Stretch" CornerRadius="8"
     IsExpanded="False" Background="{ThemeResource SystemFillColorNeutralBackgroundBrush}"
-    Padding="16,8,16,8" HorizontalContentAlignment="Stretch">
+    Padding="16,8,16,8" HorizontalContentAlignment="Stretch"
+                              AutomationProperties.Name="Search mode">
                         <Expander.Header>
                             <StackPanel Orientation="Horizontal" Spacing="8">
                                 <FontIcon Glyph="&#xE773;" FontSize="20"/>

diff --git a/src/wingetui/Interface/SoftwarePages/InstalledPackages.xaml.cs b/src/wingetui/Interface/SoftwarePages/InstalledPackages.xaml.cs
@@ -170,6 +170,8 @@ public InstalledPackagesPage()
             GenerateToolBar();
             LoadInterface();
             _ = LoadPackages();
+
+            QueryBlock.PlaceholderText = Tools.Translate("Search for packages");
         }
 
         public void ReloadPackages()

diff --git a/src/wingetui/Interface/SoftwarePages/PackageBundle.xaml b/src/wingetui/Interface/SoftwarePages/PackageBundle.xaml
@@ -625,7 +625,7 @@
                          VerticalContentAlignment="Center"
                          />
                 <Button Grid.Column="1" x:Name="FindButton" CornerRadius="0,4,4,0"
-                        Height="32" Width="30" Padding="4">
+                        Height="32" Width="30" Padding="4" AutomationProperties.HelpText="Search">
                     <AnimatedIcon>
                         <AnimatedIcon.Source>
                             <animatedvisuals:AnimatedFindVisualSource/>
@@ -673,7 +673,8 @@
                     <!-- Sources Expander -->
                     <Expander Grid.Row="0" Grid.Column="0" HorizontalAlignment="Stretch" CornerRadius="8"
                         IsExpanded="True" Background="{ThemeResource SystemFillColorNeutralBackgroundBrush}"
-                        Padding="4,4,4,8" HorizontalContentAlignment="Stretch">
+                        Padding="4,4,4,8" HorizontalContentAlignment="Stretch"
+                              AutomationProperties.Name="Filter by source">
                         <Expander.Header>
                             <StackPanel Orientation="Horizontal" Spacing="8">
                                 <FontIcon Glyph="&#xE74C;" FontSize="20"/>
@@ -710,7 +711,8 @@
                     <!-- Filter Options Expander -->
                     <Expander Grid.Row="1" Grid.Column="0" HorizontalAlignment="Stretch" CornerRadius="8"
                         IsExpanded="False" Background="{ThemeResource SystemFillColorNeutralBackgroundBrush}"
-                        Padding="16,8,16,8" HorizontalContentAlignment="Stretch">
+                        Padding="16,8,16,8" HorizontalContentAlignment="Stretch"
+                              AutomationProperties.Name="Filter options">
                         <Expander.Header>
                             <StackPanel Orientation="Horizontal" Spacing="8">
                                 <FontIcon Glyph="&#xE71C;" FontSize="20"/>
@@ -740,7 +742,8 @@
                     <!-- Search Mode Expander -->
                     <Expander Grid.Row="2" Grid.Column="0" HorizontalAlignment="Stretch" CornerRadius="8"
     IsExpanded="False" Background="{ThemeResource SystemFillColorNeutralBackgroundBrush}"
-    Padding="16,8,16,8" HorizontalContentAlignment="Stretch">
+    Padding="16,8,16,8" HorizontalContentAlignment="Stretch"
+                              AutomationProperties.Name="Search mode">
                         <Expander.Header>
                             <StackPanel Orientation="Horizontal" Spacing="8">
                                 <FontIcon Glyph="&#xE773;" FontSize="20"/>

diff --git a/src/wingetui/Interface/SoftwarePages/PackageBundle.xaml.cs b/src/wingetui/Interface/SoftwarePages/PackageBundle.xaml.cs
@@ -161,6 +161,7 @@ public PackageBundlePage()
 
             GenerateToolBar();
             LoadInterface();
+            QueryBlock.PlaceholderText = Tools.Translate("Search for packages");
         }
 
 

diff --git a/src/wingetui/Interface/SoftwarePages/SoftwareUpdates.xaml b/src/wingetui/Interface/SoftwarePages/SoftwareUpdates.xaml
@@ -639,7 +639,7 @@
                          VerticalContentAlignment="Center"
                          />
                 <Button Grid.Column="1" x:Name="FindButton" CornerRadius="0,4,4,0"
-                        Height="32" Width="30" Padding="4">
+                        Height="32" Width="30" Padding="4" AutomationProperties.HelpText="Search">
                     <AnimatedIcon>
                         <AnimatedIcon.Source>
                             <animatedvisuals:AnimatedFindVisualSource/>
@@ -650,7 +650,7 @@
                     </AnimatedIcon>
                 </Button>
                 <Button Grid.Column="2" x:Name="ReloadButton" CornerRadius="4"
-                        Margin="6,0,4,0" Padding="0"
+                        Margin="6,0,4,0" Padding="0" AutomationProperties.HelpText="Reload packages"
                         Height="32" Width="32">
                     <FontIcon Glyph="&#xE72C;" FontSize="16"/>
                 </Button>
@@ -687,7 +687,8 @@
                     <!-- Sources Expander -->
                     <Expander Grid.Row="0" Grid.Column="0" HorizontalAlignment="Stretch" CornerRadius="8"
                         IsExpanded="True" Background="{ThemeResource SystemFillColorNeutralBackgroundBrush}"
-                        Padding="4,4,4,8" HorizontalContentAlignment="Stretch">
+                        Padding="4,4,4,8" HorizontalContentAlignment="Stretch"
+                              AutomationProperties.Name="Filter by sources">
                         <Expander.Header>
                             <StackPanel Orientation="Horizontal" Spacing="8">
                                 <FontIcon Glyph="&#xE74C;" FontSize="20"/>
@@ -725,7 +726,8 @@
                     <!-- Filter Options Expander -->
                     <Expander Grid.Row="1" Grid.Column="0" HorizontalAlignment="Stretch" CornerRadius="8"
                         IsExpanded="False" Background="{ThemeResource SystemFillColorNeutralBackgroundBrush}"
-                        Padding="16,8,16,8" HorizontalContentAlignment="Stretch">
+                        Padding="16,8,16,8" HorizontalContentAlignment="Stretch"
+                              AutomationProperties.Name="Filter options">
                         <Expander.Header>
                             <StackPanel Orientation="Horizontal" Spacing="8">
                                 <FontIcon Glyph="&#xE71C;" FontSize="20"/>
@@ -755,7 +757,8 @@
                     <!-- Search mode expander -->
                     <Expander Grid.Row="2" Grid.Column="0" HorizontalAlignment="Stretch" CornerRadius="8"
     IsExpanded="False" Background="{ThemeResource SystemFillColorNeutralBackgroundBrush}"
-    Padding="16,8,16,8" HorizontalContentAlignment="Stretch">
+    Padding="16,8,16,8" HorizontalContentAlignment="Stretch"
+                              AutomationProperties.Name="Search mode">
                         <Expander.Header>
                             <StackPanel Orientation="Horizontal" Spacing="8">
                                 <FontIcon Glyph="&#xE773;" FontSize="20"/>

diff --git a/src/wingetui/Interface/SoftwarePages/SoftwareUpdates.xaml.cs b/src/wingetui/Interface/SoftwarePages/SoftwareUpdates.xaml.cs
@@ -167,6 +167,8 @@ public SoftwareUpdatesPage()
             GenerateToolBar();
             LoadInterface();
             _ = LoadPackages(ManualCheck: false);
+
+            QueryBlock.PlaceholderText = Tools.Translate("Search for packages");
         }
 
         protected void AddPackageToSourcesList(UpgradablePackage package)

diff --git a/src/wingetui/Interface/Widgets/Announcer.xaml b/src/wingetui/Interface/Widgets/Announcer.xaml
@@ -8,7 +8,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <Grid>
+    <Grid TabIndex="99">
         <Grid x:Name="g">
             <Grid.RowDefinitions>
                 <RowDefinition Height="80"/>

diff --git a/src/wingetui/Interface/Widgets/Announcer.xaml.cs b/src/wingetui/Interface/Widgets/Announcer.xaml.cs
@@ -42,7 +42,8 @@ public Announcer()
             DefaultStyleKey = typeof(Announcer);
             BringIntoViewRequested += (s, e) => { LoadAnnouncements(); };
 
-            PointerPressed += (s, e) => { LoadAnnouncements(); };
+            int i = 0;
+            PointerPressed += (s, e) => { if(i++ %3 != 0) LoadAnnouncements(); };
 
             SetText(binder.Translate("Fetching latest announcements, please wait..."));
             _textblock.TextWrapping = TextWrapping.Wrap;