WinGui: Attempt to make the new source selection window less jarring in terms of...

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

diff --git a/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml b/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml
index b44785324f360e6cb4ac19b806788a63417c93f7..437cb1c73135565e4c07e5c95a25f2abe51ab913 100644 (file)
--- a/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml
+++ b/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml
@@ -16,12 +16,12 @@
         </Grid.RowDefinitions>\r
         \r
         \r
-        <StackPanel Orientation="Horizontal" Grid.Row="0" Margin="15,30,0,0">\r
+        <StackPanel Orientation="Horizontal" Grid.Row="0" Margin="5,10,0,0">\r
             <TextBlock Text="Source Selection" FontSize="14" FontWeight="Bold" /> \r
         </StackPanel>\r
 \r
         <!-- Title Specific Scan -->\r
-        <StackPanel Grid.Row="1" Orientation="Vertical" HorizontalAlignment="Left"  Margin="15,10,0,0">\r
+        <StackPanel Grid.Row="1" Orientation="Vertical" HorizontalAlignment="Left"  Margin="5,10,0,0">\r
             <StackPanel Orientation="Horizontal">\r
                 <TextBlock Text="Optionally choose a specific title: " />\r
 \r
@@ -29,19 +29,19 @@
                                 Minimum="0" Maximum="1000" Number="{Binding SelectedTitle, Mode=TwoWay}" />\r
             </StackPanel>\r
 \r
-            <TextBlock Text="Then choose your source: " Margin="0,20,0,0" />\r
+            <TextBlock Text="Then choose your source: " Margin="0,10,0,0" />\r
         </StackPanel>\r
 \r
         <!-- Source Type -->\r
-        <StackPanel Grid.Row="2" Orientation="Vertical" HorizontalAlignment="Center" Margin="15,10,0,0">\r
+        <StackPanel Grid.Row="2" Orientation="Vertical" HorizontalAlignment="Left" Margin="5,10,0,0">\r
 \r
             <Button Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" cal:Message.Attach="[Event Click] = [Action FolderScan]"\r
-                    Margin="0,0,0,10" Padding="8" HorizontalAlignment="Left">\r
+                    Margin="0,0,0,7" Padding="8" HorizontalAlignment="Left">\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 batch scan a number of files" 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
                     </StackPanel>                   \r
                 </StackPanel>\r
             </Button>\r
@@ -86,7 +86,8 @@
         <StackPanel Grid.Row="4" />\r
         \r
         <StackPanel Grid.Row="5" VerticalAlignment="Bottom" Orientation="Vertical">\r
-            <TextBlock Text="This is an experimental replacement for the source selection menu. Feedback welcome on the forum." Margin="10,0,10,0" TextWrapping="Wrap" />\r
+            <TextBlock Text="This is an experimental replacement for the source selection menu. Feedback welcome on the forum." Margin="10,0,10,0"\r
+                       MaxWidth="300" TextWrapping="Wrap" />\r
         </StackPanel>\r
 \r
     </Grid>\r

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 9c5a21f00f90fb97eff06a6e6119f03a65012642..4ea95443719b3046e886716b1140b5726e3d9c71 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -685,9 +685,9 @@
         </Grid>\r
         \r
         <!-- Source Selection-->       \r
-        <Controls:SourceSelection Grid.Row="1" Width="400" VerticalAlignment="Stretch" BorderThickness="1" BorderBrush="DarkGray"\r
+        <Controls:SourceSelection Grid.Row="1" MinWidth="300" HorizontalAlignment="Left" VerticalAlignment="Stretch" BorderThickness="1" BorderBrush="DarkGray"\r
                                   Visibility="{Binding ShowSourceSelection, Converter={StaticResource boolToVisConverter}}" \r
-                                  Margin="0,10,0,10" />\r
+                                  />\r
         \r
         <!--  StatusPanel  -->\r
         <Controls:StatusPanel x:Name="loadingPanel"\r