Drag & Drop added

BornToBeRoot · BornToBeRoot · commit 9f094bcce1b4 · 2018-05-12T03:41:58.000+02:00
diff --git a/Source/NETworkManager/ViewModels/SettingsImportExportViewModel.cs b/Source/NETworkManager/ViewModels/SettingsImportExportViewModel.cs
@@ -19,18 +19,18 @@ public class SettingsImportExportViewModel : ViewModelBase
 
         #region Variables
         #region Import
-        private string _importLocationSelectedPath;
-        public string ImportLocationSelectedPath
+        private string _importFilePath;
+        public string ImportFilePath
         {
-            get { return _importLocationSelectedPath; }
+            get { return _importFilePath; }
             set
             {
-                if (value == _importLocationSelectedPath)
+                if (value == _importFilePath)
                     return;
 
                 ImportFileIsValid = false;
 
-                _importLocationSelectedPath = value;
+                _importFilePath = value;
                 OnPropertyChanged();
             }
         }
@@ -48,7 +48,7 @@ public bool ImportFileIsValid
                 OnPropertyChanged();
             }
         }
-
+                
         public bool _importEverything = true;
         public bool ImportEverything
         {
@@ -718,7 +718,7 @@ private void BrowseFileAction()
             };
 
             if (openFileDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
-                ImportLocationSelectedPath = openFileDialog.FileName;
+                ImportFilePath = openFileDialog.FileName;
         }
 
         public ICommand ValidateImportSettingsCommand
@@ -730,7 +730,7 @@ private async void ValidateImportSettingsAction()
         {
             try
             {
-                List<ImportExportManager.ImportExportOptions> importOptions = ImportExportManager.ValidateImportFile(ImportLocationSelectedPath);
+                List<ImportExportManager.ImportExportOptions> importOptions = ImportExportManager.ValidateImportFile(ImportFilePath);
 
                 ImportFileIsValid = true;
                 ImportApplicationSettingsExists = importOptions.Contains(ImportExportManager.ImportExportOptions.ApplicationSettings);
@@ -848,7 +848,7 @@ private async void ImportSettingsAction()
                 }
 
                 // Import (copy) files from zip archive
-                ImportExportManager.Import(ImportLocationSelectedPath, importOptions);
+                ImportExportManager.Import(ImportFilePath, importOptions);
 
                 // Do the import (replace or add)
                 if (importOptions.Contains(ImportExportManager.ImportExportOptions.NetworkInterfaceProfiles))
@@ -1013,6 +1013,13 @@ public void SaveAndCheckSettings()
             PuTTYSessionsExists = File.Exists(PuTTYSessionManager.GetSessionsFilePath());
             WakeOnLANClientsExists = File.Exists(WakeOnLANClientManager.GetClientsFilePath());
         }
+
+        public void SetImportLocationFilePathFromDragDrop(string filePath)
+        {
+            ImportFilePath = filePath;
+                        
+            OnPropertyChanged(nameof(ImportFilePath));
+        }
         #endregion
     }
 }
diff --git a/Source/NETworkManager/ViewModels/SettingsSettingsViewModel.cs b/Source/NETworkManager/ViewModels/SettingsSettingsViewModel.cs
@@ -46,7 +46,7 @@ public bool MovingFiles
                 OnPropertyChanged();
             }
         }
-
+              
         private bool _isPortable;
         public bool IsPortable
         {
@@ -650,6 +650,13 @@ public void SaveAndCheckSettings()
             PuTTYSessionsExists = File.Exists(PuTTYSessionManager.GetSessionsFilePath());
             WakeOnLANClientsExists = File.Exists(WakeOnLANClientManager.GetClientsFilePath());
         }
+
+        public void SetLocationPathFromDragDrop(string path)
+        {
+            LocationSelectedPath = path;
+
+            OnPropertyChanged(nameof(LocationSelectedPath));
+        }
         #endregion
     }
 }
diff --git a/Source/NETworkManager/Views/SettingsImportExportView.xaml b/Source/NETworkManager/Views/SettingsImportExportView.xaml
@@ -18,9 +18,9 @@
     </UserControl.Resources>
     <StackPanel >
         <TextBlock Style="{StaticResource HeaderTextBlock}" Text="{DynamicResource String_Header_Import}" />
-        <TextBox x:Name="txtImportLocation" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_LocationOfTheImport}" Style="{StaticResource BrowseFolderTextBox}" mah:TextBoxHelper.ButtonCommand="{Binding BrowseFileCommand}" Margin="0,0,0,10">
+        <TextBox x:Name="txtImportFilePath" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_LocationOfTheImport}" Style="{StaticResource BrowseFolderTextBox}" mah:TextBoxHelper.ButtonCommand="{Binding BrowseFileCommand}" AllowDrop="True" Drop="txtImportFilePath_Drop" PreviewDragOver="txtImportFilePath_PreviewDragOver" Margin="0,0,0,10">
             <TextBox.Text>
