github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-22 06:13:14 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adjusted missed NumPad names in XAML, working on #64. All Tests Pass

Browse source
This commit is contained in:
Lance McCarthy 2019-03-10 00:12:00 -05:00
commit dfae65bc6f
3 changed files with 38 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Calculator/Resources/bg-BG/Resources.resw
View file

@ -825,7 +825,7 @@
<value>Пълна клавиатура</value> <value>Пълна клавиатура</value>
<comment>Screen reader prompt for the Calculator numberPad button</comment> <comment>Screen reader prompt for the Calculator numberPad button</comment>
</data> </data>
<data name="decimalSeparatorButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve"> <data name="DecimalSeparatorButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
<value>Десетичен знак</value> <value>Десетичен знак</value>
<comment>Screen reader prompt for the "." button</comment> <comment>Screen reader prompt for the "." button</comment>
</data> </data>

4
src/Calculator/Resources/ca-ES/Resources.resw
View file

@ -705,7 +705,7 @@
<value>1</value> <value>1</value>
<comment>Screen reader prompt for the Calculator number "1" button</comment> <comment>Screen reader prompt for the Calculator number "1" button</comment>
</data> </data>
<data name="num0Button.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve"> <data name="Num0Button.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
<value>Zero</value> <value>Zero</value>
<comment>Screen reader prompt for the Calculator number "0" button</comment> <comment>Screen reader prompt for the Calculator number "0" button</comment>
</data> </data>
@ -737,7 +737,7 @@
<value>Set</value> <value>Set</value>
<comment>Screen reader prompt for the Calculator number "7" button</comment> <comment>Screen reader prompt for the Calculator number "7" button</comment>
</data> </data>
<data name="num8Button.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve"> <data name="Num8Button.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
<value>Vuit</value> <value>Vuit</value>
<comment>Screen reader prompt for the Calculator number "8" button</comment> <comment>Screen reader prompt for the Calculator number "8" button</comment>
</data> </data>

70
src/Calculator/Views/NumberPad.xaml
View file

