]> granicus.if.org Git - handbrake/commitdiff
WinGui: Changes to the Main Window and Advanced Tab to make allow it to better suppor...
authorsr55 <sr55.hb@outlook.com>
Thu, 7 Jun 2012 23:58:09 +0000 (23:58 +0000)
committersr55 <sr55.hb@outlook.com>
Thu, 7 Jun 2012 23:58:09 +0000 (23:58 +0000)
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4720 b64f7644-9d1e-0410-96f1-a4d463321fa5

win/CS/HandBrakeWPF/Views/AdvancedView.xaml
win/CS/HandBrakeWPF/Views/MainView.xaml

index 92923f6c886ed1a3987d1ca70757d1abc780d440..0e47ddf101d5f1571329757bd98bc0a3d554ce61 100644 (file)
@@ -1,10 +1,14 @@
 <UserControl x:Class="HandBrakeWPF.Views.AdvancedView"\r
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"\r
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"\r
+             xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"\r
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"\r
+             xmlns:Helpers="clr-namespace:HandBrakeWPF.Helpers"\r
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"\r
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"\r
-             xmlns:Properties="clr-namespace:HandBrakeWPF.Properties" xmlns:Helpers="clr-namespace:HandBrakeWPF.Helpers"\r
-             mc:Ignorable="d" x:Name="advancedView">\r
+             xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"\r
+             x:Name="advancedView"\r
+             mc:Ignorable="d"\r
+             >\r
     <UserControl.Resources>\r
         <Converters:AdvancedVisibilityConverter x:Key="VisibilityConverter" />\r
         <Converters:BooleanToVisibilityConverter x:Key="BooleanVisibilityConverter" />\r
             <Setter Property="TextWrapping" Value="Wrap" />\r
         </Style>\r
     </UserControl.Resources>\r
+    <Grid>\r
+        <Grid.RowDefinitions>\r
+            <RowDefinition Height="Auto" />\r
+            <RowDefinition Height="Auto" />\r
+            <RowDefinition Height="*" />\r
+        </Grid.RowDefinitions>\r
+\r
+        <!-- X264 Query  -->\r
+        <TextBox Grid.Row="2"\r
+                 HorizontalAlignment="Stretch"\r
+                 VerticalAlignment="Stretch"\r
+                 Text="{Binding AdvancedOptionsString,\r
+                                UpdateSourceTrigger=PropertyChanged}"\r
+                 TextWrapping="Wrap"\r
+                 Visibility="{Binding DisplayX264Options, Converter={StaticResource BooleanVisibilityConverter}, ConverterParameter=false}"\r
+                 />\r
+\r
+        <StackPanel Orientation="Vertical">\r
+            \r
+            <!--  Other Encoders  -->\r
+            <Grid Visibility="{Binding DisplayX264Options, Converter={StaticResource BooleanVisibilityConverter}, ConverterParameter=true}">\r
+                <Grid.RowDefinitions>\r
+                    <RowDefinition Height="Auto" />\r
+                    <RowDefinition Height="102" />\r
+                </Grid.RowDefinitions>\r
+                <TextBlock Margin="10,5,10,0"\r
+                           VerticalAlignment="Center"\r
+                           FontWeight="Bold"\r
+                           Text="Advanced Query"\r
+                           />\r
+                <TextBox Grid.Row="1"\r
+                         Margin="10,0,10,5"\r
+                         HorizontalAlignment="Stretch"\r
+                         VerticalAlignment="Stretch"\r
+                         Text="{Binding AdvancedOptionsString}"\r
+                         TextWrapping="Wrap"\r
+                         />\r
+            </Grid>\r
+            \r
+            <!--  X264  -->\r
+            <Grid Visibility="{Binding DisplayX264Options, Converter={StaticResource BooleanVisibilityConverter}, ConverterParameter=false}">\r
+                <Grid.RowDefinitions>\r
+                    <RowDefinition Height="Auto" />\r
+                    <RowDefinition Height="*" />\r
+                </Grid.RowDefinitions>\r
+                <Grid.ColumnDefinitions>\r
+                    <ColumnDefinition Width="Auto" />\r
+                    <ColumnDefinition Width="Auto" />\r
+                    <ColumnDefinition Width="Auto" />\r
+                </Grid.ColumnDefinitions>\r
+\r
+                <!--  Left Column  -->\r
+                <StackPanel Grid.Row="0"\r
+                            Grid.Column="0"\r
+                            Orientation="Vertical"\r
+                            >\r
+                    <!--  Encoding  -->\r
+                    <StackPanel Orientation="Vertical">\r
+                        <TextBlock Grid.Row="0"\r
+                                   Margin="10,5,0,0"\r
+                                   FontWeight="Bold"\r
+                                   Text="Encoding: "\r
+                                   />\r
+                        <Grid Margin="0,5,0,0"\r
+                              HorizontalAlignment="Left"\r
+                              VerticalAlignment="Top"\r
+                              >\r
+                            <Grid.RowDefinitions>\r
+                                <RowDefinition Height="Auto" />\r
+                                <RowDefinition Height="Auto" />\r
+                                <RowDefinition Height="Auto" />\r
+                                <RowDefinition Height="Auto" />\r
+                                <RowDefinition Height="Auto" />\r
+                                <RowDefinition Height="Auto" />\r
+                                <RowDefinition Height="Auto" />\r
+                                <RowDefinition Height="Auto" />\r
+                            </Grid.RowDefinitions>\r
+                            <Grid.ColumnDefinitions>\r
+                                <ColumnDefinition Width="Auto" />\r
+                                <ColumnDefinition Width="*" MinWidth="100" />\r
+                            </Grid.ColumnDefinitions>\r
+\r
+                            <Label Grid.Row="0"\r
+                                   Grid.Column="0"\r
+                                   Content="Reference Frames:"\r
+                                   Style="{StaticResource AdvancedLabel}"\r
+                                   />\r
+                            <ComboBox Grid.Row="0"\r
+                                      Grid.Column="1"\r
+                                      Height="22"\r
+                                      DisplayMemberPath="Label"\r
+                                      ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.ReferenceFrames}"\r
+                                      SelectedItem="{Binding ReferenceFrames}"\r
+                                      Style="{StaticResource LongToolTipHolder}"\r
+                                      >\r
+                                <ComboBox.ToolTip>\r
+                                    <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_ReferenceFramesToolTip}" />\r
+                                </ComboBox.ToolTip>\r
+                            </ComboBox>\r
+\r
+                            <Label Grid.Row="1"\r
+                                   Grid.Column="0"\r
+                                   Content="Maximum B-Frames:"\r
+                                   Style="{StaticResource AdvancedLabel}"\r
+                                   />\r
+                            <ComboBox Grid.Row="1"\r
+                                      Grid.Column="1"\r
+                                      Height="22"\r
+                                      DisplayMemberPath="Label"\r
+                                      ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.BFrames}"\r
+                                      SelectedItem="{Binding BFrames}"\r
+                                      Style="{StaticResource LongToolTipHolder}"\r
+                                      >\r
+                                <ComboBox.ToolTip>\r
+                                    <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_BFramesToolTip}" />\r
+                                </ComboBox.ToolTip>\r
+                            </ComboBox>\r
+\r
+\r
+                            <Label Grid.Row="4"\r
+                                   Grid.Column="0"\r
+                                   Height="28"\r
+                                   Content="CABAC:"\r
+                                   Style="{StaticResource AdvancedLabel}"\r
+                                   />\r
+                            <CheckBox Grid.Row="4"\r
+                                      Grid.Column="1"\r
+                                      Height="16"\r
+                                      IsChecked="{Binding CabacEntropyCoding}"\r
+                                      Style="{StaticResource LongToolTipHolder}"\r
+                                      >\r
+                                <CheckBox.ToolTip>\r
+                                    <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_CabacToolTip}" />\r
+                                </CheckBox.ToolTip>\r
+                            </CheckBox>\r
+\r
+                            <Label Grid.Row="5"\r
+                                   Grid.Column="0"\r
+                                   Height="28"\r
+                                   Content="8x8 Transform:"\r
+                                   Style="{StaticResource AdvancedLabel}"\r
+                                   Visibility="{Binding EightByEightDctVisible,\r
+                                                        Converter={StaticResource VisibilityConverter}}"\r
+                                   />\r
+                            <CheckBox Grid.Row="5"\r
+                                      Grid.Column="1"\r
+                                      Height="16"\r
+                                      IsChecked="{Binding EightByEightDct}"\r
+                                      Style="{StaticResource LongToolTipHolder}"\r
+                                      Visibility="{Binding EightByEightDctVisible,\r
+                                                           Converter={StaticResource VisibilityConverter}}"\r
+                                      >\r
+                                <CheckBox.ToolTip>\r
+                                    <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_EightByEightDctToolTip}" />\r
+                                </CheckBox.ToolTip>\r
+                            </CheckBox>\r
+\r
+                            <Label Grid.Row="6"\r
+                                   Grid.Column="0"\r
+                                   Content="Weighted P-Frames:"\r
+                                   Style="{StaticResource AdvancedLabel}"\r
+                                   />\r
+                            <CheckBox Grid.Row="6"\r
+                                      Grid.Column="1"\r
+                                      VerticalAlignment="Center"\r
+                                      IsChecked="{Binding WeightedPFrames}"\r
+                                      Style="{StaticResource LongToolTipHolder}"\r
+                                      >\r
+                                <CheckBox.ToolTip>\r
+                                    <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_WeightPToolTip}" />\r
+                                </CheckBox.ToolTip>\r
+                            </CheckBox>\r
+\r
+                            <Label Grid.Row="7"\r
+                                   Grid.Column="0"\r
+                                   Content="Pyramidal B-Frames:"\r
+                                   Style="{StaticResource AdvancedLabel}"\r
+                                   Visibility="{Binding PyramidalBFramesVisible,\r
+                                                        Converter={StaticResource VisibilityConverter}}"\r
+                                   />\r
+                            <ComboBox Grid.Row="7"\r
+                                      Grid.Column="1"\r
+                                      Height="22"\r
+                                      DisplayMemberPath="Label"\r
+                                      ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.PyramidalBFrames}"\r
+                                      SelectedItem="{Binding PyramidalBFrames}"\r
+                                      Style="{StaticResource LongToolTipHolder}"\r
+                                      Visibility="{Binding PyramidalBFramesVisible,\r
+                                                           Converter={StaticResource VisibilityConverter}}"\r
+                                      >\r
+                                <ComboBox.ToolTip>\r
+                                    <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_PyramidalBFramesToolTip}" />\r
+                                </ComboBox.ToolTip>\r
+                            </ComboBox>\r
+                        </Grid>\r
+                    </StackPanel>\r
 \r
