update icons in breakpoint pad

src/AddIns/Debugger/Debugger.AddIn/Pads/Controls/ConditionCell.xaml.cs

@@ -121,17 +121,21 @@ namespace Debugger.AddIn.Pads.Controls
 					
 			if (!string.IsNullOrEmpty(console.CommandText)) {
 				Breakpoint.Action = BreakpointAction.Condition;
-				Model.Image = PresentationResourceService.GetImage("Bookmarks.BreakpointConditional").Source;
+				if (Breakpoint.IsEnabled)
+					Model.Image = BreakpointBookmark.BreakpointConditionalImage.ImageSource;
 			}
 			else {
 				Breakpoint.Action = BreakpointAction.Break;
-				Model.Image = PresentationResourceService.GetImage("Bookmarks.Breakpoint").Source;
+				if (Breakpoint.IsEnabled)
+					Model.Image = BreakpointBookmark.BreakpointImage.ImageSource;
 			}
 		}
 		
 		private bool CheckSyntax()
 		{
 			string command = CommandText;
+			if (string.IsNullOrEmpty(command))
+				return true;
 			
 			// FIXME workaround the NRefactory issue that needs a ; at the end
 			if (language == "C#") {

src/Main/Base/Project/Src/Bookmarks/Pad/BookmarkPad.cs

@@ -38,7 +38,7 @@ namespace ICSharpCode.SharpDevelop.Bookmarks
 		
 		public BookmarkPad()
 		{
-			instance = this;			
+			instance = this;
 			myPanel.Children.Add(CreateToolBar());
 			listView.HideColumns(2, 0);
 		}
@@ -125,7 +125,9 @@ namespace ICSharpCode.SharpDevelop.Bookmarks
 			if (!ShowBookmarkInThisPad(mark))
 				return;
 			
-			listView.Add(new ListViewPadItemModel(mark));
+			var model = new ListViewPadItemModel(mark);
+			model.PropertyChanged += OnModelPropertyChanged;
+			listView.Add(model);
 		}
 		
 		protected virtual bool ShowBookmarkInThisPad(SDBookmark mark)
@@ -140,7 +142,10 @@ namespace ICSharpCode.SharpDevelop.Bookmarks
 		
 		void BookmarkManagerRemoved(object sender, BookmarkEventArgs e)
 		{
-			listView.Remove(new ListViewPadItemModel(e.Bookmark));
+			if (ShowBookmarkInThisPad(e.Bookmark)) {
+				var model = listView.Remove(e.Bookmark);
+				model.PropertyChanged -= OnModelPropertyChanged;
+			}
 		}
 		
 		void listView_ItemActivated(object sender, EventArgs e)
@@ -151,7 +156,23 @@ namespace ICSharpCode.SharpDevelop.Bookmarks
 				if (mark != null) {
 					FileService.JumpToFilePosition(mark.FileName, mark.LineNumber, 1);
 				}
-			}	
+			}
+		}
+		
+		void OnModelPropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+		{
+			var model = sender as ListViewPadItemModel;
+			if (e.PropertyName == "IsChecked") {
+				if (model.Mark is BreakpointBookmark) {
+					var bpm = model.Mark as BreakpointBookmark;
+					bpm.IsEnabled = model.IsChecked;
+					if (model.IsChecked) {
+						model.Image = string.IsNullOrEmpty(model.Condition) ? BreakpointBookmark.BreakpointImage.ImageSource : BreakpointBookmark.BreakpointConditionalImage.ImageSource;
+					} else {
+						model.Image = BreakpointBookmark.DisabledBreakpointImage.ImageSource;
+					}
+				}
+			}
 		}
 	}
 }

src/Main/Base/Project/Src/Bookmarks/Pad/Controls/ListViewPad.xaml.cs

@@ -89,22 +89,22 @@ namespace ICSharpCode.SharpDevelop.Bookmarks.Pad.Controls
 			ItemCollection.Add(item);
 		}
 		
-		public void Remove(ListViewPadItemModel item)
+		public ListViewPadItemModel Remove(SDBookmark bookmark)
 		{
-			SDBookmark bookmark1 = item.Mark as SDBookmark;
-			
-			if (bookmark1 is CurrentLineBookmark)
-				return;
+			if (bookmark is CurrentLineBookmark)
+				return null;
 			
-			foreach (var line in itemCollection) {
-				SDBookmark bookmark2 = line.Mark as SDBookmark;
+			foreach (var model in itemCollection) {
+				SDBookmark currentBookmark = model.Mark as SDBookmark;
 				
-				if (bookmark1.FileName == bookmark2.FileName &&
-				    bookmark1.LineNumber == bookmark2.LineNumber) {
-					ItemCollection.Remove(line);
-					break;
+				if (bookmark.FileName == currentBookmark.FileName &&
+				    bookmark.LineNumber == currentBookmark.LineNumber) {
+					ItemCollection.Remove(model);
+					return model;
 				}
 			}
+			
+			return null;
 		}
 		
 		public void AddColumn(string header, DataTemplate cellTemplate)
@@ -233,14 +233,7 @@ namespace ICSharpCode.SharpDevelop.Bookmarks.Pad.Controls
 		
 		private void NotifyPropertyChanged(string property)
 		{
-			if (property == "IsChecked")
-			{
-				if (Mark is BreakpointBookmark)
-					(Mark as BreakpointBookmark).IsEnabled = isChecked;
-			}
-			
-			if (PropertyChanged != null)
-			{
+			if (PropertyChanged != null) {
 				PropertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(property));
 			}
 		}