diff options
| author | sr55 <[email protected]> | 2016-02-10 20:29:14 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2016-02-10 20:29:41 +0000 |
| commit | 608819a9b683f6f1dd58aac9cc6da57cc777ad72 (patch) | |
| tree | 5ab8a5cd12ccf1d0d4552db0f5b9eee3736793db /win | |
| parent | 2caf380a1021b294fd26eb310bd41e59b7f1db11 (diff) | |
WinGui: WebOptimised and iPod 5G support checkboxes were not displaying the correct value on preset reload.
Diffstat (limited to 'win')
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs | 44 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Views/MainView.xaml | 4 |
2 files changed, 44 insertions, 4 deletions
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs index 2f3a67ccb..5eb792abb 100644 --- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs @@ -357,8 +357,8 @@ namespace HandBrakeWPF.ViewModels if (this.SelectedPreset != null)
{
// Main Window Settings
- this.CurrentTask.OptimizeMP4 = selectedPreset.Task.OptimizeMP4;
- this.CurrentTask.IPod5GSupport = selectedPreset.Task.IPod5GSupport;
+ this.OptimizeMP4 = selectedPreset.Task.OptimizeMP4;
+ this.IPod5GSupport = selectedPreset.Task.IPod5GSupport;
this.SelectedOutputFormat = selectedPreset.Task.OutputFormat;
// Tab Settings
@@ -379,6 +379,46 @@ namespace HandBrakeWPF.ViewModels }
/// <summary>
+ /// Optimise MP4 Checkbox
+ /// </summary>
+ public bool OptimizeMP4
+ {
+ get
+ {
+ return this.CurrentTask.OptimizeMP4;
+ }
+ set
+ {
+ if (value == this.CurrentTask.OptimizeMP4)
+ {
+ return;
+ }
+ this.CurrentTask.OptimizeMP4 = value;
+ this.NotifyOfPropertyChange(() => this.OptimizeMP4);
+ }
+ }
+
+ /// <summary>
+ /// iPod 5G Status
+ /// </summary>
+ public bool IPod5GSupport
+ {
+ get
+ {
+ return this.CurrentTask.IPod5GSupport;
+ }
+ set
+ {
+ if (value == this.CurrentTask.IPod5GSupport)
+ {
+ return;
+ }
+ this.CurrentTask.IPod5GSupport = value;
+ this.NotifyOfPropertyChange(() => this.IPod5GSupport);
+ }
+ }
+
+ /// <summary>
/// Gets or sets The Current Encode Task that the user is building
/// </summary>
public EncodeTask CurrentTask { get; set; }
diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml index dc5256ed6..ae24fb286 100644 --- a/win/CS/HandBrakeWPF/Views/MainView.xaml +++ b/win/CS/HandBrakeWPF/Views/MainView.xaml @@ -464,7 +464,7 @@ Margin="8,0,0,0"
VerticalAlignment="Center"
Content="{x:Static Properties:ResourcesUI.MainView_WebOptimized}"
- IsChecked="{Binding Path=CurrentTask.OptimizeMP4}"
+ IsChecked="{Binding Path=OptimizeMP4}"
ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Optimise}"
Visibility="{Binding IsMkv,
Converter={StaticResource boolToVisConverter},
@@ -475,7 +475,7 @@ VerticalAlignment="Center"
Content="{x:Static Properties:ResourcesUI.MainView_iPod5G}"
ToolTip="{x:Static Properties:ResourcesTooltips.MainView_IpodAtom}"
- IsChecked="{Binding Path=CurrentTask.IPod5GSupport}"
+ IsChecked="{Binding Path=IPod5GSupport}"
Visibility="{Binding IsMkv,
Converter={StaticResource boolToVisConverter},
ConverterParameter=true}"
|