@ -1,4 +1,4 @@
<UserControl x:Class="CalculatorApp.NumberPad" <UserControl x:Class="CalculatorApp.NumberPad"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:common="using:CalculatorApp.Common" xmlns:common="using:CalculatorApp.Common"
@ -30,74 +30,74 @@
<VisualState x:Name="NoErrorLayout"/> <VisualState x:Name="NoErrorLayout"/>
<VisualState x:Name="ErrorLayout"> <VisualState x:Name="ErrorLayout">
<VisualState.Setters> <VisualState.Setters>
<Setter Target="decimalSeparatorButton.IsEnabled" Value="false"/> <Setter Target="DecimalSeparatorButton.IsEnabled" Value="false"/>
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
</VisualStateGroup> </VisualStateGroup>
</VisualStateManager.VisualStateGroups> </VisualStateManager.VisualStateGroups>
<controls:CalculatorButton x:Name="num0Button" <controls:CalculatorButton x:Name="Num0Button"
x:Uid="num0Button" x:Uid="Num0Button"
Grid.Row="3" Grid.Row="3"
Grid.Column="1" Grid.Column="1"
Style="{x:Bind Path=ButtonStyle, Mode=OneWay}" Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
AutomationProperties.AutomationId="num0Button" AutomationProperties.AutomationId="Num0Button"
ButtonId="Zero"/> ButtonId="Zero"/>
<controls:CalculatorButton x:Name="num1Button" <controls:CalculatorButton x:Name="Num1Button"
x:Uid="num1Button" x:Uid="Num1Button"
Grid.Row="2" Grid.Row="2"
Style="{x:Bind Path=ButtonStyle, Mode=OneWay}" Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
AutomationProperties.AutomationId="num1Button" AutomationProperties.AutomationId="Num1Button"
ButtonId="One"/> ButtonId="One"/>
<controls:CalculatorButton x:Name="num2Button" <controls:CalculatorButton x:Name="Num2Button"
x:Uid="num2Button" x:Uid="Num2Button"
Grid.Row="2" Grid.Row="2"
Grid.Column="1" Grid.Column="1"
Style="{x:Bind Path=ButtonStyle, Mode=OneWay}" Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
AutomationProperties.AutomationId="num2Button" AutomationProperties.AutomationId="Num2Button"
ButtonId="Two"/> ButtonId="Two"/>
<controls:CalculatorButton x:Name="num3Button" <controls:CalculatorButton x:Name="Num3Button"
x:Uid="num3Button" x:Uid="Num3Button"
Grid.Row="2" Grid.Row="2"
Grid.Column="2" Grid.Column="2"
Style="{x:Bind Path=ButtonStyle, Mode=OneWay}" Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
AutomationProperties.AutomationId="num3Button" AutomationProperties.AutomationId="Num3Button"
ButtonId="Three"/> ButtonId="Three"/>
<controls:CalculatorButton x:Name="num4Button" <controls:CalculatorButton x:Name="Num4Button"
x:Uid="num4Button" x:Uid="Num4Button"
Grid.Row="1" Grid.Row="1"
Style="{x:Bind Path=ButtonStyle, Mode=OneWay}" Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
AutomationProperties.AutomationId="num4Button" AutomationProperties.AutomationId="Num4Button"
ButtonId="Four"/> ButtonId="Four"/>
<controls:CalculatorButton x:Name="num5Button" <controls:CalculatorButton x:Name="Num5Button"
x:Uid="num5Button" x:Uid="Num5Button"
Grid.Row="1" Grid.Row="1"
Grid.Column="1" Grid.Column="1"
Style="{x:Bind Path=ButtonStyle, Mode=OneWay}" Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
AutomationProperties.AutomationId="num5Button" AutomationProperties.AutomationId="Num5Button"
ButtonId="Five"/> ButtonId="Five"/>
<controls:CalculatorButton x:Name="num6Button" <controls:CalculatorButton x:Name="Num6Button"
x:Uid="num6Button" x:Uid="Num6Button"
Grid.Row="1" Grid.Row="1"
Grid.Column="2" Grid.Column="2"
Style="{x:Bind Path=ButtonStyle, Mode=OneWay}" Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
AutomationProperties.AutomationId="num6Button" AutomationProperties.AutomationId="Num6Button"
ButtonId="Six"/> ButtonId="Six"/>
<controls:CalculatorButton x:Name="num7Button" <controls:CalculatorButton x:Name="Num7Button"
x:Uid="num7Button" x:Uid="Num7Button"
Style="{x:Bind Path=ButtonStyle, Mode=OneWay}" Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
AutomationProperties.AutomationId="num7Button" AutomationProperties.AutomationId="Num7Button"
ButtonId="Seven"/> ButtonId="Seven"/>
<controls:CalculatorButton x:Name="num8Button" <controls:CalculatorButton x:Name="Num8Button"
x:Uid="num8Button" x:Uid="Num8Button"
Grid.Column="1" Grid.Column="1"
Style="{x:Bind Path=ButtonStyle, Mode=OneWay}" Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
AutomationProperties.AutomationId="num8Button" AutomationProperties.AutomationId="Num8Button"
ButtonId="Eight"/> ButtonId="Eight"/>
<controls:CalculatorButton x:Name="num9Button" <controls:CalculatorButton x:Name="Num9Button"
x:Uid="num9Button" x:Uid="Num9Button"
Grid.Column="2" Grid.Column="2"
Style="{x:Bind Path=ButtonStyle, Mode=OneWay}" Style="{x:Bind Path=ButtonStyle, Mode=OneWay}"
AutomationProperties.AutomationId="num9Button" AutomationProperties.AutomationId="Num9Button"
ButtonId="Nine"/> ButtonId="Nine"/>
<!-- <!--
@ -107,14 +107,14 @@
DO NOT REMOVE the common:KeyboardShortcutManager.Character from this element, it's value will be overwritten by the DO NOT REMOVE the common:KeyboardShortcutManager.Character from this element, it's value will be overwritten by the
string coming from the RESW file string coming from the RESW file
--> -->
<controls:CalculatorButton x:Name="decimalSeparatorButton" <controls:CalculatorButton x:Name="DecimalSeparatorButton"
x:Uid="decimalSeparatorButton" x:Uid="DecimalSeparatorButton"
Grid.Row="4" Grid.Row="4"
Grid.Column="2" Grid.Column="2"
Style="{Binding ElementName=ControlRoot, Path=ButtonStyle}" Style="{Binding ElementName=ControlRoot, Path=ButtonStyle}"
Background="{ThemeResource AppBackgroundAltMediumLowBrush}" Background="{ThemeResource AppBackgroundAltMediumLowBrush}"
common:KeyboardShortcutManager.Character="." common:KeyboardShortcutManager.Character="."
AutomationProperties.AutomationId="decimalSeparatorButton" AutomationProperties.AutomationId="DecimalSeparatorButton"
ButtonId="Decimal" ButtonId="Decimal"
IsEnabled="{Binding IsDecimalEnabled}"/> IsEnabled="{Binding IsDecimalEnabled}"/>
</Grid> </Grid>