WinGui: Some more minor tweaks to the new source menu and tidyup on the options screen.

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

1 files changed, 7 insertions, 11 deletions

diff --git a/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml b/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml
index 437cb1c73..7385f9102 100644
--- a/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml
+++ b/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml
@@ -16,27 +16,29 @@
         </Grid.RowDefinitions>

         

         

-        <StackPanel Orientation="Horizontal" Grid.Row="0" Margin="5,10,0,0">

+        <StackPanel Orientation="Horizontal" Grid.Row="0" Margin="5,8,0,0">

             <TextBlock Text="Source Selection" FontSize="14" FontWeight="Bold" /> 

         </StackPanel>

 

         <!-- Title Specific Scan -->

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

+        <StackPanel Grid.Row="1" Orientation="Vertical" HorizontalAlignment="Left"  Margin="5,5,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 SelectedTitle, Mode=TwoWay}" />

+                                Minimum="0" Maximum="1000" Number="{Binding TitleSpecificScan, Mode=TwoWay}" />

             </StackPanel>

 

             <TextBlock Text="Then choose your source: " Margin="0,10,0,0" />

         </StackPanel>

 

         <!-- Source Type -->

-        <StackPanel Grid.Row="2" Orientation="Vertical" HorizontalAlignment="Left" Margin="5,10,0,0">

+        <StackPanel Grid.Row="2" Orientation="Vertical" HorizontalAlignment="Left" Margin="5,5,0,0">

 

+            <!-- Ctrl + R -->

             <Button 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">

@@ -46,6 +48,7 @@
                 </StackPanel>

             </Button>

 

+            <!--Ctrl + F-->

             <Button 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">

@@ -82,13 +85,6 @@
         <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,10,10,10">

             <Button cal:Message.Attach="[Event Click] = [Action CloseSourceSelection]" Content="Cancel" Padding="8,2" />

         </StackPanel>

-        

-        <StackPanel Grid.Row="4" />

-        

-        <StackPanel Grid.Row="5" VerticalAlignment="Bottom" Orientation="Vertical">

-            <TextBlock Text="This is an experimental replacement for the source selection menu. Feedback welcome on the forum." Margin="10,0,10,0"

-                       MaxWidth="300" TextWrapping="Wrap" />

-        </StackPanel>

 

     </Grid>

 </UserControl>