diff options
| author | sr55 <[email protected]> | 2012-08-25 14:05:56 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2012-08-25 14:05:56 +0000 |
| commit | 5c878c4eab2f01acc386165fca26d2f3ef943b77 (patch) | |
| tree | 5e7a7257147ad1f074297dcd28af691a554cae97 /win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs | |
| parent | cbe5f09e69c95df3be3b38de06c2b7bd6b5bd949 (diff) | |
WinGui: General Tidyup of the Services Library API.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4915 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs')
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs index 5f65b26ce..f262ea7e3 100644 --- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs @@ -298,7 +298,7 @@ namespace HandBrakeWPF.ViewModels set
{
- if (!Equals(this.statusLabel, value))
+ if (!Equals(this.programStatusLabel, value))
{
this.programStatusLabel = value;
this.NotifyOfPropertyChange(() => this.ProgramStatusLabel);
@@ -1120,7 +1120,10 @@ namespace HandBrakeWPF.ViewModels public void ShowCliQuery()
{
this.errorService.ShowMessageBox(
- QueryGeneratorUtility.GenerateQuery(this.CurrentTask),
+ QueryGeneratorUtility.GenerateQuery(this.CurrentTask,
+ userSettingService.GetUserSetting<int>(ASUserSettingConstants.PreviewScanCount),
+ userSettingService.GetUserSetting<int>(ASUserSettingConstants.Verbosity),
+ userSettingService.GetUserSetting<bool>(ASUserSettingConstants.DisableLibDvdNav)),
"CLI Query",
MessageBoxButton.OK,
MessageBoxImage.Information);
@@ -1362,7 +1365,7 @@ namespace HandBrakeWPF.ViewModels if (filename != null)
{
- PlistUtility.Export(savefiledialog.FileName, this.selectedPreset);
+ PlistUtility.Export(savefiledialog.FileName, this.selectedPreset, userSettingService.GetUserSetting<int>(ASUserSettingConstants.HandBrakeBuild).ToString());
}
}
else
@@ -1645,15 +1648,18 @@ namespace HandBrakeWPF.ViewModels Execute.OnUIThread(
() =>
{
- this.ProgramStatusLabel =
- string.Format(
- "{0:00.00}%, FPS: {1:000.0}, Avg FPS: {2:000.0}, Time Remaining: {3}, Elapsed: {4:hh\\:mm\\:ss}, Pending Jobs {5}",
- e.PercentComplete,
- e.CurrentFrameRate,
- e.AverageFrameRate,
- e.EstimatedTimeLeft,
- e.ElapsedTime,
- this.queueProcessor.QueueManager.Count);
+ if (this.IsEncoding)
+ {
+ this.ProgramStatusLabel =
+ string.Format(
+ "{0:00.00}%, FPS: {1:000.0}, Avg FPS: {2:000.0}, Time Remaining: {3}, Elapsed: {4:hh\\:mm\\:ss}, Pending Jobs {5}",
+ e.PercentComplete,
+ e.CurrentFrameRate,
+ e.AverageFrameRate,
+ e.EstimatedTimeLeft,
+ e.ElapsedTime,
+ this.queueProcessor.QueueManager.Count);
+ }
});
}
|