diff options
| -rw-r--r-- | Software/DB/PPC/Tango.mdf | bin | 75497472 -> 75497472 bytes | |||
| -rw-r--r-- | Software/DB/PPC/Tango_log.ldf | bin | 53673984 -> 53673984 bytes | |||
| -rw-r--r-- | Software/Visual_Studio/Tango.Touch/Keyboard/TouchKeyboard.cs | 1 | ||||
| -rw-r--r-- | Software/Visual_Studio/Tango.Touch/Keyboard/TouchKeyboard.xaml | 20 |
4 files changed, 16 insertions, 5 deletions
diff --git a/Software/DB/PPC/Tango.mdf b/Software/DB/PPC/Tango.mdf Binary files differindex 6504c7e5b..b9f5c1349 100644 --- a/Software/DB/PPC/Tango.mdf +++ b/Software/DB/PPC/Tango.mdf diff --git a/Software/DB/PPC/Tango_log.ldf b/Software/DB/PPC/Tango_log.ldf Binary files differindex 254015241..575f06cfc 100644 --- a/Software/DB/PPC/Tango_log.ldf +++ b/Software/DB/PPC/Tango_log.ldf diff --git a/Software/Visual_Studio/Tango.Touch/Keyboard/TouchKeyboard.cs b/Software/Visual_Studio/Tango.Touch/Keyboard/TouchKeyboard.cs index 9a6b7227f..7dc88dd8d 100644 --- a/Software/Visual_Studio/Tango.Touch/Keyboard/TouchKeyboard.cs +++ b/Software/Visual_Studio/Tango.Touch/Keyboard/TouchKeyboard.cs @@ -503,6 +503,7 @@ namespace Tango.Touch.Keyboard { if (key.Contains("{")) { + key = key.Replace("'",""); Forms.SendKeys.SendWait(key); } else if (key != " ") diff --git a/Software/Visual_Studio/Tango.Touch/Keyboard/TouchKeyboard.xaml b/Software/Visual_Studio/Tango.Touch/Keyboard/TouchKeyboard.xaml index 4517a9e09..ac4640da7 100644 --- a/Software/Visual_Studio/Tango.Touch/Keyboard/TouchKeyboard.xaml +++ b/Software/Visual_Studio/Tango.Touch/Keyboard/TouchKeyboard.xaml @@ -458,6 +458,8 @@ <ColumnDefinition Width="Auto"/> <ColumnDefinition Width="Auto"/> <ColumnDefinition Width="Auto"/> + <ColumnDefinition Width="Auto"/> + <ColumnDefinition Width="Auto"/> </Grid.ColumnDefinitions> <RepeatButton Style="{StaticResource bottomButtonDots}" Command="{Binding RelativeSource={RelativeSource AncestorType=local:TouchKeyboard},Path=SpecialCharactersCommand}"> @@ -490,7 +492,7 @@ <TextBlock Text="{Binding CurrentKeyboardDefinition.LanguageCode}"></TextBlock> </RepeatButton> - <RepeatButton Command="{Binding FreeTextCommand}" CommandParameter="/" Grid.Column="2"> + <!--<RepeatButton Command="{Binding FreeTextCommand}" CommandParameter="/" Grid.Column="2"> <RepeatButton.Style> <Style TargetType="RepeatButton" BasedOn="{StaticResource bottomButton}"> <Setter Property="Visibility" Value="{Binding IsSpecialCharactersOn,Converter={StaticResource BooleanToVisibilityInverseConverter}}"></Setter> @@ -502,7 +504,7 @@ </Style> </RepeatButton.Style> <TextBlock Text="/"></TextBlock> - </RepeatButton> + </RepeatButton>--> <RepeatButton Command="{Binding FreeTextCommand}" CommandParameter="@" Grid.Column="2"> <RepeatButton.Style> @@ -529,11 +531,19 @@ </DockPanel> </RepeatButton> - <RepeatButton Command="{Binding FreeTextCommand}" CommandParameter="." Style="{StaticResource bottomButtonDots}" Grid.Column="4"> + <RepeatButton Command="{Binding FreeTextCommand}" CommandParameter="'{LEFT}'" Style="{StaticResource normalButton}" Grid.Column="4"> + <controls:TouchIcon Icon="ChevronLeft" Height="18" Width="18" /> + </RepeatButton> + + <RepeatButton Command="{Binding FreeTextCommand}" CommandParameter="'{RIGHT}'" Style="{StaticResource normalButton}" Grid.Column="5"> + <controls:TouchIcon Icon="ChevronRight" Height="18" Width="18" /> + </RepeatButton> + + <RepeatButton Command="{Binding FreeTextCommand}" CommandParameter="." Style="{StaticResource bottomButtonDots}" Grid.Column="6"> <TextBlock Text="."></TextBlock> </RepeatButton> - <RepeatButton Command="{Binding FreeTextCommand}" CommandParameter=".com" Grid.Column="5"> + <RepeatButton Command="{Binding FreeTextCommand}" CommandParameter=".com" Grid.Column="7"> <RepeatButton.Style> <Style TargetType="RepeatButton" BasedOn="{StaticResource bottomButtonDots}"> <Setter Property="Visibility" Value="Collapsed"></Setter> @@ -550,7 +560,7 @@ <TextBlock Text=".com"></TextBlock> </RepeatButton> - <RepeatButton Style="{StaticResource bottomButton}" Grid.Column="6" Command="{Binding ActionKeyCommand}"> + <RepeatButton Style="{StaticResource bottomButton}" Grid.Column="8" Command="{Binding ActionKeyCommand}"> <TextBlock Text="{Binding RelativeSource={RelativeSource AncestorType=local:TouchKeyboard},Path=ActionKeyText}"></TextBlock> </RepeatButton> </Grid> |