Merging Trunk to OpenCL branch

git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/opencl@5319 b64f7644-9d1e-0410-96f1-a4d463321fa5

6 files changed, 29 insertions, 22 deletions

diff --git a/win/CS/HandBrakeWPF/Views/ChaptersView.xaml b/win/CS/HandBrakeWPF/Views/ChaptersView.xaml
index a5fa6a6da..0895579f5 100644
--- a/win/CS/HandBrakeWPF/Views/ChaptersView.xaml
+++ b/win/CS/HandBrakeWPF/Views/ChaptersView.xaml
@@ -29,6 +29,11 @@
                   VerticalAlignment="Stretch" HorizontalAlignment="Stretch" AutoGenerateColumns="False"

                   CanUserSortColumns="False" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserResizeRows="False"

                   CanUserAddRows="False" CanUserDeleteRows="False">

+            <DataGrid.CellStyle>

+                <Style TargetType="DataGridCell">

+                    <Setter Property="MinHeight" Value="22" />

+                </Style>

+            </DataGrid.CellStyle>

             <DataGrid.ContextMenu>

                 <ContextMenu>

                     <MenuItem Header="Import Names" cal:Message.Attach="[Event Click] = [Action Import]" />

diff --git a/win/CS/HandBrakeWPF/Views/LogView.xaml b/win/CS/HandBrakeWPF/Views/LogView.xaml
index cb6687251..f8b2c9327 100644
--- a/win/CS/HandBrakeWPF/Views/LogView.xaml
+++ b/win/CS/HandBrakeWPF/Views/LogView.xaml
@@ -20,21 +20,7 @@
                      ToolBarTray.IsLocked="True"

                      Loaded="ToolBarLoaded"

                      >

-           

-

-                <TextBlock Margin="10,0,10,0"

-                           VerticalAlignment="Center"

-                           FontWeight="Bold"

-                           Text="Choose Log:" />

-                <ComboBox Width="120

-                          " Margin="0,0,10,0" Background="LightSteelBlue" Height="22" FontWeight="Black"

-                          HorizontalAlignment="Right" VerticalAlignment="Center"

-                          ItemsSource="{Binding LogModes}"

-                          SelectedIndex="{Binding SelectedMode}"

-                          />

-                

-                <Separator />

-                

+                          

                 <Button cal:Message.Attach="[Event Click] = [Action CopyLog]" Margin="10,0,0,0">

                     <StackPanel Orientation="Horizontal">

                         <Image Width="16" Source="Images/copy.png" />

@@ -50,13 +36,26 @@
 

             </ToolBar>

 

-            <TextBox Grid.Row="1"

+            <TabControl Grid.Row="1" SelectedIndex="{Binding SelectedTab}">

+                <TabItem Header="Encode Log">

+                    <TextBox Grid.Row="1"

                      AcceptsReturn="True"

                      IsReadOnly="True"

                      ScrollViewer.VerticalScrollBarVisibility="Visible"

-                     Text="{Binding Log,

-                                    Mode=OneWay}"

+                     Text="{Binding EncodeLog, Mode=OneWay,  UpdateSourceTrigger=PropertyChanged}"

                      TextWrapping="Wrap" />

+                </TabItem>

+                

+                <TabItem Header="Scan Log">

+                    <TextBox Grid.Row="1"

+                     AcceptsReturn="True"

+                     IsReadOnly="True"

+                     ScrollViewer.VerticalScrollBarVisibility="Visible"

+                     Text="{Binding ScanLog, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"

+                     TextWrapping="Wrap" />

+                </TabItem>

+

+            </TabControl>

         </Grid>

 

     </Grid>

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 1a020b603..2ffd46574 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -28,6 +28,7 @@
             <Setter Property="Padding" Value="5,1" />

             <Setter Property="FontSize" Value="11.5" />

             <Setter Property="VerticalAlignment" Value="Center" />

+            <Setter Property="MinHeight" Value="22" />

         </Style>

 

         <Style x:Key="textBlockOrangeStyle" TargetType="TextBlock">

diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index 83735e414..0394adbff 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -12,6 +12,7 @@
             <Setter Property="Padding" Value="5,1" />

             <Setter Property="FontSize" Value="11.5" />

             <Setter Property="VerticalAlignment" Value="Center" />

+            <Setter Property="MinHeight" Value="22" />

         </Style>

 

         <Style TargetType="TextBlock">

@@ -20,6 +21,7 @@
 

         <Style TargetType="TextBox">

             <Setter Property="Padding" Value="5,2" />

+            <Setter Property="MinHeight" Value="22" />

         </Style>

 

         <Style TargetType="CheckBox">

@@ -154,7 +156,7 @@
                             </StackPanel>

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

 

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

+                            <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>

diff --git a/win/CS/HandBrakeWPF/Views/ShellView.xaml b/win/CS/HandBrakeWPF/Views/ShellView.xaml
index 9bfee4bc1..bfc65c035 100644
--- 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"

         xmlns:Converters="clr-namespace:HandBrakeWPF.Converters" Title="{Data:Binding Path=WindowTitle}"

         Width="1015"

-        Height="670"

+        Height="680"

         MinWidth="1015"

         MinHeight="670"

         AllowDrop="True"

diff --git a/win/CS/HandBrakeWPF/Views/Styles/Styles.xaml b/win/CS/HandBrakeWPF/Views/Styles/Styles.xaml
index 9c3f001c8..407666234 100644
--- a/win/CS/HandBrakeWPF/Views/Styles/Styles.xaml
+++ b/win/CS/HandBrakeWPF/Views/Styles/Styles.xaml
@@ -16,7 +16,7 @@
     </Style>

 

     <Style TargetType="{x:Type ComboBox}">

-        <Setter Property="Height" Value="22"/>

+        <Setter Property="MinHeight" Value="22"/>

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

     </Style>

 

@@ -25,7 +25,7 @@
     </Style>

 

     <Style TargetType="{x:Type Button}">

-        <Setter Property="Height" Value="22"/>

+        <Setter Property="MinHeight" Value="22"/>

     </Style>

 

     <Style TargetType="{x:Type RadioButton}">