From fe4ceda48e5359d46a168bd19d283328d78ce7c9 Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Sat, 18 Apr 2015 14:45:33 +0000
Subject: [PATCH] WinGui: Some further UI design tweaks.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7095 b64f7644-9d1e-0410-96f1-a4d463321fa5
---
 .../Controls/SourceSelection.xaml             | 153 ++++++++++--------
 win/CS/HandBrakeWPF/Controls/StatusPanel.xaml |   1 -
 win/CS/HandBrakeWPF/Views/MainView.xaml       |  16 +-
 3 files changed, 91 insertions(+), 79 deletions(-)

diff --git a/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml b/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml
index 44d600c4e..4c0307575 100644
--- a/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml
+++ b/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml
@@ -3,92 +3,109 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:cal="http://www.caliburnproject.org"
         xmlns:controls="clr-namespace:HandBrakeWPF.Controls"
-        Background="{Binding Path=Background, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}">
-
-    <Grid VerticalAlignment="Top" HorizontalAlignment="Center">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-        
-        
-        <StackPanel Orientation="Horizontal" Grid.Row="0" Margin="5,8,0,0">
-            <TextBlock Text="Source Selection" FontSize="26" FontFamily="Segoe UI Light" /> 
-        </StackPanel>
-
-        <!-- Title Specific Scan -->
-        <StackPanel Grid.Row="1" Orientation="Vertical" HorizontalAlignment="Left"  Margin="5,15,0,0">
-            <StackPanel Orientation="Horizontal">
-                <TextBlock Text="Optionally choose a specific title: " />
-
-                <controls:NumberBox Width="60" Height="24" Margin="10,0,0,0"
-                                Minimum="0" Maximum="1000" Number="{Binding TitleSpecificScan, Mode=TwoWay}" />
-            </StackPanel>
+        >
 
-            <TextBlock Text="Then choose the video(s) you'd like to encode: " Margin="0,10,0,0" />
-        </StackPanel>
+    <Grid VerticalAlignment="Stretch">
+        
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
 
-        <!-- Source Type -->
-        <Grid Grid.Row="2" HorizontalAlignment="Left" Margin="5,5,0,0">
-            
+        <Grid VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Grid.Column="0" Width="300" Background="{Binding Path=Background, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}">
             <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
+            
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="30" />
+            </Grid.ColumnDefinitions>
 
-            <!-- Ctrl + R -->
-            <Button Grid.Row="0"  AutomationProperties.Name="Choose Folder to Scan" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" cal:Message.Attach="[Event Click] = [Action FolderScan]"
-                    Margin="0,0,0,7" Padding="8" HorizontalAlignment="Left">
-               
-                <StackPanel Orientation="Horizontal" MinWidth="100">
-                    <Image Source="../Views/Images/folder32.png" Width="32" />
-                    <StackPanel Orientation="Vertical">
-                        <TextBlock Text="Folder (Batch Scan)" VerticalAlignment="Center" Margin="5,0,0,0" />
-                        <TextBlock Text="Open a folder with one or more files." VerticalAlignment="Center" Margin="5,0,0,0" />
-                    </StackPanel>                   
+
+            <StackPanel Orientation="Horizontal" Grid.Row="0" Margin="20,8,0,0">
+                <TextBlock Text="Source Selection" FontSize="26" FontFamily="Segoe UI Light" />
+            </StackPanel>
+
+            <!-- Title Specific Scan -->
+            <StackPanel Grid.Row="1" Orientation="Vertical" HorizontalAlignment="Left"  Margin="20,15,0,0">
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Text="Optionally choose a specific title: " />
+
+                    <controls:NumberBox Width="60" Height="24" Margin="10,0,0,0"
+                                Minimum="0" Maximum="5000" Number="{Binding TitleSpecificScan, Mode=TwoWay}" />
                 </StackPanel>
-            </Button>
 
-            <!--Ctrl + F-->
-            <Button Grid.Row="1"  AutomationProperties.Name="Choose File to Scan" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" cal:Message.Attach="[Event Click] = [Action FileScan]"
+                <TextBlock Text="Then choose the video(s) you'd like to encode: " Margin="0,10,0,0" />
+            </StackPanel>
+
+            <!-- Source Type -->
+            <Grid Grid.Row="2" HorizontalAlignment="Left" Margin="20,5,0,0">
+
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+
+                <!-- Ctrl + R -->
+                <Button Grid.Row="0"  AutomationProperties.Name="Choose Folder to Scan" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" cal:Message.Attach="[Event Click] = [Action FolderScan]"
                     Margin="0,0,0,7" Padding="8" HorizontalAlignment="Left">
-                <StackPanel Orientation="Horizontal" MinWidth="100">
-                    <Image Source="../Views/Images/File32.png" Width="32" />
-                    <StackPanel Orientation="Vertical">
-                        <TextBlock Text="File" VerticalAlignment="Center" Margin="5,0,0,0" />
-                        <TextBlock Text="Open a single video file." VerticalAlignment="Center" Margin="5,0,0,0" />
+
+                    <StackPanel Orientation="Horizontal" MinWidth="100">
+                        <Image Source="../Views/Images/folder32.png" Width="32" />
+                        <StackPanel Orientation="Vertical">
+                            <TextBlock Text="Folder (Batch Scan)" VerticalAlignment="Center" Margin="5,0,0,0" />
+                            <TextBlock Text="Open a folder with one or more files." VerticalAlignment="Center" Margin="5,0,0,0" />
+                        </StackPanel>
                     </StackPanel>
