WinGui: Minor UI/UX tweaks.

- Tab Section titles removed from single purpose tabs (Chapters, Subtitle, Audio, Filters). Was unnecessary and frees up some space.
- A number of labels updated for consistency with the mac UI
- Added "Open preview" button to the Dimensions tab.
- Added "Source Preview" label to the Summary tab to try avoid confusion as to what this is for.
- Better job status display (HB Error codes with text description) on queue summary.

7 files changed, 61 insertions, 82 deletions

diff --git a/win/CS/HandBrakeWPF/Views/AudioView.xaml b/win/CS/HandBrakeWPF/Views/AudioView.xaml
index 6b3794dc8..d0e317073 100644
--- a/win/CS/HandBrakeWPF/Views/AudioView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AudioView.xaml
@@ -29,8 +29,6 @@
     <Grid>

         <Grid.RowDefinitions>

             <RowDefinition Height="Auto" />

-            <RowDefinition Height="Auto" />

-            <RowDefinition Height="Auto" />

             <RowDefinition Height="*" />

         </Grid.RowDefinitions>

 

@@ -39,16 +37,8 @@
             <ColumnDefinition Width="Auto" />

         </Grid.ColumnDefinitions>

 

-

         <!-- Row 0 -->

-        <TextBlock Grid.Row="0"

-                   Margin="10,5,0,0"

-                   FontSize="12" FontWeight="Bold"

-                   VerticalAlignment="Top"

-                   Text="{Binding PanelTitle}" />

-

-        <!-- Row 1 -->

-        <Grid Grid.Row="1" Margin="10,5,10,0" Grid.Column="0" >

+        <Grid Grid.Row="0" Margin="10,5,10,0" Grid.Column="0" >

             <Grid.ColumnDefinitions>

                 <ColumnDefinition Width="*" />

             </Grid.ColumnDefinitions>

@@ -104,8 +94,8 @@
             </Grid>

         </Grid>

 

-        <!-- Row 2 -->

-        <ListBox Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Stretch"

+        <!-- Row 1 -->

+        <ListBox Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Stretch"

                  Margin="10,10,10,10"

                  dd:DragDrop.DropHandler="{Binding}"

                  dd:DragDrop.IsDragSource="True"

diff --git a/win/CS/HandBrakeWPF/Views/ChaptersView.xaml b/win/CS/HandBrakeWPF/Views/ChaptersView.xaml
index 7a14542a0..b18b15bd7 100644
--- a/win/CS/HandBrakeWPF/Views/ChaptersView.xaml
+++ b/win/CS/HandBrakeWPF/Views/ChaptersView.xaml
@@ -10,25 +10,22 @@
     <Grid>

         <Grid.RowDefinitions>

             <RowDefinition Height="Auto" />

-            <RowDefinition Height="Auto" />

             <RowDefinition Height="*" />

         </Grid.RowDefinitions>

 

-        <TextBlock Text="{x:Static Properties:Resources.ChaptersView_ChapterMarkers}" FontSize="12" FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" ></TextBlock>

-

-        <Grid Grid.Row="1" Margin="10,5,10,0">

+        <Grid Grid.Row="0" Margin="10,5,10,0">

             <Grid.ColumnDefinitions>

                 <ColumnDefinition Width="Auto" />

                 <ColumnDefinition Width="*" />

                 <ColumnDefinition Width="Auto" />

                 <ColumnDefinition Width="Auto" />

             </Grid.ColumnDefinitions>

-            <CheckBox Content="{x:Static Properties:Resources.ChaptersView_CreateChapterMarkers}" IsChecked="{Binding IncludeChapterMarkers}" Grid.Column="0" VerticalAlignment="Center" />

