diff options
| author | sr55 <[email protected]> | 2012-05-20 15:39:03 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2012-05-20 15:39:03 +0000 |
| commit | 5e65c94c9f4785d05789e7b11056e9063d0d852f (patch) | |
| tree | 691b298fa93b4a3974dba95fef9568146b8397d5 /win/CS/HandBrakeWPF/ViewModels | |
| parent | a74a875a44e65737bf1b913d94c806498aac1efe (diff) | |
WinGui: Range of bug fixes and UI tweaks.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4691 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrakeWPF/ViewModels')
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs | 4 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs | 4 |
2 files changed, 3 insertions, 5 deletions
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>
|