-    <StackPanel Orientation="Vertical">\r
-\r
-        <!-- Other Encoders -->\r
-        <StackPanel Margin="10" Height="100" VerticalAlignment="Top"\r
-                     Visibility="{Binding DisplayX264Options, Converter={StaticResource BooleanVisibilityConverter}, ConverterParameter=true}">\r
-            <TextBlock Text="Advanced Query" Margin="0,0,0,5" FontWeight="Bold" VerticalAlignment="Center" />\r
-            <TextBox Text="{Binding AdvancedOptionsString}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Height="150" TextWrapping="Wrap" />\r
-        </StackPanel>\r
+                    <!--  Psychvisual  -->\r
+                    <StackPanel Orientation="Vertical">\r
+                        <TextBlock Grid.Row="0"\r
+                                   Margin="10,5,0,0"\r
+                                   FontWeight="Bold"\r
+                                   Text="Psychvisual: "\r
+                                   />\r
+                        <StackPanel Orientation="Horizontal">\r
+                            <Label Width="110"\r
+                                   HorizontalAlignment="Left"\r
+                                   VerticalAlignment="Center"\r
+                                   HorizontalContentAlignment="Right"\r
+                                   Content="No DCT-Decimate:"\r
+                                   />\r
+                            <CheckBox HorizontalAlignment="Left"\r
+                                      VerticalAlignment="Center"\r
+                                      IsChecked="{Binding NoDctDecimate}"\r
+                                      Style="{StaticResource LongToolTipHolder}"\r
+                                      >\r
+                                <CheckBox.ToolTip>\r
+                                    <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_NoDctDecimateToolTip}" />\r
+                                </CheckBox.ToolTip>\r
+                            </CheckBox>\r
+\r
+                        </StackPanel>\r
+                    </StackPanel>\r
 \r
-        <!-- X264 -->\r
-        <Grid Visibility="{Binding DisplayX264Options, Converter={StaticResource BooleanVisibilityConverter}, ConverterParameter=false}">\r
-            <Grid.RowDefinitions>\r
-                <RowDefinition Height="Auto" />\r
-                <RowDefinition Height="*" />\r
-            </Grid.RowDefinitions>\r
-            <Grid.ColumnDefinitions>\r
-                <ColumnDefinition Width="Auto" />\r
-                <ColumnDefinition Width="Auto" />\r
-                <ColumnDefinition Width="Auto" />\r
-            </Grid.ColumnDefinitions>\r
+                </StackPanel>\r
 \r
-            <!--Left Column -->\r
-            <StackPanel Orientation="Vertical" Grid.Column="0" Grid.Row="0">\r
-                <!-- Encoding -->\r
-                <StackPanel Orientation="Vertical" >\r
-                    <TextBlock Text="Encoding: " FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" />\r
-                    <Grid HorizontalAlignment="Left" Margin="0,5,0,0" VerticalAlignment="Top">\r
+                <!--  Analysis (Center Column)  -->\r
+                <StackPanel Grid.Row="0"\r
+                            Grid.Column="1"\r
+                            Orientation="Vertical"\r
+                            >\r
+                    <TextBlock Grid.Row="0"\r
+                               Margin="10,5,0,0"\r
+                               FontWeight="Bold"\r
+                               Text="Analysis: "\r
+                               />\r
+                    <Grid HorizontalAlignment="Left" VerticalAlignment="Top">\r
                         <Grid.RowDefinitions>\r
                             <RowDefinition Height="Auto" />\r
                             <RowDefinition Height="Auto" />\r
                             <RowDefinition Height="Auto" />\r
                             <RowDefinition Height="Auto" />\r
                             <RowDefinition Height="Auto" />\r
-                            <RowDefinition Height="Auto" />\r
-                            <RowDefinition Height="Auto" />\r
-                            <RowDefinition Height="Auto" />\r
                         </Grid.RowDefinitions>\r
                         <Grid.ColumnDefinitions>\r
-                            <ColumnDefinition Width="110" />\r
-                            <ColumnDefinition Width="100" />\r
+                            <ColumnDefinition Width="Auto" />\r
+                            <ColumnDefinition Width="*" MinWidth="100" />\r
                         </Grid.ColumnDefinitions>\r
 \r
-                        <Label Content="Reference Frames:" Grid.Row="0" Grid.Column="0" Style="{StaticResource AdvancedLabel}" />\r
-                        <ComboBox Grid.Row="0" Grid.Column="1" Height="22"\r
-                              ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.ReferenceFrames}" DisplayMemberPath="Label"\r
-                              SelectedItem="{Binding ReferenceFrames}" Style="{StaticResource LongToolTipHolder}">\r
+                        <Label Grid.Row="0"\r
+                               Grid.Column="0"\r
+                               Content="Adaptive B-Frames:"\r
+                               Style="{StaticResource AdvancedLabel}"\r
+                               Visibility="{Binding BFramesOptionsVisible,\r
+                                                    Converter={StaticResource VisibilityConverter}}"\r
+                               />\r
+                        <ComboBox Grid.Row="0"\r
+                                  Grid.Column="1"\r
+                                  Width="120"\r
+                                  Height="22"\r
+                                  MaxWidth="120"\r
+                                  DisplayMemberPath="Label"\r
+                                  ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.AdaptiveBFrames}"\r
+                                  SelectedItem="{Binding AdaptiveBFrames}"\r
+                                  Style="{StaticResource LongToolTipHolder}"\r
+                                  Visibility="{Binding BFramesOptionsVisible,\r
+                                                       Converter={StaticResource VisibilityConverter}}"\r
+                                  >\r
                             <ComboBox.ToolTip>\r
-                                <TextBlock Text="{x:Static Properties:Resources.Advanced_ReferenceFramesToolTip}" Style="{StaticResource LongToolTip}" />\r
+                                <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_AdaptiveBFramesToolTip}" />\r
                             </ComboBox.ToolTip>\r
                         </ComboBox>\r
 \r
-                        <Label Content="Maximum B-Frames:" Grid.Row="1" Grid.Column="0" Style="{StaticResource AdvancedLabel}" />\r
-                        <ComboBox Grid.Row="1" Grid.Column="1" Height="22"\r
-                              ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.BFrames}" DisplayMemberPath="Label"\r
-                              SelectedItem="{Binding BFrames}" Style="{StaticResource LongToolTipHolder}">\r
+                        <Label Grid.Row="1"\r
+                               Grid.Column="0"\r
+                               Content="Adaptive Direct Mode:"\r
+                               Style="{StaticResource AdvancedLabel}"\r
+                               Visibility="{Binding BFramesOptionsVisible,\r
+                                                    Converter={StaticResource VisibilityConverter}}"\r
+                               />\r
+                        <ComboBox Grid.Row="1"\r
+                                  Grid.Column="1"\r
+                                  Width="120"\r
+                                  Height="22"\r
+                                  MaxWidth="120"\r
+                                  DisplayMemberPath="Label"\r
+                                  ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.DirectPrediction}"\r
+                                  SelectedItem="{Binding DirectPrediction}"\r
+                                  Style="{StaticResource LongToolTipHolder}"\r
+                                  Visibility="{Binding BFramesOptionsVisible,\r
+                                                       Converter={StaticResource VisibilityConverter}}"\r
+                                  >\r
                             <ComboBox.ToolTip>\r
-                                <TextBlock Text="{x:Static Properties:Resources.Advanced_BFramesToolTip}" Style="{StaticResource LongToolTip}" />\r
+                                <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_AdaptiveDirectModeToolTip}" />\r
                             </ComboBox.ToolTip>\r
                         </ComboBox>\r
 \r
+                        <Label Grid.Row="2"\r
+                               Grid.Column="0"\r
+                               Content="Motion Estimation Method:"\r
+                               Style="{StaticResource AdvancedLabel}"\r
+                               />\r
+                        <ComboBox Grid.Row="2"\r
+                                  Grid.Column="1"\r
+                                  Width="120"\r
+                                  Height="22"\r
+                                  MaxWidth="120"\r
+                                  DisplayMemberPath="Label"\r
+                                  ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.MotionEstimationMethod}"\r
+                                  SelectedItem="{Binding MotionEstimationMethod}"\r
+                                  Style="{StaticResource LongToolTipHolder}"\r
+                                  >\r
+                            <ComboBox.ToolTip>\r
+                                <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_MotionEstimationMethodToolTip}" />\r
+                            </ComboBox.ToolTip>\r
+                        </ComboBox>\r
 \r
-                        <Label Content="CABAC:" Height="28" Grid.Row="4" Grid.Column="0" Style="{StaticResource AdvancedLabel}" />\r
-                        <CheckBox Height="16" Grid.Row="4" Grid.Column="1" IsChecked="{Binding CabacEntropyCoding}" Style="{StaticResource LongToolTipHolder}">\r
-                            <CheckBox.ToolTip>\r
-                                <TextBlock Text="{x:Static Properties:Resources.Advanced_CabacToolTip}" Style="{StaticResource LongToolTip}" />\r
-                            </CheckBox.ToolTip>\r
-                        </CheckBox>\r
-\r
-                        <Label Content="8x8 Transform:" Height="28" Grid.Row="5" Grid.Column="0"\r
-                           Visibility="{Binding EightByEightDctVisible, Converter={StaticResource VisibilityConverter}}"\r
-                           Style="{StaticResource AdvancedLabel}" />\r
-                        <CheckBox Height="16" Grid.Row="5" Grid.Column="1" IsChecked="{Binding EightByEightDct}"\r
-                              Visibility="{Binding EightByEightDctVisible, Converter={StaticResource VisibilityConverter}}"\r
-                              Style="{StaticResource LongToolTipHolder}">\r
-                            <CheckBox.ToolTip>\r
-                                <TextBlock Text="{x:Static Properties:Resources.Advanced_EightByEightDctToolTip}" Style="{StaticResource LongToolTip}" />\r
-                            </CheckBox.ToolTip>\r
-                        </CheckBox>\r
-\r
-                        <Label Content="Weighted P-Frames:" Grid.Row="6" Grid.Column="0" Style="{StaticResource AdvancedLabel}" />\r
-                        <CheckBox Grid.Row="6" Grid.Column="1" VerticalAlignment="Center" IsChecked="{Binding WeightedPFrames}" Style="{StaticResource LongToolTipHolder}">\r
-                            <CheckBox.ToolTip>\r
-                                <TextBlock Text="{x:Static Properties:Resources.Advanced_WeightPToolTip}" Style="{StaticResource LongToolTip}" />\r
-                            </CheckBox.ToolTip>\r
-                        </CheckBox>\r
+                        <Label Grid.Row="3"\r
+                               Grid.Column="0"\r
+                               Content="Subpixel Motion Estimation:"\r
+                               Style="{StaticResource AdvancedLabel}"\r
+                               />\r
+                        <ComboBox Grid.Row="3"\r
+                                  Grid.Column="1"\r
+                                  Width="120"\r
+                                  Height="22"\r
+                                  MaxWidth="120"\r
+                                  DisplayMemberPath="Label"\r
+                                  ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.SubpixelMotionEstimation}"\r
+                                  SelectedItem="{Binding SubpixelMotionEstimation}"\r
+                                  Style="{StaticResource LongToolTipHolder}"\r
+                                  >\r
+                            <ComboBox.ToolTip>\r
+                                <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_SubpixelMotionEstimationToolTip}" />\r
+                            </ComboBox.ToolTip>\r
+                        </ComboBox>\r
 \r
