WinGui: Improve the design of the Source Selection window. The pane will now show...

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6570 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml b/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml
index dde18c292b97c86a19369f37400a26e61f73c7dd..56b6c93e713b0508edc022af8a489c9f2102d36e 100644 (file)
--- a/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml
+++ b/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml
@@ -7,8 +7,6 @@
 \r
     <Grid VerticalAlignment="Top" HorizontalAlignment="Center">\r
         <Grid.RowDefinitions>\r
-            <RowDefinition Height="Auto" />\r
-            <RowDefinition Height="Auto" />\r
             <RowDefinition Height="Auto" />\r
             <RowDefinition Height="Auto" />\r
             <RowDefinition Height="*" />\r
@@ -29,38 +27,44 @@
                                 Minimum="0" Maximum="1000" Number="{Binding TitleSpecificScan, Mode=TwoWay}" />\r
             </StackPanel>\r
 \r
-            <TextBlock Text="Then choose your source: " Margin="0,10,0,0" />\r
+            <TextBlock Text="Then choose the video(s) you'd like to encode: " Margin="0,10,0,0" />\r
         </StackPanel>\r
 \r
         <!-- Source Type -->\r
-        <StackPanel Grid.Row="2" Orientation="Vertical" HorizontalAlignment="Left" Margin="5,5,0,0">\r
+        <Grid Grid.Row="2" HorizontalAlignment="Left" Margin="5,5,0,0">\r
+            \r
+            <Grid.RowDefinitions>\r
+                <RowDefinition Height="Auto" />\r
+                <RowDefinition Height="Auto" />\r
+                <RowDefinition Height="*" />\r
+            </Grid.RowDefinitions>\r
 \r
             <!-- Ctrl + R -->\r
-            <Button  AutomationProperties.Name="Choose Folder to Scan" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" cal:Message.Attach="[Event Click] = [Action FolderScan]"\r
+            <Button Grid.Row="0"  AutomationProperties.Name="Choose Folder to Scan" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" cal:Message.Attach="[Event Click] = [Action FolderScan]"\r
                     Margin="0,0,0,7" Padding="8" HorizontalAlignment="Left">\r
                \r
                 <StackPanel Orientation="Horizontal" MinWidth="100">\r
                     <Image Source="../Views/Images/folder32.png" Width="32" />\r
                     <StackPanel Orientation="Vertical">\r
                         <TextBlock Text="Folder" VerticalAlignment="Center" Margin="5,0,0,0" />\r
-                        <TextBlock Text="Open a VIDEO_TS folder or a batch of files" VerticalAlignment="Center" Margin="5,0,0,0" />\r
+                        <TextBlock Text="Open a folder with one or more files." VerticalAlignment="Center" Margin="5,0,0,0" />\r
                     </StackPanel>                   \r
                 </StackPanel>\r
             </Button>\r
 \r
             <!--Ctrl + F-->\r
-            <Button AutomationProperties.Name="Choose File to Scan" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" cal:Message.Attach="[Event Click] = [Action FileScan]"\r
+            <Button Grid.Row="1"  AutomationProperties.Name="Choose File to Scan" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" cal:Message.Attach="[Event Click] = [Action FileScan]"\r
                     Margin="0,0,0,7" Padding="8" HorizontalAlignment="Left">\r
                 <StackPanel Orientation="Horizontal" MinWidth="100">\r
                     <Image Source="../Views/Images/File32.png" Width="32" />\r
                     <StackPanel Orientation="Vertical">\r
                         <TextBlock Text="File" VerticalAlignment="Center" Margin="5,0,0,0" />\r
-                        <TextBlock Text="Open a single file." VerticalAlignment="Center" Margin="5,0,0,0" />\r
+                        <TextBlock Text="Open a single video file." VerticalAlignment="Center" Margin="5,0,0,0" />\r
                     </StackPanel>\r
                 </StackPanel>\r
             </Button>\r
-            \r
-            <ListBox ItemsSource="{Binding Drives}" Background="Transparent"  BorderThickness="0">\r
+\r
+            <ListBox Grid.Row="2" ItemsSource="{Binding Drives}" Background="Transparent"  BorderThickness="0">\r
                 <ListBox.ItemTemplate>\r
                     <DataTemplate>\r
                         <Button Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" \r
@@ -79,7 +83,7 @@
                 </ListBox.ItemTemplate>\r
                 \r
             </ListBox>\r
-        </StackPanel>\r
+        </Grid>\r
 \r
         <!-- Cancel Window -->\r
         <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,10,10,10">\r