Merge pull request #5529 from MDoerner/OptionToDisableDragAndDrop

retailcoder · web-flow · commit 9dd34c52f9e5 · 2020-07-04T17:30:39.000-04:00
Adds an option to disable drag and drop for CE folders.
diff --git a/Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerViewModel.cs b/Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerViewModel.cs
@@ -63,12 +63,15 @@ public CodeExplorerViewModel(
             _state.StateChanged += HandleStateChanged;
             _state.ModuleStateChanged += ParserState_ModuleStateChanged;
 
-            _externalRemoveCommand = removeCommand;
             _generalSettingsProvider = generalSettingsProvider;
+            _generalSettingsProvider.SettingsChanged += GeneralSettingsChanged;
+            RefreshDragAndDropSetting();
+
             _windowSettingsProvider = windowSettingsProvider;
             _uiDispatcher = uiDispatcher;
             _vbe = vbe;
             _templateProvider = templateProvider;
+            _externalRemoveCommand = removeCommand;
             Annotations = annotations.ToList();
 
             CollapseAllSubnodesCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteCollapseNodes, EvaluateCanSwitchNodeState);
@@ -79,6 +82,7 @@ public CodeExplorerViewModel(
                 RemoveCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteRemoveCommand, _externalRemoveCommand.CanExecute);
             }
 
+
             OnPropertyChanged(nameof(Projects));
 
             SyncCodePaneCommand = syncProvider.GetSyncCommand(this);
@@ -489,12 +493,25 @@ private void ExpandToNode(ICodeExplorerNode node)
 
         public Visibility VBAVisibility => _vbe.Kind == VBEKind.Hosted ? Visibility.Visible : Visibility.Collapsed;
 
+        public bool AllowDragAndDrop { get; internal set; }
+
+        private void GeneralSettingsChanged(object sender, ConfigurationChangedEventArgs e)
+        {
+            RefreshDragAndDropSetting();
+        }
+
+        private void RefreshDragAndDropSetting()
+        {
+            AllowDragAndDrop = _generalSettingsProvider.Read().EnableFolderDragAndDrop;
+        }
+
         public void Dispose()
         {
             if (_state != null)
             {
                 _state.StateChanged -= HandleStateChanged;
                 _state.ModuleStateChanged -= ParserState_ModuleStateChanged;
+                _generalSettingsProvider.SettingsChanged -= GeneralSettingsChanged;
             }
         }
     }
diff --git a/Rubberduck.Core/Properties/Settings.Designer.cs b/Rubberduck.Core/Properties/Settings.Designer.cs
diff --git a/Rubberduck.Core/Settings/GeneralSettings.cs b/Rubberduck.Core/Settings/GeneralSettings.cs
@@ -21,6 +21,7 @@ public interface IGeneralSettings
         bool UserEditedLogLevel { get; set; }
         int MinimumLogLevel { get; set; }
         bool SetDpiUnaware { get; set; }
+        bool EnableFolderDragAndDrop { get; set; }
         List<ExperimentalFeature> EnableExperimentalFeatures { get; set; }
     }
 
@@ -74,6 +75,7 @@ public int MinimumLogLevel
         }
 
         public bool SetDpiUnaware { get; set; }
+        public bool EnableFolderDragAndDrop { get; set; }
 
         public List<ExperimentalFeature> EnableExperimentalFeatures { get; set; } = new List<ExperimentalFeature>();
 
@@ -100,7 +102,8 @@ public bool Equals(GeneralSettings other)
                    MinimumLogLevel == other.MinimumLogLevel &&                   
                    EnableExperimentalFeatures.Count == other.EnableExperimentalFeatures.Count &&
                    EnableExperimentalFeatures.All(other.EnableExperimentalFeatures.Contains) &&
-                   SetDpiUnaware == other.SetDpiUnaware;
+                   SetDpiUnaware == other.SetDpiUnaware &&
+                   EnableFolderDragAndDrop == other.EnableFolderDragAndDrop;
         }
     }
 }
diff --git a/Rubberduck.Core/UI/CodeExplorer/CodeExplorerControl.xaml.cs b/Rubberduck.Core/UI/CodeExplorer/CodeExplorerControl.xaml.cs
@@ -56,11 +56,13 @@ private void TreeView_PreviewMouseMove(object sender, MouseEventArgs e)
 
         private void EvaluateDragInitialization(object sender, MouseEventArgs e)
         {
-            if (e.LeftButton != MouseButtonState.Pressed)
+            if (e.LeftButton != MouseButtonState.Pressed
+                || !(DataContext is CodeExplorerViewModel viewModel)
+                || !viewModel.AllowDragAndDrop)
             {
                 return;
             }
-
+            
             var currentPosition = e.GetPosition(null);
             var fromLeftClick = currentPosition - _lastLeftClickPosition;
 
diff --git a/Rubberduck.Core/UI/Settings/GeneralSettings.xaml b/Rubberduck.Core/UI/Settings/GeneralSettings.xaml
@@ -89,11 +89,13 @@
                     <CheckBox Margin="15,0,0,5" Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_IncludePreRelease}"
                               IsChecked="{Binding IncludePreRelease}"
                               IsEnabled="{Binding IsChecked, ElementName=IsVersionCheckEnabled}"/>
