WinGui: Minor tidy up of options. Cleanup of some code warnings and some initial DPIAwareness code.

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

4 files changed, 38 insertions, 32 deletions

diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index 4f28678c9..69f57ab74 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -1,11 +1,8 @@
 <UserControl  x:Class="HandBrakeWPF.Views.OptionsView" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"

         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:cal="http://www.caliburnproject.org"

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

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

-              xmlns:dd="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop"

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

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

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

               Style="{StaticResource whiteUserControlStyle}">

 

     <UserControl.Resources>

@@ -175,28 +172,37 @@
                         <StackPanel Orientation="Vertical" Grid.Column="1" Margin="20,0,0,0">

                             <CheckBox Content="Automatically name output files" IsChecked="{Binding AutomaticallyNameFiles}" />

 

-                            <StackPanel Orientation="Horizontal" Margin="0,5,0,0">

-                                <TextBlock VerticalAlignment="Center" Text="Default Path: " />

-                                <TextBox Name="autoNameOutputPath" Text="{Binding AutoNameDefaultPath}" Width="180" />

-                                <Button Content="Browse" Margin="5,0,0,0" cal:Message.Attach="[Event Click] = [Action BrowseAutoNamePath]" />

-                            </StackPanel>

-                            <TextBlock Text="Available Options: {source_path} or {source_folder_name} (Not Both)" />

-

-                            <StackPanel Orientation="Horizontal" Margin="0,15,0,0">

-                                <TextBlock VerticalAlignment="Center" Text="Format:" />

-                                <TextBox Name="autoNameFormat" Text="{Binding AutonameFormat}" Width="180" ToolTip=" {Source} = Source Name,  {Title} = Title Number,  {Chapters} = Selected Chapters, {Date} = Todays Date,"  />

-                            </StackPanel>

-                            <TextBlock Text="Available Options: {source} {title} {chapters} {date} {time} {quality} {bitrate}" />

+                            <Grid Margin="0,5,0,0">

+                                <Grid.RowDefinitions>

+                                    <RowDefinition Height="Auto"/>

+                                    <RowDefinition Height="Auto"/>

+                                </Grid.RowDefinitions>

+                                <Grid.ColumnDefinitions>

+                                    <ColumnDefinition Width="Auto" />

+                                    <ColumnDefinition Width="Auto" />

+                                    <ColumnDefinition Width="Auto" />

+                                </Grid.ColumnDefinitions>

+                                

+                                <TextBlock VerticalAlignment="Center" Text="Default Path: " Grid.Column="0" Grid.Row="0" />

+                                <TextBox Name="autoNameOutputPath" Text="{Binding AutoNameDefaultPath}" Width="380" Grid.Column="1" Grid.Row="0" 

+                                         ToolTip="{x:Static Properties:Resources.Options_DefaultPathAdditionalParams}" Style="{StaticResource LongToolTipHolder}"  />

+                                <Button Content="Browse" Margin="5,0,0,0" Grid.Column="2" Grid.Row="0" 

+                                        cal:Message.Attach="[Event Click] = [Action BrowseAutoNamePath]" />

+

+                                <TextBlock VerticalAlignment="Center" Text="Format:"  Grid.Column="0" Grid.Row="1" Margin="0,5,0,0" />

+                                <TextBox Name="autoNameFormat" Text="{Binding AutonameFormat}" Width="380"  Grid.Column="1" Grid.Row="1"  Margin="0,5,0,0"

+                                         ToolTip="{x:Static Properties:Resources.Options_AdditionalFormatOptions}"  Style="{StaticResource LongToolTipHolder}" />

+                            </Grid>

 

                             <StackPanel Orientation="Vertical" Margin="0,15,0,0">

+                                <CheckBox Content="Change case to Title Case" IsChecked="{Binding ChangeToTitleCase}" />

                                 <CheckBox Content="Replace underscores with a space" IsChecked="{Binding RemoveUnderscores}"/>

                                 <CheckBox Content="Remove common punctuation" ToolTip="Dash (-), Period (.) and Comma (,) " IsChecked="{Binding RemovePunctuation}"  />

-                                <CheckBox Content="Change case to Title Case" IsChecked="{Binding ChangeToTitleCase}" />

                             </StackPanel>

 

                             <StackPanel Orientation="Horizontal" Margin="0,15,0,0">

                                 <TextBlock VerticalAlignment="Center" Text="MP4 File Extension:" />

-                                <ComboBox Name="mp4FileExtension" Width="120" ItemsSource="{Binding Mp4ExtensionOptions}" SelectedIndex="{Binding SelectedMp4Extension}" HorizontalAlignment="Left"></ComboBox>

+                                <ComboBox Name="mp4FileExtension" Width="120" ItemsSource="{Binding Mp4ExtensionOptions}" SelectedIndex="{Binding SelectedMp4Extension}" HorizontalAlignment="Left" />

                             </StackPanel>

                         </StackPanel>

                     </StackPanel>

diff --git a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
index 1458d1dea..53aae130a 100644
--- a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="HandBrakeWPF.Views.PictureSettingsView"

+ <UserControl x:Class="HandBrakeWPF.Views.PictureSettingsView"

              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"

              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

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

diff --git a/win/CS/HandBrakeWPF/Views/Styles/Styles.xaml b/win/CS/HandBrakeWPF/Views/Styles/Styles.xaml
index 2472a6b28..bac308784 100644
--- a/win/CS/HandBrakeWPF/Views/Styles/Styles.xaml
+++ b/win/CS/HandBrakeWPF/Views/Styles/Styles.xaml
@@ -9,6 +9,20 @@
         </Style.Triggers>

     </Style>

 

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

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

+    </Style>

+

+    <Style TargetType="ToolTip">

+        <Setter Property="ContentTemplate">

+            <Setter.Value>

+                <DataTemplate>

+                    <TextBlock TextWrapping="Wrap" Width="450" Text="{Binding}" />

+                </DataTemplate>

+            </Setter.Value>

+        </Setter>

+    </Style>

+

     <Style x:Key="whiteUserControlStyle" TargetType="UserControl">

         <Style.Triggers>

             <DataTrigger Binding="{Binding UseSystemColours}" Value="False">

diff --git a/win/CS/HandBrakeWPF/Views/VideoView.xaml b/win/CS/HandBrakeWPF/Views/VideoView.xaml
index a7b87a3a7..039625b67 100644
--- a/win/CS/HandBrakeWPF/Views/VideoView.xaml
+++ b/win/CS/HandBrakeWPF/Views/VideoView.xaml
@@ -15,20 +15,6 @@
         <Converters:EnumComboConverter x:Key="enumComboConverter" />

         <Converters:InverseBooleanConverter x:Key="inverseConverter" />

         <Video:VideoEncoderConverter x:Key="videoEncoderConverter" />

-

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

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

-        </Style>

-

-        <Style TargetType="ToolTip">

-            <Setter Property="ContentTemplate">

-                <Setter.Value>

-                    <DataTemplate>

-                        <TextBlock TextWrapping="Wrap" Width="450" Text="{Binding}" />

-                    </DataTemplate>

-                </Setter.Value>

-            </Setter>

-        </Style>

     </UserControl.Resources>

 

     <Grid Margin="10,5,0,0">