Move status label on backup screen

Deadpikle · Feb 6, 2019 · f7b0e96 · f7b0e96
1 parent e13cafc
commit f7b0e96
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/EasyBackup/EasyBackup.csproj b/EasyBackup/EasyBackup.csproj
@@ -167,12 +167,6 @@
     <Content Include="Sounds\failure-tbone.wav">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Sounds\jingle-achievement.wav">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Sounds\success.mp3">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Sounds\success.wav">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

diff --git a/EasyBackup/Views/BackupInProgress.xaml b/EasyBackup/Views/BackupInProgress.xaml
@@ -8,20 +8,18 @@
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="*"/>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*"/>
         </Grid.ColumnDefinitions>
-        <Label Grid.Column="0" Grid.ColumnSpan="2" Content="Easy Backup" HorizontalAlignment="Center" 
+        <Label Grid.Column="0" Grid.ColumnSpan="2" Content="Easy Backup" HorizontalAlignment="Center"  Grid.Row="0"
                FontSize="24" FontWeight="Bold" Margin="0,0,0,0"/>
-        <TextBlock Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" Text="{Binding Status}" HorizontalAlignment="Center" 
-               FontSize="18" FontWeight="Bold" Margin="0,0,0,5" TextWrapping="Wrap" Foreground="{Binding StatusColor}"/>
-        <DataGrid Grid.Row="2" ItemsSource="{Binding ItemProgressData}"
+        <DataGrid Grid.Row="1" ItemsSource="{Binding ItemProgressData}"
                   ColumnHeaderStyle="{StaticResource NoCapsColumnHeader}"
                   Name="PathsDataGrid"
                   CanUserAddRows="False"
@@ -70,6 +68,8 @@
                 </Style>
             </DataGrid.RowStyle>
         </DataGrid>
+        <TextBlock Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="2" Text="{Binding Status}" HorizontalAlignment="Center" 
+               FontSize="18" FontWeight="Bold" Margin="0,5,0,5" TextWrapping="Wrap" Foreground="{Binding StatusColor}"/>
         <TextBlock Grid.Row="3" HorizontalAlignment="Center" FontWeight="Bold"
                FontSize="24" Margin="0,0,0,0">
             Backup Progress: <Run Text="{Binding CurrentProgressString, Mode=OneWay}"/>%