WinGui: Improved Audio Listbox Item style. Moved to a single line design. Since...

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

diff --git a/win/CS/HandBrakeWPF/Views/AudioView.xaml b/win/CS/HandBrakeWPF/Views/AudioView.xaml
index 9eaacd48f7b5da9b405d8ae676d1a1b8f7cbc384..0b9dd5a8d562f65448b0b60d70475c3cd95049f2 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/AudioView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AudioView.xaml
@@ -11,6 +11,7 @@
              xmlns:NumericUpDown="clr-namespace:EagleBoost.Wpf.Presentation.Controls.NumericUpDown;assembly=EagleBoost.Wpf.Presentation"\r
              xmlns:dropButton="clr-namespace:HandBrakeWPF.Controls.DropButton"\r
              xmlns:splitButton="clr-namespace:HandBrakeWPF.Controls.SplitButton"\r
+             xmlns:controls="clr-namespace:HandBrakeWPF.Controls"\r
              d:DesignHeight="170"\r
              d:DesignWidth="616"\r
              mc:Ignorable="d"\r
@@ -82,7 +83,7 @@
                           IsChecked="{Binding Task.AllowedPassthruOptions.AudioAllowDTSHDPass}" />\r
                 <TextBlock Margin="5,0,5,0" Text="Fallback:" />\r
 \r
-                <ComboBox Grid.Column="3" VerticalAlignment="Center"\r
+                <ComboBox VerticalAlignment="Center"\r
                                       Width="100"\r
                                       Height="22"\r
                                       Margin="10,0,5,0">\r
@@ -166,10 +167,10 @@
                                Source="Images/Movies.png" />\r
 \r
                         <!--  Settings  -->\r
-                        <Grid Grid.Column="1" Grid.Row="0" HorizontalAlignment="Stretch">\r
+                        <Grid Grid.Column="1" Grid.Row="0" HorizontalAlignment="Stretch" Margin="0,5,0,5">\r
                             <Grid.ColumnDefinitions>\r
                                 <ColumnDefinition Width="Auto" />\r
-                                <ColumnDefinition Width="*" MaxWidth="160" />\r
+                                <ColumnDefinition Width="Auto"/>\r
                                 <ColumnDefinition Width="Auto" />\r
                                 <ColumnDefinition Width="Auto" />\r
                                 <ColumnDefinition Width="Auto" />\r
@@ -183,33 +184,16 @@
 \r
                             <Grid.RowDefinitions>\r
                                 <RowDefinition Height="28" />\r
-                                <RowDefinition Height="28" />\r
                             </Grid.RowDefinitions>\r
 \r
                             <!--  Row 1  -->\r
-\r
-                            <TextBlock Grid.Column="0"\r
-                                       VerticalAlignment="Center"\r
-                                       FontWeight="Bold"\r
-                                       Text="Source" />\r
-                            <ComboBox Grid.Column="1"\r
-                                      Height="22"\r
-                                      MaxWidth="150"\r
-                                      Margin="5,0,5,0"\r
-                                      HorizontalAlignment="Stretch"\r
-                                      ItemsSource="{Binding DataContext.SourceTracks,\r
-                                                            RelativeSource={RelativeSource FindAncestor,\r
-                                                                                           AncestorType={x:Type UserControl}}}"\r
+                            <TextBlock Grid.Column="0" VerticalAlignment="Center" FontWeight="Bold" Text="Source" />\r
+                            <ComboBox Grid.Column="1" Height="22" Width="100" Margin="5,0,5,0" HorizontalAlignment="Stretch"\r
+                                      ItemsSource="{Binding DataContext.SourceTracks, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"\r
                                       SelectedItem="{Binding ScannedTrack}" />\r
-\r
-                            <TextBlock Grid.Column="2"\r
-                                       VerticalAlignment="Center"\r
-                                       FontWeight="Bold"\r
-                                       Text="Codec" />\r
-                            <ComboBox Grid.Column="3"\r
-                                      Width="100"\r
-                                      Height="22"\r
-                                      Margin="5,0,5,0">\r
+                            \r
+                            <TextBlock Grid.Column="2" VerticalAlignment="Center" FontWeight="Bold" Text="Codec" />\r
+                            <ComboBox Grid.Column="3" Width="100" Height="22" Margin="5,0,5,0">\r
                                 <ComboBox.SelectedItem>\r
                                     <MultiBinding Converter="{StaticResource audioEncoderConverter}">\r
                                         <Binding Path="Encoder" />\r
