diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-12-09 13:20:32 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-12-09 13:20:32 +0200 |
| commit | 58c791b68d9058516166cc26fc15563bd56ebeb6 (patch) | |
| tree | 6a16a443df1b3b1be2570522254c5bfdd87d0f80 /Software/Visual_Studio/PPC | |
| parent | 7b39fd2828ebc3e523b217d7d4c0aa91758123f9 (diff) | |
| download | Tango-58c791b68d9058516166cc26fc15563bd56ebeb6.tar.gz Tango-58c791b68d9058516166cc26fc15563bd56ebeb6.zip | |
Fixed issue with touch keyboard special char when caps lock is on.
Diffstat (limited to 'Software/Visual_Studio/PPC')
4 files changed, 13 insertions, 5 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/machine-update-firmware.png b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/machine-update-firmware.png Binary files differnew file mode 100644 index 000000000..ba1fe91e3 --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/machine-update-firmware.png diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj index ed0092a4d..862b7c891 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj @@ -402,6 +402,7 @@ <Link>Tango.ColorLib.dll</Link> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> + <Resource Include="Images\machine-update-firmware.png" /> <Resource Include="Images\chip_128px.png" /> <Resource Include="Images\warning-red.png" /> <Resource Include="Images\update.png" /> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/FirmwareUpgradeViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/FirmwareUpgradeViewVM.cs index b7c36f263..dea9cdac4 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/FirmwareUpgradeViewVM.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/FirmwareUpgradeViewVM.cs @@ -113,6 +113,7 @@ namespace Tango.PPC.UI.ViewModels }; handler.Failed += (_, ex) => { + Status = ex.FlattenMessage(); NavigateTo(FirmUpgradeView.FirmwareFailedView); }; handler.Completed += (_, __) => @@ -122,6 +123,7 @@ namespace Tango.PPC.UI.ViewModels } catch (Exception ex) { + Status = ex.FlattenMessage(); LogManager.Log(ex); await NavigateTo(FirmUpgradeView.FirmwareFailedView); } diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/FirmwareUpgradeView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/FirmwareUpgradeView.xaml index 985e00291..82b211d4e 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/FirmwareUpgradeView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/FirmwareUpgradeView.xaml @@ -14,12 +14,11 @@ <Grid> <DockPanel> - <StackPanel DockPanel.Dock="Top" HorizontalAlignment="Center" Margin="0 100 0 0"> - <Image Source="/Images/chip_128px.png" Width="128" Height="128" /> - <TextBlock HorizontalAlignment="Center" FontSize="{StaticResource TangoHeaderFontSize}" Margin="50">FIRMWARE UPGRADE</TextBlock> + <StackPanel DockPanel.Dock="Top" HorizontalAlignment="Center" Margin="0 10 0 0"> + <Image Source="/Images/machine-update-firmware.png" Stretch="None" /> </StackPanel> - <controls:NavigationControl x:Name="navigationControl" TransitionType="Slide" KeepElementsAttached="True" Margin="0 20 0 0" SelectedIndex="0"> + <controls:NavigationControl x:Name="navigationControl" TransitionType="Slide" KeepElementsAttached="True" Margin="0 20 0 0" SelectedIndex="2"> <Grid controls:NavigationControl.NavigationName="FirmwareProgressView"> <StackPanel HorizontalAlignment="Center" Margin="0 0 0 0"> <TextBlock TextAlignment="Center" LineHeight="40" Margin="20 0" TextWrapping="Wrap" FontSize="{StaticResource TangoTitleFontSize}"> @@ -42,7 +41,13 @@ <Grid controls:NavigationControl.NavigationName="FirmwareFailedView"> <StackPanel HorizontalAlignment="Center" Margin="0 50 0 0"> <touch:TouchIcon Icon="AlertOctagon" Foreground="{StaticResource TangoErrorBrush}" Width="70" Height="70" /> - <TextBlock VerticalAlignment="Center" Margin="0 10 0 0" Foreground="{StaticResource TangoErrorBrush}" FontSize="{StaticResource TangoTitleFontSize}">Firmware upgrade failed, tap 'try again' to restart the process.</TextBlock> + <TextBlock TextAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 10 0 0" FontSize="{StaticResource TangoTitleFontSize}"> + <Run>Firmware upgrade failed.</Run> + <LineBreak/> + <Run Text="{Binding Status,Mode=OneWay}"></Run> + <LineBreak/> + <Run>Tap 'try again' to restart the process.</Run> + </TextBlock> <touch:TouchButton Margin="0 200 0 0" Padding="20" Width="300" CornerRadius="35" Command="{Binding TryAgainCommand}">TRY AGAIN</touch:TouchButton> </StackPanel> |