-                </StackPanel>
-            </Button>
+                </Button>
 
-            <ListBox Grid.Row="2" ItemsSource="{Binding Drives}" Background="Transparent"  BorderThickness="0">
-                <ListBox.ItemTemplate>
-                    <DataTemplate>
-                        <Button Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" 
+                <!--Ctrl + F-->
+                <Button Grid.Row="1"  AutomationProperties.Name="Choose File to Scan" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" cal:Message.Attach="[Event Click] = [Action FileScan]"
+                    Margin="0,0,0,7" Padding="8" HorizontalAlignment="Left">
+                    <StackPanel Orientation="Horizontal" MinWidth="100">
+                        <Image Source="../Views/Images/File32.png" Width="32" />
+                        <StackPanel Orientation="Vertical">
+                            <TextBlock Text="File" VerticalAlignment="Center" Margin="5,0,0,0" />
+                            <TextBlock Text="Open a single video file." VerticalAlignment="Center" Margin="5,0,0,0" />
+                        </StackPanel>
+                    </StackPanel>
+                </Button>
+
+                <ListBox Grid.Row="2" ItemsSource="{Binding Drives}" Background="Transparent"  BorderThickness="0">
+                    <ListBox.ItemTemplate>
+                        <DataTemplate>
+                            <Button Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" 
                                 cal:Message.Attach="[Event Click] = [Action ProcessDrive($this.Tag)]"
                                 Margin="0,0,0,10" Padding="8" HorizontalAlignment="Left" 
                                 Tag="{Binding}" AutomationProperties.Name="Choose Disc to Scan">
-                            <StackPanel Orientation="Horizontal" MinWidth="100">
-                                <Image Source="../Views/Images/Disc.png" Width="32" />
-                                <StackPanel Orientation="Vertical">
-                                    <TextBlock Text="{Binding Text}" VerticalAlignment="Center" Margin="5,0,0,0" />
-                                    <TextBlock Text="Open this DVD or Bluray Drive" VerticalAlignment="Center" Margin="5,0,0,0" />
+                                <StackPanel Orientation="Horizontal" MinWidth="100">
+                                    <Image Source="../Views/Images/Disc.png" Width="32" />
+                                    <StackPanel Orientation="Vertical">
+                                        <TextBlock Text="{Binding Text}" VerticalAlignment="Center" Margin="5,0,0,0" />
+                                        <TextBlock Text="Open this DVD or Bluray Drive" VerticalAlignment="Center" Margin="5,0,0,0" />
+                                    </StackPanel>
                                 </StackPanel>
-                            </StackPanel>
-                        </Button>
-                    </DataTemplate>
-                </ListBox.ItemTemplate>
-                
-            </ListBox>
-        </Grid>
+                            </Button>
+                        </DataTemplate>
+                    </ListBox.ItemTemplate>
 
-        <!-- Cancel Window -->
-        <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,10,2,10">
-            <Button cal:Message.Attach="[Event Click] = [Action CloseSourceSelection]" Content="Cancel" Padding="8,2" />
-        </StackPanel>
+                </ListBox>
+            </Grid>
+
+            <!-- Cancel Window -->
+            <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,10,2,10">
+                <Button cal:Message.Attach="[Event Click] = [Action CloseSourceSelection]" Content="Cancel" Padding="8,2" />
+            </StackPanel>
+
+        </Grid>
+            
 
+        <StackPanel Grid.Column="1" Background="Black" Opacity="0.45" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"/>
     </Grid>
 </UserControl>
diff --git a/win/CS/HandBrakeWPF/Controls/StatusPanel.xaml b/win/CS/HandBrakeWPF/Controls/StatusPanel.xaml
index 4c4fbe20d..62d09fa8e 100644
--- a/win/CS/HandBrakeWPF/Controls/StatusPanel.xaml
+++ b/win/CS/HandBrakeWPF/Controls/StatusPanel.xaml
@@ -2,7 +2,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:ctr="clr-namespace:HandBrakeWPF.Controls"
              x:Class="HandBrakeWPF.Controls.StatusPanel"
-             FontFamily="S"
              >
 
     <UserControl.Resources>
diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 8e365891a..ba311ae59 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -640,16 +640,12 @@
         </Grid>
 
         <!-- Source Selection-->
-        <Controls:SourceSelection Grid.Row="1" MinWidth="300" HorizontalAlignment="Left" VerticalAlignment="Stretch" BorderThickness="1" BorderBrush="DarkGray"
-                                  Visibility="{Binding ShowSourceSelection, Converter={StaticResource boolToVisConverter}, TargetNullValue=Collapsed, FallbackValue=Collapsed}" Panel.ZIndex="1"
-                                  />
-
-
-        <!--<DockPanel Background="Black" Opacity="0.40" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Panel.ZIndex="0"
-                   Grid.Row="1"
-                   Visibility="{Binding ShowSourceSelection, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />-->
-
-        <!--  StatusPanel   Height="70" -->
+        <Controls:SourceSelection x:Name="sourceSelection"
+                                  Grid.Row="0" Grid.RowSpan="3"
+                                  Visibility="{Binding ShowSourceSelection, Converter={StaticResource boolToVisConverter}, ConverterParameter=false, TargetNullValue=Collapsed, FallbackValue=Collapsed}"
+                                  VerticalAlignment="Stretch" HorizontalAlignment="Stretch"
+                                  Panel.ZIndex="10" />
+        
         <Controls:StatusPanel x:Name="loadingPanel"
                               Grid.Row="0"
                               Grid.RowSpan="3"
-- 
2.40.0