WinGui: UI Cosmetic fixes.

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

diff --git a/win/CS/HandBrakeWPF/Views/ChaptersView.xaml b/win/CS/HandBrakeWPF/Views/ChaptersView.xaml
index a5fa6a6dab0dae43db4408f856772509f5593ee3..0895579f5828560db5309f02519b5474ca143284 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/ChaptersView.xaml
+++ b/win/CS/HandBrakeWPF/Views/ChaptersView.xaml
@@ -29,6 +29,11 @@
                   VerticalAlignment="Stretch" HorizontalAlignment="Stretch" AutoGenerateColumns="False"\r
                   CanUserSortColumns="False" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserResizeRows="False"\r
                   CanUserAddRows="False" CanUserDeleteRows="False">\r
+            <DataGrid.CellStyle>\r
+                <Style TargetType="DataGridCell">\r
+                    <Setter Property="MinHeight" Value="22" />\r
+                </Style>\r
+            </DataGrid.CellStyle>\r
             <DataGrid.ContextMenu>\r
                 <ContextMenu>\r
                     <MenuItem Header="Import Names" cal:Message.Attach="[Event Click] = [Action Import]" />\r

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 5fbc3cc9362b170252902288192ce3947d6560fb..0d93eea2d3d819bbf95d10b3f8e4234adbab704d 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -28,6 +28,7 @@
             <Setter Property="Padding" Value="5,1" />\r
             <Setter Property="FontSize" Value="11.5" />\r
             <Setter Property="VerticalAlignment" Value="Center" />\r
+            <Setter Property="MinHeight" Value="22" />\r
         </Style>\r
 \r
         <Style x:Key="textBlockOrangeStyle" TargetType="TextBlock">\r

diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index 83735e41436127b13b1dbbe89adaeaafea7ead5e..0394adbff965a670d4ef8fdf4fc4c39c2a4829d9 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -12,6 +12,7 @@
             <Setter Property="Padding" Value="5,1" />\r
             <Setter Property="FontSize" Value="11.5" />\r
             <Setter Property="VerticalAlignment" Value="Center" />\r
+            <Setter Property="MinHeight" Value="22" />\r
         </Style>\r
 \r
         <Style TargetType="TextBlock">\r
@@ -20,6 +21,7 @@
 \r
         <Style TargetType="TextBox">\r
             <Setter Property="Padding" Value="5,2" />\r
+            <Setter Property="MinHeight" Value="22" />\r
         </Style>\r
 \r
         <Style TargetType="CheckBox">\r
@@ -154,7 +156,7 @@
                             </StackPanel>\r
                             <TextBlock Text="Available Options: {source_path} or {source_folder_name} (Not Both)" />\r
 \r
-                            <StackPanel Orientation="Horizontal" Margin="0,10,0,0">\r
+                            <StackPanel Orientation="Horizontal" Margin="0,15,0,0">\r
                                 <TextBlock VerticalAlignment="Center" Text="Format:" />\r
                                 <TextBox Name="autoNameFormat" Text="{Binding AutonameFormat}" Width="180" ToolTip=" {Source} = Source Name,  {Title} = Title Number,  {Chapters} = Selected Chapters, {Date} = Todays Date,"  />\r
                             </StackPanel>\r

diff --git a/win/CS/HandBrakeWPF/Views/ShellView.xaml b/win/CS/HandBrakeWPF/Views/ShellView.xaml
index 9bfee4bc144e28fe1018ff7cc2f3dea78ce3f363..bfc65c03527e654571c0bcb5b9ec98c6481ca2f3 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/ShellView.xaml
+++ b/win/CS/HandBrakeWPF/Views/ShellView.xaml
@@ -4,7 +4,7 @@
         xmlns:Data="clr-namespace:System.Windows.Data;assembly=PresentationFramework"\r
         xmlns:Converters="clr-namespace:HandBrakeWPF.Converters" Title="{Data:Binding Path=WindowTitle}"\r
         Width="1015"\r
-        Height="670"\r
+        Height="680"\r
         MinWidth="1015"\r
         MinHeight="670"\r
         AllowDrop="True"\r

diff --git a/win/CS/HandBrakeWPF/Views/Styles/Styles.xaml b/win/CS/HandBrakeWPF/Views/Styles/Styles.xaml
index 9c3f001c8e7f99f9a4fe879adefc5e0153123329..407666234e16fabdae3f2035f6c4053df96c920a 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/Styles/Styles.xaml
+++ b/win/CS/HandBrakeWPF/Views/Styles/Styles.xaml
@@ -16,7 +16,7 @@
     </Style>\r
 \r
     <Style TargetType="{x:Type ComboBox}">\r
-        <Setter Property="Height" Value="22"/>\r
+        <Setter Property="MinHeight" Value="22"/>\r
         <Setter Property="Margin" Value="0,2,0,2" />\r
     </Style>\r
 \r
@@ -25,7 +25,7 @@
     </Style>\r
 \r
     <Style TargetType="{x:Type Button}">\r
-        <Setter Property="Height" Value="22"/>\r
+        <Setter Property="MinHeight" Value="22"/>\r
     </Style>\r
 \r
     <Style TargetType="{x:Type RadioButton}">\r