-                        <Label Content="Pyramidal B-Frames:" Grid.Row="7" Grid.Column="0"\r
-                           Visibility="{Binding PyramidalBFramesVisible, Converter={StaticResource VisibilityConverter}}"\r
-                           Style="{StaticResource AdvancedLabel}" />\r
-                        <ComboBox Grid.Row="7" Grid.Column="1" Height="22" ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.PyramidalBFrames}" DisplayMemberPath="Label"\r
-                              SelectedItem="{Binding PyramidalBFrames}"\r
-                              Visibility="{Binding PyramidalBFramesVisible, Converter={StaticResource VisibilityConverter}}"\r
-                              Style="{StaticResource LongToolTipHolder}">\r
+                        <Label Grid.Row="4"\r
+                               Grid.Column="0"\r
+                               Content="Motion Estimation Range:"\r
+                               Style="{StaticResource AdvancedLabel}"\r
+                               Visibility="{Binding MotionEstimationRangeVisible,\r
+                                                    Converter={StaticResource VisibilityConverter}}"\r
+                               />\r
+                        <ComboBox Grid.Row="4"\r
+                                  Grid.Column="1"\r
+                                  Width="120"\r
+                                  Height="22"\r
+                                  MaxWidth="120"\r
+                                  DisplayMemberPath="Label"\r
+                                  ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.MotionEstimationRange}"\r
+                                  SelectedItem="{Binding MotionEstimationRange}"\r
+                                  Style="{StaticResource LongToolTipHolder}"\r
+                                  Visibility="{Binding MotionEstimationRangeVisible,\r
+                                                       Converter={StaticResource VisibilityConverter}}"\r
+                                  >\r
                             <ComboBox.ToolTip>\r
-                                <TextBlock Text="{x:Static Properties:Resources.Advanced_PyramidalBFramesToolTip}" Style="{StaticResource LongToolTip}" />\r
+                                <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_MotionEstimationRangeToolTip}" />\r
                             </ComboBox.ToolTip>\r
                         </ComboBox>\r
                     </Grid>\r
-                </StackPanel>\r
-\r
-                <!-- Psychvisual -->\r
-                <StackPanel Orientation="Vertical" >\r
-                    <TextBlock Text="Psychvisual: " FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" />\r
-                    <StackPanel Orientation="Horizontal">\r
-                        <Label Content="No DCT-Decimate:" Width="110" HorizontalAlignment="Left" HorizontalContentAlignment="Right"  VerticalAlignment="Center" />\r
-                        <CheckBox VerticalAlignment="Center" HorizontalAlignment="Left" IsChecked="{Binding NoDctDecimate}" \r
-                              Style="{StaticResource LongToolTipHolder}">\r
-                            <CheckBox.ToolTip>\r
-                                <TextBlock Text="{x:Static Properties:Resources.Advanced_NoDctDecimateToolTip}" Style="{StaticResource LongToolTip}" />\r
-                            </CheckBox.ToolTip>\r
-                        </CheckBox>\r
-\r
-                    </StackPanel>\r
-                </StackPanel>\r
-\r
-            </StackPanel>\r
-\r
-            <!-- Analysis (Center Column)-->\r
-            <StackPanel Orientation="Vertical" Grid.Column="1" Grid.Row="0" >\r
-                <TextBlock Text="Analysis: " FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" />\r
-                <Grid HorizontalAlignment="Left" VerticalAlignment="Top">\r
-                    <Grid.RowDefinitions>\r
-                        <RowDefinition Height="Auto" />\r
-                        <RowDefinition Height="Auto" />\r
-                        <RowDefinition Height="Auto" />\r
-                        <RowDefinition Height="Auto" />\r
-                        <RowDefinition Height="Auto" />\r
-                    </Grid.RowDefinitions>\r
-                    <Grid.ColumnDefinitions>\r
-                        <ColumnDefinition Width="Auto" />\r
-                        <ColumnDefinition />\r
-                    </Grid.ColumnDefinitions>\r
-\r
-                    <Label Content="Adaptive B-Frames:" Grid.Row="0" Grid.Column="0"\r
-                       Visibility="{Binding BFramesOptionsVisible, Converter={StaticResource VisibilityConverter}}"\r
-                       Style="{StaticResource AdvancedLabel}" />\r
-                    <ComboBox Grid.Row="0" Grid.Column="1" Height="22" ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.AdaptiveBFrames}" DisplayMemberPath="Label"\r
-                          SelectedItem="{Binding AdaptiveBFrames}" Visibility="{Binding BFramesOptionsVisible, Converter={StaticResource VisibilityConverter}}"\r
-                          Style="{StaticResource LongToolTipHolder}" MaxWidth="120" Width="120">\r
-                        <ComboBox.ToolTip>\r
-                            <TextBlock Text="{x:Static Properties:Resources.Advanced_AdaptiveBFramesToolTip}" Style="{StaticResource LongToolTip}" />\r
-                        </ComboBox.ToolTip>\r
-                    </ComboBox>\r
 \r
-                    <Label Content="Adaptive Direct Mode:" Grid.Row="1" Grid.Column="0"\r
-                       Visibility="{Binding BFramesOptionsVisible, Converter={StaticResource VisibilityConverter}}"\r
-                       Style="{StaticResource AdvancedLabel}" />\r
-                    <ComboBox Grid.Row="1" Grid.Column="1" Height="22" MaxWidth="120" Width="120"\r
-                          ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.DirectPrediction}" DisplayMemberPath="Label"\r
-                          SelectedItem="{Binding DirectPrediction}" \r
-                          Visibility="{Binding BFramesOptionsVisible, Converter={StaticResource VisibilityConverter}}"\r
-                          Style="{StaticResource LongToolTipHolder}">\r
-                        <ComboBox.ToolTip>\r
-                            <TextBlock Text="{x:Static Properties:Resources.Advanced_AdaptiveDirectModeToolTip}" Style="{StaticResource LongToolTip}" />\r
-                        </ComboBox.ToolTip>\r
-                    </ComboBox>\r
-\r
-                    <Label Content="Motion Estimation Method:" Grid.Row="2" Grid.Column="0" Style="{StaticResource AdvancedLabel}" />\r
-                    <ComboBox Grid.Row="2" Grid.Column="1" Height="22" MaxWidth="120" Width="120"\r
-                          ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.MotionEstimationMethod}" DisplayMemberPath="Label"\r
-                          SelectedItem="{Binding MotionEstimationMethod}" Style="{StaticResource LongToolTipHolder}">\r
-                        <ComboBox.ToolTip>\r
-                            <TextBlock Text="{x:Static Properties:Resources.Advanced_MotionEstimationMethodToolTip}" Style="{StaticResource LongToolTip}" />\r
-                        </ComboBox.ToolTip>\r
-                    </ComboBox>\r
-\r
-                    <Label Content="Subpixel Motion Estimation:" Grid.Row="3" Grid.Column="0" Style="{StaticResource AdvancedLabel}" />\r
-                    <ComboBox Grid.Row="3" Grid.Column="1" Height="22" MaxWidth="120" Width="120"\r
-                          ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.SubpixelMotionEstimation}" DisplayMemberPath="Label"\r
-                          SelectedItem="{Binding SubpixelMotionEstimation}" Style="{StaticResource LongToolTipHolder}">\r
-                        <ComboBox.ToolTip>\r
-                            <TextBlock Text="{x:Static Properties:Resources.Advanced_SubpixelMotionEstimationToolTip}" Style="{StaticResource LongToolTip}" />\r
-                        </ComboBox.ToolTip>\r
-                    </ComboBox>\r
-\r
-                    <Label Content="Motion Estimation Range:" Grid.Row="4" Grid.Column="0"\r
-                       Visibility="{Binding MotionEstimationRangeVisible, Converter={StaticResource VisibilityConverter}}"\r
-                       Style="{StaticResource AdvancedLabel}" />\r
-                    <ComboBox Grid.Row="4" Grid.Column="1" Height="22" MaxWidth="120" Width="120"\r
-                          ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.MotionEstimationRange}" DisplayMemberPath="Label"\r
-                          SelectedItem="{Binding MotionEstimationRange}"\r
-                          Visibility="{Binding MotionEstimationRangeVisible, Converter={StaticResource VisibilityConverter}}"\r
-                          Style="{StaticResource LongToolTipHolder}">\r
-                        <ComboBox.ToolTip>\r
-                            <TextBlock Text="{x:Static Properties:Resources.Advanced_MotionEstimationRangeToolTip}" Style="{StaticResource LongToolTip}" />\r
-                        </ComboBox.ToolTip>\r
-                    </ComboBox>\r
-                </Grid>\r
-\r
-                <Grid Height="80" HorizontalAlignment="Left" VerticalAlignment="Top" Width="300">\r
-                    <Grid.RowDefinitions>\r
-                        <RowDefinition Height="Auto" />\r
-                        <RowDefinition Height="Auto" />\r
-                        <RowDefinition Height="Auto" />\r
-                    </Grid.RowDefinitions>\r
-                    <Grid.ColumnDefinitions>\r
-                        <ColumnDefinition Width="Auto" />\r
-                        <ColumnDefinition />\r
-                    </Grid.ColumnDefinitions>\r
-\r
-                    <Label Content="Adaptive Quantization Strength:" Grid.Row="0" Grid.Column="0" Style="{StaticResource AdvancedLabel}" />\r
-                    <Slider Grid.Row="0" Grid.Column="1" Minimum="0.0" Maximum="2.0" TickPlacement="BottomRight"\r
-                        TickFrequency="0.1" SmallChange="0.1" LargeChange="0.2" IsSnapToTickEnabled="True"\r
-                        Value="{Binding AdaptiveQuantizationStrength}" Style="{StaticResource LongToolTipHolder}">\r
-                        <Slider.ToolTip>\r
-                            <TextBlock Text="{x:Static Properties:Resources.Advanced_AdaptiveQuantizationStrengthToolTip}" Style="{StaticResource LongToolTip}" />\r
-                        </Slider.ToolTip>\r
-                    </Slider>\r
-\r
-                    <Label Content="Psychovisual Rate Distortion:" Grid.Row="1" Grid.Column="0" Style="{StaticResource AdvancedLabel}"\r
-                           Visibility="{Binding PsychovisualRateDistortionVisible, Converter={StaticResource VisibilityConverter}}" />\r
-                    <Slider Grid.Row="1" Grid.Column="1" Minimum="0.0" Maximum="2.0" TickPlacement="BottomRight"\r
-                            TickFrequency="0.1" SmallChange="0.1" LargeChange="0.2" IsSnapToTickEnabled="True"\r
-                            Visibility="{Binding PsychovisualRateDistortionVisible, Converter={StaticResource VisibilityConverter}}"\r
-                            Value="{Binding PsychovisualRateDistortion}" Style="{StaticResource LongToolTipHolder}">\r
-                        <Slider.ToolTip>\r
-                            <TextBlock Text="{x:Static Properties:Resources.Advanced_PsychovisualRateDistortionToolTip}" Style="{StaticResource LongToolTip}" />\r
-                        </Slider.ToolTip>\r
-                    </Slider>\r
-\r
-                    <Label Content="Psychovisual Trellis:" Grid.Row="2" Grid.Column="0" Style="{StaticResource AdvancedLabel}"\r
-                       Visibility="{Binding PsychovisualTrellisVisible, Converter={StaticResource VisibilityConverter}}" />\r
-                    <Slider Grid.Row="2" Grid.Column="1" Minimum="0.0" Maximum="1.0" TickPlacement="BottomRight"\r
-                        TickFrequency="0.05" SmallChange="0.05" LargeChange="0.2" IsSnapToTickEnabled="True"\r
-                        Value="{Binding PsychovisualTrellis}"\r
-                        Visibility="{Binding PsychovisualTrellisVisible, Converter={StaticResource VisibilityConverter}}"\r
-                        Style="{StaticResource LongToolTipHolder}">\r
-                        <Slider.ToolTip>\r
-                            <TextBlock Text="{x:Static Properties:Resources.Advanced_PsychovisualTrellisToolTip}" Style="{StaticResource LongToolTip}" />\r
-                        </Slider.ToolTip>\r
-                    </Slider>\r
-                </Grid>\r
+                    <Grid Width="300"\r
+                          Height="80"\r
+                          HorizontalAlignment="Left"\r
+                          VerticalAlignment="Top"\r
+                          >\r
+                        <Grid.RowDefinitions>\r
+                            <RowDefinition Height="Auto" />\r
+                            <RowDefinition Height="Auto" />\r
+                            <RowDefinition Height="Auto" />\r
+                        </Grid.RowDefinitions>\r
+                        <Grid.ColumnDefinitions>\r
+                            <ColumnDefinition Width="Auto" />\r
+                            <ColumnDefinition Width="*" MinWidth="100" />\r
+                        </Grid.ColumnDefinitions>\r
 \r
