diff options
| author | sr55 <[email protected]> | 2014-08-02 15:18:50 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2014-08-02 15:18:50 +0000 |
| commit | 6ea78897d46244337d7b857555b843451cc7aeea (patch) | |
| tree | 24ef639cca12251bc4b7c004aa2b86185fcaa7c1 /win/CS/HandBrakeWPF/ViewModels | |
| parent | 872a601d453f16a41c8994f9f98453a5ecadad64 (diff) | |
WinGui: Fix a styling issue on the preview window. Disable libhb encode for the upcoming release so that users don't inadvertently turn it on. Made the new preview window an optional setting, off by default as it's a Alpha feature. (See Preferences)
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6256 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrakeWPF/ViewModels')
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs | 25 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs | 11 |
2 files changed, 35 insertions, 1 deletions
diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs index 9cf6c694b..af4243b93 100644 --- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs @@ -281,6 +281,11 @@ namespace HandBrakeWPF.ViewModels private bool showAdvancedTab;
/// <summary>
+ /// The enable static preview.
+ /// </summary>
+ private bool enableStaticPreview;
+
+ /// <summary>
/// The remove punctuation.
/// </summary>
private bool removePunctuation;
@@ -1129,6 +1134,22 @@ namespace HandBrakeWPF.ViewModels }
}
+ /// <summary>
+ /// Gets or sets a value indicating whether enable static preview.
+ /// </summary>
+ public bool EnableStaticPreview
+ {
+ get
+ {
+ return this.enableStaticPreview;
+ }
+ set
+ {
+ this.enableStaticPreview = value;
+ this.NotifyOfPropertyChange(() => this.EnableStaticPreview);
+ }
+ }
+
#endregion
#region Video
@@ -1572,6 +1593,8 @@ namespace HandBrakeWPF.ViewModels // Use dvdnav
this.DisableLibdvdNav = userSettingService.GetUserSetting<bool>(UserSettingConstants.DisableLibDvdNav);
+ this.EnableStaticPreview = userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableStaticPreview);
+
int port;
int.TryParse(userSettingService.GetUserSetting<string>(UserSettingConstants.ServerPort), out port);
this.ServerPort = port;
@@ -1629,7 +1652,7 @@ namespace HandBrakeWPF.ViewModels userSettingService.SetUserSetting(UserSettingConstants.PreviewScanCount, this.SelectedPreviewCount);
userSettingService.SetUserSetting(UserSettingConstants.X264Step, double.Parse(this.SelectedGranulairty, CultureInfo.InvariantCulture));
userSettingService.SetUserSetting(UserSettingConstants.ShowAdvancedTab, this.ShowAdvancedTab);
- userSettingService.SetUserSetting(UserSettingConstants.ShowAdvancedTab, this.ShowAdvancedTab);
+ userSettingService.SetUserSetting(UserSettingConstants.EnableStaticPreview, this.EnableStaticPreview);
int value;
if (int.TryParse(this.MinLength.ToString(CultureInfo.InvariantCulture), out value))
diff --git a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs index 51c018ad9..1bcc43c36 100644 --- a/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs @@ -611,6 +611,17 @@ namespace HandBrakeWPF.ViewModels }
}
+ /// <summary>
+ /// Gets a value indicating whether is picture preview enabled.
+ /// </summary>
+ public bool IsPicturePreviewEnabled
+ {
+ get
+ {
+ return this.UserSettingService.GetUserSetting<bool>(UserSettingConstants.EnableStaticPreview);
+ }
+ }
+
#endregion
#region Public Methods
|