WinGui: Couple of minor UI tweaks and new tooltips.

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

5 files changed, 69 insertions, 7 deletions

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index b1a31d882..3b5ef0e3c 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -61,6 +61,21 @@ namespace HandBrakeWPF.Properties {
         }

         

         /// <summary>

+        ///   Looks up a localized string similar to You can optionally store a maximum resolution for encodes that use this preset. There are 3 modes:

+        ///

+        ///None:  There is no maximum resolution for encodes using this preset. They will always use the source resolution minus any cropping that may be applied.

+        ///

+        ///Custom: You can optionally set a Maximum width and height. When doing this an encode will be less than or equal to these values.

+        ///

+        ///Source Maximum:  Similar to custom, but the resolution of your current source is used as the Max width and Height values in [rest of string was truncated]&quot;;.

+        /// </summary>

+        public static string AddPreset_PictureSizeMode {

+            get {

+                return ResourceManager.GetString("AddPreset_PictureSizeMode", resourceCulture);

+            }

+        }

+        

+        /// <summary>

         ///   Looks up a localized string similar to x264 has a variety of algorithms to decide when to use B-frames and how many to use.

         ///

         ///Fast mode takes roughly the same amount of time no matter how many B-frames you specify.  However, while fast, its decisions are often suboptimal.

@@ -153,6 +168,17 @@ namespace HandBrakeWPF.Properties {
         }

         

         /// <summary>

+        ///   Looks up a localized string similar to The options passed to the x264 encoder. 

+        ///The above controls are only a subset of useful x264 parameters. 

+        ///This box allows you to add or modify additional or current parameters as desired. .

+        /// </summary>

+        public static string Advanced_EncoderOptions {

+            get {

+                return ResourceManager.GetString("Advanced_EncoderOptions", resourceCulture);

+            }

+        }

+        

+        /// <summary>

         ///   Looks up a localized string similar to Controls the motion estimation method. Motion estimation is how the encoder estimates how each block of pixels in a frame has moved.  

         ///A better motion search method improves compression at the cost of speed.

         ///

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index 64d5ef562..2d4c9f8a3 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -290,4 +290,18 @@ So small increases in value will result in progressively larger increases in the
 

 Suggested values are: 18 to 20 for Standard Definition and 20 to 23 for High Definition.</value>

   </data>

+  <data name="AddPreset_PictureSizeMode" xml:space="preserve">

+    <value>You can optionally store a maximum resolution for encodes that use this preset. There are 3 modes:

+

+None:  There is no maximum resolution for encodes using this preset. They will always use the source resolution minus any cropping that may be applied.

+

+Custom: You can optionally set a Maximum width and height. When doing this an encode will be less than or equal to these values.

+

+Source Maximum:  Similar to custom, but the resolution of your current source is used as the Max width and Height values instead.</value>

+  </data>

+  <data name="Advanced_EncoderOptions" xml:space="preserve">

+    <value>The options passed to the x264 encoder. 

+The above controls are only a subset of useful x264 parameters. 

+This box allows you to add or modify additional or current parameters as desired. </value>

+  </data>

 </root>
\ No newline at end of file
diff --git a/win/CS/HandBrakeWPF/Views/AddPresetView.xaml b/win/CS/HandBrakeWPF/Views/AddPresetView.xaml
index d6f6cb7e0..3e7a3fd7b 100644
--- a/win/CS/HandBrakeWPF/Views/AddPresetView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AddPresetView.xaml
@@ -5,6 +5,7 @@
         xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"

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

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

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

         Title="{Binding Title}"

         Width="350"

         ResizeMode="NoResize"

@@ -16,6 +17,11 @@
     <Window.Resources>

         <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />

         <Converters:EnumComboConverter x:Key="enumComboConverter" />

+

+        <Style x:Key="LongToolTipHolder" TargetType="FrameworkElement">

+            <Setter Property="ToolTipService.ShowDuration" Value="20000" />

+            <Setter Property="Margin" Value="0,2,0,2" />

+        </Style>

     </Window.Resources>

 

     <Grid HorizontalAlignment="Stretch"

@@ -80,11 +86,15 @@
 

             <TextBlock Grid.Row="2"

                        Grid.Column="0"

-                       Text="Use Picture Size:" />

+                       Style="{StaticResource LongToolTipHolder}"

+                       ToolTip="{x:Static Properties:Resources.AddPreset_PictureSizeMode}"