-            </StackPanel>\r
+                        <Label Grid.Row="0"\r
+                               Grid.Column="0"\r
+                               Content="Adaptive Quantization Strength:"\r
+                               Style="{StaticResource AdvancedLabel}"\r
+                               />\r
+                        <Slider Grid.Row="0"\r
+                                Grid.Column="1"\r
+                                IsSnapToTickEnabled="True"\r
+                                LargeChange="0.2"\r
+                                Maximum="2.0"\r
+                                Minimum="0.0"\r
+                                SmallChange="0.1"\r
+                                Style="{StaticResource LongToolTipHolder}"\r
+                                TickFrequency="0.1"\r
+                                TickPlacement="BottomRight"\r
+                                Value="{Binding AdaptiveQuantizationStrength}"\r
+                                >\r
+                            <Slider.ToolTip>\r
+                                <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_AdaptiveQuantizationStrengthToolTip}" />\r
+                            </Slider.ToolTip>\r
+                        </Slider>\r
+\r
+                        <Label Grid.Row="1"\r
+                               Grid.Column="0"\r
+                               Content="Psychovisual Rate Distortion:"\r
+                               Style="{StaticResource AdvancedLabel}"\r
+                               Visibility="{Binding PsychovisualRateDistortionVisible,\r
+                                                    Converter={StaticResource VisibilityConverter}}"\r
+                               />\r
+                        <Slider Grid.Row="1"\r
+                                Grid.Column="1"\r
+                                IsSnapToTickEnabled="True"\r
+                                LargeChange="0.2"\r
+                                Maximum="2.0"\r
+                                Minimum="0.0"\r
+                                SmallChange="0.1"\r
+                                Style="{StaticResource LongToolTipHolder}"\r
+                                TickFrequency="0.1"\r
+                                TickPlacement="BottomRight"\r
+                                Visibility="{Binding PsychovisualRateDistortionVisible,\r
+                                                     Converter={StaticResource VisibilityConverter}}"\r
+                                Value="{Binding PsychovisualRateDistortion}"\r
+                                >\r
+                            <Slider.ToolTip>\r
+                                <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_PsychovisualRateDistortionToolTip}" />\r
+                            </Slider.ToolTip>\r
+                        </Slider>\r
+\r
+                        <Label Grid.Row="2"\r
+                               Grid.Column="0"\r
+                               Content="Psychovisual Trellis:"\r
+                               Style="{StaticResource AdvancedLabel}"\r
+                               Visibility="{Binding PsychovisualTrellisVisible,\r
+                                                    Converter={StaticResource VisibilityConverter}}"\r
+                               />\r
+                        <Slider Grid.Row="2"\r
+                                Grid.Column="1"\r
+                                IsSnapToTickEnabled="True"\r
+                                LargeChange="0.2"\r
+                                Maximum="1.0"\r
+                                Minimum="0.0"\r
+                                SmallChange="0.05"\r
+                                Style="{StaticResource LongToolTipHolder}"\r
+                                TickFrequency="0.05"\r
+                                TickPlacement="BottomRight"\r
+                                Visibility="{Binding PsychovisualTrellisVisible,\r
+                                                     Converter={StaticResource VisibilityConverter}}"\r
+                                Value="{Binding PsychovisualTrellis}"\r
+                                >\r
+                            <Slider.ToolTip>\r
+                                <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_PsychovisualTrellisToolTip}" />\r
+                            </Slider.ToolTip>\r
+                        </Slider>\r
+                    </Grid>\r
 \r
-            <!-- Analysis (Right Column)-->\r
-            <StackPanel Orientation="Vertical" Grid.Column="2" Grid.Row="0">\r
-                <Grid Margin="0,20,0,0">\r
-                    <Grid.RowDefinitions>\r
-                        <RowDefinition Height="Auto" />\r
-                        <RowDefinition Height="Auto" />\r
-                        <RowDefinition Height="Auto" />\r
-                        <RowDefinition Height="Auto" />\r
-                    </Grid.RowDefinitions>\r
-                    <Grid.ColumnDefinitions>\r
-                        <ColumnDefinition Width="Auto" />\r
-                        <ColumnDefinition Width="100" />\r
-                    </Grid.ColumnDefinitions>\r
-                    <Label Content="Partition Type:" Height="28" HorizontalAlignment="Right" VerticalAlignment="Top" Grid.Column="0" />\r
-                    <ComboBox Height="23" HorizontalAlignment="Right"  VerticalAlignment="Top" Width="100" MaxWidth="100"\r
-                      ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.Analysis}" DisplayMemberPath="Label" Grid.Column="1" \r
-                      SelectedItem="{Binding Analysis}" Style="{StaticResource LongToolTipHolder}">\r
-                        <ComboBox.ToolTip>\r
-                            <TextBlock Text="{x:Static Properties:Resources.Advanced_AnalysisToolTip}" Style="{StaticResource LongToolTip}" />\r
-                        </ComboBox.ToolTip>\r
-                    </ComboBox>\r
+                </StackPanel>\r
 \r
-                    <Label Content="Trellis:" Height="28" HorizontalAlignment="Right"  VerticalAlignment="Top" Grid.Column="0" Grid.Row="1" />\r
-                    <ComboBox Height="23" HorizontalAlignment="Right" VerticalAlignment="Top" Width="100" MaxWidth="100" Grid.Row="1"\r
-                      ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.Trellis}" DisplayMemberPath="Label" Grid.Column="1" \r
-                      SelectedItem="{Binding Trellis}" Style="{StaticResource LongToolTipHolder}">\r
-                        <ComboBox.ToolTip>\r
-                            <TextBlock Text="{x:Static Properties:Resources.Advanced_TrellisToolTip}" Style="{StaticResource LongToolTip}" />\r
-                        </ComboBox.ToolTip>\r
-                    </ComboBox>\r
+                <!--  Analysis (Right Column)  -->\r
+                <StackPanel Grid.Row="0"\r
+                            Grid.Column="2"\r
+                            Orientation="Vertical"\r
+                            >\r
+                    <Grid Margin="0,20,0,0">\r
+                        <Grid.RowDefinitions>\r
+                            <RowDefinition Height="Auto" />\r
+                            <RowDefinition Height="Auto" />\r
+                            <RowDefinition Height="Auto" />\r
+                            <RowDefinition Height="Auto" />\r
+                        </Grid.RowDefinitions>\r
+                        <Grid.ColumnDefinitions>\r
+                            <ColumnDefinition Width="Auto" />\r
+                            <ColumnDefinition Width="*" MinWidth="100" />\r
+                        </Grid.ColumnDefinitions>\r
+                        <Label Grid.Column="0"\r
+                               Height="28"\r
+                               HorizontalAlignment="Right"\r
+                               VerticalAlignment="Top"\r
+                               Content="Partition Type:"\r
+                               />\r
+                        <ComboBox Grid.Column="1"\r
+                                  Width="100"\r
+                                  Height="23"\r
+                                  MaxWidth="100"\r
+                                  HorizontalAlignment="Right"\r
+                                  VerticalAlignment="Top"\r
+                                  DisplayMemberPath="Label"\r
+                                  ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.Analysis}"\r
+                                  SelectedItem="{Binding Analysis}"\r
+                                  Style="{StaticResource LongToolTipHolder}"\r
+                                  >\r
+                            <ComboBox.ToolTip>\r
+                                <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_AnalysisToolTip}" />\r
+                            </ComboBox.ToolTip>\r
+                        </ComboBox>\r
 \r
+                        <Label Grid.Row="1"\r
+                               Grid.Column="0"\r
+                               Height="28"\r
+                               HorizontalAlignment="Right"\r
+                               VerticalAlignment="Top"\r
+                               Content="Trellis:"\r
+                               />\r
+                        <ComboBox Grid.Row="1"\r
+                                  Grid.Column="1"\r
+                                  Width="100"\r
+                                  Height="23"\r
+                                  MaxWidth="100"\r
+                                  HorizontalAlignment="Right"\r
+                                  VerticalAlignment="Top"\r
+                                  DisplayMemberPath="Label"\r
+                                  ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.Trellis}"\r
+                                  SelectedItem="{Binding Trellis}"\r
+                                  Style="{StaticResource LongToolTipHolder}"\r
+                                  >\r
+                            <ComboBox.ToolTip>\r
+                                <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_TrellisToolTip}" />\r
+                            </ComboBox.ToolTip>\r
+                        </ComboBox>\r
 \r
-                    <Label Content="Deblocking:" Height="28" HorizontalAlignment="Right" VerticalAlignment="Top" Grid.Column="0" Grid.Row="2"  />\r
-                    <ComboBox Height="23" HorizontalAlignment="Right" VerticalAlignment="Top" Width="100" MaxWidth="100"\r
-                          ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.DeblockingStrength}" DisplayMemberPath="Label" Grid.Column="1" Grid.Row="2" \r
-                          SelectedItem="{Binding DeblockingStrength}" Style="{StaticResource LongToolTipHolder}">\r
-                        <ComboBox.ToolTip>\r
-                            <TextBlock Text="{x:Static Properties:Resources.Advanced_DeblockingToolTip}" Style="{StaticResource LongToolTip}" />\r
-                        </ComboBox.ToolTip>\r
-                    </ComboBox>\r
-                    <ComboBox Height="23" HorizontalAlignment="Right"  VerticalAlignment="Top" Width="100" MaxWidth="100"  Grid.Column="1" Grid.Row="3" \r
-                          ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.DeblockingThreshold}" DisplayMemberPath="Label"\r
-                          SelectedItem="{Binding DeblockingThreshold}" Style="{StaticResource LongToolTipHolder}">\r
-                        <ComboBox.ToolTip>\r
-                            <TextBlock Text="{x:Static Properties:Resources.Advanced_DeblockingToolTip}" Style="{StaticResource LongToolTip}" />\r
-                        </ComboBox.ToolTip>\r
-                    </ComboBox>\r
-                </Grid>\r
-            </StackPanel>\r
 \r