-                    
                     <CheckBox Margin="5,0,0,5" Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_CompileBeforeParse}"
                               IsChecked="{Binding CompileBeforeParse}" />
                     <CheckBox Margin="5,0,0,5" Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_SetDpiUnaware}"
-                              IsEnabled="{Binding SetDpiUnawareEnabled}"  IsChecked="{Binding SetDpiUnaware}" />
+                              IsEnabled="{Binding SetDpiUnawareEnabled}"  
+                              IsChecked="{Binding SetDpiUnaware}" />
+                    <CheckBox Margin="5,0,0,5" Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_EnableDragAndDrop}"
+                              IsChecked="{Binding EnableFolderDragAndDrop}" />
                     <StackPanel Orientation="Horizontal"/>
 
                     <Label Content="{Resx ResxName=Rubberduck.Resources.RubberduckUI, Key=GeneralSettings_MinimumLogLevelLabel}" FontWeight="SemiBold" />
diff --git a/Rubberduck.Core/UI/Settings/GeneralSettingsViewModel.cs b/Rubberduck.Core/UI/Settings/GeneralSettingsViewModel.cs
@@ -102,6 +102,7 @@ public ObservableViewModelCollection<HotkeySettingViewModel> Hotkeys
                 }
             }
         }
+
         private void InvalidateShouldDisplayWarning(object sender, ElementPropertyChangedEventArgs<HotkeySettingViewModel> e)
         {
             OnPropertyChanged(nameof(ShouldDisplayHotkeyModificationLabel));
@@ -195,6 +196,20 @@ public bool CompileBeforeParse
             }
         }
 