+                       Text="Picture Size:" />

             <ComboBox Grid.Row="2"

                       Grid.Column="1"

                       Width="125"

                       HorizontalAlignment="Left"

+                      Style="{StaticResource LongToolTipHolder}"

+                      ToolTip="{x:Static Properties:Resources.AddPreset_PictureSizeMode}"

                       ItemsSource="{Binding PictureSettingsModes,

                                             Converter={StaticResource enumComboConverter}}"

                       SelectedItem="{Binding SelectedPictureSettingMode,

@@ -104,18 +114,18 @@
             </StackPanel>

 

             <CheckBox Grid.Row="4"

-                      Grid.Column="1"

+                      Grid.Column="0" Grid.ColumnSpan="2"

                       Margin="0,10,0,0"

-                      Content="Use Picture Filters"

+                      Content="Save Video Filter Settings"

                       IsChecked="{Binding Preset.UsePictureFilters}" />

 

             <!--  Description  -->

             <TextBlock Grid.Row="5"

                        Grid.Column="0"

-                       FontWeight="Bold"

+                       FontWeight="Bold" Margin="0,10,0,0"

                        Text="Description:" />

             <TextBox Grid.Row="6"

-                     Grid.ColumnSpan="2"

+                     Grid.ColumnSpan="2" Margin="0,10,0,0"

                      HorizontalAlignment="Stretch"

                      Text="{Binding Preset.Description}" />

         </Grid>

diff --git a/win/CS/HandBrakeWPF/Views/AdvancedView.xaml b/win/CS/HandBrakeWPF/Views/AdvancedView.xaml
index a05b41bff..2043680ff 100644
--- a/win/CS/HandBrakeWPF/Views/AdvancedView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AdvancedView.xaml
@@ -31,13 +31,25 @@
         <Grid.RowDefinitions>

             <RowDefinition Height="Auto" />

             <RowDefinition Height="Auto" />

+            <RowDefinition Height="Auto" />

             <RowDefinition Height="*" />

         </Grid.RowDefinitions>

 

         <!-- X264 Query  -->

-        <TextBox Grid.Row="2"

+

+        <TextBlock Grid.Row="2" Margin="10,5,10,0"

+                           VerticalAlignment="Center"

+                           FontWeight="Bold"

+                           Text="x264 Encoder Options:"

+                   Visibility="{Binding DisplayX264Options, Converter={StaticResource BooleanVisibilityConverter}, ConverterParameter=false}"

+                           />

+        

+        <TextBox Grid.Row="3"

+                 Margin="10,2,10, 2"

                  HorizontalAlignment="Stretch"

                  VerticalAlignment="Stretch"

+                 Style="{StaticResource LongToolTipHolder}"

+                 ToolTip="{x:Static Properties:Resources.Advanced_EncoderOptions}"

                  Text="{Binding AdvancedOptionsString,

                                 UpdateSourceTrigger=PropertyChanged}"

                  TextWrapping="Wrap"

diff --git a/win/CS/HandBrakeWPF/Views/FiltersView.xaml b/win/CS/HandBrakeWPF/Views/FiltersView.xaml
index a27deb617..9c46aeabd 100644
--- a/win/CS/HandBrakeWPF/Views/FiltersView.xaml
+++ b/win/CS/HandBrakeWPF/Views/FiltersView.xaml
@@ -59,7 +59,7 @@
                          Visibility="{Binding ShowDenoiseCustom, Converter={StaticResource boolToVisConverter}}" />

 

                 <TextBlock Text="Deblock:" Grid.Row="4" Grid.Column="0" Margin="0,0,0,10"/>

-                <Slider Width="120" Value="{Binding DeblockValue}" Minimum="4" Maximum="15" Grid.Row="4" Grid.Column="1" Margin="0,0,0,10"/>

+                <Slider Width="120" Value="{Binding DeblockValue}" TickPlacement="BottomRight" Minimum="4" Maximum="15" Grid.Row="4" Grid.Column="1" Margin="0,0,0,10"/>

                 <TextBlock Text="{Binding DeblockText}" Grid.Row="4" Grid.Column="2" Margin="0,0,0,10"/>

 

                 <CheckBox Content="Grayscale" IsChecked="{Binding Grayscale}" Grid.Row="5" Grid.Column="1" Margin="0,0,0,10"/>