-            <!-- Query -->\r
-            <StackPanel Orientation="Vertical" Grid.Row="1" Grid.ColumnSpan="3" Margin="0,10,0,0" HorizontalAlignment="Stretch">\r
-                <TextBox Text="{Binding AdvancedOptionsString, UpdateSourceTrigger=PropertyChanged}" Height="35" MaxWidth="700" \r
-                         HorizontalAlignment="Stretch" TextWrapping="Wrap" />\r
-            </StackPanel>\r
-        </Grid>\r
+                        <Label Grid.Row="2"\r
+                               Grid.Column="0"\r
+                               Height="28"\r
+                               HorizontalAlignment="Right"\r
+                               VerticalAlignment="Top"\r
+                               Content="Deblocking:"\r
+                               />\r
+                        <ComboBox Grid.Row="2"\r
+                                  Grid.Column="1"\r
+                                  Width="100"\r
+                                  Height="23"\r
+                                  MaxWidth="100"\r
+                                  HorizontalAlignment="Right"\r
+                                  VerticalAlignment="Top"\r
+                                  DisplayMemberPath="Label"\r
+                                  ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.DeblockingStrength}"\r
+                                  SelectedItem="{Binding DeblockingStrength}"\r
+                                  Style="{StaticResource LongToolTipHolder}"\r
+                                  >\r
+                            <ComboBox.ToolTip>\r
+                                <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_DeblockingToolTip}" />\r
+                            </ComboBox.ToolTip>\r
+                        </ComboBox>\r
+                        <ComboBox Grid.Row="3"\r
+                                  Grid.Column="1"\r
+                                  Width="100"\r
+                                  Height="23"\r
+                                  MaxWidth="100"\r
+                                  HorizontalAlignment="Right"\r
+                                  VerticalAlignment="Top"\r
+                                  DisplayMemberPath="Label"\r
+                                  ItemsSource="{x:Static Helpers:AdvancedChoicesHelper.DeblockingThreshold}"\r
+                                  SelectedItem="{Binding DeblockingThreshold}"\r
+                                  Style="{StaticResource LongToolTipHolder}"\r
+                                  >\r
+                            <ComboBox.ToolTip>\r
+                                <TextBlock Style="{StaticResource LongToolTip}" Text="{x:Static Properties:Resources.Advanced_DeblockingToolTip}" />\r
+                            </ComboBox.ToolTip>\r
+                        </ComboBox>\r
+                    </Grid>\r
+                </StackPanel>\r
+            </Grid>\r
 \r
-    </StackPanel>\r
+        </StackPanel>\r
+    </Grid>\r
 </UserControl>
\ No newline at end of file
index 0b8347c0b0a9077b76970bc7add0f155c1d1cad0..938e3171931a9f08ac443dcade33193e5c03355e 100644 (file)
@@ -1,27 +1,35 @@
 <Window x:Class="HandBrakeWPF.Views.MainView"\r
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"\r
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:Data="clr-namespace:System.Windows.Data;assembly=PresentationFramework" \r
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"\r
+        xmlns:Controls="clr-namespace:HandBrakeWPF.Controls"\r
         xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"\r
-        xmlns:Micro="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro"\r
+        xmlns:Data="clr-namespace:System.Windows.Data;assembly=PresentationFramework"\r
         xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"\r
-        xmlns:Controls="clr-namespace:HandBrakeWPF.Controls" Title="{Data:Binding Path=WindowTitle}" Width="1015" \r
-        FontSize="11" Background="#FFF0F0F0"\r
+        xmlns:Micro="clr-namespace:Caliburn.Micro;assembly=Caliburn.Micro"\r
+        Title="{Data:Binding Path=WindowTitle}"\r
+        Width="1015"\r
+        Height="652"\r
+        MinWidth="1015"\r
+        MinHeight="652"\r
+        AllowDrop="True"\r
+        Background="#FFF0F0F0"\r
+        FontSize="11"\r
         Micro:Message.Attach="[Event Loaded] = [Action Load]"\r
-        UseLayoutRounding="True" SizeToContent="Height"\r
-        WindowStartupLocation="CenterScreen"\r
         SnapsToDevicePixels="True"\r
-        AllowDrop="True">\r
+        UseLayoutRounding="True"\r
+        WindowStartupLocation="CenterScreen"\r
+        >\r
 \r
     <i:Interaction.Triggers>\r
         <i:EventTrigger EventName="Drop">\r
             <Micro:ActionMessage MethodName="FilesDroppedOnWindow">\r
-                <Micro:Parameter Value="$eventArgs"></Micro:Parameter>\r
+                <Micro:Parameter Value="$eventArgs" />\r
             </Micro:ActionMessage>\r
         </i:EventTrigger>\r
 \r
         <i:EventTrigger EventName="Closing">\r
             <Micro:ActionMessage MethodName="HandleWindowClosing">\r
-                <Micro:Parameter Value="$eventArgs"></Micro:Parameter>\r
+                <Micro:Parameter Value="$eventArgs" />\r
             </Micro:ActionMessage>\r
         </i:EventTrigger>\r
     </i:Interaction.Triggers>\r
 \r
         <CollectionViewSource x:Key="presetsCvs" Source="{Binding Presets}">\r
             <CollectionViewSource.GroupDescriptions>\r
-                <PropertyGroupDescription PropertyName="Category"/>\r
+                <PropertyGroupDescription PropertyName="Category" />\r
             </CollectionViewSource.GroupDescriptions>\r
         </CollectionViewSource>\r
 \r
         <DataTemplate x:Key="presetsTemplate">\r
             <StackPanel>\r
-                <TextBlock Text="{Binding Path=Name}"/>\r
+                <TextBlock Text="{Binding Path=Name}" />\r
             </StackPanel>\r
         </DataTemplate>\r
 \r
-        <HierarchicalDataTemplate x:Key="presetsCategoryTemplate" ItemsSource="{Binding Path=Items}" \r
-                                  ItemTemplate="{StaticResource presetsTemplate}">\r
-            <TextBlock Text="{Binding Path=Name}" FontWeight="Bold"/>\r
+        <HierarchicalDataTemplate x:Key="presetsCategoryTemplate"\r
+                                  ItemsSource="{Binding Path=Items}"\r
+                                  ItemTemplate="{StaticResource presetsTemplate}"\r
+                                  >\r
+            <TextBlock FontWeight="Bold" Text="{Binding Path=Name}" />\r
         </HierarchicalDataTemplate>\r
 \r
         <Style TargetType="TreeViewItem">\r
         <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />\r
     </Window.Resources>\r
 \r
-    <Grid VerticalAlignment="Stretch" HorizontalAlignment="Stretch">\r
+    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">\r
         <Grid.RowDefinitions>\r
             <RowDefinition Height="Auto" />\r
-            <RowDefinition Height="Auto" />\r
+            <RowDefinition Height="*" />\r
             <RowDefinition Height="Auto" />\r
         </Grid.RowDefinitions>\r
 \r
-        <!-- Menu and Taskbar-->\r
-        <StackPanel Orientation="Vertical" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"\r
-                        Grid.Row="0">\r
-            <!-- Main Menu -->\r
-            <Menu Height="23" VerticalAlignment="Top" HorizontalAlignment="Stretch">\r
+        <!--  Menu and Taskbar  -->\r
+        <StackPanel Grid.Row="0"\r
+                    HorizontalAlignment="Stretch"\r
+                    VerticalAlignment="Stretch"\r
+                    Orientation="Vertical"\r
+                    >\r
+            <!--  Main Menu  -->\r
+            <Menu Height="23"\r
+                  HorizontalAlignment="Stretch"\r
+                  VerticalAlignment="Top"\r
+                  >\r
                 <MenuItem Header="File">\r
                     <MenuItem Header="Cancel Scan" Micro:Message.Attach="[Event Click] = [Action CancelScan]" />\r
                     <Separator />\r
                 </MenuItem>\r
 \r
                 <MenuItem Header="Tools">\r
-                    <MenuItem Header="Show Queue" Micro:Message.Attach="[Event Click] = [Action OpenQueueWindow]" >\r
+                    <MenuItem Header="Show Queue" Micro:Message.Attach="[Event Click] = [Action OpenQueueWindow]">\r
                         <MenuItem.Icon>\r
-                            <Image Source="Images/Queue_Small.png" Width="16" />\r
+                            <Image Width="16" Source="Images/Queue_Small.png" />\r
                         </MenuItem.Icon>\r
                     </MenuItem>\r
-                    <MenuItem Header="Activity Window" Micro:Message.Attach="[Event Click] = [Action OpenLogWindow]" >\r
+                    <MenuItem Header="Activity Window" Micro:Message.Attach="[Event Click] = [Action OpenLogWindow]">\r
                         <MenuItem.Icon>\r
-                            <Image Source="Images/Output_Small.png" Width="16" />\r
+                            <Image Width="16" Source="Images/Output_Small.png" />\r
                         </MenuItem.Icon>\r
                     </MenuItem>\r
                     <Separator />\r
-                    <MenuItem Header="Options" Micro:Message.Attach="[Event Click] = [Action OpenOptionsWindow]" >\r
+                    <MenuItem Header="Options" Micro:Message.Attach="[Event Click] = [Action OpenOptionsWindow]">\r
                         <MenuItem.Icon>\r
-                            <Image Source="Images/Pref_Small.png" Width="16" />\r
+                            <Image Width="16" Source="Images/Pref_Small.png" />\r
                         </MenuItem.Icon>\r
                     </MenuItem>\r
                 </MenuItem>\r
 \r
                 <MenuItem Header="Help">\r
-                    <MenuItem Header="HandBrake User Guide (HTTP)" Micro:Message.Attach="[Event Click] = [Action LaunchHelp]" >\r
+                    <MenuItem Header="HandBrake User Guide (HTTP)" Micro:Message.Attach="[Event Click] = [Action LaunchHelp]">\r
                         <MenuItem.Icon>\r
-                            <Image Source="Images/Help16.png" Width="16" />\r
+                            <Image Width="16" Source="Images/Help16.png" />\r
                         </MenuItem.Icon>\r
                     </MenuItem>\r
                     <Separator />\r
                 </MenuItem>\r
             </Menu>\r
 \r
-            <!-- ToolBar -->\r
-            <ToolBar Name="mainToolBar" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"  SnapsToDevicePixels="False">\r
-                <Menu Background="Transparent" >\r
+            <!--  ToolBar  -->\r
+            <ToolBar Name="mainToolBar"\r
+                     HorizontalAlignment="Stretch"\r
+                     VerticalAlignment="Stretch"\r
+                     SnapsToDevicePixels="False"\r
+                     >\r
+                <Menu Background="Transparent">\r
                     <MenuItem ItemsSource="{Binding SourceToolbarMenu}">\r
                         <MenuItem.Header>\r
                             <StackPanel Orientation="Horizontal">\r
-                                <Image Source="Images/Movies.png" Height="32" Width="32" />\r
-                                <Label Content="Source"  Margin="8,0,0,0" VerticalAlignment="Center" />\r
+                                <Image Width="32"\r
+                                       Height="32"\r
+                                       Source="Images/Movies.png"\r
+                                       />\r
+                                <Label Margin="8,0,0,0"\r
+                                       VerticalAlignment="Center"\r
+                                       Content="Source"\r
+                                       />\r
                             </StackPanel>\r
                         </MenuItem.Header>\r
 \r
 \r
                 <Separator />\r
 \r
