WinGui: (WPF) Added Debug menu (1. Show CLI Query to allow for easier debugging). Wired up most tabs into the EncodeTask object so the parameters are sent to the encode engine. General code tidy-up and fixes.

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

5 files changed, 16 insertions, 7 deletions

diff --git a/win/CS/HandBrakeWPF/Views/AudioView.xaml b/win/CS/HandBrakeWPF/Views/AudioView.xaml
index 710cdd827..d94f25738 100644
--- a/win/CS/HandBrakeWPF/Views/AudioView.xaml
+++ b/win/CS/HandBrakeWPF/Views/AudioView.xaml
@@ -29,7 +29,7 @@
             <Button Content="Add Track" cal:Message.Attach="[Event Click] = [Action Add]" Grid.Column="0" Width="75" Margin="0,0,10,0" />

         </Grid>

 

-        <ListBox Grid.Row="2" ItemsSource="{Binding AudioTracks}" 

+        <ListBox Grid.Row="2" ItemsSource="{Binding Task.AudioTracks}" 

                  SelectionMode="Extended" Background="LightGray" Margin="10,10,10,10"

                  dd:DragDrop.IsDragSource="True" dd:DragDrop.IsDropTarget="True"

                  dd:DragDrop.DropHandler="{Binding}">

diff --git a/win/CS/HandBrakeWPF/Views/ChaptersView.xaml b/win/CS/HandBrakeWPF/Views/ChaptersView.xaml
index f3d6d1ed8..e7eb53f7d 100644
--- a/win/CS/HandBrakeWPF/Views/ChaptersView.xaml
+++ b/win/CS/HandBrakeWPF/Views/ChaptersView.xaml
@@ -25,7 +25,7 @@
             <Button Content="Export" Name="export" Grid.Column="3" Width="75" cal:Message.Attach="[Event Click] = [Action Export]" />

         </Grid>

 

-        <DataGrid Grid.Row="2" Margin="10" ItemsSource="{Binding Chapters}" 

+        <DataGrid Grid.Row="2" Margin="10" ItemsSource="{Binding Task.ChapterNames}" 

                   VerticalAlignment="Stretch" HorizontalAlignment="Stretch" AutoGenerateColumns="False"

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

                   CanUserAddRows="False" CanUserDeleteRows="False">

diff --git a/win/CS/HandBrakeWPF/Views/FiltersView.xaml b/win/CS/HandBrakeWPF/Views/FiltersView.xaml
index 53e75a6b0..a27deb617 100644
--- a/win/CS/HandBrakeWPF/Views/FiltersView.xaml
+++ b/win/CS/HandBrakeWPF/Views/FiltersView.xaml
@@ -6,6 +6,7 @@
              xmlns:Converters="clr-namespace:HandBrakeWPF.Converters" mc:Ignorable="d" >

     <UserControl.Resources>

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

+        <Converters:EnumComboConverter x:Key="boolComboConverter" />

     </UserControl.Resources>

 

     <Grid>

@@ -34,22 +35,26 @@
                 </Grid.ColumnDefinitions>

 

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

-                <ComboBox Width="120" Grid.Row="0" ItemsSource="{Binding DetelecineOptions}" SelectedItem="{Binding SelectedDetelecine}" Grid.Column="1" Margin="0,0,0,10"/>

+                <ComboBox Width="120" Grid.Row="0" ItemsSource="{Binding DetelecineOptions, Converter={StaticResource boolComboConverter}}" 

+                          SelectedItem="{Binding SelectedDetelecine, Converter={StaticResource boolComboConverter}}" Grid.Column="1" Margin="0,0,0,10"/>

                 <TextBox Width="120" Grid.Row="0" Grid.Column="2" Margin="0,0,0,10" Text="{Binding CustomDetelecine}"

                          Visibility="{Binding ShowDetelecineCustom, Converter={StaticResource boolToVisConverter}}"/>

 

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

-                <ComboBox Width="120" Grid.Row="1" ItemsSource="{Binding DecombOptions}" SelectedItem="{Binding SelectedDecomb}" Grid.Column="1" Margin="0,0,0,10"/>

+                <ComboBox Width="120" Grid.Row="1" ItemsSource="{Binding DecombOptions, Converter={StaticResource boolComboConverter}}" 

+                          SelectedItem="{Binding SelectedDecomb, Converter={StaticResource boolComboConverter}}" Grid.Column="1" Margin="0,0,0,10"/>

                 <TextBox Width="120" Grid.Row="1" Grid.Column="2" Margin="0,0,0,10" Text="{Binding CustomDecomb}"

                          Visibility="{Binding ShowDecombCustom, Converter={StaticResource boolToVisConverter}}" />

 

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

-                <ComboBox Width="120" Grid.Row="2" ItemsSource="{Binding DeInterlaceOptions}" SelectedItem="{Binding SelectedDeInterlace}" Grid.Column="1" Margin="0,0,0,10"/>

+                <ComboBox Width="120" Grid.Row="2" ItemsSource="{Binding DeInterlaceOptions, Converter={StaticResource boolComboConverter}}"

+                          SelectedItem="{Binding SelectedDeInterlace, Converter={StaticResource boolComboConverter}}" Grid.Column="1" Margin="0,0,0,10"/>

                 <TextBox Width="120" Grid.Row="2" Grid.Column="2" Margin="0,0,0,10" Text="{Binding CustomDeinterlace}"

                          Visibility="{Binding ShowDeinterlaceCustom, Converter={StaticResource boolToVisConverter}}" />

 

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

-                <ComboBox Width="120" Grid.Row="3" ItemsSource="{Binding DenoiseOptions}" SelectedItem="{Binding SelectedDenoise}" Grid.Column="1" Margin="0,0,0,10"/>

+                <ComboBox Width="120" Grid.Row="3" ItemsSource="{Binding DenoiseOptions, Converter={StaticResource boolComboConverter}}" 

+                          SelectedItem="{Binding SelectedDenoise, Converter={StaticResource boolComboConverter}}" Grid.Column="1" Margin="0,0,0,10"/>

                 <TextBox Width="120" Grid.Row="3" Grid.Column="2" Margin="0,0,0,10" Text="{Binding CustomDenoise}"

                          Visibility="{Binding ShowDenoiseCustom, Converter={StaticResource boolToVisConverter}}" />

 

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 9a44920af..af9e27a7b 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -87,6 +87,10 @@
                         <Separator />

                         <MenuItem Header="About..." Micro:Message.Attach="[Event Click] = [Action OpenAboutApplication]" />

                     </MenuItem>

+

+                    <MenuItem Header="Debug">

+                        <MenuItem Header="Show CLI Equiv" Micro:Message.Attach="[Event Click] = [Action ShowCliQuery]" />

+                    </MenuItem>

                 </Menu>

 

                 <!-- ToolBar -->

diff --git a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
index 0492fcaed..71e48a7ba 100644
--- a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
+++ b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
@@ -25,7 +25,7 @@
             <Button Content="Import SRT" Grid.Column="2" Width="75" cal:Message.Attach="[Event Click] = [Action Import]" />

         </Grid>

 

-        <ListBox Grid.Row="2" ItemsSource="{Binding SubtitleTracks}" 

+        <ListBox Grid.Row="2" ItemsSource="{Binding Task.SubtitleTracks}" 

                  SelectionMode="Extended" Background="LightGray" Margin="10,10,10,10"

                  dd:DragDrop.IsDragSource="True" dd:DragDrop.IsDropTarget="True"

                  dd:DragDrop.DropHandler="{Binding}">