-                <Binding Path="ImportLocationSelectedPath" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
+                <Binding Path="ImportFilePath" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                     <Binding.ValidationRules>
                         <Validator:EmptyValidator ValidatesOnTargetUpdated="True" />
                         <Validator:FileExistsValidator ValidatesOnTargetUpdated="True" />
@@ -33,7 +33,7 @@
                 <Style TargetType="{x:Type Button}" BasedOn="{StaticResource DefaultButton}">
                     <Setter Property="IsEnabled" Value="False" />
                     <Style.Triggers>
-                        <DataTrigger Binding="{Binding ElementName=txtImportLocation, Path=(Validation.HasError)}" Value="False">
+                        <DataTrigger Binding="{Binding ElementName=txtImportFilePath, Path=(Validation.HasError)}" Value="False">
                             <Setter Property="IsEnabled" Value="True" />
                         </DataTrigger>
                     </Style.Triggers>
diff --git a/Source/NETworkManager/Views/SettingsImportExportView.xaml.cs b/Source/NETworkManager/Views/SettingsImportExportView.xaml.cs
@@ -25,5 +25,21 @@ public void SaveAndCheckSettings()
         {
             viewModel.SaveAndCheckSettings();
         }
+
+        private void txtImportFilePath_Drop(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(DataFormats.FileDrop))
+            {
+                string[] files = (string[])e.Data.GetData(DataFormats.FileDrop);
+
+                viewModel.SetImportLocationFilePathFromDragDrop(files[0]);
+            }
+        }
+
+        private void txtImportFilePath_PreviewDragOver(object sender, DragEventArgs e)
+        {
+            e.Effects = DragDropEffects.Copy;
+            e.Handled = true;
+        }
     }
 }
diff --git a/Source/NETworkManager/Views/SettingsSettingsView.xaml b/Source/NETworkManager/Views/SettingsSettingsView.xaml
@@ -21,7 +21,7 @@
     </UserControl.Resources>
     <StackPanel >
         <TextBlock Style="{StaticResource HeaderTextBlock}" Text="{DynamicResource String_Header_Location}" />
-        <TextBox x:Name="txtLocation" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_EnterLocation}" mah:TextBoxHelper.ButtonCommand="{Binding BrowseFolderCommand}" Margin="0,0,0,10">
+        <TextBox x:Name="txtLocation" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_EnterLocation}" mah:TextBoxHelper.ButtonCommand="{Binding BrowseFolderCommand}" AllowDrop="True" Drop="txtLocation_Drop" PreviewDragOver="txtLocation_PreviewDragOver" Margin="0,0,0,10">
             <TextBox.Text>
                 <Binding Path="LocationSelectedPath" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                     <Binding.ValidationRules>
diff --git a/Source/NETworkManager/Views/SettingsSettingsView.xaml.cs b/Source/NETworkManager/Views/SettingsSettingsView.xaml.cs
@@ -25,5 +25,21 @@ public void SaveAndCheckSettings()
         {
             viewModel.SaveAndCheckSettings();
         }