-                <Button Name="Start" Micro:Message.Attach="[Event Click] = [Action StartEncode]" Visibility="{Binding IsEncoding, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}">\r
+                <Button Name="Start"\r
+                        Micro:Message.Attach="[Event Click] = [Action StartEncode]"\r
+                        Visibility="{Binding IsEncoding,\r
+                                             Converter={StaticResource boolToVisConverter},\r
+                                             ConverterParameter=true}"\r
+                        >\r
                     <StackPanel Orientation="Horizontal">\r
-                        <Image Source="Images/Play.png" Height="32" Width="32" />\r
-                        <Label Content="Start"  Margin="8,0,0,0" VerticalAlignment="Center" />\r
+                        <Image Width="32"\r
+                               Height="32"\r
+                               Source="Images/Play.png"\r
+                               />\r
+                        <Label Margin="8,0,0,0"\r
+                               VerticalAlignment="Center"\r
+                               Content="Start"\r
+                               />\r
                     </StackPanel>\r
                 </Button>\r
 \r
-                <Button Name="Stop" Micro:Message.Attach="[Event Click] = [Action StopEncode]" Visibility="{Binding IsEncoding, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}">\r
+                <Button Name="Stop"\r
+                        Micro:Message.Attach="[Event Click] = [Action StopEncode]"\r
+                        Visibility="{Binding IsEncoding,\r
+                                             Converter={StaticResource boolToVisConverter},\r
+                                             ConverterParameter=false}"\r
+                        >\r
                     <StackPanel Orientation="Horizontal">\r
-                        <Image Source="Images/stop.png" Height="32" Width="32" SnapsToDevicePixels="True" />\r
-                        <Label Content="Stop"  Margin="8,0,0,0" VerticalAlignment="Center" />\r
+                        <Image Width="32"\r
+                               Height="32"\r
+                               SnapsToDevicePixels="True"\r
+                               Source="Images/stop.png"\r
+                               />\r
+                        <Label Margin="8,0,0,0"\r
+                               VerticalAlignment="Center"\r
+                               Content="Stop"\r
+                               />\r
                     </StackPanel>\r
                 </Button>\r
 \r
                 <Menu Background="Transparent">\r
-                    <MenuItem >\r
+                    <MenuItem>\r
                         <MenuItem.Header>\r
                             <StackPanel Orientation="Horizontal">\r
-                                <Button Name="QueueDrop"  Micro:Message.Attach="[Event Click] = [Action AddToQueue]"\r
-                                            VerticalAlignment="Stretch" HorizontalAlignment="Stretch"\r
-                                            HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch"\r
-                                            Background="Transparent">\r
+                                <Button Name="QueueDrop"\r
+                                        HorizontalAlignment="Stretch"\r
+                                        VerticalAlignment="Stretch"\r
+                                        HorizontalContentAlignment="Stretch"\r
+                                        VerticalContentAlignment="Stretch"\r
+                                        Background="Transparent"\r
+                                        Micro:Message.Attach="[Event Click] = [Action AddToQueue]"\r
+                                        >\r
                                     <StackPanel Orientation="Horizontal">\r
-                                        <Image Source="Images/AddToQueue.png" Height="32" Width="32" SnapsToDevicePixels="True" />\r
-                                        <Label Content="Add To Queue"  Margin="8,0,0,0" VerticalAlignment="Center" />\r
+                                        <Image Width="32"\r
+                                               Height="32"\r
+                                               SnapsToDevicePixels="True"\r
+                                               Source="Images/AddToQueue.png"\r
+                                               />\r
+                                        <Label Margin="8,0,0,0"\r
+                                               VerticalAlignment="Center"\r
+                                               Content="Add To Queue"\r
+                                               />\r
                                     </StackPanel>\r
                                     <Button.Style>\r
                                         <Style TargetType="{x:Type Button}">\r
                                             <Setter Property="Template">\r
                                                 <Setter.Value>\r
                                                     <ControlTemplate TargetType="{x:Type Button}">\r
-                                                        <Border x:Name="border" SnapsToDevicePixels="True" Background="{TemplateBinding Background}">\r
-                                                            <ContentPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" \r
-                                                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" \r
-                                                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"\r
-                                                                                  Content="{TemplateBinding Content}" \r
-                                                                                  ContentTemplate="{TemplateBinding ContentTemplate}"/>\r
+                                                        <Border x:Name="border"\r
+                                                                Background="{TemplateBinding Background}"\r
+                                                                SnapsToDevicePixels="True"\r
+                                                                >\r
+                                                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"\r
+                                                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"\r
+                                                                              Content="{TemplateBinding Content}"\r
+                                                                              ContentTemplate="{TemplateBinding ContentTemplate}"\r
+                                                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"\r
+                                                                              />\r
                                                         </Border>\r
                                                         <ControlTemplate.Triggers>\r
                                                             <Trigger Property="IsPressed" Value="True">\r
-                                                                <Setter Property="Background" TargetName="border" Value="#FF98B5E2"/>\r
+                                                                <Setter TargetName="border" Property="Background" Value="#FF98B5E2" />\r
                                                             </Trigger>\r
                                                         </ControlTemplate.Triggers>\r
                                                     </ControlTemplate>\r
                                     </Button.Style>\r
                                 </Button>\r
 \r
-                                <Path Fill="{DynamicResource GlyphBrush}" Data="M 0 0 L 4 4 L 8 0 Z"  Height="5" Margin="2,2,2,0"/>\r
+                                <Path Height="5"\r
+                                      Margin="2,2,2,0"\r
+                                      Data="M 0 0 L 4 4 L 8 0 Z"\r
+                                      Fill="{DynamicResource GlyphBrush}"\r
+                                      />\r
                             </StackPanel>\r
                         </MenuItem.Header>\r
-                        <MenuItem Header="Add All" Micro:Message.Attach="[Event Click] = [Action AddAllToQueue]"/>\r
+                        <MenuItem Header="Add All" Micro:Message.Attach="[Event Click] = [Action AddAllToQueue]" />\r
                     </MenuItem>\r
                 </Menu>\r
 \r
-                <Button Name="ShowQueue"  Micro:Message.Attach="[Event Click] = [Action OpenQueueWindow]">\r
+                <Button Name="ShowQueue" Micro:Message.Attach="[Event Click] = [Action OpenQueueWindow]">\r
                     <StackPanel Orientation="Horizontal">\r
-                        <Image Source="Images/Queue.png" Height="32" Width="32" SnapsToDevicePixels="True" />\r
-                        <Label Content="Show Queue"  Margin="8,0,0,0" VerticalAlignment="Center" />\r
+                        <Image Width="32"\r
+                               Height="32"\r
+                               SnapsToDevicePixels="True"\r
+                               Source="Images/Queue.png"\r
+                               />\r
+                        <Label Margin="8,0,0,0"\r
+                               VerticalAlignment="Center"\r
+                               Content="Show Queue"\r
+                               />\r
                     </StackPanel>\r
                 </Button>\r
 \r
 \r
                 <Button Name="Preview" Micro:Message.Attach="[Event Click] = [Action OpenPreviewWindow]">\r
                     <StackPanel Orientation="Horizontal">\r
-                        <Image Source="Images/window.png" Height="32" Width="32" SnapsToDevicePixels="True" />\r
-                        <Label Content="Preview"  Margin="8,0,0,0" VerticalAlignment="Center" />\r
+                        <Image Width="32"\r
+                               Height="32"\r
+                               SnapsToDevicePixels="True"\r
+                               Source="Images/window.png"\r
+                               />\r
+                        <Label Margin="8,0,0,0"\r
+                               VerticalAlignment="Center"\r
+                               Content="Preview"\r
+                               />\r
                     </StackPanel>\r
                 </Button>\r
 \r
                 <Button Name="ActivityWindow" Micro:Message.Attach="[Event Click] = [Action OpenLogWindow]">\r
                     <StackPanel Orientation="Horizontal">\r
-                        <Image Source="Images/ActivityWindow.png" Height="32" Width="32" />\r
-                        <Label Content="Activity Window"  Margin="8,0,0,0" VerticalAlignment="Center" />\r
+                        <Image Width="32"\r
+                               Height="32"\r
+                               Source="Images/ActivityWindow.png"\r
+                               />\r
+                        <Label Margin="8,0,0,0"\r
+                               VerticalAlignment="Center"\r
+                               Content="Activity Window"\r
+                               />\r
                     </StackPanel>\r
                 </Button>\r
             </ToolBar>\r
         </StackPanel>\r
 \r
-        <!-- Main Body-->\r
-        <StackPanel Orientation="Horizontal" Grid.Row="1">\r
-\r
-            <!-- Main Controls-->\r
+        <!--  Main Body  -->\r
+        <Grid Grid.Row="1">\r
+            <Grid.ColumnDefinitions>\r
+                <ColumnDefinition Width="*" />\r
+                <ColumnDefinition Width="260" />\r
+            </Grid.ColumnDefinitions>\r
+            <Grid.RowDefinitions>\r
+                <RowDefinition Height="Auto" />\r
+                <RowDefinition Height="Auto" />\r
+                <RowDefinition Height="Auto" />\r
+                <RowDefinition Height="*" />\r
+            </Grid.RowDefinitions>\r
+            <!--  Main Controls  -->\r
             <StackPanel Orientation="Vertical">\r
-                <!-- Source -->\r
-                <StackPanel Margin="10,5,10,5" MaxWidth="725" Width="725" HorizontalAlignment="Left">\r
+                <!--  Source  -->\r
+                <StackPanel Margin="10,5,5,5"\r
+                            HorizontalAlignment="Stretch"\r
+                            VerticalAlignment="Stretch"\r
+                            >\r
                     <StackPanel Orientation="Horizontal">\r
                         <Label Content="Source" FontWeight="Bold" />\r
                         <Label Content="{Binding Path=SourceLabel}" />\r
                     </StackPanel>\r
-\r
                     <StackPanel Orientation="Horizontal">\r