+            <CheckBox Content="{x:Static Properties:Resources.ChaptersView_CreateChapterMarkers}" IsChecked="{Binding IncludeChapterMarkers}" Grid.Column="0" VerticalAlignment="Center" VerticalContentAlignment="Center" />

             <Button Content="{x:Static Properties:Resources.ChaptersView_Import}" Name="import" Grid.Column="2" Width="75" Margin="0,0,10,0" cal:Message.Attach="[Event Click] = [Action Import]" />

             <Button Content="{x:Static Properties:Resources.ChaptersView_Export}" Name="export" Grid.Column="3" Width="75" cal:Message.Attach="[Event Click] = [Action Export]" />

         </Grid>

 

-        <DataGrid Grid.Row="2" Margin="10" ItemsSource="{Binding Chapters}" 

+        <DataGrid Grid.Row="1" Margin="10" ItemsSource="{Binding Chapters}" 

                   VerticalAlignment="Stretch"  AutoGenerateColumns="False"

                   CanUserSortColumns="False" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserResizeRows="False"

                   CanUserAddRows="False" CanUserDeleteRows="False" HeadersVisibility="Column"

diff --git a/win/CS/HandBrakeWPF/Views/FiltersView.xaml b/win/CS/HandBrakeWPF/Views/FiltersView.xaml
index 38291fef9..36a1c8a33 100644
--- a/win/CS/HandBrakeWPF/Views/FiltersView.xaml
+++ b/win/CS/HandBrakeWPF/Views/FiltersView.xaml
@@ -19,7 +19,6 @@
         <Grid.RowDefinitions>

             <RowDefinition Height="Auto" />

             <RowDefinition Height="Auto" />

-            <RowDefinition Height="Auto" />

         </Grid.RowDefinitions>

 

         <Grid.ColumnDefinitions>

@@ -27,9 +26,7 @@
             <ColumnDefinition Width="Auto" />

         </Grid.ColumnDefinitions>

 

-        <TextBlock Text="{x:Static Properties:Resources.FiltersView_Filters}" FontSize="12" FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" />

-

-        <StackPanel Orientation="Vertical" Grid.Row="1" Grid.Column="0" Margin="10,10,0,0">

+        <StackPanel Orientation="Vertical" Grid.Row="0" Grid.Column="0" Margin="10,10,0,0">

             <Grid>

                 <Grid.RowDefinitions>

                     <RowDefinition Height="Auto" />

diff --git a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
index 6bd9dace6..8fba7bbdc 100644
--- a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
@@ -4,7 +4,8 @@
              xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"

              xmlns:controls="clr-namespace:HandBrakeWPF.Controls"

               xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"

-              xmlns:picture="clr-namespace:HandBrakeWPF.Converters.Picture">

+              xmlns:picture="clr-namespace:HandBrakeWPF.Converters.Picture"

+              xmlns:cal="http://www.caliburnproject.org">

 

     <UserControl.Resources>

         <Converters:BooleanConverter x:Key="boolConverter" />

@@ -21,7 +22,6 @@
         <Grid.RowDefinitions>

             <RowDefinition Height="Auto" />

             <RowDefinition Height="Auto" />

-            <RowDefinition Height="Auto" />

             <RowDefinition Height="*" />

             <RowDefinition Height="Auto" />

         </Grid.RowDefinitions>

@@ -33,7 +33,6 @@
             <ColumnDefinition Width="*" />

         </Grid.ColumnDefinitions>

 

-

         <!-- Size Panel-->

         <TextBlock Text="{x:Static Properties:Resources.PictureSettingsView_ResAndScaling}" FontSize="12" FontWeight="Bold"  Grid.Row="0" Grid.Column="0" Margin="10,5,0,15" />

         <StackPanel Name="SizePanel" Orientation="Vertical" VerticalAlignment="Top" Margin="5,0,0,0" Grid.Row="1" Grid.Column="0">

@@ -132,8 +131,8 @@
 

             </Grid>

         </StackPanel>

-

-            <!-- Crop Panel -->

+        

