merge

1 files changed, 2 insertions, 33 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Updater/MainWindow.xaml b/Software/Visual_Studio/PPC/Tango.PPC.Updater/MainWindow.xaml
index 351ca0838..a5e63477f 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Updater/MainWindow.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Updater/MainWindow.xaml
@@ -6,43 +6,12 @@
         xmlns:local="clr-namespace:Tango.PPC.Updater"
         mc:Ignorable="d"
         WindowStyle="None" ResizeMode="NoResize" Width="800" Height="1280">
-
-    <Window.Resources>
-        <SolidColorBrush x:Key="Foreground" Color="#1c63ea" />
-
-        <Style TargetType="Button" x:Key="Button">
-            <Setter Property="Foreground" Value="{StaticResource Foreground}"></Setter>
-            <Setter Property="FontSize" Value="18"></Setter>
-            <Setter Property="FontWeight" Value="SemiBold"></Setter>
-            <Setter Property="Margin" Value="20 0"></Setter>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border BorderBrush="{StaticResource Foreground}" BorderThickness="1" CornerRadius="25" Background="Transparent">
-                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" Content="{TemplateBinding Content}" />
-                        </Border>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-    </Window.Resources>
     
     <Grid>
-        <StackPanel x:Name="stackProgress" HorizontalAlignment="Center" VerticalAlignment="Center">
+        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
             <Image Source="/Images/package.png" Width="200" />
             <TextBlock x:Name="txtStatus" Margin="0 100 0 0" FontSize="16" Text="Updating Tango..." HorizontalAlignment="Center"></TextBlock>
-            <ProgressBar x:Name="prog" Margin="0 30 0 0" Width="500" Height="10" Maximum="100" Value="0" BorderThickness="0" Foreground="{StaticResource Foreground}"></ProgressBar>
-        </StackPanel>
-        
-        <StackPanel x:Name="stackFailed" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0 460 0 0" Visibility="Collapsed">
-            <Image Source="/Images/warning.png" Width="200" RenderOptions.BitmapScalingMode="Fant" />
-            <TextBlock Margin="0 100 0 0" FontSize="16" Text="Update Failed" Foreground="#FF0072" FontWeight="SemiBold" HorizontalAlignment="Center"></TextBlock>
-            <TextBlock x:Name="txtError" Margin="0 20 0 0" FontSize="16" Foreground="Gray" Text="Unexpected error" HorizontalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" Height="100"></TextBlock>
-
-            <UniformGrid Width="600" Height="55" Columns="2" Margin="0 200 0 0">
-                <Button x:Name="btnAbort" Content="ABORT" Style="{StaticResource Button}"></Button>
-                <Button x:Name="btnRetry" Content="RETRY" Style="{StaticResource Button}"></Button>
-            </UniformGrid>
+            <ProgressBar x:Name="prog" Margin="0 30 0 0" Width="500" Height="10" Maximum="100" Value="0" BorderThickness="0" Foreground="#1c63ea"></ProgressBar>
         </StackPanel>
     </Grid>
 </Window>