-                        <Label Content="Title" Margin="8,0,0,0" />\r
-                        <ComboBox Name="Titles" Margin="8,0,0,0" MinWidth="100" ItemsSource="{Binding ScannedSource.Titles}" SelectedItem="{Binding Path=SelectedTitle}" />\r
-\r
-                        <Label Content="Angle" Margin="8,0,0,0" />\r
-                        <ComboBox Name="Angles" Margin="8,0,0,0" MinWidth="60" ItemsSource="{Binding Angles}"  SelectedItem="{Binding SelectedAngle}"/>\r
-\r
-                        <ComboBox Name="PointToPointMode" Margin="8,0,0,0" MinWidth="80" ItemsSource="{Binding RangeMode}" SelectedItem="{Binding SelectedPointToPoint}" />\r
-\r
-                        <ComboBox Name="StartPoint" Margin="8,0,0,0" MinWidth="60" ItemsSource="{Binding StartEndRangeItems}" SelectedItem="{Binding SelectedStartPoint}"\r
-                                      Visibility="{Binding ShowTextEntryForPointToPointMode,Converter={StaticResource boolToVisConverter}, ConverterParameter=true}"/>\r
-                        <TextBox Name="StartPointText" Margin="8,0,0,0" MinWidth="60" Text="{Binding SelectedStartPoint}"\r
-                                     Visibility="{Binding ShowTextEntryForPointToPointMode, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}"/>\r
-\r
-                        <Label Content="through" Margin="8,0,0,0" />\r
-                        <ComboBox Name="EndPoint" Margin="8,0,0,0" MinWidth="60" ItemsSource="{Binding StartEndRangeItems}" SelectedItem="{Binding SelectedEndPoint}"\r
-                                      Visibility="{Binding ShowTextEntryForPointToPointMode, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}"/>\r
-                        <TextBox Name="EndPointText" Margin="8,0,0,0" MinWidth="60" Text="{Binding SelectedEndPoint}" \r
-                                     Visibility="{Binding ShowTextEntryForPointToPointMode, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />\r
-\r
-                        <Label Content="Duration" Margin="8,0,0,0" />\r
-                        <Label Content="{Binding Duration}" Margin="8,0,0,0" />\r
+                        <Label Margin="8,0,0,0" Content="Title" />\r
+                        <ComboBox Name="Titles"\r
+                                  MinWidth="100"\r
+                                  Margin="8,0,0,0"\r
+                                  ItemsSource="{Binding ScannedSource.Titles}"\r
+                                  SelectedItem="{Binding Path=SelectedTitle}"\r
+                                  />\r
+                        <Label Margin="8,0,0,0" Content="Angle" />\r
+                        <ComboBox Name="Angles"\r
+                                  MinWidth="60"\r
+                                  Margin="8,0,0,0"\r
+                                  ItemsSource="{Binding Angles}"\r
+                                  SelectedItem="{Binding SelectedAngle}"\r
+                                  />\r
+                        <ComboBox Name="PointToPointMode"\r
+                                  MinWidth="80"\r
+                                  Margin="8,0,0,0"\r
+                                  ItemsSource="{Binding RangeMode}"\r
+                                  SelectedItem="{Binding SelectedPointToPoint}"\r
+                                  />\r
+                        <ComboBox Name="StartPoint"\r
+                                  MinWidth="60"\r
+                                  Margin="8,0,0,0"\r
+                                  ItemsSource="{Binding StartEndRangeItems}"\r
+                                  SelectedItem="{Binding SelectedStartPoint}"\r
+                                  Visibility="{Binding ShowTextEntryForPointToPointMode,\r
+                                                       Converter={StaticResource boolToVisConverter},\r
+                                                       ConverterParameter=true}"\r
+                                  />\r
+                        <TextBox Name="StartPointText"\r
+                                 MinWidth="60"\r
+                                 Margin="8,0,0,0"\r
+                                 Text="{Binding SelectedStartPoint}"\r
+                                 Visibility="{Binding ShowTextEntryForPointToPointMode,\r
+                                                      Converter={StaticResource boolToVisConverter},\r
+                                                      ConverterParameter=false}"\r
+                                 />\r
+                        <Label Margin="8,0,0,0" Content="through" />\r
+                        <ComboBox Name="EndPoint"\r
+                                  MinWidth="60"\r
+                                  Margin="8,0,0,0"\r
+                                  ItemsSource="{Binding StartEndRangeItems}"\r
+                                  SelectedItem="{Binding SelectedEndPoint}"\r
+                                  Visibility="{Binding ShowTextEntryForPointToPointMode,\r
+                                                       Converter={StaticResource boolToVisConverter},\r
+                                                       ConverterParameter=true}"\r
+                                  />\r
+                        <TextBox Name="EndPointText"\r
+                                 MinWidth="60"\r
+                                 Margin="8,0,0,0"\r
+                                 Text="{Binding SelectedEndPoint}"\r
+                                 Visibility="{Binding ShowTextEntryForPointToPointMode,\r
+                                                      Converter={StaticResource boolToVisConverter},\r
+                                                      ConverterParameter=false}"\r
+                                 />\r
+                        <Label Margin="8,0,0,0" Content="Duration" />\r
+                        <Label Margin="8,0,0,0" Content="{Binding Duration}" />\r
                     </StackPanel>\r
                 </StackPanel>\r
-\r
-                <!-- Destination -->\r
-                <StackPanel Margin="10,5,10,5" MaxWidth="725" Width="725" HorizontalAlignment="Left">\r
-                    <Label Content="Destination" FontWeight="Bold" />\r
-                    <StackPanel Orientation="Horizontal">\r
-                        <Label Content="File" Margin="8,0,0,0" />\r
-                        <TextBox Name="Destination" Margin="8,0,0,0" Width="600" Text="{Binding Destination, UpdateSourceTrigger=PropertyChanged}" />\r
-                        <Button Name="DestinationBrowser" Margin="8,0,0,0" Content="Browse" Micro:Message.Attach="[Event Click] = [Action BrowseDestination]" />\r
-                    </StackPanel>\r
-                </StackPanel>\r
-\r
-                <!-- Output Options -->\r
-                <StackPanel Margin="10,5,10,5" MaxWidth="725" Width="725" HorizontalAlignment="Left">\r
-                    <Label Content="Output Settings" FontWeight="Bold" />\r
-                    <StackPanel Orientation="Horizontal">\r
-                        <Label Content="Container" Margin="8,0,0,0" />\r
-                        <ComboBox Name="Container" Margin="8,0,0,0" MinWidth="100" ItemsSource="{Binding OutputFormats}" SelectedItem="{Binding SelectedOutputFormat}" />\r
-\r
-                        <CheckBox Name="LargeFileMp4" Content="Large File Size" IsChecked="{Binding Path=CurrentTask.LargeFile}"\r
-                                      Visibility="{Binding IsMkv, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" VerticalAlignment="Center" Margin="8,0,0,0" />\r
-                        <CheckBox Name="WebOptimized" Content="Web Optimized" IsChecked="{Binding Path=CurrentTask.OptimizeMP4}"\r
-                                      Visibility="{Binding IsMkv, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" VerticalAlignment="Center" Margin="8,0,0,0" />\r
-                        <CheckBox Name="iPod5G" Content="iPod 5G Support" IsChecked="{Binding Path=CurrentTask.IPod5GSupport}"\r
-                                      Visibility="{Binding IsMkv, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" VerticalAlignment="Center" Margin="8,0,0,0" />\r
-                    </StackPanel>\r
+            </StackPanel>\r
+            <!--  Destination  -->\r
+            <StackPanel Grid.Row="1"\r
+                        Margin="10,5,5,5"\r
+                        HorizontalAlignment="Stretch"\r
+                        VerticalAlignment="Stretch"\r
+                        >\r
+                <Label Content="Destination" FontWeight="Bold" />\r
+                <Grid>\r
+                    <Grid.ColumnDefinitions>\r
+                        <ColumnDefinition Width="Auto" />\r
+                        <ColumnDefinition Width="*" />\r
+                        <ColumnDefinition Width="Auto" />\r
+                    </Grid.ColumnDefinitions>\r
+                    <Label Margin="8,0,0,0" Content="File" />\r
+                    <TextBox Name="Destination"\r
+                             Grid.Column="1"\r
+                             Margin="8,0,0,0"\r
+                             Text="{Binding Destination,\r
+                                            UpdateSourceTrigger=PropertyChanged}"\r
+                             />\r
+                    <Button Name="DestinationBrowser"\r
+                            Grid.Column="2"\r
+                            Margin="8,0,0,0"\r
+                            Content="Browse"\r
+                            Micro:Message.Attach="[Event Click] = [Action BrowseDestination]"\r
+                            />\r
+                </Grid>\r
+            </StackPanel>\r
+            <!--  Output Options  -->\r
+            <StackPanel Grid.Row="2"\r
+                        Margin="10,5,5,5"\r
+                        HorizontalAlignment="Stretch"\r
+                        VerticalAlignment="Stretch"\r
+                        >\r
+                <Label Content="Output Settings" FontWeight="Bold" />\r
+                <StackPanel Orientation="Horizontal">\r
+                    <Label Margin="8,0,0,0" Content="Container" />\r
+                    <ComboBox Name="Container"\r
+                              MinWidth="100"\r
+                              Margin="8,0,0,0"\r
+                              ItemsSource="{Binding OutputFormats}"\r
+                              SelectedItem="{Binding SelectedOutputFormat}"\r
+                              />\r
+                    <CheckBox Name="LargeFileMp4"\r
+                              Margin="8,0,0,0"\r
+                              VerticalAlignment="Center"\r
+                              Content="Large File Size"\r
+                              IsChecked="{Binding Path=CurrentTask.LargeFile}"\r
+                              Visibility="{Binding IsMkv,\r
+                                                   Converter={StaticResource boolToVisConverter},\r
+                                                   ConverterParameter=true}"\r
+                              />\r
+                    <CheckBox Name="WebOptimized"\r
+                              Margin="8,0,0,0"\r
+                              VerticalAlignment="Center"\r
+                              Content="Web Optimized"\r
+                              IsChecked="{Binding Path=CurrentTask.OptimizeMP4}"\r
+                              Visibility="{Binding IsMkv,\r
+                                                   Converter={StaticResource boolToVisConverter},\r
+                                                   ConverterParameter=true}"\r
+                              />\r
+                    <CheckBox Name="iPod5G"\r
+                              Margin="8,0,0,0"\r
+                              VerticalAlignment="Center"\r
+                              Content="iPod 5G Support"\r
+                              IsChecked="{Binding Path=CurrentTask.IPod5GSupport}"\r
+                              Visibility="{Binding IsMkv,\r
+                                                   Converter={StaticResource boolToVisConverter},\r
+                                                   ConverterParameter=true}"\r
+                              />\r
                 </StackPanel>\r
-\r
-                <!-- Tab Control -->\r
-                <TabControl HorizontalAlignment="Left" VerticalAlignment="Stretch" Width="725" Height="310" Margin="10,10,10,10" Name="tabControl" >\r
-                    <TabItem Header="Picture" Name="pictureTab">\r
-                        <ContentControl x:Name="PictureSettingsViewModel" ></ContentControl>\r
-                    </TabItem>\r
-                    <TabItem Header="Video Filters" Name="filtersTab">\r
-                        <ContentControl x:Name="FiltersViewModel" ></ContentControl>\r
-                    </TabItem>\r
-                    <TabItem Header="Video" Name="videoTab">\r
-                        <ContentControl x:Name="VideoViewModel" ></ContentControl>\r
-                    </TabItem>\r
-                    <TabItem Header="Audio" Name="audioTab">\r
-                        <ContentControl x:Name="AudioViewModel" ></ContentControl>\r
-                    </TabItem>\r
-                    <TabItem Header="Subtitles" Name="subtitlesTab">\r
-                        <ContentControl x:Name="SubtitleViewModel"></ContentControl>\r
-                    </TabItem>\r
-                    <TabItem Header="Chapters" Name="chaptersTab">\r
-                        <ContentControl x:Name="ChaptersViewModel"></ContentControl>\r
-                    </TabItem>\r
-                    <TabItem Header="Advanced" Name="advancedTab">\r
-                        <ContentControl x:Name="AdvancedViewModel"></ContentControl>\r
-                    </TabItem>\r
-                </TabControl>\r
-\r
             </StackPanel>\r
