Merge pull request #8482 from mono/nuget-manage-packages-checkbox-selection-via-keyboard

[NuGet] Allow checkboxes to be selected by keyboard in packages dialog

1 files changed, 3 insertions, 46 deletions

diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/ManagePackagesDialog.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/ManagePackagesDialog.cs
index 2cf875404d..967351c86e 100644
--- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/ManagePackagesDialog.cs
+++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/ManagePackagesDialog.cs
@@ -101,7 +101,6 @@ namespace MonoDevelop.PackageManagement
 			this.packageSourceComboBox.SelectionChanged += PackageSourceChanged;
 			this.addPackagesButton.Clicked += AddPackagesButtonClicked;
 			this.packageSearchEntry.Changed += PackageSearchEntryChanged;
-			this.packageSearchEntry.Activated += PackageSearchEntryActivated;
 			this.packageVersionComboBox.SelectionChanged += PackageVersionChanged;
 			imageLoader.Loaded += ImageLoaded;
 
@@ -836,51 +835,9 @@ namespace MonoDevelop.PackageManagement
 
 		void PackagesListRowActivated (object sender, ListViewRowEventArgs e)
 		{
-			if (PackagesCheckedCount > 0) {
-				AddPackagesButtonClicked (sender, e);
-			} else {
-				ManagePackagesSearchResultViewModel packageViewModel = packageStore.GetValue (e.RowIndex, packageViewModelField);
-				ManagePackage (packageViewModel);
-			}
-		}
-
-		void ManagePackage (ManagePackagesSearchResultViewModel packageViewModel)
-		{
-			try {
-				if (packageViewModel != null) {
-					if (viewModel.IsConsolidatePageSelected) {
-						List<IPackageAction> packageActions = viewModel.CreateConsolidatePackageActions (
-							new ManagePackagesSearchResultViewModel [] { packageViewModel }
-						);
-						RunPackageActions (packageActions);
-					} else {
-						var projects = SelectProjects (packageViewModel).ToList ();
-						if (!projects.Any ())
-							return;
-
-						List<IPackageAction> packageActions = viewModel.CreatePackageActions (
-							new ManagePackagesSearchResultViewModel [] { packageViewModel },
-							projects);
-						RunPackageActions (packageActions);
-					}
-				}
-			} catch (Exception ex) {
-				LoggingService.LogInternalError ("ManagePackage failed.", ex);
-				ShowErrorMessage (ex.Message);
-			}
-		}
-
-		void PackageSearchEntryActivated (object sender, EventArgs e)
-		{
-			if (loadingMessageVisible)
-				return;
-
-			if (PackagesCheckedCount > 0) {
-				AddPackagesButtonClicked (sender, e);
-			} else {
-				ManagePackagesSearchResultViewModel selectedPackageViewModel = GetSelectedPackageViewModel ();
-				ManagePackage (selectedPackageViewModel);
-			}
+			ManagePackagesSearchResultViewModel packageViewModel = packageStore.GetValue (e.RowIndex, packageViewModelField);
+			packageViewModel.IsChecked = !packageViewModel.IsChecked;
+			PackageCellViewPackageChecked (null, null);
 		}
 
 		void PackagesListViewScrollValueChanged (object sender, EventArgs e)