pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fix toobar issue and added resource strings

pull/4/head
eusebiu 15 years ago
parent
b53f8635f2
commit
0619139d42
5 changed files with 50 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      data/resources/StringResources.resx
  2. 26
      src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.addin
  3. 26
      src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
  4. 2
      src/Main/Base/Project/Src/Bookmarks/Pad/BookmarkPadToolbarCommands.cs
  5. 13
      src/Main/Base/Project/Src/Commands/DebugCommands.cs

10
data/resources/StringResources.resx
Unescape View File

@ -4297,6 +4297,12 @@ you have write permission in that path and file. (maybe a write protection probl @@ -4297,6 +4297,12 @@ you have write permission in that path and file. (maybe a write protection probl
<data name="ICSharpCode.SharpDevelop.CodeGenerator.ToString.Hint" xml:space="preserve">
<value>Choose Properties to include in the description</value>
</data>
<data name="ICSharpCode.SharpDevelop.Commands.Debug.RemoveAllBreakPoints" xml:space="preserve">
<value>Do you want to remove all breakpoints?</value>
</data>
<data name="ICSharpCode.SharpDevelop.Commands.Debug.RemoveAllBreakPointsCaption" xml:space="preserve">
<value>Remove breakpoints</value>
</data>
<data name="ICSharpCode.SharpDevelop.Commands.CharpConvertProjectToVB" xml:space="preserve">
<value>From C# to VB.NET</value>
</data>
@ -7878,6 +7884,10 @@ The resources files have been renamed/moved accordingly.</value> @@ -7878,6 +7884,10 @@ The resources files have been renamed/moved accordingly.</value>
<value>Toggle Breakpoint</value>
<comment>Set/remove breakpoint on current line</comment>
</data>
<data name="XML.MainMenu.DebugMenu.RemoveAllBreakpoints" xml:space="preserve">
<value>Remove all breakpoints</value>
<comment>Remove all breakpoints</comment>
</data>
<data name="XML.MainMenu.EditMenu" xml:space="preserve">
<value>&amp;Edit</value>
</data>

26
src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.addin
Unescape View File

@ -165,30 +165,4 @@ @@ -165,30 +165,4 @@
<Class class="Debugger.AddIn.Visualizers.ObjectGraphVisualizerDescriptor" />
<Class class="Debugger.AddIn.Visualizers.GridVisualizerDescriptor" />
</Path>
<Path name="/SharpDevelop/Pads/BreakpointPad/Toolbar">
<ToolbarItem id = "GotoPrev"
icon = "Bookmarks.PrevBreakpoint"
tooltip = "${res:MainWindow.Windows.BookmarkPad.GotoPrev.ToolTip}"
class = "ICSharpCode.SharpDevelop.Project.Commands.PrevBreakpointCommand"/>
<ToolbarItem id = "GotoNext"
icon = "Bookmarks.NextBreakpoint"
tooltip = "${res:MainWindow.Windows.BookmarkPad.GotoNext.ToolTip}"
class = "ICSharpCode.SharpDevelop.Project.Commands.NextBreakpointCommand"/>
<ToolbarItem id = "GotoInFolderSeparator" type = "Separator" />
<ToolbarItem id = "DisableAllBreakpoints"
icon = "Bookmarks.DisableAllBreakpoints"
tooltip = "${res:MainWindow.Windows.BookmarkPad.EnableDisableAll.ToolTip}"
class = "ICSharpCode.SharpDevelop.Bookmarks.EnableDisableAll"/>
<ToolbarItem id = "EnableDisableSeparator" type = "Separator" />
<ToolbarItem id = "DeleteMark"
icon = "Icons.16x16.DeleteIcon"
tooltip = "${res:MainWindow.Windows.BookmarkPad.DeleteMark.ToolTip}"
class = "ICSharpCode.SharpDevelop.Bookmarks.DeleteMark"/>
<ToolbarItem id = "EnableDisableSeparator" type = "Separator" />
<ToolbarItem id = "DeleteAllBreakpoints"
icon = "Bookmarks.DeleteAllBreakpoints"
tooltip = "${res:MainWindow.Windows.BookmarkPad.DeleteAllMarks.ToolTip}"
class = "ICSharpCode.SharpDevelop.Project.Commands.RemoveAllBreakpointsCommand"/>
</Path>
</AddIn>

26
src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
Unescape View File

@ -967,6 +967,32 @@ @@ -967,6 +967,32 @@
class="ICSharpCode.SharpDevelop.Commands.NavigateForward"/>
</Condition>
</Path>
<Path name="/SharpDevelop/Pads/BreakpointPad/Toolbar">
<ToolbarItem id = "GotoPrev"
icon = "Bookmarks.PrevBreakpoint"
tooltip = "${res:MainWindow.Windows.BookmarkPad.GotoPrev.ToolTip}"
class = "ICSharpCode.SharpDevelop.Project.Commands.PrevBreakpointCommand"/>
<ToolbarItem id = "GotoNext"
icon = "Bookmarks.NextBreakpoint"
tooltip = "${res:MainWindow.Windows.BookmarkPad.GotoNext.ToolTip}"
class = "ICSharpCode.SharpDevelop.Project.Commands.NextBreakpointCommand"/>
<ToolbarItem id = "GotoInFolderSeparator" type = "Separator" />
<ToolbarItem id = "DisableAllBreakpoints"
icon = "Bookmarks.DisableAllBreakpoints"
tooltip = "${res:MainWindow.Windows.BookmarkPad.EnableDisableAll.ToolTip}"
class = "ICSharpCode.SharpDevelop.Bookmarks.EnableDisableAll"/>
<ToolbarItem id = "EnableDisableSeparator" type = "Separator" />
<ToolbarItem id = "DeleteMark"
icon = "Icons.16x16.DeleteIcon"
tooltip = "${res:MainWindow.Windows.BookmarkPad.DeleteMark.ToolTip}"
class = "ICSharpCode.SharpDevelop.Bookmarks.DeleteBreakpointCommand"/>
<ToolbarItem id = "EnableDisableSeparator" type = "Separator" />
<ToolbarItem id = "DeleteAllBreakpoints"
icon = "Bookmarks.DeleteAllBreakpoints"
tooltip = "${res:MainWindow.Windows.BookmarkPad.DeleteAllMarks.ToolTip}"
class = "ICSharpCode.SharpDevelop.Project.Commands.RemoveAllBreakpointsCommand"/>
</Path>
<!-- end toolbars -->
<Path name = "/SharpDevelop/Workbench/OpenFileTab/ContextMenu">

2
src/Main/Base/Project/Src/Bookmarks/Pad/BookmarkPadToolbarCommands.cs
Unescape View File

@ -39,7 +39,7 @@ namespace ICSharpCode.SharpDevelop.Bookmarks @@ -39,7 +39,7 @@ namespace ICSharpCode.SharpDevelop.Bookmarks
{
protected void deleteBookMark (SDBookmark bookmark) {
if (bookmark == null) return;
if (bookmark is SDMarkerBookmark) return;
if (bookmark is BreakpointBookmark) return;
ICSharpCode.SharpDevelop.Bookmarks.BookmarkManager.RemoveMark(bookmark);
}
}

13
src/Main/Base/Project/Src/Commands/DebugCommands.cs
Unescape View File

@ -173,6 +173,19 @@ namespace ICSharpCode.SharpDevelop.Project.Commands @@ -173,6 +173,19 @@ namespace ICSharpCode.SharpDevelop.Project.Commands
}
}
public class DeleteBreakpointCommand : AbstractMenuCommand
{
public override void Run()
{
var bookmarkBase = (BookmarkPadBase)Owner;
var item = bookmarkBase.CurrentItem;
if (item.Mark is BreakpointBookmark) {
BookmarkManager.RemoveMark(item.Mark);
}
}
}
public sealed class PrevBreakpointCommand : NextPrevBreakpointCommand
{
public override void Run()

Write Preview
Loading…
Cancel
Save