Assign access keys

bricelam · Sep 29, 2016 · 1736816 · 1736816
1 parent f1c0797
commit 1736816
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 42 deletions.
diff --git a/src/ImageResizer/Properties/Resources.Designer.cs b/src/ImageResizer/Properties/Resources.Designer.cs
diff --git a/src/ImageResizer/Properties/Resources.resx b/src/ImageResizer/Properties/Resources.resx
@@ -130,13 +130,13 @@
     <value>Encoding</value>
   </data>
   <data name="Advanced_FallbackEncoder" xml:space="preserve">
-    <value>Fallback encoder:</value>
+    <value>_Fallback encoder:</value>
   </data>
   <data name="Advanced_File" xml:space="preserve">
     <value>File</value>
   </data>
   <data name="Advanced_FileName" xml:space="preserve">
-    <value>Filename:</value>
+    <value>_Filename:</value>
   </data>
   <data name="Advanced_FileNameToken1" xml:space="preserve">
     <value>Original filename</value>
@@ -154,19 +154,19 @@
     <value>The following parameters can be used.</value>
   </data>
   <data name="Advanced_JpegQualityLevel" xml:space="preserve">
-    <value>JPEG quality level:</value>
+    <value>_JPEG quality level:</value>
   </data>
   <data name="Advanced_KeepDateModified" xml:space="preserve">
-    <value>Use original date modified</value>
+    <value>_Use original date modified</value>
   </data>
   <data name="Advanced_PngInterlaceOption" xml:space="preserve">
-    <value>PNG interlacing:</value>
+    <value>_PNG interlacing:</value>
   </data>
   <data name="Advanced_Sizes" xml:space="preserve">
     <value>Sizes</value>
   </data>
   <data name="Advanced_TiffCompressOption" xml:space="preserve">
-    <value>TIFF compression:</value>
+    <value>_TIFF compression:</value>
   </data>
   <data name="Advanced_Title" xml:space="preserve">
     <value>Advanced Options</value>
@@ -187,19 +187,19 @@
     <value>(auto)</value>
   </data>
   <data name="Input_Content" xml:space="preserve">
-    <value>Select a size.</value>
+    <value>_Select a size.</value>
   </data>
   <data name="Input_Custom" xml:space="preserve">
-    <value>_Custom</value>
+    <value>Custom</value>
   </data>
   <data name="Input_IgnoreOrientation" xml:space="preserve">
-    <value>Ignore the _orientation of pictures</value>
+    <value>Ign_ore the orientation of pictures</value>
   </data>
   <data name="Input_MainInstruction" xml:space="preserve">
     <value>Resize your pictures</value>
   </data>
   <data name="Input_Replace" xml:space="preserve">