+        private bool _enableFolderDragAndDrop;
+        public bool EnableFolderDragAndDrop
+        {
+            get => _enableFolderDragAndDrop;
+            set
+            {
+                if (_enableFolderDragAndDrop != value)
+                {
+                    _enableFolderDragAndDrop = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
         private bool _setDpiUnaware;
         public bool SetDpiUnaware
         {
@@ -305,6 +320,7 @@ private Rubberduck.Settings.GeneralSettings GetCurrentGeneralSettings()
                 IncludePreRelease = IncludePreRelease,
                 CompileBeforeParse = CompileBeforeParse,
                 SetDpiUnaware =  SetDpiUnaware,
+                EnableFolderDragAndDrop = EnableFolderDragAndDrop,
                 IsSmartIndenterPrompted = _indenterPrompted,
                 IsAutoSaveEnabled = AutoSaveEnabled,
                 AutoSavePeriod = AutoSavePeriod,
@@ -331,6 +347,7 @@ private void TransferSettingsToView(IGeneralSettings general, IHotkeySettings ho
             IncludePreRelease = general.IncludePreRelease;
             CompileBeforeParse = general.CompileBeforeParse;
             SetDpiUnaware = general.SetDpiUnaware;
+            EnableFolderDragAndDrop = general.EnableFolderDragAndDrop;
             _indenterPrompted = general.IsSmartIndenterPrompted;
             AutoSaveEnabled = general.IsAutoSaveEnabled;
             AutoSavePeriod = general.AutoSavePeriod;
diff --git a/Rubberduck.Resources/RubberduckUI.Designer.cs b/Rubberduck.Resources/RubberduckUI.Designer.cs
diff --git a/Rubberduck.Resources/RubberduckUI.de.resx b/Rubberduck.Resources/RubberduckUI.de.resx
@@ -1722,6 +1722,9 @@ Wollen Sie fortfahren?</value>
   <data name="RenameDialog_TitleText_Folder" xml:space="preserve">
     <value>Ordner umbenennen</value>
   </data>
+  <data name="GeneralSettings_EnableDragAndDrop" xml:space="preserve">
+    <value>Drag and Drop im Code Explorer aktivieren</value>
+  </data>
   <data name="AnnotateDeclarationDialog_AdjustAttributeLabel" xml:space="preserve">
     <value>Attribut hinzufügen / anpassen</value>
   </data>
diff --git a/Rubberduck.Resources/RubberduckUI.resx b/Rubberduck.Resources/RubberduckUI.resx
@@ -1953,6 +1953,9 @@ Do you want to proceed?</value>
   <data name="RenameDialog_TitleText_Folder" xml:space="preserve">
     <value>Rename folder</value>
   </data>
+  <data name="GeneralSettings_EnableDragAndDrop" xml:space="preserve">
+    <value>Enable drag and drop in Code Explorer</value>
+  </data>
   <data name="AnnotateDeclarationDialog_AdjustAttributeLabel" xml:space="preserve">
     <value>Add/Adjust attribute</value>
   </data>
diff --git a/Rubberduck.Resources/Settings/SettingsUI.Designer.cs b/Rubberduck.Resources/Settings/SettingsUI.Designer.cs
diff --git a/Rubberduck.Resources/Settings/SettingsUI.resx b/Rubberduck.Resources/Settings/SettingsUI.resx
@@ -202,7 +202,7 @@
     <value>Click [{0}] to close the window and apply changes, or [{1}] to discard them.</value>
   </data>
   <data name="PageInstructions_IndenterSettings" xml:space="preserve">
-    <value>Configure indenter settings.</value>
+    <value>Configure indenter settings</value>
   </data>
   <data name="PageInstructions_InspectionSettings" xml:space="preserve">
     <value>Configure inspection severity. Use "DoNotShow" to disable an inspection.</value>
diff --git a/RubberduckTests/CodeExplorer/CodeExplorerViewModelTests.cs b/RubberduckTests/CodeExplorer/CodeExplorerViewModelTests.cs
@@ -13,6 +13,8 @@
 using Rubberduck.Parsing.Annotations;
 using Rubberduck.Parsing.UIContext;
 using Rubberduck.Parsing.VBA;
+using Rubberduck.Settings;
+using Rubberduck.SettingsProvider;
 using Rubberduck.UI.Command.ComCommands;
 using RubberduckTests.Mocks;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
@@ -2353,11 +2355,14 @@ public void UnparsedSetToTrue_NoProjects()
             var parser = MockParser.Create(vbe.Object, null, MockVbeEvents.CreateMockVbeEvents(vbe));
             var state = parser.State;
             var dispatcher = new Mock<IUiDispatcher>();
+            var generalSettingsProvider = new Mock<IConfigurationService<GeneralSettings>>();
+            var generalSettings = new GeneralSettings();
+            generalSettingsProvider.Setup(m => m.Read()).Returns(generalSettings);
 
             dispatcher.Setup(m => m.Invoke(It.IsAny<Action>())).Callback((Action argument) => argument.Invoke());
             dispatcher.Setup(m => m.StartTask(It.IsAny<Action>(), It.IsAny<TaskCreationOptions>())).Returns((Action argument, TaskCreationOptions options) => Task.Factory.StartNew(argument.Invoke, options));
 
-            var viewModel = new CodeExplorerViewModel(state, null, null, null, dispatcher.Object, vbe.Object, null,
+            var viewModel = new CodeExplorerViewModel(state, null, generalSettingsProvider.Object, null, dispatcher.Object, vbe.Object, null,
                 new CodeExplorerSyncProvider(vbe.Object, state, vbeEvents.Object), new List<IAnnotation>());
 
             parser.Parse(new CancellationTokenSource());

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ public interface IGeneralSettings`
`21`	`21`	`bool UserEditedLogLevel { get; set; }`
`22`	`22`	`int MinimumLogLevel { get; set; }`
`23`	`23`	`bool SetDpiUnaware { get; set; }`
	`24`	`+ bool EnableFolderDragAndDrop { get; set; }`
`24`	`25`	`List<ExperimentalFeature> EnableExperimentalFeatures { get; set; }`
`25`	`26`	`}`
`26`	`27`
`@@ -74,6 +75,7 @@ public int MinimumLogLevel`
`74`	`75`	`}`
`75`	`76`
`76`	`77`	`public bool SetDpiUnaware { get; set; }`
	`78`	`+ public bool EnableFolderDragAndDrop { get; set; }`
`77`	`79`
`78`	`80`	`public List<ExperimentalFeature> EnableExperimentalFeatures { get; set; } = new List<ExperimentalFeature>();`
`79`	`81`
`@@ -100,7 +102,8 @@ public bool Equals(GeneralSettings other)`
`100`	`102`	`MinimumLogLevel == other.MinimumLogLevel &&`
`101`	`103`	`EnableExperimentalFeatures.Count == other.EnableExperimentalFeatures.Count &&`
`102`	`104`	`EnableExperimentalFeatures.All(other.EnableExperimentalFeatures.Contains) &&`
`103`		`- SetDpiUnaware == other.SetDpiUnaware;`
	`105`	`+ SetDpiUnaware == other.SetDpiUnaware &&`
	`106`	`+ EnableFolderDragAndDrop == other.EnableFolderDragAndDrop;`
`104`	`107`	`}`
`105`	`108`	`}`
`106`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,11 +56,13 @@ private void TreeView_PreviewMouseMove(object sender, MouseEventArgs e)`
`56`	`56`
`57`	`57`	`private void EvaluateDragInitialization(object sender, MouseEventArgs e)`
`58`	`58`	`{`
`59`		`- if (e.LeftButton != MouseButtonState.Pressed)`
	`59`	`+ if (e.LeftButton != MouseButtonState.Pressed`
	`60`	`+ \|\| !(DataContext is CodeExplorerViewModel viewModel)`
	`61`	`+ \|\| !viewModel.AllowDragAndDrop)`
`60`	`62`	`{`
`61`	`63`	`return;`
`62`	`64`	`}`
`63`		`-`
	`65`	`+`
`64`	`66`	`var currentPosition = e.GetPosition(null);`
`65`	`67`	`var fromLeftClick = currentPosition - _lastLeftClickPosition;`
`66`	`68`