@@ -223,130 +207,34 @@
                                 </ComboBox.ItemsSource>\r
                             </ComboBox>\r
 \r
-                            <TextBlock Grid.Column="4"\r
-                                       VerticalAlignment="Center"\r
-                                       FontWeight="Bold"\r
-                                       Text="Bitrate"\r
-                                       Visibility="{Binding CannotSetBitrate,\r
-                                                            Converter={StaticResource boolToVisConverter},\r
-                                                            ConverterParameter=true}" />\r
-                            <ComboBox Grid.Column="5"\r
-                                      Width="70"\r
-                                      Height="22"\r
-                                      Margin="5,0,5,0"\r
-                                      ItemsSource="{Binding TrackReference,\r
-                                                            Converter={StaticResource audioBitrateConverter}}"\r
+                            <TextBlock Grid.Column="4" VerticalAlignment="Center" FontWeight="Bold" Text="Bitrate"\r
+                                       Visibility="{Binding CannotSetBitrate, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />\r
+                            <ComboBox Grid.Column="5" Width="55" Height="22" Margin="5,0,5,0" ItemsSource="{Binding TrackReference, Converter={StaticResource audioBitrateConverter}}"\r
                                       SelectedItem="{Binding Bitrate}"\r
-                                      Visibility="{Binding CannotSetBitrate,\r
-                                                           Converter={StaticResource boolToVisConverter},\r
-                                                           ConverterParameter=true}" />\r
-\r
-                            <TextBlock Grid.Column="6"\r
-                                       VerticalAlignment="Center"\r
-                                       FontWeight="Bold"\r
-                                       Text="Samplerate"\r
-                                       Visibility="{Binding IsPassthru,\r
-                                                            Converter={StaticResource boolToVisConverter},\r
-                                                            ConverterParameter=true}" />\r
-                            <ComboBox Grid.Column="7"\r
-                                      Width="70"\r
-                                      Height="22"\r
-                                      Margin="5,0,5,0"\r
-                                      ItemsSource="{Binding DataContext.SampleRates,\r
-                                                            RelativeSource={RelativeSource FindAncestor,\r
-                                                                                           AncestorType={x:Type UserControl}}}"\r
-                                      SelectedItem="{Binding SampleRateDisplayValue}"\r
-                                      Visibility="{Binding IsPassthru,\r
-                                                           Converter={StaticResource boolToVisConverter},\r
-                                                           ConverterParameter=true}" />\r
+                                      Visibility="{Binding CannotSetBitrate, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />\r
 \r
+      \r
                             <!--  Row 2  -->\r
-                            <TextBlock Grid.Row="1"\r
-                                       Grid.Column="0"\r
-                                       VerticalAlignment="Center"\r
-                                       FontWeight="Bold"\r
-                                       Text="Mixdown"\r
-                                       Visibility="{Binding IsPassthru,\r
-                                                            Converter={StaticResource boolToVisConverter},\r
-                                                            ConverterParameter=true}" />\r
-                            <ComboBox Grid.Row="1"\r
-                                      Grid.Column="1"\r
-                                      Height="22"\r
-                                      MaxWidth="300"\r
-                                      Margin="5,0,5,0"\r
-                                      HorizontalAlignment="Stretch"\r
-                                      ItemsSource="{Binding DataContext.AudioMixdowns,\r
-                                                            Converter={StaticResource enumComboConverter},\r
-                                                            RelativeSource={RelativeSource FindAncestor,\r
-                                                                                           AncestorType={x:Type UserControl}}}"\r
-                                      SelectedItem="{Binding MixDown,\r
-                                                             Converter={StaticResource enumComboConverter}}"\r
-                                      Visibility="{Binding IsPassthru,\r
-                                                           Converter={StaticResource boolToVisConverter},\r
-                                                           ConverterParameter=true}" />\r
+                            <TextBlock Grid.Row="0" Grid.Column="6" VerticalAlignment="Center" FontWeight="Bold" Text="Mixdown"\r
+                                       Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />\r
+                            <ComboBox Grid.Row="0" Grid.Column="7" Height="22" Width="120" Margin="5,0,5,0" HorizontalAlignment="Stretch"\r
+                                      ItemsSource="{Binding DataContext.AudioMixdowns, Converter={StaticResource enumComboConverter}, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"\r
+                                      SelectedItem="{Binding MixDown, Converter={StaticResource enumComboConverter}}"\r
+                                      Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />\r
 \r