+
+        private void txtLocation_Drop(object sender, DragEventArgs e)
+        {
+            if (e.Data.GetDataPresent(DataFormats.FileDrop))
+            {
+                string[] files = (string[])e.Data.GetData(DataFormats.FileDrop);
+
+                viewModel.SetLocationPathFromDragDrop(files[0]);
+            }
+        }
+
+        private void txtLocation_PreviewDragOver(object sender, DragEventArgs e)
+        {
+            e.Effects = DragDropEffects.Copy;
+            e.Handled = true;
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -19,18 +19,18 @@ public class SettingsImportExportViewModel : ViewModelBase`
`19`	`19`
`20`	`20`	`#region Variables`
`21`	`21`	`#region Import`
`22`		`- private string _importLocationSelectedPath;`
`23`		`- public string ImportLocationSelectedPath`
	`22`	`+ private string _importFilePath;`
	`23`	`+ public string ImportFilePath`
`24`	`24`	`{`
`25`		`- get { return _importLocationSelectedPath; }`
	`25`	`+ get { return _importFilePath; }`
`26`	`26`	`set`
`27`	`27`	`{`
`28`		`- if (value == _importLocationSelectedPath)`
	`28`	`+ if (value == _importFilePath)`
`29`	`29`	`return;`
`30`	`30`
`31`	`31`	`ImportFileIsValid = false;`
`32`	`32`
`33`		`- _importLocationSelectedPath = value;`
	`33`	`+ _importFilePath = value;`
`34`	`34`	`OnPropertyChanged();`
`35`	`35`	`}`
`36`	`36`	`}`
`@@ -48,7 +48,7 @@ public bool ImportFileIsValid`
`48`	`48`	`OnPropertyChanged();`
`49`	`49`	`}`
`50`	`50`	`}`
`51`		`-`
	`51`	`+`
`52`	`52`	`public bool _importEverything = true;`
`53`	`53`	`public bool ImportEverything`
`54`	`54`	`{`
`@@ -718,7 +718,7 @@ private void BrowseFileAction()`
`718`	`718`	`};`
`719`	`719`
`720`	`720`	`if (openFileDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)`
`721`		`- ImportLocationSelectedPath = openFileDialog.FileName;`
	`721`	`+ ImportFilePath = openFileDialog.FileName;`
`722`	`722`	`}`
`723`	`723`
`724`	`724`	`public ICommand ValidateImportSettingsCommand`
`@@ -730,7 +730,7 @@ private async void ValidateImportSettingsAction()`
`730`	`730`	`{`
`731`	`731`	`try`
`732`	`732`	`{`
`733`		`- List<ImportExportManager.ImportExportOptions> importOptions = ImportExportManager.ValidateImportFile(ImportLocationSelectedPath);`
	`733`	`+ List<ImportExportManager.ImportExportOptions> importOptions = ImportExportManager.ValidateImportFile(ImportFilePath);`
`734`	`734`
`735`	`735`	`ImportFileIsValid = true;`
`736`	`736`	`ImportApplicationSettingsExists = importOptions.Contains(ImportExportManager.ImportExportOptions.ApplicationSettings);`
`@@ -848,7 +848,7 @@ private async void ImportSettingsAction()`
`848`	`848`	`}`
`849`	`849`
`850`	`850`	`// Import (copy) files from zip archive`
`851`		`- ImportExportManager.Import(ImportLocationSelectedPath, importOptions);`
	`851`	`+ ImportExportManager.Import(ImportFilePath, importOptions);`
`852`	`852`
`853`	`853`	`// Do the import (replace or add)`
`854`	`854`	`if (importOptions.Contains(ImportExportManager.ImportExportOptions.NetworkInterfaceProfiles))`
`@@ -1013,6 +1013,13 @@ public void SaveAndCheckSettings()`
`1013`	`1013`	`PuTTYSessionsExists = File.Exists(PuTTYSessionManager.GetSessionsFilePath());`
`1014`	`1014`	`WakeOnLANClientsExists = File.Exists(WakeOnLANClientManager.GetClientsFilePath());`
`1015`	`1015`	`}`
	`1016`	`+`
	`1017`	`+ public void SetImportLocationFilePathFromDragDrop(string filePath)`
	`1018`	`+ {`
	`1019`	`+ ImportFilePath = filePath;`
	`1020`	`+`
	`1021`	`+ OnPropertyChanged(nameof(ImportFilePath));`
	`1022`	`+ }`
`1016`	`1023`	`#endregion`
`1017`	`1024`	`}`
`1018`	`1025`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public bool MovingFiles`
`46`	`46`	`OnPropertyChanged();`
`47`	`47`	`}`
`48`	`48`	`}`
`49`		`-`
	`49`	`+`
`50`	`50`	`private bool _isPortable;`
`51`	`51`	`public bool IsPortable`
`52`	`52`	`{`
`@@ -650,6 +650,13 @@ public void SaveAndCheckSettings()`
`650`	`650`	`PuTTYSessionsExists = File.Exists(PuTTYSessionManager.GetSessionsFilePath());`
`651`	`651`	`WakeOnLANClientsExists = File.Exists(WakeOnLANClientManager.GetClientsFilePath());`
`652`	`652`	`}`
	`653`	`+`
	`654`	`+ public void SetLocationPathFromDragDrop(string path)`
	`655`	`+ {`
	`656`	`+ LocationSelectedPath = path;`
	`657`	`+`
	`658`	`+ OnPropertyChanged(nameof(LocationSelectedPath));`
	`659`	`+ }`
`653`	`660`	`#endregion`
`654`	`661`	`}`
`655`	`662`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,5 +25,21 @@ public void SaveAndCheckSettings()`
`25`	`25`	`{`
`26`	`26`	`viewModel.SaveAndCheckSettings();`
`27`	`27`	`}`
	`28`	`+`
	`29`	`+ private void txtImportFilePath_Drop(object sender, DragEventArgs e)`
	`30`	`+ {`
	`31`	`+ if (e.Data.GetDataPresent(DataFormats.FileDrop))`
	`32`	`+ {`
	`33`	`+ string[] files = (string[])e.Data.GetData(DataFormats.FileDrop);`
	`34`	`+`
	`35`	`+ viewModel.SetImportLocationFilePathFromDragDrop(files[0]);`
	`36`	`+ }`
	`37`	`+ }`
	`38`	`+`
	`39`	`+ private void txtImportFilePath_PreviewDragOver(object sender, DragEventArgs e)`
	`40`	`+ {`
	`41`	`+ e.Effects = DragDropEffects.Copy;`
	`42`	`+ e.Handled = true;`
	`43`	`+ }`
`28`	`44`	`}`
`29`	`45`	`}`