+        <!-- Crop Panel -->

         <TextBlock Text="{x:Static Properties:Resources.PictureSettingsView_RotateAndCrop}" FontSize="12" FontWeight="Bold" Grid.Row="0" Grid.Column="1" Margin="50,5,0,15" />

         <Grid Name="CropPanel" Margin="50,0,0,0" VerticalAlignment="Top" HorizontalAlignment="Stretch" Grid.Row="1" Grid.Column="1">

             <Grid.ColumnDefinitions>

@@ -281,25 +280,30 @@
             <TextBlock Text="{x:Static Properties:Resources.PictureSettingsView_PaddingColour}" Grid.Row="2" Grid.Column="0" />

             <ComboBox ItemsSource="{Binding PaddingFilter.PaddingColours}" SelectedItem="{Binding PaddingFilter.Colour}" Grid.Row="2" Grid.Column="1" />

 

-        </Grid>-->

+        </Grid> -->

+

+        <!-- Preview Control -->

+        <Grid Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="3">

+            <Grid.ColumnDefinitions>

+                <ColumnDefinition Width="Auto" />

+                <ColumnDefinition Width="*" />

+            </Grid.ColumnDefinitions>

+

+        </Grid>

+

 

         <!-- Output Panel -->

-        <StackPanel Name="PreviewPanel" Margin="5,5,0,0" VerticalAlignment="Top" HorizontalAlignment="Stretch" Grid.Row="4"  Grid.Column="0" Grid.ColumnSpan="4">

+        <StackPanel Name="PreviewPanel" Margin="5,5,0,0" VerticalAlignment="Top" HorizontalAlignment="Stretch" Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="3">

             <Label Content="{x:Static Properties:Resources.PictureSettingsView_Output}" FontSize="12" FontWeight="Bold" />

 

-            <Grid >

-                <Grid.RowDefinitions>

-                    <RowDefinition Height="Auto" />

-                    <RowDefinition Height="Auto" />

-                </Grid.RowDefinitions>

+            <StackPanel Orientation="Horizontal" Margin="0,0,0,5">

+                <Label Content="{Binding DisplaySize}" HorizontalAlignment="Left" VerticalContentAlignment="Center" VerticalAlignment="Center"

+                       Visibility="{Binding ShowDisplaySize, Converter={StaticResource boolToVisConverter}}" />

 

-                <Grid.ColumnDefinitions>

-                    <ColumnDefinition Width="Auto" />

-                </Grid.ColumnDefinitions>

+                <Button Content="{x:Static Properties:Resources.PictureSettingsView_SeePreview}" cal:Message.Attach="[Event Click] = [Action OpenPreviewWindow]"

+                        VerticalAlignment="Center" VerticalContentAlignment="Center" Margin="20,0,0,0" FontWeight="Bold" />

+            </StackPanel>

 

-                <Label Content="{Binding DisplaySize}" Grid.Row="0" Grid.Column="0" HorizontalAlignment="Left" Margin="0,0,0,5"

-                       Visibility="{Binding ShowDisplaySize, Converter={StaticResource boolToVisConverter}}" />

-            </Grid>

 

         </StackPanel>

     </Grid>

diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml b/win/CS/HandBrakeWPF/Views/QueueView.xaml
index b227a3d63..53039bd1f 100644
--- a/win/CS/HandBrakeWPF/Views/QueueView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml
@@ -407,11 +407,7 @@
                                     </Button>

                                 </StackPanel>

 

-

-                                <TextBlock FontWeight="Bold" Text="Status:" VerticalAlignment="Top" Grid.Row="0" Grid.Column="0" Margin="0,15,10,5" Visibility="{Binding SelectedTask.IsJobStatusVisible, Converter={StaticResource boolToVisConverter}}"  />

-                                <TextBlock Text="{Binding SelectedTask.JobProgress.JobStatus}" Visibility="{Binding SelectedTask.IsJobStatusVisible, Converter={StaticResource boolToVisConverter}}" 