-                            <TextBlock Grid.Row="1"\r
-                                       Grid.Column="2"\r
-                                       VerticalAlignment="Center"\r
-                                       FontWeight="Bold"\r
-                                       Text="DRC"\r
-                                       Visibility="{Binding IsPassthru,\r
-                                                            Converter={StaticResource boolToVisConverter},\r
-                                                            ConverterParameter=true}" />\r
+             \r
 \r
-                            <NumericUpDown:NumericUpDown Name="drcNumericCtl"\r
-                                                         Grid.Row="1"\r
-                                                         Grid.Column="3"\r
-                                                         Width="45"\r
-                                                         Margin="5,0,5,0"\r
-                                                         HorizontalAlignment="Left"\r
-                                                         DecimalPlace="1"\r
-                                                         LargeChange="0.1"\r
-                                                         Maximum="4"\r
-                                                         Minimum="0"\r
-                                                         SmallChange="0.1"\r
-                                                         Visibility="{Binding IsPassthru,\r
-                                                                              Converter={StaticResource boolToHiddenVisConverter},\r
-                                                                              ConverterParameter=true}"\r
-                                                         Value="{Binding DRC,\r
-                                                                         Mode=TwoWay}" />\r
-\r
-                            <TextBlock Grid.Row="1"\r
-                                       Grid.Column="4"\r
-                                       VerticalAlignment="Center"\r
-                                       FontWeight="Bold"\r
-                                       Text="Gain"\r
-                                       Visibility="{Binding IsPassthru,\r
-                                                            Converter={StaticResource boolToVisConverter},\r
-                                                            ConverterParameter=true}" />\r
-                            <NumericUpDown:NumericUpDown Name="gainNumericCtl"\r
-                                                         Grid.Row="1"\r
-                                                         Grid.Column="5"\r
-                                                         Width="45"\r
-                                                         Margin="5,0,5,0"\r
-                                                         HorizontalAlignment="Left"\r
-                                                         DecimalPlace="0"\r
-                                                         LargeChange="1"\r
-                                                         Maximum="20"\r
-                                                         Minimum="-20"\r
-                                                         SmallChange="1"\r
-                                                         Visibility="{Binding IsPassthru,\r
-                                                                              Converter={StaticResource boolToHiddenVisConverter},\r
-                                                                              ConverterParameter=true}"\r
-                                                         Value="{Binding Gain,\r
-                                                                         Mode=TwoWay}" />\r
-\r
-                            <ToggleButton Name="advancedOptionsToggle" VerticalAlignment="Center" Grid.Column="6" Grid.Row="1" Grid.ColumnSpan="2"\r
-                                          FontWeight="Bold" Height="22" Padding="4,0" HorizontalAlignment="Left" >\r
+                            <ToggleButton Name="advancedOptionsToggle" VerticalAlignment="Center" Grid.Column="8" Grid.Row="0" Grid.ColumnSpan="2"\r
+                                           Padding="3,0" Height="22" HorizontalAlignment="Left" >\r
                                 <ToggleButton.Style>\r
                                     <Style TargetType="{x:Type ToggleButton}">\r
-                                        <Setter Property="Content" Value="Show Advanced"/>\r
+                                        <Setter Property="Content" Value="Show"/>\r
                                         <Style.Triggers>\r
                                             <Trigger Property="IsChecked" Value="True">\r
-                                                <Setter Property="Content" Value="Hide Advanced"/>\r
+                                                <Setter Property="Content" Value="Hide"/>\r
                                             </Trigger>\r
                                             <Trigger Property="IsChecked" Value="False">\r
-                                                <Setter Property="Content" Value="Show Advanced"/>\r
+                                                <Setter Property="Content" Value="Show"/>\r
                                             </Trigger>\r
                                         </Style.Triggers>\r
                                     </Style>\r
@@ -371,10 +259,32 @@
                         <!-- Hidden Row -->\r
                         <Grid Grid.Column="1" Grid.Row="1" HorizontalAlignment="Stretch" Visibility="{Binding IsChecked, ElementName=advancedOptionsToggle, Converter={StaticResource boolToVisConverter}}">\r
                             <StackPanel Orientation="Horizontal" Margin="0,5,0,5" >\r