-    <value>_Resize the original pictures (don't create copies)</value>
+    <value>R_esize the original pictures (don't create copies)</value>
   </data>
   <data name="Input_Resize" xml:space="preserve">
     <value>_Resize</value>
@@ -208,7 +208,7 @@
     <value>Advanced options...</value>
   </data>
   <data name="Input_ShrinkOnly" xml:space="preserve">
-    <value>Ma_ke pictures smaller but not larger</value>
+    <value>_Make pictures smaller but not larger</value>
   </data>
   <data name="Large" xml:space="preserve">
     <value>Large</value>
@@ -238,7 +238,7 @@
     <value>Resizing your pictures...</value>
   </data>
   <data name="Progress_Stop" xml:space="preserve">
-    <value>Stop</value>
+    <value>_Stop</value>
   </data>
   <data name="Progress_TimeRemaining_HourMinute" xml:space="preserve">
     <value>About {0} hour, {1} minute remaining.</value>
@@ -301,7 +301,7 @@
     <value>Pixels</value>
   </data>
   <data name="Results_Close" xml:space="preserve">
-    <value>_Close</value>
+    <value>Close</value>
   </data>
   <data name="Results_MainInstruction" xml:space="preserve">
     <value>Can't resize the following pictures</value>

diff --git a/src/ImageResizer/Views/AdvancedWindow.xaml b/src/ImageResizer/Views/AdvancedWindow.xaml
@@ -1,5 +1,4 @@
-<!-- TODO: Review accessors -->
-<Window xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<Window xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:local="clr-namespace:ImageResizer.Views"
         xmlns:m="clr-namespace:ImageResizer.Models"
@@ -112,8 +111,11 @@
                         <RowDefinition/>
                         <RowDefinition/>
                     </Grid.RowDefinitions>
-                    <Label Content="{x:Static p:Resources.Advanced_FallbackEncoder}" Padding="0,5,5,0"/>
-                    <ComboBox Height="23"
+                    <Label Content="{x:Static p:Resources.Advanced_FallbackEncoder}"
+                           Padding="0,5,5,0"
+                           Target="{Binding ElementName=_fallbackEncoderComboBox}"/>
+                    <ComboBox Name="_fallbackEncoderComboBox"
+                              Height="23"
                               HorizontalAlignment="Left"
                               ItemsSource="{Binding Encoders}"
                               SelectedItem="{Binding Settings.FallbackEncoder}"
@@ -127,8 +129,10 @@
                     <Label Content="{x:Static p:Resources.Advanced_JpegQualityLevel}"
                            Margin="0,7,0,0"
                            Padding="0,5,5,0"
+                           Target="{Binding ElementName=_jpegQualityLevelTextBox}"
                            Grid.Row="1"/>
-                    <TextBox Height="23"
+                    <TextBox Name="_jpegQualityLevelTextBox"
+                             Height="23"
                              HorizontalAlignment="Left"
                              Margin="0,7,0,0"
                              Text="{Binding Settings.JpegQualityLevel,ValidatesOnExceptions=True,ValidatesOnDataErrors=True}"
@@ -138,8 +142,10 @@
                     <Label Content="{x:Static p:Resources.Advanced_PngInterlaceOption}"
                            Margin="0,7,0,0"
                            Padding="0,5,5,0"
+                           Target="{Binding ElementName=_pngInterlaceComboBox}"
                            Grid.Row="2"/>
-                    <ComboBox Height="23"
+                    <ComboBox Name="_pngInterlaceComboBox"
+                              Height="23"
                               HorizontalAlignment="Left"
                               ItemsSource="{Binding Source={StaticResource PngInterlaceOptionValues}}"
                               Margin="0,7,0,0"
@@ -155,8 +161,10 @@
                     <Label Content="{x:Static p:Resources.Advanced_TiffCompressOption}"
                            Margin="0,7,0,0"
                            Padding="0,5,5,0"
+                           Target="{Binding ElementName=_tiffCompressComboBox}"
                            Grid.Row="3"/>
-                    <ComboBox Height="23"
+                    <ComboBox Name="_tiffCompressComboBox"
+                              Height="23"
                               HorizontalAlignment="Left"
                               ItemsSource="{Binding Source={StaticResource TiffCompressOptionValues}}"
                               Margin="0,7,0,0"
@@ -194,8 +202,12 @@
                         </Grid.ColumnDefinitions>
                         <Label Content="{x:Static p:Resources.Advanced_FileName}"
                                HorizontalAlignment="Left"
-                               Padding="0,5,5,0"/>
-                        <TextBox Text="{Binding Settings.FileName}" Height="23" Grid.Column="1" />
+                               Padding="0,5,5,0"
+                               Target="{Binding ElementName=_fileNameTextBox}"/>
+                        <TextBox Name="_fileNameTextBox"
+                                 Text="{Binding Settings.FileName}"
+                                 Height="23"
+                                 Grid.Column="1"/>
                     </Grid>
                     <Separator Margin="0,11,0,0"/>
                     <CheckBox Content="{x:Static p:Resources.Advanced_KeepDateModified}"

diff --git a/src/ImageResizer/Views/InputPage.xaml b/src/ImageResizer/Views/InputPage.xaml
@@ -1,5 +1,4 @@
-<!-- TODO: Review accessors -->
-<UserControl xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<UserControl xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
              xmlns:local="clr-namespace:ImageResizer.Views"
              xmlns:m="clr-namespace:ImageResizer.Models"
@@ -11,8 +10,11 @@
         <TextBlock Style="{StaticResource MainInstructionTextBlockStyle}"
                    Margin="11,11,11,0"
                    Text="{x:Static p:Resources.Input_MainInstruction}"/>
-        <TextBlock Margin="11,11,11,0" Text="{x:Static p:Resources.Input_Content}"/>
-        <ListBox BorderThickness="0"
+        <Label Content="{x:Static p:Resources.Input_Content}"
+               Margin="11,11,11,0"
+               Target="{Binding ElementName=_selectedSizeListBox}"/>
+        <ListBox Name="_selectedSizeListBox"
+                 BorderThickness="0"
                  ItemsSource="{Binding Settings.AllSizes}"
                  Margin="20,0,11,0"
                  SelectedIndex="{Binding Settings.SelectedSizeIndex}">
@@ -48,7 +50,7 @@
                 </DataTemplate>
                 <DataTemplate DataType="{x:Type m:CustomSize}">
                     <StackPanel Orientation="Horizontal">
-                        <AccessText VerticalAlignment="Center" Text="{Binding Name}"/>
+                        <TextBlock VerticalAlignment="Center" Text="{Binding Name}"/>
                         <ComboBox Height="23"
                                   ItemsSource="{Binding Source={StaticResource ResizeFitValues}}"
                                   Margin="5,0,0,0"

diff --git a/src/ImageResizer/Views/ProgressPage.xaml b/src/ImageResizer/Views/ProgressPage.xaml
@@ -26,7 +26,6 @@
                 Margin="0,11,0,0"
                 Padding="11,11">
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-                <!-- TODO: Review accessor -->
                 <Button Command="{Binding StopCommand}"
                         Content="{x:Static p:Resources.Progress_Stop}"
                         Height="23"

diff --git a/src/ImageResizer/Views/ResultsPage.xaml b/src/ImageResizer/Views/ResultsPage.xaml
@@ -26,11 +26,11 @@
                 Margin="0,11,0,0"
                 Padding="11,11">
             <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
-                <!-- TODO: Review accessor -->
                 <Button Command="{Binding CloseCommand}"
                         Content="{x:Static p:Resources.Results_Close}"
                         Height="23"
                         IsDefault="True"
+                        IsCancel="True"
                         Width="75"/>
             </StackPanel>
         </Border>