diff options
| author | sr55 <[email protected]> | 2014-11-29 20:08:06 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2014-11-29 20:08:06 +0000 |
| commit | a3341ae890cadc580d29c460ad5ae73498e07119 (patch) | |
| tree | 6732716117247c386d3b34d2dded4b5bb5e8726f /win/CS/HandBrakeWPF/ViewModels | |
| parent | d1c09806176975cc724021cbbc6989c11b59c685 (diff) | |
[Merge] Merging fixes 6569 to 6571
git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/0.10.x@6572 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrakeWPF/ViewModels')
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs | 10 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs | 13 |
2 files changed, 23 insertions, 0 deletions
diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs index e08d2d9ff..fba717b4c 100644 --- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs @@ -9,6 +9,8 @@ namespace HandBrakeWPF.ViewModels.Interfaces
{
+ using System.Windows;
+
using HandBrake.ApplicationServices.Model;
/// <summary>
@@ -92,5 +94,13 @@ namespace HandBrakeWPF.ViewModels.Interfaces /// The show cli query.
/// </summary>
void ShowCliQuery();
+
+ /// <summary>
+ /// The files dropped on window.
+ /// </summary>
+ /// <param name="e">
+ /// The e.
+ /// </param>
+ void FilesDroppedOnWindow(DragEventArgs e);
}
}
\ No newline at end of file diff --git a/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs index ef32eb205..10c82f1a4 100644 --- a/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs @@ -9,6 +9,8 @@ namespace HandBrakeWPF.ViewModels
{
+ using System.IO;
+ using System.Linq;
using System.Windows;
using Caliburn.Micro;
@@ -186,6 +188,17 @@ namespace HandBrakeWPF.ViewModels #endregion
/// <summary>
+ /// The files dropped on window. Pass this through to the active view model.
+ /// </summary>
+ /// <param name="e">
+ /// The DragEventArgs.
+ /// </param>
+ public void FilesDroppedOnWindow(DragEventArgs e)
+ {
+ this.MainViewModel.FilesDroppedOnWindow(e);
+ }
+
+ /// <summary>
/// Checks with the use if this window can be closed.
/// </summary>
/// <returns>
|