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

remove remaining traces of ITextEditorProvider and ICodeEditorProvider

pull/59/merge
Siegfried Pammer 12 years ago
parent
46c5c037aa
commit
b277aa8865
5 changed files with 18 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/AddIns/Analysis/UnitTesting/Pad/UnitTestNode.cs
  2. 12
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.addin
  3. 8
      src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.addin
  4. 12
      src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
  5. 2
      src/Main/Base/Project/Src/Internal/ConditionEvaluators/WindowOpenEvaluator.cs

2
src/AddIns/Analysis/UnitTesting/Pad/UnitTestNode.cs
Unescape View File

@ -15,8 +15,6 @@ namespace ICSharpCode.UnitTesting
{ {
public class UnitTestNode : ModelCollectionTreeNode public class UnitTestNode : ModelCollectionTreeNode
{ {
protected static readonly IComparer<SharpTreeNode> NodeTextComparer = KeyComparer.Create((SharpTreeNode n) => n.Text.ToString(), StringComparer.OrdinalIgnoreCase, StringComparer.OrdinalIgnoreCase);
readonly ITest test; readonly ITest test;
public UnitTestNode(ITest test) public UnitTestNode(ITest test)

12
src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.addin
Unescape View File

@ -72,19 +72,20 @@
class = "ICSharpCode.XamlBinding.Options.CodeCompletion" /> class = "ICSharpCode.XamlBinding.Options.CodeCompletion" />
</Path> </Path>
<!-- TODO reimplement as context actions
<Path name="/SharpDevelop/Workbench/MainMenu"> <Path name="/SharpDevelop/Workbench/MainMenu">
<ComplexCondition> <ComplexCondition>
<And> <And>
<Condition name="ActiveContentExtension" activeextension=".xaml" /> <Condition name="ActiveContentExtension" activeextension=".xaml" />
<Condition name="WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditorProvider" /> <Condition name="WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditor" />
</And> </And>
<MenuItem id="XamlRefactoring" insertafter="Refactor" insertbefore="Project" label="${res:XML.MainMenu.RefactorMenu}" type="Menu"> <MenuItem id="XamlRefactoring" insertafter="Refactor" insertbefore="Project" label="${res:XML.MainMenu.RefactorMenu}" type="Menu">
<MenuItem id="RemoveMargin" <MenuItem id="RemoveMargin"
class="ICSharpCode.XamlBinding.PowerToys.Commands.RemoveMarginCommand" class="ICSharpCode.XamlBinding.PowerToys.Commands.RemoveMarginCommand"
label="${res:AddIns.XamlBinding.Menu.RemoveMargin}" /> label="${res:AddIns.XamlBinding.Menu.RemoveMargin}" />
<!-- <MenuItem id="RemoveUnnecessaryAttributes" <MenuItem id="RemoveUnnecessaryAttributes"
class="ICSharpCode.XamlBinding.PowerToys.Commands.RemoveUnnecessaryAttributesCommand" class="ICSharpCode.XamlBinding.PowerToys.Commands.RemoveUnnecessaryAttributesCommand"
label="${res:AddIns.XamlBinding.Menu.RemoveUnnecessaryAttributes}" />--> label="${res:AddIns.XamlBinding.Menu.RemoveUnnecessaryAttributes}" />
<MenuItem type="Separator" /> <MenuItem type="Separator" />
<MenuItem id="ExtractPropertiesAsStyle" <MenuItem id="ExtractPropertiesAsStyle"
class="ICSharpCode.XamlBinding.PowerToys.Commands.ExtractPropertiesAsStyleCommand" class="ICSharpCode.XamlBinding.PowerToys.Commands.ExtractPropertiesAsStyleCommand"
@ -138,10 +139,11 @@
<MenuItem id="EditGridColumnsAndRows" <MenuItem id="EditGridColumnsAndRows"
class="ICSharpCode.XamlBinding.PowerToys.Commands.EditGridColumnsAndRowsCommand" class="ICSharpCode.XamlBinding.PowerToys.Commands.EditGridColumnsAndRowsCommand"
label="${res:AddIns.XamlBinding.Menu.EditGridColumnsAndRows}" /> label="${res:AddIns.XamlBinding.Menu.EditGridColumnsAndRows}" />
<!-- <MenuItem id="CreateBusinessForm" <MenuItem id="CreateBusinessForm"
class="ICSharpCode.XamlBinding.PowerToys.Commands.CreateBusinessFormFromClassCommand" class="ICSharpCode.XamlBinding.PowerToys.Commands.CreateBusinessFormFromClassCommand"
label="${res:AddIns.XamlBinding.Menu.CreateBusinessFormFromClass}" />--> label="${res:AddIns.XamlBinding.Menu.CreateBusinessFormFromClass}" />
</MenuItem> </MenuItem>
</ComplexCondition> </ComplexCondition>
</Path> </Path>
-->
</AddIn> </AddIn>

8
src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.addin
Unescape View File

@ -44,7 +44,7 @@
<!-- <!--
<Path name = "/SharpDevelop/ViewContent/TextEditor/ContextMenu"> <Path name = "/SharpDevelop/ViewContent/TextEditor/ContextMenu">
<Condition name = "WindowActive" activewindow="ICSharpCode.AvalonEdit.AddIn.ICodeEditorProvider"> <Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditor">
<MenuItem id = "SaveWithEncoding" <MenuItem id = "SaveWithEncoding"
label = "${res:XML.MainMenu.FileMenu.SaveWithEncoding}" label = "${res:XML.MainMenu.FileMenu.SaveWithEncoding}"
insertafter="SaveAs" insertafter="SaveAs"
@ -55,7 +55,7 @@
--> -->
<Path name = "/SharpDevelop/Workbench/MainMenu/File"> <Path name = "/SharpDevelop/Workbench/MainMenu/File">
<Condition name = "WindowActive" activewindow="ICSharpCode.AvalonEdit.AddIn.ICodeEditorProvider" action="Disable"> <Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditor" action="Disable">
<MenuItem id = "SaveWithEncoding" <MenuItem id = "SaveWithEncoding"
label = "${res:XML.MainMenu.FileMenu.SaveWithEncoding}" label = "${res:XML.MainMenu.FileMenu.SaveWithEncoding}"
insertafter="SaveAs" insertafter="SaveAs"
@ -65,7 +65,7 @@
</Path> </Path>
<Path name = "/SharpDevelop/Workbench/MainMenu/Edit/Format"> <Path name = "/SharpDevelop/Workbench/MainMenu/Edit/Format">
<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditorProvider" action="Disable"> <Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditor" action="Disable">
<MenuItem id = "RemoveLeadingWs" <MenuItem id = "RemoveLeadingWs"
insertbefore = "Separator4" insertbefore = "Separator4"
label = "${res:XML.MainMenu.EditMenu.FormatMenu.RlWs}" label = "${res:XML.MainMenu.EditMenu.FormatMenu.RlWs}"
@ -126,7 +126,7 @@
<Path name = "/SharpDevelop/Workbench/MainMenu/Edit"> <Path name = "/SharpDevelop/Workbench/MainMenu/Edit">
<MenuItem id = "Folding" label = "${res:XML.MainMenu.EditMenu.FoldingMenu}" type="Menu" insertafter="Format"> <MenuItem id = "Folding" label = "${res:XML.MainMenu.EditMenu.FoldingMenu}" type="Menu" insertafter="Format">
<Condition name = "WindowActive" activewindow="ICSharpCode.AvalonEdit.AddIn.ICodeEditorProvider" action="Disable"> <Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditor" action="Disable">
<MenuItem id = "ToggleFolding" <MenuItem id = "ToggleFolding"
label = "${res:XML.MainMenu.EditMenu.FoldingMenu.ToggleFolding}" label = "${res:XML.MainMenu.EditMenu.FoldingMenu.ToggleFolding}"
shortcut = "Shift|Control|M" shortcut = "Shift|Control|M"

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

@ -1561,7 +1561,7 @@
type = "Item" type = "Item"
command = "Delete"/> command = "Delete"/>
<MenuItem id = "Separator2" type = "Separator" /> <MenuItem id = "Separator2" type = "Separator" />
<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditorProvider" action="Disable"> <Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditor" action="Disable">
<MenuItem id = "Insert" label = "${res:XML.MainMenu.EditMenu.Insert}" type="Menu"> <MenuItem id = "Insert" label = "${res:XML.MainMenu.EditMenu.Insert}" type="Menu">
<MenuItem id = "PasteAsComment" <MenuItem id = "PasteAsComment"
label = "${res:XML.MainMenu.EditMenu.Paste.AsComment}" label = "${res:XML.MainMenu.EditMenu.Paste.AsComment}"
@ -1814,7 +1814,7 @@
<MenuItem id = "ToggleBreakpointSeparator" type = "Separator" /> <MenuItem id = "ToggleBreakpointSeparator" type = "Separator" />
<ComplexCondition action="Disable"> <ComplexCondition action="Disable">
<And> <And>
<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditorProvider"/> <Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditor"/>
<Condition name = "ActiveViewContentUntitled" activewindowuntitled="False"/> <Condition name = "ActiveViewContentUntitled" activewindowuntitled="False"/>
</And> </And>
<MenuItem id = "Toggle Breakpoint" <MenuItem id = "Toggle Breakpoint"
@ -1827,7 +1827,7 @@
<MenuItem id = "Search" label = "${res:XML.MainMenu.SearchMenu}" type="Menu"> <MenuItem id = "Search" label = "${res:XML.MainMenu.SearchMenu}" type="Menu">
<MenuItem id = "SearchSeparator" type = "Separator" /> <MenuItem id = "SearchSeparator" type = "Separator" />
<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditorProvider" action="Disable"> <Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditor" action="Disable">
<MenuItem id = "ToggleBookmark" <MenuItem id = "ToggleBookmark"
label = "${res:XML.MainMenu.SearchMenu.ToggleBookmark}" label = "${res:XML.MainMenu.SearchMenu.ToggleBookmark}"
shortcut = "Control|M" shortcut = "Control|M"
@ -1889,7 +1889,7 @@
<Include id = "ToolList" path = "/SharpDevelop/Workbench/Tools" /> <Include id = "ToolList" path = "/SharpDevelop/Workbench/Tools" />
<MenuItem id = "Separator2" type = "Separator" /> <MenuItem id = "Separator2" type = "Separator" />
<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditorProvider"> <Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditor">
<MenuItem id = "ConvertCode" label = "${res:XML.MainMenu.ToolMenu.ConvertCodeTo}" type="Menu"> <MenuItem id = "ConvertCode" label = "${res:XML.MainMenu.ToolMenu.ConvertCodeTo}" type="Menu">
<Condition name="ActiveContentExtension" activeextension=".vb" action = "Disable"> <Condition name="ActiveContentExtension" activeextension=".vb" action = "Disable">
<MenuItem id = "CSharp" <MenuItem id = "CSharp"
@ -2063,7 +2063,7 @@
<Path name = "/SharpDevelop/Workbench/ToolBar/Standard"> <Path name = "/SharpDevelop/Workbench/ToolBar/Standard">
<ToolbarItem id = "SearchSeparator" type = "Separator"/> <ToolbarItem id = "SearchSeparator" type = "Separator"/>
<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditorProvider" action="Disable"> <Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditor" action="Disable">
<ToolbarItem id = "Comment" <ToolbarItem id = "Comment"
icon = "Icons.16x16.CommentRegion" icon = "Icons.16x16.CommentRegion"
tooltip = "${res:XML.TextAreaContextMenu.CommentUncommentSelection}" tooltip = "${res:XML.TextAreaContextMenu.CommentUncommentSelection}"
@ -2155,7 +2155,7 @@
</Path> </Path>
<Path name = "/SharpDevelop/Pads/BookmarkPad/Toolbar"> <Path name = "/SharpDevelop/Pads/BookmarkPad/Toolbar">
<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditorProvider" action="Disable"> <Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditor" action="Disable">
<ToolbarItem id = "ToggleBookmark" <ToolbarItem id = "ToggleBookmark"
tooltip = "${res:XML.MainMenu.SearchMenu.ToggleBookmark}" tooltip = "${res:XML.MainMenu.SearchMenu.ToggleBookmark}"
icon = "Bookmarks.ToggleMark" icon = "Bookmarks.ToggleMark"

2
src/Main/Base/Project/Src/Internal/ConditionEvaluators/WindowOpenEvaluator.cs
Unescape View File

@ -34,7 +34,7 @@ namespace ICSharpCode.SharpDevelop
Type openWindowType = Type.GetType(openWindow, false); Type openWindowType = Type.GetType(openWindow, false);
if (openWindowType == null) { if (openWindowType == null) {
SD.Log.WarnFormatted("WindowActiveCondition: cannot find Type {0}", openWindow); SD.Log.WarnFormatted("WindowOpenCondition: cannot find Type {0}", openWindow);
return false; return false;
} }

Write Preview
Loading…
Cancel
Save