summaryrefslogtreecommitdiffstats
path: root/win/CS/HandBrakeWPF/ViewModels
diff options
context:
space:
mode:
Diffstat (limited to 'win/CS/HandBrakeWPF/ViewModels')
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/AudioDefaultsViewModel.cs1
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs1
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs6
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs13
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs6
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/Interfaces/IManagePresetViewModel.cs3
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/Interfaces/IMetaDataViewModel.cs3
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs8
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/ManagePresetViewModel.cs3
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/MetaDataViewModel.cs15
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs3
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs1
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs4
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs2
14 files changed, 52 insertions, 17 deletions
diff --git a/win/CS/HandBrakeWPF/ViewModels/AudioDefaultsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AudioDefaultsViewModel.cs
index ec757034b..2a18d7a4b 100644
--- a/win/CS/HandBrakeWPF/ViewModels/AudioDefaultsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AudioDefaultsViewModel.cs
@@ -340,7 +340,6 @@ namespace HandBrakeWPF.ViewModels
/// </summary>
public IEnumerable<HBMixdown> Mixdowns { get; set; }
-
/// <summary>
/// Gets or sets AudioBitrates.
/// </summary>
diff --git a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
index 232ed3567..9f3cd760d 100644
--- a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
@@ -109,7 +109,6 @@ namespace HandBrakeWPF.ViewModels
/// </summary>
public EncodeTask Task { get; set; }
-
/// <summary>
/// Gets the panel title.
/// </summary>
diff --git a/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs
index 037bacde0..da65e2945 100644
--- a/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs
@@ -208,8 +208,10 @@ namespace HandBrakeWPF.ViewModels
string validationErrorMessage;
if (!this.ValidateImportedChapters(importedChapters, out validationErrorMessage))
{
- if( !string.IsNullOrEmpty(validationErrorMessage))
- throw new GeneralApplicationException(Resources.ChaptersViewModel_ValidationFailedWarning, validationErrorMessage);
+ if (!string.IsNullOrEmpty(validationErrorMessage))
+ throw new GeneralApplicationException(
+ Resources.ChaptersViewModel_ValidationFailedWarning,
+ validationErrorMessage);
// The user has cancelled the import, so exit
return;
diff --git a/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
index 7cb50ac37..3c5e13f82 100644
--- a/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs
@@ -15,8 +15,6 @@ namespace HandBrakeWPF.ViewModels
using Caliburn.Micro;
- using HandBrake.ApplicationServices.Interop;
- using HandBrake.ApplicationServices.Interop.HbLib;
using HandBrake.ApplicationServices.Interop.Model.Encoding;
using HandBrakeWPF.Services.Interfaces;
@@ -267,6 +265,9 @@ namespace HandBrakeWPF.ViewModels
}
}
+ /// <summary>
+ /// Gets or sets the selected comb detect preset.
+ /// </summary>
public CombDetect SelectedCombDetectPreset
{
get
@@ -295,6 +296,9 @@ namespace HandBrakeWPF.ViewModels
}
}
+ /// <summary>
+ /// Gets or sets the custom comb detect.
+ /// </summary>
public string CustomCombDetect
{
get
@@ -551,6 +555,9 @@ namespace HandBrakeWPF.ViewModels
}
}
+ /// <summary>
+ /// The rotation options.
+ /// </summary>
public BindingList<int> RotationOptions => new BindingList<int> { 0, 90, 180, 270 };
/// <summary>
@@ -638,7 +645,6 @@ namespace HandBrakeWPF.ViewModels
this.CustomDetelecine = preset.Task.CustomDetelecine;
this.CustomDenoise = preset.Task.CustomDenoise;
-
this.SelectedRotation = preset.Task.Rotation;
this.FlipVideo = preset.Task.FlipVideo;
}
@@ -685,7 +691,6 @@ namespace HandBrakeWPF.ViewModels
this.NotifyOfPropertyChange(() => this.FlipVideo);
this.NotifyOfPropertyChange(() => this.SelectedRotation);
-
}
/// <summary>
diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs
index 539e239a5..17f460123 100644
--- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs
@@ -25,6 +25,12 @@ namespace HandBrakeWPF.ViewModels.Interfaces
/// </summary>
Preset SelectedPreset { set; }
+ /// <summary>
+ /// The preset select.
+ /// </summary>
+ /// <param name="tag">
+ /// The tag.
+ /// </param>
void PresetSelect(object tag);
/// <summary>
diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IManagePresetViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IManagePresetViewModel.cs
index 2af41b1de..29ff92929 100644
--- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IManagePresetViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IManagePresetViewModel.cs
@@ -19,6 +19,9 @@ namespace HandBrakeWPF.ViewModels.Interfaces
/// <summary>
/// Prepare the Preset window
/// </summary>
+ /// <param name="preset">
+ /// The preset.
+ /// </param>
void Setup(Preset preset);
/// <summary>
diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMetaDataViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMetaDataViewModel.cs
index 1e62880c2..63f36f4fe 100644
--- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMetaDataViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMetaDataViewModel.cs
@@ -9,6 +9,9 @@
namespace HandBrakeWPF.ViewModels.Interfaces
{
+ /// <summary>
+ /// The MetaDataViewModel interface.
+ /// </summary>
public interface IMetaDataViewModel : ITabInterface
{
}
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 823d95f09..b1e231412 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -283,7 +283,7 @@ namespace HandBrakeWPF.ViewModels
public IStaticPreviewViewModel StaticPreviewViewModel { get; set; }
/// <summary>
- /// The MetaData View Model
+ /// Gets or sets the The MetaData View Model
/// </summary>
public IMetaDataViewModel MetaDataViewModel { get; set; }
@@ -1195,6 +1195,9 @@ namespace HandBrakeWPF.ViewModels
#region Commands
+ /// <summary>
+ /// Gets or sets the queue command.
+ /// </summary>
public ICommand QueueCommand { get; set; }
#endregion
@@ -1400,7 +1403,6 @@ namespace HandBrakeWPF.ViewModels
return false;
}
-
// Sanity check the filename
if (!string.IsNullOrEmpty(this.Destination) && FileHelper.FilePathHasInvalidChars(this.Destination))
{
@@ -1678,7 +1680,7 @@ namespace HandBrakeWPF.ViewModels
/// <summary>
/// Pass on the "When Done" Action to the queue view model.
/// </summary>
- /// <param name="action"></param>
+ /// <param name="action">action</param>
public void WhenDone(string action)
{
this.QueueViewModel?.WhenDone(action);
diff --git a/win/CS/HandBrakeWPF/ViewModels/ManagePresetViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/ManagePresetViewModel.cs
index 2f559bb65..7f0fed5b6 100644
--- a/win/CS/HandBrakeWPF/ViewModels/ManagePresetViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/ManagePresetViewModel.cs
@@ -59,6 +59,9 @@ namespace HandBrakeWPF.ViewModels
/// <summary>
/// Prepare the Preset window to create a Preset Object later.
/// </summary>
+ /// <param name="presetToEdit">
+ /// The preset To Edit.
+ /// </param>
public void Setup(Preset presetToEdit)
{
this.Preset = new Preset(presetToEdit); // Clone. We will not touch the existing object.
diff --git a/win/CS/HandBrakeWPF/ViewModels/MetaDataViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MetaDataViewModel.cs
index 7e6efb3a0..e0bd332d1 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MetaDataViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MetaDataViewModel.cs
@@ -17,14 +17,24 @@ namespace HandBrakeWPF.ViewModels
using HandBrakeWPF.Services.Presets.Model;
using HandBrakeWPF.Services.Scan.Model;
using HandBrakeWPF.ViewModels.Interfaces;
+
+ /// <summary>
+ /// The meta data view model.
+ /// </summary>
public class MetaDataViewModel : ViewModelBase, IMetaDataViewModel
{
private EncodeTask task;
private MetaData metaData;
/// <summary>
- /// Initializes a new instance of the <see cref="ViewModelBase"/> class.
+ /// Initializes a new instance of the <see cref="MetaDataViewModel"/> class.
/// </summary>
+ /// <param name="windowManager">
+ /// The window Manager.
+ /// </param>
+ /// <param name="userSettingService">
+ /// The user Setting Service.
+ /// </param>
public MetaDataViewModel(IWindowManager windowManager, IUserSettingService userSettingService)
{
this.Task = new EncodeTask();
@@ -52,6 +62,9 @@ namespace HandBrakeWPF.ViewModels
}
}
+ /// <summary>
+ /// Gets or sets the meta data.
+ /// </summary>
public MetaData MetaData
{
get
diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index b1962e48b..125939054 100644
--- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -109,6 +109,9 @@ namespace HandBrakeWPF.ViewModels
/// <param name="aboutViewModel">
/// The about View Model.
/// </param>
+ /// <param name="errorService">
+ /// The error Service.
+ /// </param>
public OptionsViewModel(IUserSettingService userSettingService, IUpdateService updateService, IAboutViewModel aboutViewModel, IErrorService errorService)
{
this.Title = "Options";
diff --git a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
index 3ad23d605..eed3a1a79 100644
--- a/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs
@@ -430,7 +430,6 @@ namespace HandBrakeWPF.ViewModels
this.queueProcessor.JobProcessingStarted -= this.QueueProcessorJobProcessingStarted;
this.queueProcessor.LowDiskspaceDetected -= this.QueueProcessor_LowDiskspaceDetected;
-
base.OnDeactivate(close);
}
diff --git a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
index b08122abd..fdc2886c7 100644
--- a/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs
@@ -558,7 +558,7 @@ namespace HandBrakeWPF.ViewModels
// Setup the encode task as a preview encode
encodeTask.IsPreviewEncode = true;
- encodeTask.PreviewEncodeStartAt = this.SelectedPreviewImage +1;
+ encodeTask.PreviewEncodeStartAt = this.SelectedPreviewImage + 1;
encodeTask.PreviewEncodeDuration = this.Duration;
QueueTask task = new QueueTask(encodeTask, HBConfigurationFactory.Create(), this.ScannedSource.ScanPath);
ThreadPool.QueueUserWorkItem(this.CreatePreview, task);
@@ -591,7 +591,7 @@ namespace HandBrakeWPF.ViewModels
// Attempt to find VLC if it doesn't exist in the default set location.
string vlcPath;
- if (8 == IntPtr.Size || (!String.IsNullOrEmpty(Environment.GetEnvironmentVariable("PROCESSOR_ARCHITEW6432"))))
+ if (IntPtr.Size == 8 || (!String.IsNullOrEmpty(Environment.GetEnvironmentVariable("PROCESSOR_ARCHITEW6432"))))
vlcPath = Environment.GetEnvironmentVariable("ProgramFiles(x86)");
else
vlcPath = Environment.GetEnvironmentVariable("ProgramFiles");
diff --git a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
index 4f75359f4..55a679ea7 100644
--- a/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs
@@ -931,7 +931,6 @@ namespace HandBrakeWPF.ViewModels
this.VideoBitrate = preset.Task.VideoEncodeRateType == VideoEncodeRateType.AverageBitrate ? preset.Task.VideoBitrate : null;
-
this.NotifyOfPropertyChange(() => this.Task);
if (preset.Task != null)
@@ -1336,7 +1335,6 @@ namespace HandBrakeWPF.ViewModels
|| this.SelectedVideoEncoder == VideoEncoder.QuickSync
|| this.SelectedVideoEncoder == VideoEncoder.QuickSyncH265;
-
// Refresh Display
this.NotifyOfPropertyChange(() => this.Rfqp);
this.NotifyOfPropertyChange(() => this.ShowAdvancedTab);