-                                       TextWrapping="WrapWithOverflow" TextTrimming="CharacterEllipsis" Margin="0,0,0,5" />

-

+                                <!-- Job Summary -->

                                 <Grid Style="{StaticResource LongToolTipHolder}" Margin="0,10,0,0" >

                                     <Grid.Resources>

                                         <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">

@@ -429,6 +425,7 @@
                                         <RowDefinition Height="Auto" />

                                         <RowDefinition Height="Auto" />

                                         <RowDefinition Height="Auto" />

+                                        <RowDefinition Height="Auto" />

                                     </Grid.RowDefinitions>

 

                                     <Grid.ColumnDefinitions>

@@ -436,12 +433,14 @@
                                         <ColumnDefinition Width="*" />

                                     </Grid.ColumnDefinitions>

 

-                                    <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Source}" VerticalAlignment="Top" Grid.Row="0" Grid.Column="0" />

-                                    <TextBlock Text="{Binding SelectedTask.Task.Source}" TextWrapping="Wrap" Grid.Row="0" Grid.Column="1" />

+                                    <TextBlock FontWeight="Bold" Text="Status:" VerticalAlignment="Top"  Grid.Row="0" />

+                                    <TextBlock Text="{Binding SelectedTask.JobProgress.JobStatus}" TextWrapping="WrapWithOverflow" VerticalAlignment="Top" TextTrimming="CharacterEllipsis" Grid.Row="0" Grid.Column="1" />

 

-                                    <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.MainView_Title}" VerticalAlignment="Top" Grid.Row="1" Grid.Column="0" />

+                                    <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Source}" VerticalAlignment="Top" Grid.Row="1" Grid.Column="0" />

+                                    <TextBlock Text="{Binding SelectedTask.Task.Source}" TextWrapping="Wrap" Grid.Row="1" Grid.Column="1" />

 

-                                    <StackPanel Orientation="Horizontal"  Grid.Row="1" Grid.Column="1" Margin="0,0,0,0" >

+                                    <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.MainView_Title}" VerticalAlignment="Top" Grid.Row="2" Grid.Column="0" />

+                                    <StackPanel Orientation="Horizontal"  Grid.Row="2" Grid.Column="1" Margin="0,0,0,0" >

                                         <TextBlock Text="{Binding SelectedTask.Task.Title}" TextWrapping="Wrap"/>

                                         <TextBlock Text="{Binding SelectedTask.Task.PointToPointMode, Converter={StaticResource PointToPointConverter}}" TextWrapping="Wrap" Margin="10,0,0,0" FontWeight="Bold"/>

                                         <TextBlock Text=":" FontWeight="Bold" />

@@ -450,30 +449,27 @@
                                         <TextBlock Text="{Binding SelectedTask.Task.EndPoint}" TextWrapping="Wrap"/>

                                     </StackPanel>

 

+                                    <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Destination}" VerticalAlignment="Top" Grid.Row="3" Grid.Column="0" />

+                                    <TextBlock Text="{Binding SelectedTask.Task.Destination}" TextWrapping="Wrap" Grid.Row="3" Grid.Column="1" />

 

+                                    <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_PictureSettings}" VerticalAlignment="Top" Grid.Row="4" Grid.Column="0" />

+                                    <TextBlock Text="{Binding SelectedTask.Task, Converter={StaticResource pictureSettingsDescConverter}}" TextWrapping="Wrap" Grid.Row="4" Grid.Column="1"  />

 

-                                    <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Destination}" VerticalAlignment="Top" Grid.Row="2" Grid.Column="0" />

-                                    <TextBlock Text="{Binding SelectedTask.Task.Destination}" TextWrapping="Wrap" Grid.Row="2" Grid.Column="1" />

-

-                                    <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_PictureSettings}" VerticalAlignment="Top" Grid.Row="3" Grid.Column="0" />

