Browse Source

fixed SD2-1619 - Checkmark in Breakpoint context menu missing

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@5232 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
pull/1/head
Siegfried Pammer 16 years ago
parent
commit
74086bc0ac
  1. 2
      data/resources/image/BitmapResources/BitmapResources.res
  2. BIN
      data/resources/image/BitmapResources/Bookmarks/BreakpointConditional.png
  3. BIN
      data/resources/image/BitmapResources/Bookmarks/UnhealthyBreakpointConditional.png
  4. 17
      src/Main/Base/Project/Src/Services/Debugger/BreakpointBookmark.cs
  5. 1
      src/Main/Base/Project/Src/Util/ExtensionMethods.cs
  6. BIN
      src/Main/StartUp/Project/Resources/BitmapResources.resources

2
data/resources/image/BitmapResources/BitmapResources.res

@ -333,8 +333,10 @@ Bookmarks.DeleteAllMarks = Bookmarks\DeleteAllMarks.png
Bookmarks.EnableDisableAll = Bookmarks\EnableDisableAll.png Bookmarks.EnableDisableAll = Bookmarks\EnableDisableAll.png
Bookmarks.EnableDisableMark = Bookmarks\EnableDisableMark.png Bookmarks.EnableDisableMark = Bookmarks\EnableDisableMark.png
Bookmarks.Breakpoint = Bookmarks\Breakpoint.png Bookmarks.Breakpoint = Bookmarks\Breakpoint.png
Bookmarks.BreakpointConditional = Bookmarks\BreakpointConditional.png
Bookmarks.DisabledBreakpoint = Bookmarks\DisabledBreakpoint.png Bookmarks.DisabledBreakpoint = Bookmarks\DisabledBreakpoint.png
Bookmarks.UnhealthyBreakpoint = Bookmarks\UnhealthyBreakpoint.png Bookmarks.UnhealthyBreakpoint = Bookmarks\UnhealthyBreakpoint.png
Bookmarks.UnhealthyBreakpointConditional = Bookmarks\UnhealthyBreakpointConditional.png
Bookmarks.CurrentLine = Bookmarks\CurrentLine.png Bookmarks.CurrentLine = Bookmarks\CurrentLine.png
#backend icons #backend icons

BIN
data/resources/image/BitmapResources/Bookmarks/BreakpointConditional.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 691 B

BIN
data/resources/image/BitmapResources/Bookmarks/UnhealthyBreakpointConditional.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 625 B

17
src/Main/Base/Project/Src/Services/Debugger/BreakpointBookmark.cs

@ -41,8 +41,15 @@ namespace ICSharpCode.SharpDevelop.Debugging
} }
public BreakpointAction Action { public BreakpointAction Action {
get { return action; } get {
set { this.action = value; } return action;
}
set {
if (action != value) {
action = value;
Redraw();
}
}
} }
public virtual bool IsHealthy { public virtual bool IsHealthy {
@ -86,17 +93,19 @@ namespace ICSharpCode.SharpDevelop.Debugging
} }
public static readonly IImage BreakpointImage = new ResourceServiceImage("Bookmarks.Breakpoint"); public static readonly IImage BreakpointImage = new ResourceServiceImage("Bookmarks.Breakpoint");
public static readonly IImage BreakpointConditionalImage = new ResourceServiceImage("Bookmarks.BreakpointConditional");
public static readonly IImage DisabledBreakpointImage = new ResourceServiceImage("Bookmarks.DisabledBreakpoint"); public static readonly IImage DisabledBreakpointImage = new ResourceServiceImage("Bookmarks.DisabledBreakpoint");
public static readonly IImage UnhealthyBreakpointImage = new ResourceServiceImage("Bookmarks.UnhealthyBreakpoint"); public static readonly IImage UnhealthyBreakpointImage = new ResourceServiceImage("Bookmarks.UnhealthyBreakpoint");
public static readonly IImage UnhealthyBreakpointConditionalImage = new ResourceServiceImage("Bookmarks.UnhealthyBreakpointConditional");
public override IImage Image { public override IImage Image {
get { get {
if (!this.IsEnabled) if (!this.IsEnabled)
return DisabledBreakpointImage; return DisabledBreakpointImage;
else if (this.IsHealthy) else if (this.IsHealthy)
return BreakpointImage; return this.Action == BreakpointAction.Break ? BreakpointImage : BreakpointConditionalImage;
else else
return UnhealthyBreakpointImage; return this.Action == BreakpointAction.Break ? UnhealthyBreakpointImage : UnhealthyBreakpointConditionalImage;
} }
} }

1
src/Main/Base/Project/Src/Util/ExtensionMethods.cs

@ -403,6 +403,7 @@ namespace ICSharpCode.SharpDevelop
} else { } else {
r.Click += delegate { item.PerformClick(); }; r.Click += delegate { item.PerformClick(); };
} }
r.IsChecked = item.Checked;
return r; return r;
} }

BIN
src/Main/StartUp/Project/Resources/BitmapResources.resources

Binary file not shown.
Loading…
Cancel
Save