Browse Source

Deleting all selected bookmarks or breakpoints in pad (on Del key or toolbar command), not only one of them.

pull/520/head
Andreas Weizel 11 years ago
parent
commit
bbf0565fe2
  1. 13
      src/Main/Base/Project/Editor/Bookmarks/BookmarkPad.cs
  2. 7
      src/Main/Base/Project/Editor/Bookmarks/BookmarkPadToolbarCommands.cs

13
src/Main/Base/Project/Editor/Bookmarks/BookmarkPad.cs

@ -65,6 +65,10 @@ namespace ICSharpCode.SharpDevelop.Editor.Bookmarks
get { return (SDBookmark)this.control.listView.SelectedItem; } get { return (SDBookmark)this.control.listView.SelectedItem; }
} }
public IEnumerable<SDBookmark> SelectedItems {
get { return this.control.listView.SelectedItems.OfType<SDBookmark>(); }
}
protected BookmarkPadBase() protected BookmarkPadBase()
{ {
this.control = new BookmarkPadContent(); this.control = new BookmarkPadContent();
@ -86,11 +90,14 @@ namespace ICSharpCode.SharpDevelop.Editor.Bookmarks
}; };
this.control.listView.KeyDown += delegate(object sender, System.Windows.Input.KeyEventArgs e) { this.control.listView.KeyDown += delegate(object sender, System.Windows.Input.KeyEventArgs e) {
SDBookmark bm = this.control.listView.SelectedItem as SDBookmark; var selectedItems = this.SelectedItems.ToList();
if (bm == null) return; if (!selectedItems.Any())
return;
switch (e.Key) { switch (e.Key) {
case System.Windows.Input.Key.Delete: case System.Windows.Input.Key.Delete:
SD.BookmarkManager.RemoveMark(bm); foreach (var selectedItem in selectedItems) {
SD.BookmarkManager.RemoveMark(selectedItem);
}
break; break;
} }
}; };

7
src/Main/Base/Project/Editor/Bookmarks/BookmarkPadToolbarCommands.cs

@ -67,8 +67,11 @@ namespace ICSharpCode.SharpDevelop.Editor.Bookmarks
public override void Run() public override void Run()
{ {
BookmarkPadBase pad = (BookmarkPadBase)this.Owner; BookmarkPadBase pad = (BookmarkPadBase)this.Owner;
if (pad.SelectedItem != null) { var selectedItems = pad.SelectedItems.ToList();
SD.BookmarkManager.RemoveMark(pad.SelectedItem); if (selectedItems.Any()) {
foreach (var selectedItem in selectedItems) {
SD.BookmarkManager.RemoveMark(selectedItem);
}
} }
} }
} }

Loading…
Cancel
Save