-                                    <TextBlock Text="{Binding SelectedTask.Task, Converter={StaticResource pictureSettingsDescConverter}}" TextWrapping="Wrap" Grid.Row="3" Grid.Column="1"  />

+                                    <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_FilterSettings}" VerticalAlignment="Top" Grid.Row="5" Grid.Column="0" />

+                                    <TextBlock Text="{Binding SelectedTask.Task, Converter={StaticResource filterSettingsDescConverter}}" TextWrapping="Wrap" Grid.Row="5" Grid.Column="1"  />

 

-                                    <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_FilterSettings}" VerticalAlignment="Top" Grid.Row="4" Grid.Column="0" />

-                                    <TextBlock Text="{Binding SelectedTask.Task, Converter={StaticResource filterSettingsDescConverter}}" TextWrapping="Wrap" Grid.Row="4" Grid.Column="1"  />

+                                    <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Video}" Grid.Row="6" Grid.Column="0" />

+                                    <TextBlock Text="{Binding SelectedTask.Task, Converter={StaticResource videoOptionsTooltipConverter}}" Grid.Row="6" Grid.Column="1" TextWrapping="Wrap"  />

 

-                                    <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Video}" Grid.Row="5" Grid.Column="0" />

-                                    <TextBlock Text="{Binding SelectedTask.Task, Converter={StaticResource videoOptionsTooltipConverter}}" Grid.Row="5" Grid.Column="1" TextWrapping="Wrap"  />

+                                    <TextBlock FontWeight="Bold" VerticalAlignment="Top" Grid.Row="7" Grid.Column="0"  Text="{x:Static Properties:Resources.QueueView_Advanced}" />

+                                    <TextBlock Text="{Binding SelectedTask.Task, Converter={StaticResource encoderOptionsTooltipConverter}}" Grid.Row="7" Grid.Column="1" TextWrapping="Wrap"  />

 

-                                    <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Audio}"  Grid.Row="6" Grid.Column="0" VerticalAlignment="Top"/>

-                                    <TextBlock Text="{Binding SelectedTask.Task.AudioTracks, Converter={StaticResource audioTrackDisplayConverter}}"

-                                           Grid.Row="6" Grid.Column="1" />

+                                    <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Audio}"  Grid.Row="8" Grid.Column="0" VerticalAlignment="Top"/>

+                                    <TextBlock Text="{Binding SelectedTask.Task.AudioTracks, Converter={StaticResource audioTrackDisplayConverter}}" Grid.Row="8" Grid.Column="1" />

 

-                                    <TextBlock FontWeight="Bold" VerticalAlignment="Top" Text="{x:Static Properties:Resources.QueueView_Subtitles}" Grid.Row="7" Grid.Column="0"   />

-                                    <TextBlock Text="{Binding SelectedTask.Task.SubtitleTracks, Converter={StaticResource subtitleTrackDisplayConverter}}"

-                                           Grid.Row="7" Grid.Column="1" />

+                                    <TextBlock FontWeight="Bold" VerticalAlignment="Top" Text="{x:Static Properties:Resources.QueueView_Subtitles}" Grid.Row="9" Grid.Column="0"   />

+                                    <TextBlock Text="{Binding SelectedTask.Task.SubtitleTracks, Converter={StaticResource subtitleTrackDisplayConverter}}" Grid.Row="9" Grid.Column="1" />

 

-                                    <TextBlock FontWeight="Bold" VerticalAlignment="Top" Grid.Row="8" Grid.Column="0"  Text="{x:Static Properties:Resources.QueueView_Advanced}" />

-                                    <TextBlock Text="{Binding SelectedTask.Task, Converter={StaticResource encoderOptionsTooltipConverter}}" Grid.Row="8" Grid.Column="1" TextWrapping="Wrap"  />

                                 </Grid>

 

                             </StackPanel>

diff --git a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
index 51600df14..cbd67bb6f 100644
--- a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
+++ b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
@@ -34,7 +34,6 @@
     <Grid>

         <Grid.RowDefinitions>

             <RowDefinition Height="Auto" />

