diff options
Diffstat (limited to 'win/CS/HandBrakeWPF/ViewModels')
4 files changed, 8 insertions, 23 deletions
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs index ca3280a2c..0499e7157 100644 --- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs @@ -1545,20 +1545,12 @@ namespace HandBrakeWPF.ViewModels {
if (!presetService.CanUpdatePreset(preset.Name))
{
- MessageBox.Show(
- Resources.Main_PresetErrorBuiltInName,
- Resources.Error,
- MessageBoxButton.OK,
- MessageBoxImage.Error);
+ MessageBox.Show(Resources.Main_PresetErrorBuiltInName, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
return;
}
MessageBoxResult result =
- MessageBox.Show(
- Resources.Main_PresetOverwriteWarning,
- Resources.Overwrite,
- MessageBoxButton.YesNo,
- MessageBoxImage.Warning);
+ MessageBox.Show(Resources.Main_PresetOverwriteWarning, Resources.Overwrite, MessageBoxButton.YesNo, MessageBoxImage.Warning);
if (result == MessageBoxResult.Yes)
{
presetService.Update(preset);
diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs index 7e717c20e..b6b301d2b 100644 --- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs @@ -1849,7 +1849,7 @@ namespace HandBrakeWPF.ViewModels // #############################
// VLC Path
- this.VLCPath = this.userSettingService.GetUserSetting<string>(UserSettingConstants.VLC_Path) ?? string.Empty;
+ this.VLCPath = this.userSettingService.GetUserSetting<string>(UserSettingConstants.VLCPath) ?? string.Empty;
// #############################
// Audio and Subtitles Tab
@@ -2019,7 +2019,7 @@ namespace HandBrakeWPF.ViewModels this.userSettingService.SetUserSetting(UserSettingConstants.RemovePunctuation, this.RemovePunctuation);
/* Previews */
- this.userSettingService.SetUserSetting(UserSettingConstants.VLC_Path, this.VLCPath);
+ this.userSettingService.SetUserSetting(UserSettingConstants.VLCPath, this.VLCPath);
/* Audio and Subtitles */
this.userSettingService.SetUserSetting(UserSettingConstants.NativeLanguage, this.SelectedPreferredLangauge);
diff --git a/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs index b398a1b5c..932978e85 100644 --- a/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/PreviewViewModel.cs @@ -17,7 +17,6 @@ namespace HandBrakeWPF.ViewModels using System.Threading;
using System.Windows;
- using HandBrake.ApplicationServices;
using HandBrake.ApplicationServices.Model;
using HandBrake.ApplicationServices.Model.Encoding;
using HandBrake.ApplicationServices.Services.Interfaces;
@@ -327,7 +326,7 @@ namespace HandBrakeWPF.ViewModels }
else
{
- if (!File.Exists(UserSettingService.GetUserSetting<string>(UserSettingConstants.VLC_Path)))
+ if (!File.Exists(UserSettingService.GetUserSetting<string>(UserSettingConstants.VLCPath)))
{
// Attempt to find VLC if it doesn't exist in the default set location.
string vlcPath;
@@ -344,7 +343,7 @@ namespace HandBrakeWPF.ViewModels if (File.Exists(vlcPath))
{
- UserSettingService.SetUserSetting(UserSettingConstants.VLC_Path, vlcPath);
+ UserSettingService.SetUserSetting(UserSettingConstants.VLCPath, vlcPath);
}
else
{
@@ -353,9 +352,9 @@ namespace HandBrakeWPF.ViewModels }
}
- if (File.Exists(UserSettingService.GetUserSetting<string>(UserSettingConstants.VLC_Path)))
+ if (File.Exists(UserSettingService.GetUserSetting<string>(UserSettingConstants.VLCPath)))
{
- ProcessStartInfo vlc = new ProcessStartInfo(UserSettingService.GetUserSetting<string>(UserSettingConstants.VLC_Path), args);
+ ProcessStartInfo vlc = new ProcessStartInfo(UserSettingService.GetUserSetting<string>(UserSettingConstants.VLCPath), args);
Process.Start(vlc);
}
}
diff --git a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs index c4a26e033..d836f6d49 100644 --- a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs @@ -189,12 +189,6 @@ namespace HandBrakeWPF.ViewModels this.PreviewImage = image;
}
- protected override void OnActivate()
- {
- Console.Write("test");
- base.OnActivate();
- }
-
/// <summary>
/// The update preview frame.
/// </summary>
|