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

Accesibility improvements + updated colors

Browse Source
This commit is contained in:
Niels Laute
2020-11-08 14:31:57 +01:00
parent da36371448
commit 0d43ea2bb9
6 changed files with 92 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/modules/imageresizer/ui/Properties/Resources.Designer.cs generated
View File

@@ -123,6 +123,15 @@ namespace ImageResizer.Properties {
} }
} }
/// <summary>
/// Looks up a localized string similar to Filename.
/// </summary>
public static string Advanced_FileName_Tooltip {
get {
return ResourceManager.GetString("Advanced_FileName_Tooltip", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Original filename. /// Looks up a localized string similar to Original filename.
/// </summary> /// </summary>
@@ -375,6 +384,15 @@ namespace ImageResizer.Properties {
} }
} }
/// <summary>
/// Looks up a localized string similar to Apply settings.
/// </summary>
public static string OK_Tooltip {
get {
return ResourceManager.GetString("OK_Tooltip", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Phone. /// Looks up a localized string similar to Phone.
/// </summary> /// </summary>
@@ -528,6 +546,15 @@ namespace ImageResizer.Properties {
} }
} }
/// <summary>
/// Looks up a localized string similar to Resize pictures.
/// </summary>
public static string Resize_Tooltip {
get {
return ResourceManager.GetString("Resize_Tooltip", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Fill. /// Looks up a localized string similar to Fill.
/// </summary> /// </summary>

9
src/modules/imageresizer/ui/Properties/Resources.resx
View File

@@ -159,6 +159,9 @@
<data name="Advanced_FileNameTokens" xml:space="preserve"> <data name="Advanced_FileNameTokens" xml:space="preserve">
<value>The following parameters can be used.</value> <value>The following parameters can be used.</value>
</data> </data>
<data name="Advanced_FileName_Tooltip" xml:space="preserve">
<value>Filename</value>
</data>
<data name="Advanced_JpegQualityLevel" xml:space="preserve"> <data name="Advanced_JpegQualityLevel" xml:space="preserve">
<value>_JPEG quality level:</value> <value>_JPEG quality level:</value>
</data> </data>
@@ -222,6 +225,9 @@
<data name="OK" xml:space="preserve"> <data name="OK" xml:space="preserve">
<value>OK</value> <value>OK</value>
</data> </data>
<data name="OK_Tooltip" xml:space="preserve">
<value>Apply settings</value>
</data>
<data name="Phone" xml:space="preserve"> <data name="Phone" xml:space="preserve">
<value>Phone</value> <value>Phone</value>
</data> </data>
@@ -303,6 +309,9 @@
<data name="ResizeUnit_Pixel" xml:space="preserve"> <data name="ResizeUnit_Pixel" xml:space="preserve">
<value>Pixels</value> <value>Pixels</value>
</data> </data>
<data name="Resize_Tooltip" xml:space="preserve">
<value>Resize pictures</value>
</data>
<data name="Results_Close" xml:space="preserve"> <data name="Results_Close" xml:space="preserve">
<value>Close</value> <value>Close</value>
</data> </data>

6
src/modules/imageresizer/ui/Themes/Dark.xaml
View File

@@ -15,8 +15,8 @@
<system:String x:Key="Theme.ColorScheme">Accent1</system:String> <system:String x:Key="Theme.ColorScheme">Accent1</system:String>
<Color x:Key="Theme.PrimaryAccentColor">Black</Color> <Color x:Key="Theme.PrimaryAccentColor">Black</Color>
<SolidColorBrush x:Key="SecondaryBackgroundBrush" Color="#FF3a3a3a" /> <SolidColorBrush x:Key="SecondaryBackgroundBrush" Color="#FF1f1f1f" />
<SolidColorBrush x:Key="PrimaryBackgroundBrush" Color="#FF333333" /> <SolidColorBrush x:Key="PrimaryBackgroundBrush" Color="#FF000000" />
<SolidColorBrush x:Key="WindowBorderBrush" Color="#FF535353"/> <SolidColorBrush x:Key="WindowBorderBrush" Color="#FF535353"/>
<SolidColorBrush x:Key="TitleBarSecondaryForegroundBrush" Color="#FF9a9a9a"/> <SolidColorBrush x:Key="TitleBarSecondaryForegroundBrush" Color="#FF9a9a9a"/>
@@ -25,5 +25,5 @@
<SolidColorBrush x:Key="ColorControlBackgroundBrush" Color="#FF454545"/> <SolidColorBrush x:Key="ColorControlBackgroundBrush" Color="#FF454545"/>
<SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FFFFFFFF" /> <SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FFFFFFFF" />
<SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FF6b6b6b" /> <SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FF999999" />
</ResourceDictionary> </ResourceDictionary>

38
src/modules/imageresizer/ui/Views/AdvancedWindow.xaml
View File

@@ -41,11 +41,11 @@
<RowDefinition/> <RowDefinition/>
<RowDefinition Height="Auto"/> <RowDefinition Height="Auto"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TabControl> <TabControl Style="{StaticResource TabControlPivotStyle}">
<TabItem Header="{x:Static p:Resources.Advanced_Sizes}"> <TabItem Header="{x:Static p:Resources.Advanced_Sizes}">
<StackPanel Margin="12"> <StackPanel Margin="0,12,0,12">
<!-- TODO: Allow these to be drag-and-drop reordered (issue #15) --> <!-- TODO: Allow these to be drag-and-drop reordered (issue #15) -->
<ItemsControl Grid.IsSharedSizeScope="True" ItemsSource="{Binding Settings.Sizes}"> <ItemsControl Grid.IsSharedSizeScope="True" TabIndex="0" ItemsSource="{Binding Settings.Sizes}">
<ItemsControl.ItemTemplate> <ItemsControl.ItemTemplate>
<DataTemplate DataType="m:ResizeSize"> <DataTemplate DataType="m:ResizeSize">
<Grid Margin="0,0,0,8"> <Grid Margin="0,0,0,8">
@@ -131,15 +131,13 @@
</DataTemplate> </DataTemplate>
</ItemsControl.ItemTemplate> </ItemsControl.ItemTemplate>
</ItemsControl> </ItemsControl>
<TextBlock> <Button Margin="0,12,0,0"
<local:AccessibleHyperlink ControlType="Button" Command="{Binding AddSizeCommand}"> Command="{Binding AddSizeCommand}"
<Run Text="{x:Static p:Resources.Advanced_CreateSize}"/> Content="{x:Static p:Resources.Advanced_CreateSize}"/>
</local:AccessibleHyperlink>
</TextBlock>
</StackPanel> </StackPanel>
</TabItem> </TabItem>
<TabItem Header="{x:Static p:Resources.Advanced_Encoding}"> <TabItem Header="{x:Static p:Resources.Advanced_Encoding}">
<Grid Margin="12" VerticalAlignment="Top"> <Grid Margin="0,12,0,12" VerticalAlignment="Top">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/> <ColumnDefinition Width="Auto"/>
<ColumnDefinition/> <ColumnDefinition/>
@@ -216,7 +214,7 @@
</Grid> </Grid>
</TabItem> </TabItem>
<TabItem Header="{x:Static p:Resources.Advanced_File}"> <TabItem Header="{x:Static p:Resources.Advanced_File}">
<StackPanel Margin="12,8"> <StackPanel Margin="0,12,0,12">
<TextBlock Text="{x:Static p:Resources.Advanced_FileNameTokens}"/> <TextBlock Text="{x:Static p:Resources.Advanced_FileNameTokens}"/>
<TextBlock Margin="0,8,0,0"> <TextBlock Margin="0,8,0,0">
<Run Text="%1 -"/> <Run Text="%1 -"/>
@@ -243,14 +241,16 @@
<ColumnDefinition/> <ColumnDefinition/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Label HorizontalAlignment="Left" <Label HorizontalAlignment="Left"
x:Name="fileNameTextBoxLabel"
Content="{x:Static p:Resources.Advanced_FileName}" Content="{x:Static p:Resources.Advanced_FileName}"
Padding="0,4,4,0" Padding="0,4,4,0"
Target="{Binding ElementName=_fileNameTextBox}"/> Target="{Binding ElementName=fileNameTextBox}"/>
<TextBox Grid.Column="1" <TextBox Grid.Column="1"
Height="23" Height="23"
TabIndex="1" TabIndex="0"
TextWrapping="Wrap" TextWrapping="Wrap"
Name="_fileNameTextBox" Name="fileNameTextBox"
AutomationProperties.Name="{x:Static p:Resources.Advanced_FileName_Tooltip}"
Text="{Binding Settings.FileName}"/> Text="{Binding Settings.FileName}"/>
</Grid> </Grid>
<Separator Margin="0,12,0,0"/> <Separator Margin="0,12,0,0"/>
@@ -269,12 +269,16 @@
HorizontalAlignment="Right" HorizontalAlignment="Right"
Orientation="Horizontal"> Orientation="Horizontal">
<Button MinWidth="76" <Button MinWidth="76"
Click="HandleAcceptClick" TabIndex="100"
Style="{StaticResource AccentButtonStyle}" Click="HandleAcceptClick"
Content="{x:Static p:Resources.OK}" Style="{StaticResource AccentButtonStyle}"
IsDefault="True"/> Content="{x:Static p:Resources.OK}"
AutomationProperties.Name="{x:Static p:Resources.OK_Tooltip}"
IsDefault="True"/>
<Button MinWidth="76" <Button MinWidth="76"
Margin="8,0,0,0" Margin="8,0,0,0"
TabIndex="101"
Content="{x:Static p:Resources.Cancel}" Content="{x:Static p:Resources.Cancel}"
IsCancel="True"/> IsCancel="True"/>
</StackPanel> </StackPanel>

52
src/modules/imageresizer/ui/Views/InputPage.xaml
View File

@@ -12,12 +12,15 @@
FontSize="16" FontSize="16"
Content="{x:Static p:Resources.Input_Content}" Content="{x:Static p:Resources.Input_Content}"
Target="{Binding ElementName=_selectedSizeListBox}"/> Target="{Binding ElementName=_selectedSizeListBox}"/>
<ListBox Margin="12,12,12,0" <ListBox Margin="12,12,12,0"
BorderThickness="0" BorderThickness="0"
Background="Transparent" Background="Transparent"
AutomationProperties.Name="Sizes listbox"
ItemsSource="{Binding Settings.AllSizes}" ItemsSource="{Binding Settings.AllSizes}"
Name="_selectedSizeListBox" Name="_selectedSizeListBox"
SelectedIndex="{Binding Settings.SelectedSizeIndex}"> SelectedIndex="{Binding Settings.SelectedSizeIndex}">
<ListBox.ItemContainerStyle> <ListBox.ItemContainerStyle>
<Style TargetType="ListBoxItem"> <Style TargetType="ListBoxItem">
<Setter Property="Template"> <Setter Property="Template">
@@ -26,6 +29,7 @@
<RadioButton Margin="0,4,0,0" <RadioButton Margin="0,4,0,0"
VerticalAlignment="Center" VerticalAlignment="Center"
VerticalContentAlignment="Top" VerticalContentAlignment="Top"
AutomationProperties.Name="{Binding Name}"
Focusable="False" Focusable="False"
IsChecked="{Binding IsSelected,RelativeSource={RelativeSource TemplatedParent}}"> IsChecked="{Binding IsSelected,RelativeSource={RelativeSource TemplatedParent}}">
<ContentPresenter/> <ContentPresenter/>
@@ -33,26 +37,30 @@
</ControlTemplate> </ControlTemplate>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
<Setter Property="AutomationProperties.Name" Value="{Binding Name}"/>
</Style> </Style>
</ListBox.ItemContainerStyle> </ListBox.ItemContainerStyle>
<ListBox.Resources> <ListBox.Resources>
<DataTemplate DataType="{x:Type m:ResizeSize}"> <DataTemplate DataType="{x:Type m:ResizeSize}">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock Text="{Binding Name}" FontWeight="Bold"/> <TextBlock Text="{Binding Name}" FontWeight="Bold" Foreground="{DynamicResource PrimaryForegroundBrush}"/>
<TextBlock Text="(" Margin="4,0,0,0"/> <TextBlock Text="(" Margin="4,0,0,0" Foreground="{DynamicResource SecondaryForegroundBrush}"/>
<TextBlock Text="{Binding Fit,Converter={StaticResource EnumValueConverter},ConverterParameter=ThirdPersonSingular}"/> <TextBlock Text="{Binding Fit,Converter={StaticResource EnumValueConverter},ConverterParameter=ThirdPersonSingular}" Foreground="{DynamicResource SecondaryForegroundBrush}"/>
<TextBlock Text="{Binding Width,Converter={StaticResource AutoDoubleConverter},ConverterParameter=Auto}" Margin="4,0,0,0"/> <TextBlock Text="{Binding Width,Converter={StaticResource AutoDoubleConverter},ConverterParameter=Auto}" Margin="4,0,0,0" Foreground="{DynamicResource SecondaryForegroundBrush}"/>
<TextBlock Text="x" Visibility="{Binding ShowHeight,Converter={StaticResource BoolValueConverter}}" Margin="4,0,0,0"/> <TextBlock Text="x" Visibility="{Binding ShowHeight,Converter={StaticResource BoolValueConverter}}" Margin="4,0,0,0" Foreground="{DynamicResource SecondaryForegroundBrush}"/>
<TextBlock Text="{Binding Height,Converter={StaticResource AutoDoubleConverter},ConverterParameter=Auto}" Visibility="{Binding ShowHeight,Converter={StaticResource BoolValueConverter}}" Margin="4,0,0,0"/> <TextBlock Text="{Binding Height,Converter={StaticResource AutoDoubleConverter},ConverterParameter=Auto}" Visibility="{Binding ShowHeight,Converter={StaticResource BoolValueConverter}}" Margin="4,0,0,0" Foreground="{DynamicResource SecondaryForegroundBrush}"/>
<TextBlock Text="{Binding Unit,Converter={StaticResource EnumValueConverter},ConverterParameter=ToLower}" Margin="4,0,0,0"/> <TextBlock Text="{Binding Unit,Converter={StaticResource EnumValueConverter},ConverterParameter=ToLower}" Margin="4,0,0,0" Foreground="{DynamicResource SecondaryForegroundBrush}"/>
<TextBlock Text=")"/> <TextBlock Text=")" Foreground="{DynamicResource SecondaryForegroundBrush}"/>
</StackPanel> </StackPanel>
</DataTemplate> </DataTemplate>
<DataTemplate DataType="{x:Type m:CustomSize}"> <DataTemplate DataType="{x:Type m:CustomSize}">
<StackPanel Orientation="Horizontal" Margin="0,-8,0,0"> <StackPanel Orientation="Horizontal" Margin="0,-8,0,0">
<TextBlock VerticalAlignment="Center" Text="{Binding Name}" FontWeight="Bold"/> <TextBlock VerticalAlignment="Center"
<ComboBox Text="{Binding Name}"
Margin="8,0,0,0" FontWeight="Bold"/>
<ComboBox Margin="8,0,0,0"
ItemsSource="{Binding Source={StaticResource ResizeFitValues}}" ItemsSource="{Binding Source={StaticResource ResizeFitValues}}"
SelectedItem="{Binding Fit}"> SelectedItem="{Binding Fit}">
<ComboBox.ItemTemplate> <ComboBox.ItemTemplate>
@@ -77,8 +85,8 @@
</TextBox> </TextBox>
<TextBlock Margin="8,0,0,0" <TextBlock Margin="8,0,0,0"
VerticalAlignment="Center" VerticalAlignment="Center"
Visibility="{Binding ShowHeight,Converter={StaticResource BoolValueConverter}}"> Visibility="{Binding ShowHeight,Converter={StaticResource BoolValueConverter}}"/>
</TextBlock>
<TextBox Width="56" <TextBox Width="56"
Style="{StaticResource DefaultTextBoxStyle}" Style="{StaticResource DefaultTextBoxStyle}"
Margin="0,0,0,0" Margin="0,0,0,0"
@@ -94,11 +102,9 @@
</Binding> </Binding>
</TextBox.Text> </TextBox.Text>
</TextBox> </TextBox>
<ComboBox <ComboBox Margin="8,0,0,0"
Margin="8,0,0,0"
ItemsSource="{Binding Source={StaticResource ResizeUnitValues}}" ItemsSource="{Binding Source={StaticResource ResizeUnitValues}}"
SelectedItem="{Binding Unit}" SelectedItem="{Binding Unit}">
>
<ComboBox.ItemTemplate> <ComboBox.ItemTemplate>
<DataTemplate DataType="{x:Type m:ResizeUnit}"> <DataTemplate DataType="{x:Type m:ResizeUnit}">
<ContentPresenter Content="{Binding Converter={StaticResource EnumValueConverter}}"/> <ContentPresenter Content="{Binding Converter={StaticResource EnumValueConverter}}"/>
@@ -109,6 +115,7 @@
</DataTemplate> </DataTemplate>
</ListBox.Resources> </ListBox.Resources>
</ListBox> </ListBox>
<CheckBox Margin="12,24,12,0" <CheckBox Margin="12,24,12,0"
Content="{x:Static p:Resources.Input_ShrinkOnly}" Content="{x:Static p:Resources.Input_ShrinkOnly}"
IsChecked="{Binding Settings.ShrinkOnly}"/> IsChecked="{Binding Settings.ShrinkOnly}"/>
@@ -117,9 +124,11 @@
<CheckBox Margin="12,4,12,0" <CheckBox Margin="12,4,12,0"
Content="{x:Static p:Resources.Input_Replace}" Content="{x:Static p:Resources.Input_Replace}"
IsChecked="{Binding Settings.Replace}"/> IsChecked="{Binding Settings.Replace}"/>
<CheckBox Margin="12,4,12,0" <CheckBox Margin="12,4,12,0"
Content="{x:Static p:Resources.Input_IgnoreOrientation}" Content="{x:Static p:Resources.Input_IgnoreOrientation}"
IsChecked="{Binding Settings.IgnoreOrientation}"/> IsChecked="{Binding Settings.IgnoreOrientation}"/>
<Border Margin="0,24,0,0" <Border Margin="0,24,0,0"
Background="{DynamicResource SecondaryBackgroundBrush}" Background="{DynamicResource SecondaryBackgroundBrush}"
Padding="12"> Padding="12">
@@ -134,18 +143,20 @@
FontFamily="Segoe MDL2 Assets" FontFamily="Segoe MDL2 Assets"
Style="{StaticResource DefaultButtonStyle}" Style="{StaticResource DefaultButtonStyle}"
FontSize="16" FontSize="16"
Margin="-10,0,0,0"
AutomationProperties.Name="{x:Static p:Resources.Input_ShowAdvanced}"
ToolTip="{x:Static p:Resources.Input_ShowAdvanced}" ToolTip="{x:Static p:Resources.Input_ShowAdvanced}"
Background="Transparent" Background="Transparent"
Command="{Binding ShowAdvancedCommand}" Command="{Binding ShowAdvancedCommand}"/>
/>
<!-- Visibility="{Binding ShowAdvancedSettings, Converter={StaticResource BoolValueConverter}}" --> <!-- Visibility="{Binding ShowAdvancedSettings, Converter={StaticResource BoolValueConverter}}" -->
<Button Grid.Column="1" <Button Grid.Column="1"
Style="{StaticResource AccentButtonStyle}" Style="{StaticResource AccentButtonStyle}"
MinWidth="76" MinWidth="76"
Command="{Binding ResizeCommand}" Command="{Binding ResizeCommand}"
AutomationProperties.Name="{x:Static p:Resources.Resize_Tooltip}"
Content="{x:Static p:Resources.Input_Resize}" Content="{x:Static p:Resources.Input_Resize}"
IsDefault="True"/> IsDefault="True"/>
<Button Grid.Column="2" <Button Grid.Column="2"
Style="{StaticResource DefaultButtonStyle}" Style="{StaticResource DefaultButtonStyle}"
MinWidth="76" MinWidth="76"
@@ -156,5 +167,4 @@
</Grid> </Grid>
</Border> </Border>
</StackPanel> </StackPanel>
</UserControl> </UserControl>

1
src/modules/imageresizer/ui/Views/MainWindow.xaml
View File

@@ -16,6 +16,7 @@
ui:WindowHelper.UseModernWindowStyle="True" ui:WindowHelper.UseModernWindowStyle="True"
ui:TitleBar.IsIconVisible="True" ui:TitleBar.IsIconVisible="True"
ui:TitleBar.Background="{DynamicResource PrimaryBackgroundBrush}" ui:TitleBar.Background="{DynamicResource PrimaryBackgroundBrush}"
AutomationProperties.Name="Image Resizer"
> >
<Window.Resources> <Window.Resources>