-            <RowDefinition Height="Auto" />

             <RowDefinition Height="*" />

         </Grid.RowDefinitions>

 

@@ -44,14 +43,7 @@
         </Grid.ColumnDefinitions>

 

         <!-- Row 0 -->

-        <TextBlock Grid.Row="0" Grid.Column="0"

-                   Margin="10,5,0,0"

-                   FontSize="12" FontWeight="Bold"

-                   VerticalAlignment="Top"

-                   Text="{Binding PanelTitle}" />

-

-        <!-- Row 1 -->

-        <Grid Grid.Row="1" Margin="10,5,10,0">

+        <Grid Grid.Row="0" Margin="10,5,10,0">

             

             <Grid.ColumnDefinitions>

                 <ColumnDefinition Width="Auto" />

@@ -104,8 +96,8 @@
         </Grid>

 

 

-        <!-- Row 2 -->

-        <ListBox Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2"

+        <!-- Row 0 -->

+        <ListBox Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2"

                  Margin="10,10,10,10" x:Name="subtitleListBox"

                  dd:DragDrop.DropHandler="{Binding}"

                  dd:DragDrop.IsDragSource="True"

diff --git a/win/CS/HandBrakeWPF/Views/SummaryView.xaml b/win/CS/HandBrakeWPF/Views/SummaryView.xaml
index 494f37971..ac6baffda 100644
--- a/win/CS/HandBrakeWPF/Views/SummaryView.xaml
+++ b/win/CS/HandBrakeWPF/Views/SummaryView.xaml
@@ -110,7 +110,8 @@
             <Grid Grid.Row="0" Grid.ColumnSpan="2" HorizontalAlignment="Left" VerticalAlignment="Top" Background="Transparent">
 
                 <Grid.RowDefinitions>
-                    <RowDefinition Height="*" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*"/>
                     <RowDefinition Height="Auto"/>
                     <RowDefinition Height="32"/>
                 </Grid.RowDefinitions>
@@ -120,14 +121,16 @@
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
 
-                <Image Source="{Binding PreviewImage}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Margin="0,5,10,0" x:Name="previewImage" Panel.ZIndex="0" Grid.ColumnSpan="2"
+                <TextBlock Text="{x:Static Properties:Resources.SummaryView_SourcePreview}" FontSize="12" FontWeight="Bold" Grid.Row="0" Grid.ColumnSpan="2" VerticalAlignment="Center" />
+
+                <Image Source="{Binding PreviewImage}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Margin="0,5,10,0" x:Name="previewImage" Grid.Row="1" Panel.ZIndex="0" Grid.ColumnSpan="2"
                        MaxWidth="{Binding MaxWidth}" MaxHeight="{Binding MaxHeight}" MouseWheel="PreviewImage_OnMouseWheel" />
 
-                <Border Grid.Row="1" Grid.ColumnSpan="2" VerticalAlignment="Bottom" HorizontalAlignment="Center" Background="Transparent" Margin="0,5,0,5">
+                <Border Grid.Row="2" Grid.ColumnSpan="2" VerticalAlignment="Bottom" HorizontalAlignment="Center" Background="Transparent" Margin="0,5,0,5">
                     <TextBlock Text="{Binding PreviewInfo}" TextAlignment="Center" Visibility="{Binding IsPreviewInfoVisible, Converter={StaticResource boolToVisConverter}}" />
                 </Border>
 
-                <Grid Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="2" HorizontalAlignment="Center" Width="84" Visibility="{Binding IsPreviewInfoVisible, Converter={StaticResource boolToVisConverter}}">
+                <Grid Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="3" HorizontalAlignment="Center" Width="84" Visibility="{Binding IsPreviewInfoVisible, Converter={StaticResource boolToVisConverter}}">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="42" />
                         <ColumnDefinition Width="42" />