Browse Source

Fixed SD2-1484: Subversion AddIn: Cannot delete ignored file.

P/Invoke AddIn: move "Insert P/Invoke signature" to Edit>Insert menu.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@3711 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 17 years ago
parent
commit
e7cfd48550
  1. 26
      src/AddIns/Misc/PInvokeAddIn/Project/PInvoke.addin
  2. 3
      src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/AutostartCommands.cs

26
src/AddIns/Misc/PInvokeAddIn/Project/PInvoke.addin

@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
author = "Matt Ward"
copyright = "prj:///doc/copyright.txt"
description = "PInvoke.Net integration for SharpDevelop.">
<Manifest>
<Identity name = "ICSharpCode.PInvokeAddIn"/>
<Dependency addin = "SharpDevelop"/>
@ -11,38 +11,38 @@ @@ -11,38 +11,38 @@
<Runtime>
<Import assembly="PInvokeAddIn.dll" />
</Runtime>
<!-- Menu options -->
<Path name="/Workspace/Tools">
<Path name="/SharpDevelop/Workbench/MainMenu/Edit/Insert">
<ComplexCondition action = "Disable">
<Or>
<Condition name = "ActiveContentExtension" activeextension = ".vb"/>
<Condition name = "ActiveContentExtension" activeextension = ".cs"/>
</Or>
<MenuItem id = "InsertPInvoke"
label = "${res:ICSharpCode.PInvokeAddIn.InsertPInvokeSignaturesMenuLabel}"
description = "Insert PInvoke signatures."
class = "ICSharpCode.PInvokeAddIn.InsertPInvokeSignaturesCommand"
label = "${res:ICSharpCode.PInvokeAddIn.InsertPInvokeSignaturesMenuLabel}"
description = "Insert PInvoke signatures."
class = "ICSharpCode.PInvokeAddIn.InsertPInvokeSignaturesCommand"
/>
</ComplexCondition>
</ComplexCondition>
</Path>
<!-- Right click in text editor menu option -->
<Path name = "/SharpDevelop/ViewContent/DefaultTextEditor/ContextMenu">
<MenuItem id = "Separator4"
type = "Separator"
insertafter = "Options"/>
<ComplexCondition action = "Disable">
<Or>
<Condition name = "ActiveContentExtension" activeextension = ".vb"/>
<Condition name = "ActiveContentExtension" activeextension = ".cs"/>
</Or>
</Or>
<MenuItem id = "InsertPInvoke"
label = "${res:ICSharpCode.PInvokeAddIn.InsertPInvokeSignaturesMenuLabel}"
label = "${res:ICSharpCode.PInvokeAddIn.InsertPInvokeSignaturesMenuLabel}"
insertafter = "Separator4"
class ="ICSharpCode.PInvokeAddIn.InsertPInvokeSignaturesCommand"
class ="ICSharpCode.PInvokeAddIn.InsertPInvokeSignaturesCommand"
/>
</ComplexCondition>
</Path>

3
src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/AutostartCommands.cs

@ -221,6 +221,7 @@ namespace ICSharpCode.Svn.Commands @@ -221,6 +221,7 @@ namespace ICSharpCode.Svn.Commands
switch (status.TextStatus) {
case StatusKind.None:
case StatusKind.Unversioned:
case StatusKind.Ignored:
break;
default:
// must be done using the subversion client, even if
@ -272,6 +273,7 @@ namespace ICSharpCode.Svn.Commands @@ -272,6 +273,7 @@ namespace ICSharpCode.Svn.Commands
switch (status.TextStatus) {
case StatusKind.None:
case StatusKind.Unversioned:
case StatusKind.Ignored:
case StatusKind.Deleted:
return; // nothing to do
case StatusKind.Normal:
@ -360,6 +362,7 @@ namespace ICSharpCode.Svn.Commands @@ -360,6 +362,7 @@ namespace ICSharpCode.Svn.Commands
switch (status.TextStatus) {
case StatusKind.Unversioned:
case StatusKind.None:
case StatusKind.Ignored:
return; // nothing to do
case StatusKind.Normal:
case StatusKind.Modified:

Loading…
Cancel
Save