WinGui: Range of bug fixes and UI tweaks.

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

6 files changed, 24 insertions, 21 deletions

diff --git a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
index a6f29357f..0403fa881 100644
--- a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
@@ -58,7 +58,12 @@ namespace HandBrakeWPF.Converters.Video
                 return EnumHelper<VideoEncoder>.GetEnumDisplayValuesSubset(encoders);

             }

 

-            return EnumHelper<VideoEncoder>.GetDisplay((VideoEncoder)values[0]);

+            if (values[0].GetType() == typeof(VideoEncoder))

+            {

+                return EnumHelper<VideoEncoder>.GetDisplay((VideoEncoder)values[0]);

+            }

+

+            return null;

         }

 

         /// <summary>

diff --git a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
index e3fddb827..cbed5a1bc 100644
--- a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs
@@ -494,7 +494,7 @@ namespace HandBrakeWPF.ViewModels
                 this.Height = preset.Task.Height ?? (sourceResolution.Height - this.CropTop - this.CropBottom);

             }

 

-            if (this.Task.Anamorphic == Anamorphic.Custom)

+            if (preset.Task.Anamorphic == Anamorphic.Custom)

             {

                 this.DisplayWidth = preset.Task.DisplayWidth != null ? int.Parse(preset.Task.DisplayWidth.ToString()) : 0;

                 this.ParWidth = preset.Task.PixelAspectX;

@@ -503,7 +503,7 @@ namespace HandBrakeWPF.ViewModels
 

             this.MaintainAspectRatio = preset.Task.KeepDisplayAspect;

 

-            if (this.Task.Modulus.HasValue)

+            if (preset.Task.Modulus.HasValue)

             {

                 this.SelectedModulus = preset.Task.Modulus;

             }

diff --git a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
index b5344788d..e6e6c8c01 100644
--- a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
@@ -69,11 +69,9 @@ namespace HandBrakeWPF.ViewModels
         /// The window manager.

         /// </param>

         /// <param name="queueProcessor">

-        /// 

         /// The Queue Processor Service 

         /// </param>

         /// <param name="errorService">

-        /// 

         /// The Error Service 

         /// </param>

         public QueueViewModel(IWindowManager windowManager, IQueueProcessor queueProcessor, IErrorService errorService)

@@ -331,7 +329,7 @@ namespace HandBrakeWPF.ViewModels
         /// </param>

         private void QueueManager_QueueChanged(object sender, EventArgs e)

         {

-            // TODO

+            this.JobsPending = string.Format("{0} jobs pending", this.queueProcessor.QueueManager.Count);

         }

 

         /// <summary>

diff --git a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
index 99097a0b0..ae87c95b1 100644
--- a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
+++ b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
@@ -27,7 +27,7 @@
                 <ColumnDefinition Width="Auto" />

             </Grid.ColumnDefinitions>

             <Button Content="Add" Name="AddTrack" Grid.Column="0" Width="75" Margin="0,0,10,0" cal:Message.Attach="[Event Click] = [Action Add]" />

-            <Button Content="Import SRT" Grid.Column="2" Width="75" cal:Message.Attach="[Event Click] = [Action Import]" />

+            <Button Content="Import SRT" Grid.Column="2" Width="85" cal:Message.Attach="[Event Click] = [Action Import]" />

         </Grid>

 

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

diff --git a/win/CS/HandBrakeWPF/Views/VideoView.xaml b/win/CS/HandBrakeWPF/Views/VideoView.xaml
index b49ae924b..153c36fec 100644
--- a/win/CS/HandBrakeWPF/Views/VideoView.xaml
+++ b/win/CS/HandBrakeWPF/Views/VideoView.xaml
@@ -53,7 +53,7 @@
                     <TextBlock Text="Franerate (FPS):" Width="100"/>

                     <StackPanel Orientation="Vertical">

                         <ComboBox Width="120" ItemsSource="{Binding Framerates}" SelectedItem="{Binding SelectedFramerate}" />

-                        <RadioButton Content="Constant Framerate" IsChecked="{Binding IsConstantFramerate}" />

+                        <RadioButton Content="Constant Framerate" IsChecked="{Binding IsConstantFramerate}" Margin="0,10,0,0" />

                         <RadioButton Content="Variable Framerate" IsChecked="{Binding IsVariableFramerate}" Visibility="{Binding ShowPeakFramerate, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />

                         <RadioButton Content="Peak Framerate" IsChecked="{Binding IsPeakFramerate}" Visibility="{Binding ShowPeakFramerate, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />

                     </StackPanel>

diff --git a/win/CS/HandBrakeWPF/Views/VideoView.xaml.cs b/win/CS/HandBrakeWPF/Views/VideoView.xaml.cs
index f59435f02..8a0842a96 100644
--- a/win/CS/HandBrakeWPF/Views/VideoView.xaml.cs
+++ b/win/CS/HandBrakeWPF/Views/VideoView.xaml.cs
@@ -1,24 +1,24 @@
-using System;

-using System.Collections.Generic;

-using System.Linq;

-using System.Text;

-using System.Windows;

-using System.Windows.Controls;

-using System.Windows.Data;

-using System.Windows.Documents;

-using System.Windows.Input;

-using System.Windows.Media;

-using System.Windows.Media.Imaging;

-using System.Windows.Navigation;

-using System.Windows.Shapes;

+// --------------------------------------------------------------------------------------------------------------------

+// <copyright file="VideoView.xaml.cs" company="HandBrake Project (http://handbrake.fr)">

+//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

+// </copyright>

+// <summary>

+//   Interaction logic for VideoView.xaml

+// </summary>

+// --------------------------------------------------------------------------------------------------------------------

 

 namespace HandBrakeWPF.Views

 {

+    using System.Windows.Controls;

+

     /// <summary>

     /// Interaction logic for VideoView.xaml

     /// </summary>

     public partial class VideoView : UserControl

     {

+        /// <summary>

+        /// Initializes a new instance of the <see cref="VideoView"/> class.

+        /// </summary>

         public VideoView()

         {

             InitializeComponent();