-\r
-            <!-- Presets -->\r
-            <StackPanel Margin="5,5,5,5" Orientation="Vertical">\r
-                <GroupBox Header="Presets" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">\r
-                    <StackPanel Orientation="Vertical">\r
-\r
-                        <TreeView ItemsSource="{Binding Source={StaticResource presetsCvs}, Path=Groups}" \r
-                                      ItemTemplate="{StaticResource presetsCategoryTemplate}" Width="240" Height="430"\r
-                                      >\r
-                            <i:Interaction.Triggers>\r
-                                <i:EventTrigger EventName="SelectedItemChanged">\r
-                                    <Micro:ActionMessage MethodName="SetSelectedPreset">\r
-                                        <Micro:Parameter Value="$eventArgs"></Micro:Parameter>\r
-                                    </Micro:ActionMessage>\r
-                                </i:EventTrigger>\r
-                            </i:Interaction.Triggers>\r
-\r
-                        </TreeView>\r
-\r
-\r
-                        <ToolBar Name="presetsToolBar" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" UseLayoutRounding="False" Background="Transparent" \r
-                                     SnapsToDevicePixels="False">\r
-                            <Button Micro:Message.Attach="[Event Click] = [Action PresetAdd]">\r
-                                <Button.Content>\r
-                                    <StackPanel Orientation="Horizontal">\r
-                                        <Image Source="Images/Add16.png" Height="16" Width="16" />\r
-                                        <TextBlock Text="Add" Style="{StaticResource textBlockOrangeStyle}"  Margin="2,0,0,0" VerticalAlignment="Center" />\r
-                                    </StackPanel>\r
-                                </Button.Content>\r
-                            </Button>\r
-\r
-                            <Button Micro:Message.Attach="[Event Click] = [Action PresetRemove]">\r
-                                <Button.Content>\r
+            <!--  Tab Control  -->\r
+            <TabControl Name="tabControl"\r
+                        Grid.Row="3"\r
+                        Margin="10,10,5,5"\r
+                        HorizontalAlignment="Stretch"\r
+                        VerticalAlignment="Stretch"\r
+                        >\r
+                <TabItem Name="pictureTab" Header="Picture">\r
+                    <ContentControl x:Name="PictureSettingsViewModel" />\r
+                </TabItem>\r
+                <TabItem Name="filtersTab" Header="Video Filters">\r
+                    <ContentControl x:Name="FiltersViewModel" />\r
+                </TabItem>\r
+                <TabItem Name="videoTab" Header="Video">\r
+                    <ContentControl x:Name="VideoViewModel" />\r
+                </TabItem>\r
+                <TabItem Name="audioTab" Header="Audio">\r
+                    <ContentControl x:Name="AudioViewModel" />\r
+                </TabItem>\r
+                <TabItem Name="subtitlesTab" Header="Subtitles">\r
+                    <ContentControl x:Name="SubtitleViewModel" />\r
+                </TabItem>\r
+                <TabItem Name="chaptersTab" Header="Chapters">\r
+                    <ContentControl x:Name="ChaptersViewModel" />\r
+                </TabItem>\r
+                <TabItem Name="advancedTab" Header="Advanced">\r
+                    <ContentControl x:Name="AdvancedViewModel" />\r
+                </TabItem>\r
+            </TabControl>\r
+            <!--  Presets  -->\r
+            <GroupBox Grid.RowSpan="4"\r
+                      Grid.Column="1"\r
+                      HorizontalAlignment="Stretch"\r
+                      VerticalAlignment="Stretch"\r
+                      Header="Presets"\r
+                      Margin="0,0,0,5"\r
+                      >\r
+                <Grid>\r
+                    <Grid.RowDefinitions>\r
+                        <RowDefinition Height="*" />\r
+                        <RowDefinition Height="Auto" />\r
+                    </Grid.RowDefinitions>\r
+                    <TreeView HorizontalAlignment="Stretch"\r
+                              VerticalAlignment="Stretch"\r
+                              ItemsSource="{Binding Source={StaticResource presetsCvs},\r
+                                                    Path=Groups}"\r
+                              ItemTemplate="{StaticResource presetsCategoryTemplate}"\r
+                              >\r
+                        <i:Interaction.Triggers>\r
+                            <i:EventTrigger EventName="SelectedItemChanged">\r
+                                <Micro:ActionMessage MethodName="SetSelectedPreset">\r
+                                    <Micro:Parameter Value="$eventArgs" />\r
+                                </Micro:ActionMessage>\r
+                            </i:EventTrigger>\r
+                        </i:Interaction.Triggers>\r
+                    </TreeView>\r
+                    <ToolBar Name="presetsToolBar"\r
+                             Grid.Row="1"\r
+                             HorizontalAlignment="Stretch"\r
+                             VerticalAlignment="Stretch"\r
+                             Background="Transparent"\r
+                             SnapsToDevicePixels="False"\r
+                             UseLayoutRounding="False"\r
+                             >\r
+                        <Button Micro:Message.Attach="[Event Click] = [Action PresetAdd]">\r
+                            <Button.Content>\r
+                                <StackPanel Orientation="Horizontal">\r
+                                    <Image Width="16"\r
+                                           Height="16"\r
+                                           Source="Images/Add16.png"\r
+                                           />\r
+                                    <TextBlock Margin="2,0,0,0"\r
+                                               VerticalAlignment="Center"\r
+                                               Style="{StaticResource textBlockOrangeStyle}"\r
+                                               Text="Add"\r
+                                               />\r
+                                </StackPanel>\r
+                            </Button.Content>\r
+                        </Button>\r
+                        <Button Micro:Message.Attach="[Event Click] = [Action PresetRemove]">\r
+                            <Button.Content>\r
+                                <StackPanel Orientation="Horizontal">\r
+                                    <Image Width="16"\r
+                                           Height="16"\r
+                                           Source="Images/Close.png"\r
+                                           />\r
+                                    <TextBlock Margin="2,0,0,0"\r
+                                               VerticalAlignment="Center"\r
+                                               Style="{StaticResource textBlockOrangeStyle}"\r
+                                               Text="Remove"\r
+                                               />\r
+                                </StackPanel>\r
+                            </Button.Content>\r
+                        </Button>\r
+                        <Menu Background="Transparent">\r
+                            <MenuItem ToolBar.OverflowMode="Never">\r
+                                <MenuItem.Header>\r
                                     <StackPanel Orientation="Horizontal">\r
-                                        <Image Source="Images/Close.png" Height="16" Width="16" />\r
-                                        <TextBlock Text="Remove" Style="{StaticResource textBlockOrangeStyle}"  Margin="2,0,0,0" VerticalAlignment="Center" />\r
+                                        <Image Width="16"\r
+                                               Height="16"\r
+                                               Source="Images/Options24.png"\r
+                                               />\r
+                                        <TextBlock Margin="2,0,0,0"\r
+                                                   VerticalAlignment="Center"\r
+                                                   Style="{StaticResource textBlockOrangeStyle}"\r
+                                                   Text="Options"\r
+                                                   />\r
                                     </StackPanel>\r
-                                </Button.Content>\r
-                            </Button>\r
-\r
-                            <Menu Background="Transparent" >\r
-                                <MenuItem ToolBar.OverflowMode="Never">\r
-                                    <MenuItem.Header>\r
-                                        <StackPanel Orientation="Horizontal">\r
-                                            <Image Source="Images/Options24.png" Height="16" Width="16" />\r
-                                            <TextBlock Text="Options" Style="{StaticResource textBlockOrangeStyle}" Margin="2,0,0,0" VerticalAlignment="Center" />\r
-                                        </StackPanel>\r
-                                    </MenuItem.Header>\r
-\r
-                                    <MenuItem Header="Set Default" Micro:Message.Attach="[Event Click] = [Action PresetSetDefault]" />\r
-                                    <Separator />\r
-                                    <MenuItem Header="Import" Micro:Message.Attach="[Event Click] = [Action PresetImport]" />\r
-                                    <MenuItem Header="Export" Micro:Message.Attach="[Event Click] = [Action PresetExport]" />\r
-                                    <Separator />\r
-                                    <MenuItem Header="Reset Built-in Presets" Micro:Message.Attach="[Event Click] = [Action PresetReset]" />\r
-                                </MenuItem>\r
-                            </Menu>\r
-\r
-\r
-                        </ToolBar>\r
-                    </StackPanel>\r
-                </GroupBox>\r
-            </StackPanel>\r
-\r
-        </StackPanel>\r
-\r
+                                </MenuItem.Header>\r
+                                <MenuItem Header="Set Default" Micro:Message.Attach="[Event Click] = [Action PresetSetDefault]" />\r
+                                <Separator />\r
+                                <MenuItem Header="Import" Micro:Message.Attach="[Event Click] = [Action PresetImport]" />\r
+                                <MenuItem Header="Export" Micro:Message.Attach="[Event Click] = [Action PresetExport]" />\r
+                                <Separator />\r
+                                <MenuItem Header="Reset Built-in Presets" Micro:Message.Attach="[Event Click] = [Action PresetReset]" />\r
+                            </MenuItem>\r
+                        </Menu>\r
+                    </ToolBar>\r
+                </Grid>\r
+            </GroupBox>\r
+        </Grid>\r
+\r
+        <!--  StatusPanel  -->\r
         <Controls:StatusPanel x:Name="loadingPanel"\r
-                              Panel.ZIndex="10"\r
                               Grid.Row="1"\r
                               Grid.RowSpan="2"\r
                               Height="70"\r
                               VerticalAlignment="Bottom"\r
+                              Panel.ZIndex="10"\r
                               IsLoading="{Binding ShowStatusWindow}"\r
                               Message="{Binding StatusLabel}"\r
-                              SubMessage="Please Wait ..."  />\r
-\r
-        <!-- Status Bar -->\r
-        <StatusBar Padding="0" Margin="0" Grid.Row="2" Height="32" Grid.ColumnSpan="2" VerticalAlignment="Bottom" >\r
-            <Label Content="{Binding Path=StatusLabel}" FontSize="11" Padding="0,0,0,5" VerticalAlignment="Center" />\r
-\r
-            <Button Content="BETA WPF UI RELEASE NOTES"  Micro:Message.Attach="[Event Click] = [Action ShowReleaseNotes]" \r
-                         FontWeight="Bold" Foreground="Blue" Padding="0,0,0,5" FontSize="11"\r
-                        />\r
+                              SubMessage="Please Wait ..."\r
+                              />\r
+\r
+        <!--  Status Bar  -->\r
+        <StatusBar Grid.Row="2"\r
+                   Grid.ColumnSpan="2"\r
+                   Height="32"\r
+                   Margin="0"\r
+                   VerticalAlignment="Bottom"\r
+                   Padding="0"\r
+                   >\r
+            <Label VerticalAlignment="Center"\r
+                   Content="{Binding Path=StatusLabel}"\r
+                   FontSize="11"\r
+                   Padding="0,0,0,5"\r
+                   />\r
+\r
+            <Button Content="BETA WPF UI RELEASE NOTES"\r
+                    FontSize="11"\r
+                    FontWeight="Bold"\r
+                    Foreground="Blue"\r
+                    Micro:Message.Attach="[Event Click] = [Action ShowReleaseNotes]"\r
+                    Padding="0,0,0,5"\r
+                    />\r
 \r
 \r
         </StatusBar>\r