WinGui:

- When switching between the video tab and advanced panel, set the advanced tab's advanced query string from the x264 preset.
- Add a copy full query context menu to the "extra options" text box.
- Auto set the Picture settings mode on the Add Preset window.


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

2 files changed, 14 insertions, 5 deletions

diff --git a/win/CS/HandBrakeWPF/Views/AddPresetView.xaml b/win/CS/HandBrakeWPF/Views/AddPresetView.xaml
index b49b439a6..0c398eaaf 100644
--- a/win/CS/HandBrakeWPF/Views/AddPresetView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AddPresetView.xaml
@@ -5,7 +5,7 @@
         xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"

         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

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

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

         Title="{Binding Title}"

         Width="350"

         ResizeMode="NoResize"

@@ -106,11 +106,13 @@
                         Orientation="Horizontal"

                         Visibility="{Binding ShowCustomInputs,

                                              Converter={StaticResource boolToVisConverter}}">

-                <TextBox Width="50" Text="{Binding CustomWidth}" />

+                <controls:NumberBox Width="60" Number="{Binding CustomWidth, Mode=TwoWay}" HorizontalAlignment="Left" Margin="0,0,0,5" 

+                                    AllowEmpty="True" />

                 <TextBlock Margin="10,0,10,0"

                            FontWeight="Bold"

                            Text="X" />

-                <TextBox Width="50" Text="{Binding CustomHeight}" />

+                <controls:NumberBox Width="60" Number="{Binding CustomHeight, Mode=TwoWay}" HorizontalAlignment="Left" Margin="0,0,0,5" 

+                                    AllowEmpty="True" />

             </StackPanel>

 

             <CheckBox Grid.Row="4"

diff --git a/win/CS/HandBrakeWPF/Views/VideoView.xaml b/win/CS/HandBrakeWPF/Views/VideoView.xaml
index 7c617c2c1..c4bd565c7 100644
--- a/win/CS/HandBrakeWPF/Views/VideoView.xaml
+++ b/win/CS/HandBrakeWPF/Views/VideoView.xaml
@@ -5,7 +5,8 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

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

              xmlns:Video="clr-namespace:HandBrakeWPF.Converters.Video"

-             xmlns:Properties="clr-namespace:HandBrakeWPF.Properties" mc:Ignorable="d" >

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

+             xmlns:Micro="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro" mc:Ignorable="d" >

 

     <UserControl.Resources>

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

@@ -196,7 +197,13 @@
                     <TextBlock Text="Extra Options:" Grid.Row="4" Grid.Column="0" Margin="0,10,0,0" VerticalAlignment="Center" HorizontalAlignment="Left" />

                     <TextBox Text="{Binding ExtraArguments, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"

                          Height="30" MaxLines="2" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="3" Margin="5,10,0,0" VerticalAlignment="Center"

-                         ToolTip="{Binding FullOptionsTooltip}" Style="{StaticResource LongToolTipHolder}" />

+                         ToolTip="{Binding FullOptionsTooltip}" Style="{StaticResource LongToolTipHolder}">

+                        <TextBox.ContextMenu>

+                            <ContextMenu>

+                                <MenuItem Header="Copy Full Query" Micro:Message.Attach="[Event Click] = [Action CopyQuery]"  />

+                            </ContextMenu>

+                        </TextBox.ContextMenu>

+                    </TextBox>

 

 

                 </Grid>