-                                <TextBlock Text="Track Name:" VerticalAlignment="Center" FontWeight="Bold" Margin="0,0,5,0" />\r
+\r
+                                <TextBlock VerticalAlignment="Center" FontWeight="Bold" Text="Samplerate"\r
+                                       Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />\r
+                                <ComboBox Width="70" Height="22" Margin="5,0,5,0"\r
+                                      ItemsSource="{Binding DataContext.SampleRates, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"\r
+                                      SelectedItem="{Binding SampleRateDisplayValue}"\r
+                                      Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />\r
+\r
+                                <TextBlock VerticalAlignment="Center" FontWeight="Bold" Text="DRC"\r
+                                       Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />\r
+\r
+                                <controls:NumberBox Name="drcNumericCtl" Width="45" Margin="5,0,5,0" HorizontalAlignment="Left"\r
+                                                    Minimum="0" Modulus="0.1" Maximum="4" Number="{Binding DRC, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False"\r
+                                                    Visibility="{Binding IsPassthru, Converter={StaticResource boolToHiddenVisConverter}, ConverterParameter=true}"/>\r
+\r
+                                <TextBlock  VerticalAlignment="Center" FontWeight="Bold" Text="Gain"\r
+                                       Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />\r
+\r
+                                <controls:NumberBox Name="gainNumericCtl" Width="45" Margin="5,0,5,0" HorizontalAlignment="Left"\r
+                                                    Minimum="-20" Modulus="1" Maximum="20" Number="{Binding Gain, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False"\r
+                                                    Visibility="{Binding IsPassthru, Converter={StaticResource boolToHiddenVisConverter}, ConverterParameter=true}"/>\r
+\r
+                                <TextBlock Text="Track Name:" VerticalAlignment="Center" FontWeight="Bold" Margin="5,0,5,0" />\r
                                 <TextBox Text="{Binding TrackName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Width="138" Height="22" />\r
-                            </StackPanel>\r
-                                \r
+\r
+                            </StackPanel>       \r
                         </Grid>\r
                     </Grid>\r
 \r

diff --git a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
index 7701b72725b9ff898f0eb0e54ba628535a76e64a..a808c76b4ecf582e05dfeed6b3aad618d666dff7 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml
@@ -105,7 +105,7 @@
         <StackPanel Name="CropPanel" Margin="50,0,0,0" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">\r
             <Label Content="Cropping" FontWeight="Bold" />\r
             <RadioButton Content="Automatic" IsChecked="{Binding IsCustomCrop, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="10,0,0,0"/>\r
-            <RadioButton Content="Custom" IsChecked="{Binding IsCustomCrop}" Margin="10,0,0,0" />\r
+            <RadioButton Content="Custom" IsChecked="{Binding IsCustomCrop}" Margin="10,5,0,0" />\r
 \r
             <Grid Margin="0,10,0,0">\r
                 <Grid.RowDefinitions>\r

diff --git a/win/CS/HandBrakeWPF/Views/ShellView.xaml b/win/CS/HandBrakeWPF/Views/ShellView.xaml
index 43edcb36bd9c13dfb2b453c20b88011ec0247dde..49b7c94dc07b7483c60fce43a5b53eac6ef7b833 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/ShellView.xaml
+++ b/win/CS/HandBrakeWPF/Views/ShellView.xaml
@@ -6,9 +6,9 @@
         xmlns:views="clr-namespace:HandBrakeWPF.Views"\r
         Title="{Data:Binding Path=WindowTitle}"\r
         Width="1015"\r
-        Height="670"\r
+        Height="675"\r
         MinWidth="750"\r
-        MinHeight="670"\r
+        MinHeight="675"\r
         AllowDrop="True"\r
         SnapsToDevicePixels="True"\r
         UseLayoutRounding="True"\r

diff --git a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
index 2f607ecd3cc29eec8d2986b6fe6352ffe9f4ee88..f0d63b0e2c6305390bc7448052ad414072b66776 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
+++ b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
@@ -162,7 +162,6 @@
                             </CheckBox>        \r
                         </Grid>\r
 \r
-\r
                         <!--  SRT Subtitle Settings  -->\r
                         <Grid Grid.Column="1" HorizontalAlignment="Stretch" Margin="0,8,0,8"\r
                               Visibility="{Binding IsSrtSubtitle, Converter={StaticResource booleanToVisConverter}, ConverterParameter=false}" >\r