Browse Source

Merge 3.0wpf into trunk.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@3485 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 18 years ago
parent
commit
41a88a7912
  1. 45
      AddIns/ICSharpCode.SharpDevelop.addin
  2. 191
      data/resources/layouts/Debug.xml
  3. 153
      data/resources/layouts/Default.xml
  4. 136
      data/resources/layouts/Plain.xml
  5. 3
      src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin
  6. 22
      src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/FSharpBinding.fsproj
  7. 2
      src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonConsolePad.cs
  8. 2
      src/AddIns/BackendBindings/WixBinding/Project/Src/Commands/AddWixExtensionToProject.cs
  9. 2
      src/AddIns/BackendBindings/WixBinding/Project/Src/Commands/AddWixItemToProjectBaseCommand.cs
  10. 2
      src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/PackageFilesView.cs
  11. 2
      src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/SetupDialogListPad.cs
  12. 2
      src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/WixDialogDesigner.cs
  13. 3
      src/AddIns/BackendBindings/WixBinding/Project/WixBinding.addin
  14. 3
      src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/ClassDiagramAddin.addin
  15. 2
      src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramCommand.cs
  16. 12
      src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramViewContent.cs
  17. 11
      src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassEditorPad.cs
  18. 2
      src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/Src/AddNewClassCommand.cs
  19. 8
      src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/Src/ClassesList.cs
  20. 2
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Commands/SideBarCommands.cs
  21. 4
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerViewContent.cs
  22. 9
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/FormKeyHandler.cs
  23. 2
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/AddComponentsDialog.cs
  24. 2
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/UIService.cs
  25. 2
      src/AddIns/DisplayBindings/HexEditor/Project/Src/View/HexEditView.cs
  26. 2
      src/AddIns/DisplayBindings/IconEditor/IconEditorAddIn/Src/IconViewContent.cs
  27. 2
      src/AddIns/DisplayBindings/ResourceEditor/Project/Src/Commands/AddNewFileCommand.cs
  28. 2
      src/AddIns/DisplayBindings/ResourceEditor/Project/Src/Commands/SaveEntryAsCommand.cs
  29. 6
      src/AddIns/DisplayBindings/ResourceEditor/Project/Src/DisplayDefinition.cs
  30. 2
      src/AddIns/DisplayBindings/ResourceEditor/Project/Src/ResourceEdit/BitmapView.cs
  31. 2
      src/AddIns/DisplayBindings/SettingsEditor/Project/SettingsViewContent.cs
  32. 4
      src/AddIns/DisplayBindings/WorkflowDesigner/Project/Src/PrimaryView/PrimaryViewContent.cs
  33. 4
      src/AddIns/DisplayBindings/WorkflowDesigner/Project/Src/SecondaryView/SecondaryViewContent.cs
  34. 44
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/GetBitmapExtension.cs
  35. 122
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/SharpDevelopElementHost.cs
  36. 12
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfViewContent.cs
  37. 7
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/WpfDesign.AddIn.csproj
  38. 10
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Configuration/AssemblyInfo.cs
  39. 2
      src/AddIns/DisplayBindings/XmlEditor/Project/Src/AssignStylesheetCommand.cs
  40. 2
      src/AddIns/DisplayBindings/XmlEditor/Project/Src/XPathQueryPad.cs
  41. 2
      src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlTreeView.cs
  42. 2
      src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlView.cs
  43. 1
      src/AddIns/DisplayBindings/XmlEditor/Project/Src/XslOutputView.cs
  44. 3
      src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.addin
  45. 7
      src/AddIns/Misc/AddInManager/Project/Src/ManagerForm.cs
  46. 2
      src/AddIns/Misc/AddinScout/Project/Src/AddInScoutViewContent.cs
  47. 3
      src/AddIns/Misc/CodeCoverage/Project/CodeCoverage.addin
  48. 2
      src/AddIns/Misc/CodeCoverage/Project/Src/CodeCoveragePad.cs
  49. 2
      src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Src/ComponentInspectorView.cs
  50. 18
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.addin
  51. 17
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.csproj
  52. 5
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/CallStackPad.cs
  53. 5
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LoadedModulesPad.cs
  54. 5
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LocalVarPad.cs
  55. 5
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/RunningThreadsPad.cs
  56. 7
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/WatchPad.cs
  57. 20
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/WatchPadCommands.cs
  58. 2
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DebugeeExceptionForm.cs
  59. 2
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DebuggerEventForm.cs
  60. 4
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs
  61. 5
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/TreeModel/ErrorNode.cs
  62. 2
      src/AddIns/Misc/HighlightingEditor/Project/Src/ColorButton.cs
  63. 2
      src/AddIns/Misc/HighlightingEditor/Project/Src/ColorDialog.cs
  64. 2
      src/AddIns/Misc/HighlightingEditor/Project/Src/EditHighlightingPanel.cs
  65. 3
      src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.DynamicHelp.addin
  66. 12
      src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.addin
  67. 8
      src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/DynamicHelpPad.cs
  68. 8
      src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexPad.cs
  69. 9
      src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexResultsPad.cs
  70. 8
      src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/SearchPad.cs
  71. 8
      src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/TocPad.cs
  72. 5
      src/AddIns/Misc/PInvokeAddIn/Project/Src/InsertPInvokeSignaturesCommand.cs
  73. 2
      src/AddIns/Misc/ReflectorAddIn/ReflectorAddIn/Project/Src/TextEditorContextMenuCommand.cs
  74. 5
      src/AddIns/Misc/RegExpTk/Project/Src/Commands/MenuCommand.cs
  75. 4
      src/AddIns/Misc/RegExpTk/Project/Src/Dialogs/MainWindow.cs
  76. 2
      src/AddIns/Misc/ResourceToolkit/Project/Src/CodeCompletion/NewResourceCodeCompletionData.cs
  77. 2
      src/AddIns/Misc/ResourceToolkit/Project/Src/Commands/TextEditorContextMenuBuilder.cs
  78. 2
      src/AddIns/Misc/ResourceToolkit/Project/Src/Gui/UnusedResourceKeysViewContent.cs
  79. 17
      src/AddIns/Misc/SearchAndReplace/Project/Commands/SearchToolbarCommands.cs
  80. 2
      src/AddIns/Misc/SearchAndReplace/Project/Engine/SearchReplaceManager.cs
  81. 3
      src/AddIns/Misc/SearchAndReplace/Project/Gui/SearchAndReplaceDialog.cs
  82. 9
      src/AddIns/Misc/SearchAndReplace/Project/SearchAndReplace.csproj
  83. 2
      src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/HistoryViewDisplayBinding/HistoryView.cs
  84. 3
      src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/SvnGuiWrapper.cs
  85. 8
      src/AddIns/Misc/SubversionAddIn/Project/Src/SvnClientWrapper.cs
  86. 2
      src/AddIns/Misc/UnitTesting/Src/UnitTestsPad.cs
  87. 3
      src/AddIns/Misc/UnitTesting/UnitTesting.addin
  88. BIN
      src/Libraries/AvalonDock/AvalonDock.dll
  89. 118
      src/Libraries/DockPanel_Src/DockSample/AboutDialog.Designer.cs
  90. 26
      src/Libraries/DockPanel_Src/DockSample/AboutDialog.cs
  91. 120
      src/Libraries/DockPanel_Src/DockSample/AboutDialog.resx
  92. 113
      src/Libraries/DockPanel_Src/DockSample/Customization/DockHelper.cs
  93. 55
      src/Libraries/DockPanel_Src/DockSample/Customization/Extender.cs
  94. 619
      src/Libraries/DockPanel_Src/DockSample/Customization/InertButton.cs
  95. 133
      src/Libraries/DockPanel_Src/DockSample/Customization/Resources.Designer.cs
  96. 151
      src/Libraries/DockPanel_Src/DockSample/Customization/Resources.resx
  97. BIN
      src/Libraries/DockPanel_Src/DockSample/Customization/Resources/DockIndicator_PaneDiamond.bmp
  98. BIN
      src/Libraries/DockPanel_Src/DockSample/Customization/Resources/DockIndicator_PaneDiamond_Bottom.bmp
  99. BIN
      src/Libraries/DockPanel_Src/DockSample/Customization/Resources/DockIndicator_PaneDiamond_Hotspot.bmp
  100. BIN
      src/Libraries/DockPanel_Src/DockSample/Customization/Resources/DockIndicator_PaneDiamond_HotspotIndex.bmp
  101. Some files were not shown because too many files have changed in this diff Show More

45
AddIns/ICSharpCode.SharpDevelop.addin

@ -74,73 +74,84 @@ @@ -74,73 +74,84 @@
title = "${res:MainWindow.Windows.ProjectScoutLabel}"
icon = "PadIcons.ProjectBrowser"
shortcut = "Control|Alt|L"
class = "ICSharpCode.SharpDevelop.Project.ProjectBrowserPad"/>
class = "ICSharpCode.SharpDevelop.Project.ProjectBrowserPad"
defaultPosition = "Left" />
<Pad id = "ClassBrowser"
category = "Main"
title = "${res:MainWindow.Windows.ClassScoutLabel}"
icon = "PadIcons.ClassBrowser"
shortcut = "Control|Shift|C"
class = "ICSharpCode.SharpDevelop.Gui.ClassBrowser.ClassBrowserPad"/>
class = "ICSharpCode.SharpDevelop.Gui.ClassBrowser.ClassBrowserPad"
defaultPosition = "Right" />
<Pad id = "SideBar"
category = "Main"
title = "${res:MainWindow.Windows.ToolbarLabel}"
icon = "PadIcons.Toolbar"
shortcut = "Control|Alt|X"
class = "ICSharpCode.SharpDevelop.Gui.ToolsPad"/>
class = "ICSharpCode.SharpDevelop.Gui.ToolsPad"
defaultPosition = "Left" />
<Pad id = "ErrorList"
category = "Main"
title = "${res:MainWindow.Windows.ErrorList}"
shortcut = "Control|Alt|K"
icon = "PadIcons.ErrorList"
class = "ICSharpCode.SharpDevelop.Gui.ErrorListPad"/>
class = "ICSharpCode.SharpDevelop.Gui.ErrorListPad"
defaultPosition = "Bottom" />
<Pad id = "TaskList"
category = "Main"
title = "${res:MainWindow.Windows.TaskList}"
icon = "PadIcons.TaskList"
class = "ICSharpCode.SharpDevelop.Gui.TaskListPad"/>
class = "ICSharpCode.SharpDevelop.Gui.TaskListPad"
defaultPosition = "Bottom" />
<Pad id = "CompilerMessageView"
category = "Main"
title = "${res:MainWindow.Windows.OutputWindow}"
icon = "PadIcons.Output"
shortcut = "Control|Alt|O"
class = "ICSharpCode.SharpDevelop.Gui.CompilerMessageView"/>
class = "ICSharpCode.SharpDevelop.Gui.CompilerMessageView"
defaultPosition = "Bottom" />
<Pad id = "PropertyPad"
category = "Main"
title = "${res:MainWindow.Windows.PropertiesScoutLabel}"
icon = "Icons.16x16.PropertiesIcon"
shortcut = "F4"
class = "ICSharpCode.SharpDevelop.Gui.PropertyPad"/>
class = "ICSharpCode.SharpDevelop.Gui.PropertyPad"
defaultPosition = "Right" />
<Pad id = "FileScout"
category = "Tools"
title = "${res:MainWindow.Windows.FileScoutLabel}"
icon = "PadIcons.FileBrowser"
shortcut = "Control|Alt|F"
class = "ICSharpCode.SharpDevelop.Gui.FileScout"/>
class = "ICSharpCode.SharpDevelop.Gui.FileScout"
defaultPosition = "Left, Hidden" />
<Pad id = "SearchResults"
category = "Tools"
title = "${res:MainWindow.Windows.SearchResultsLabel}"
icon = "PadIcons.FindResults"
class = "SearchAndReplace.SearchResultPanel"/>
class = "SearchAndReplace.SearchResultPanel"
defaultPosition = "Bottom, Hidden" />
<Pad id = "Bookmarks"
category = "Tools"
title = "${res:MainWindow.Windows.BookmarksLabel}"
icon = "PadIcons.Bookmarks"
class = "ICSharpCode.SharpDevelop.Bookmarks.BookmarkPad"/>
class = "ICSharpCode.SharpDevelop.Bookmarks.BookmarkPad"
defaultPosition = "Bottom, Hidden" />
<Pad id = "DefinitionView"
category = "Tools"
title = "${res:MainWindow.Windows.DefinitionViewLabel}"
icon = "PadIcons.DefinitionView"
class = "ICSharpCode.SharpDevelop.Gui.DefinitionViewPad"/>
class = "ICSharpCode.SharpDevelop.Gui.DefinitionViewPad"
defaultPosition = "Bottom, Hidden" />
</Path>
<Path name = "/SharpDevelop/Workbench/Combine/FileFilter">
@ -943,7 +954,7 @@ @@ -943,7 +954,7 @@
</Condition>
<ToolbarItem id = "ChooseConfigurationSeparator" type = "Separator"/>
<ToolbarItem id = "ChooseLayout"
type = "ComboBox"
class = "ICSharpCode.SharpDevelop.Commands.ChooseLayoutCommand" />
@ -1432,7 +1443,11 @@ @@ -1432,7 +1443,11 @@
class = "ICSharpCode.SharpDevelop.Project.Commands.PublishProject"/>-->
</Condition>
<MenuItem id = "Separator2" type = "Separator" />
<MenuItem id="AbortBuild" type="Builder" class="ICSharpCode.SharpDevelop.Project.Commands.AbortBuild"/>
<MenuItem id="AbortBuild"
label="${res:XML.MainMenu.BuildMenu.AbortBuild}"
shortcut="Pause"
class="ICSharpCode.SharpDevelop.Project.Commands.AbortBuild"
loadclasslazy="false"/>
<MenuItem id = "Separator3" type = "Separator" />
<MenuItem id = "SetConfiguration"
label = "${res:XML.MainMenu.BuildMenu.SetConfiguration}"
@ -1483,7 +1498,7 @@ @@ -1483,7 +1498,7 @@
class = "ICSharpCode.SharpDevelop.Project.Commands.StopDebuggingCommand"/>
</Condition>
</Condition>
<Condition name="DebuggerSupports" debuggersupports="Attaching">
<Condition name="IsProcessRunning" isprocessrunning="False" isdebugging="False" action="Disable">
<MenuItem id = "Attach"
@ -1491,7 +1506,7 @@ @@ -1491,7 +1506,7 @@
class = "ICSharpCode.SharpDevelop.Project.Commands.AttachToProcessCommand"/>
</Condition>
</Condition>
<Condition name="DebuggerSupports" debuggersupports="Detaching">
<Condition name="IsProcessRunning" isdebugging="True" action="Disable">
<MenuItem id = "Detach"

191
data/resources/layouts/Debug.xml

@ -1,169 +1,22 @@ @@ -1,169 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!--DockPanel configuration file. Author: Weifen Luo, all rights reserved.-->
<!--!!! AUTOMATICALLY GENERATED FILE. DO NOT MODIFY !!!-->
<DockPanel FormatVersion="1.0" DockLeftPortion="0.196180555555556" DockRightPortion="0.171180555555556" DockTopPortion="0.25" DockBottomPortion="0.25" ActiveDocumentPane="-1" ActivePane="-1">
<Contents Count="30">
<Content ID="0" PersistString="ICSharpCode.SharpDevelop.Project.ProjectBrowserPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="1" PersistString="ICSharpCode.SharpDevelop.Gui.ClassBrowser.ClassBrowserPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="2" PersistString="ICSharpCode.SharpDevelop.Gui.ErrorListPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="3" PersistString="ICSharpCode.SharpDevelop.Gui.TaskListPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="4" PersistString="ICSharpCode.SharpDevelop.Gui.CompilerMessageView" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="5" PersistString="ICSharpCode.SharpDevelop.Gui.PropertyPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="6" PersistString="ICSharpCode.SharpDevelop.Gui.FileScout" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="7" PersistString="SearchAndReplace.SearchResultPanel" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="8" PersistString="ICSharpCode.SharpDevelop.Bookmarks.BookmarkPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="9" PersistString="ICSharpCode.CodeCoverage.CodeCoveragePad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="10" PersistString="ICSharpCode.SharpDevelop.Gui.DefinitionViewPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="11" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.BreakPointsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="12" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.CallStackPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="13" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.LoadedModulesPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="14" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.RunningThreadsPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="15" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.LocalVarPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="16" PersistString="HtmlHelp2.HtmlHelp2TocPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="17" PersistString="HtmlHelp2.HtmlHelp2IndexPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="18" PersistString="HtmlHelp2.HtmlHelp2SearchPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="19" PersistString="HtmlHelp2.HtmlHelp2IndexResultsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="20" PersistString="HtmlHelp2.HtmlHelp2DynamicHelpPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="21" PersistString="ICSharpCode.WixBinding.SetupDialogListPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="22" PersistString="ICSharpCode.XmlEditor.XPathQueryPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="23" PersistString="ICSharpCode.SharpDevelop.Gui.ToolsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="24" PersistString="ClassDiagramAddin.ClassEditorPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="25" PersistString="ICSharpCode.UnitTesting.UnitTestsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="26" PersistString="FSharpBinding.FSharpInteractive" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="27" PersistString="ICSharpCode.PythonBinding.PythonConsolePad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="28" PersistString="Grunwald.BooBinding.InteractiveInterpreterPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="29" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.ConsolePad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
</Contents>
<Panes Count="9">
<Pane ID="0" DockState="DockLeft" ActiveContent="0">
<Contents Count="3">
<Content ID="0" RefID="0" />
<Content ID="1" RefID="6" />
<Content ID="2" RefID="1" />
</Contents>
</Pane>
<Pane ID="1" DockState="Float" ActiveContent="-1">
<Contents Count="2">
<Content ID="0" RefID="7" />
<Content ID="1" RefID="8" />
</Contents>
</Pane>
<Pane ID="2" DockState="Float" ActiveContent="-1">
<Contents Count="4">
<Content ID="0" RefID="2" />
<Content ID="1" RefID="4" />
<Content ID="2" RefID="3" />
<Content ID="3" RefID="10" />
</Contents>
</Pane>
<Pane ID="3" DockState="DockBottom" ActiveContent="4">
<Contents Count="22">
<Content ID="0" RefID="2" />
<Content ID="1" RefID="4" />
<Content ID="2" RefID="15" />
<Content ID="3" RefID="14" />
<Content ID="4" RefID="27" />
<Content ID="5" RefID="3" />
<Content ID="6" RefID="10" />
<Content ID="7" RefID="26" />
<Content ID="8" RefID="9" />
<Content ID="9" RefID="8" />
<Content ID="10" RefID="7" />
<Content ID="11" RefID="5" />
<Content ID="12" RefID="24" />
<Content ID="13" RefID="23" />
<Content ID="14" RefID="19" />
<Content ID="15" RefID="18" />
<Content ID="16" RefID="17" />
<Content ID="17" RefID="16" />
<Content ID="18" RefID="20" />
<Content ID="19" RefID="28" />
<Content ID="20" RefID="25" />
<Content ID="21" RefID="11" />
</Contents>
</Pane>
<Pane ID="4" DockState="Float" ActiveContent="-1">
<Contents Count="1">
<Content ID="0" RefID="5" />
</Contents>
</Pane>
<Pane ID="5" DockState="Float" ActiveContent="-1">
<Contents Count="1">
<Content ID="0" RefID="13" />
</Contents>
</Pane>
<Pane ID="6" DockState="DockBottom" ActiveContent="12">
<Contents Count="3">
<Content ID="0" RefID="12" />
<Content ID="1" RefID="13" />
<Content ID="2" RefID="29" />
</Contents>
</Pane>
<Pane ID="7" DockState="Float" ActiveContent="-1">
<Contents Count="3">
<Content ID="0" RefID="11" />
<Content ID="1" RefID="25" />
<Content ID="2" RefID="14" />
</Contents>
</Pane>
<Pane ID="8" DockState="Float" ActiveContent="-1">
<Contents Count="1">
<Content ID="0" RefID="26" />
</Contents>
</Pane>
</Panes>
<DockWindows>
<DockWindow ID="0" DockState="Document" ZOrderIndex="1">
<NestedPanes Count="0" />
</DockWindow>
<DockWindow ID="1" DockState="DockLeft" ZOrderIndex="4">
<NestedPanes Count="1">
<Pane ID="0" RefID="0" PrevPane="-1" Alignment="Bottom" Proportion="0.5" />
</NestedPanes>
</DockWindow>
<DockWindow ID="2" DockState="DockRight" ZOrderIndex="2">
<NestedPanes Count="0" />
</DockWindow>
<DockWindow ID="3" DockState="DockTop" ZOrderIndex="3">
<NestedPanes Count="0" />
</DockWindow>
<DockWindow ID="4" DockState="DockBottom" ZOrderIndex="5">
<NestedPanes Count="2">
<Pane ID="0" RefID="3" PrevPane="-1" Alignment="Right" Proportion="0.5" />
<Pane ID="1" RefID="6" PrevPane="3" Alignment="Right" Proportion="0.490625" />
</NestedPanes>
</DockWindow>
</DockWindows>
<FloatWindows Count="6">
<FloatWindow ID="0" Bounds="367, 404, 300, 300" ZOrderIndex="0">
<NestedPanes Count="1">
<Pane ID="0" RefID="1" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</NestedPanes>
</FloatWindow>
<FloatWindow ID="1" Bounds="1650, 609, 300, 300" ZOrderIndex="1">
<NestedPanes Count="1">
<Pane ID="0" RefID="2" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</NestedPanes>
</FloatWindow>
<FloatWindow ID="2" Bounds="2013, 283, 300, 300" ZOrderIndex="2">
<NestedPanes Count="1">
<Pane ID="0" RefID="4" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</NestedPanes>
</FloatWindow>
<FloatWindow ID="3" Bounds="629, 139, 550, 259" ZOrderIndex="3">
<NestedPanes Count="1">
<Pane ID="0" RefID="5" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</NestedPanes>
</FloatWindow>
<FloatWindow ID="4" Bounds="815, 244, 300, 300" ZOrderIndex="4">
<NestedPanes Count="1">
<Pane ID="0" RefID="7" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</NestedPanes>
</FloatWindow>
<FloatWindow ID="5" Bounds="272, 363, 300, 300" ZOrderIndex="5">
<NestedPanes Count="1">
<Pane ID="0" RefID="8" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</NestedPanes>
</FloatWindow>
</FloatWindows>
</DockPanel>
<DockingManager>
<ResizingPanel Orientation="Horizontal">
<DockablePane ResizeWidth="200" Anchor="Left">
<DockableContent Name="ICSharpCode_SharpDevelop_Project_ProjectBrowserPad" AutoHide="false" />
<DockableContent Name="ICSharpCode_SharpDevelop_Gui_ToolsPad" AutoHide="false" />
</DockablePane>
<ResizingPanel Orientation="Vertical">
<DocumentPanePlaceHolder />
<DockablePane ResizeHeight="150" Anchor="Bottom">
<DockableContent Name="ICSharpCode_SharpDevelop_Gui_ErrorListPad" AutoHide="false" />
<DockableContent Name="ICSharpCode_SharpDevelop_Gui_TaskListPad" AutoHide="false" />
<DockableContent Name="ICSharpCode_SharpDevelop_Gui_CompilerMessageView" AutoHide="false" />
</DockablePane>
</ResizingPanel>
<DockablePane ResizeWidth="200" Anchor="Right">
<DockableContent Name="ICSharpCode_SharpDevelop_Gui_ClassBrowser_ClassBrowserPad" AutoHide="false" />
<DockableContent Name="ICSharpCode_SharpDevelop_Gui_PropertyPad" AutoHide="false" />
</DockablePane>
</ResizingPanel>
<Hidden />
<Windows />
</DockingManager>

153
data/resources/layouts/Default.xml

@ -1,131 +1,22 @@ @@ -1,131 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!--DockPanel configuration file. Author: Weifen Luo, all rights reserved.-->
<!--!!! AUTOMATICALLY GENERATED FILE. DO NOT MODIFY !!!-->
<DockPanel FormatVersion="1.0" DockLeftPortion="0.196180555555556" DockRightPortion="0.172743055555556" DockTopPortion="0.25" DockBottomPortion="0.25" ActiveDocumentPane="5" ActivePane="-1">
<Contents Count="31">
<Content ID="0" PersistString="ICSharpCode.SharpDevelop.Project.ProjectBrowserPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="1" PersistString="ICSharpCode.SharpDevelop.Gui.ClassBrowser.ClassBrowserPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="2" PersistString="ICSharpCode.SharpDevelop.Gui.ErrorListPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="3" PersistString="ICSharpCode.SharpDevelop.Gui.TaskListPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="4" PersistString="ICSharpCode.SharpDevelop.Gui.CompilerMessageView" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="5" PersistString="ICSharpCode.SharpDevelop.Gui.PropertyPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="6" PersistString="ICSharpCode.SharpDevelop.Gui.FileScout" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="7" PersistString="SearchAndReplace.SearchResultPanel" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="8" PersistString="ICSharpCode.SharpDevelop.Bookmarks.BookmarkPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="9" PersistString="ICSharpCode.CodeCoverage.CodeCoveragePad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="10" PersistString="ICSharpCode.SharpDevelop.Gui.DefinitionViewPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="11" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.BreakPointsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="12" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.CallStackPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="13" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.LoadedModulesPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="14" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.RunningThreadsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="15" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.LocalVarPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="16" PersistString="HtmlHelp2.HtmlHelp2TocPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="17" PersistString="HtmlHelp2.HtmlHelp2IndexPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="18" PersistString="HtmlHelp2.HtmlHelp2SearchPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="19" PersistString="HtmlHelp2.HtmlHelp2IndexResultsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="20" PersistString="HtmlHelp2.HtmlHelp2DynamicHelpPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="21" PersistString="ICSharpCode.WixBinding.SetupDialogListPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="22" PersistString="ICSharpCode.XmlEditor.XPathQueryPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="23" PersistString="ICSharpCode.UnitTesting.UnitTestsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="24" PersistString="ICSharpCode.SharpDevelop.Gui.ToolsPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="25" PersistString="ClassDiagramAddin.ClassEditorPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="26" PersistString="FSharpBinding.FSharpInteractive" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="27" PersistString="Grunwald.BooBinding.InteractiveInterpreterPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="28" PersistString="ICSharpCode.PythonBinding.PythonConsolePad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="29" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.ConsolePad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="30" PersistString="ICSharpCode.SharpDevelop.Gui.SdiWorkspaceWindow" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
</Contents>
<Panes Count="6">
<Pane ID="0" DockState="DockRight" ActiveContent="5">
<Contents Count="6">
<Content ID="0" RefID="5" />
<Content ID="1" RefID="1" />
<Content ID="2" RefID="12" />
<Content ID="3" RefID="13" />
<Content ID="4" RefID="23" />
<Content ID="5" RefID="25" />
</Contents>
</Pane>
<Pane ID="1" DockState="DockLeft" ActiveContent="0">
<Contents Count="3">
<Content ID="0" RefID="0" />
<Content ID="1" RefID="6" />
<Content ID="2" RefID="24" />
</Contents>
</Pane>
<Pane ID="2" DockState="Float" ActiveContent="-1">
<Contents Count="5">
<Content ID="0" RefID="2" />
<Content ID="1" RefID="3" />
<Content ID="2" RefID="7" />
<Content ID="3" RefID="8" />
<Content ID="4" RefID="10" />
</Contents>
</Pane>
<Pane ID="3" DockState="DockBottom" ActiveContent="4">
<Contents Count="12">
<Content ID="0" RefID="2" />
<Content ID="1" RefID="4" />
<Content ID="2" RefID="3" />
<Content ID="3" RefID="10" />
<Content ID="4" RefID="7" />
<Content ID="5" RefID="8" />
<Content ID="6" RefID="15" />
<Content ID="7" RefID="9" />
<Content ID="8" RefID="26" />
<Content ID="9" RefID="27" />
<Content ID="10" RefID="28" />
<Content ID="11" RefID="29" />
</Contents>
</Pane>
<Pane ID="4" DockState="DockRight" ActiveContent="-1">
<Contents Count="7">
<Content ID="0" RefID="20" />
<Content ID="1" RefID="16" />
<Content ID="2" RefID="17" />
<Content ID="3" RefID="18" />
<Content ID="4" RefID="14" />
<Content ID="5" RefID="19" />
<Content ID="6" RefID="11" />
</Contents>
</Pane>
<Pane ID="5" DockState="Document" ActiveContent="30">
<Contents Count="1">
<Content ID="0" RefID="30" />
</Contents>
</Pane>
</Panes>
<DockWindows>
<DockWindow ID="0" DockState="Document" ZOrderIndex="1">
<NestedPanes Count="1">
<Pane ID="0" RefID="5" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</NestedPanes>
</DockWindow>
<DockWindow ID="1" DockState="DockLeft" ZOrderIndex="4">
<NestedPanes Count="1">
<Pane ID="0" RefID="1" PrevPane="-1" Alignment="Bottom" Proportion="0.5" />
</NestedPanes>
</DockWindow>
<DockWindow ID="2" DockState="DockRight" ZOrderIndex="5">
<NestedPanes Count="2">
<Pane ID="0" RefID="0" PrevPane="-1" Alignment="Bottom" Proportion="0.5" />
<Pane ID="1" RefID="4" PrevPane="0" Alignment="Top" Proportion="0.353459972862958" />
</NestedPanes>
</DockWindow>
<DockWindow ID="3" DockState="DockTop" ZOrderIndex="3">
<NestedPanes Count="0" />
</DockWindow>
<DockWindow ID="4" DockState="DockBottom" ZOrderIndex="2">
<NestedPanes Count="1">
<Pane ID="0" RefID="3" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</NestedPanes>
</DockWindow>
</DockWindows>
<FloatWindows Count="1">
<FloatWindow ID="0" Bounds="367, 404, 300, 300" ZOrderIndex="0">
<NestedPanes Count="1">
<Pane ID="0" RefID="2" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</NestedPanes>
</FloatWindow>
</FloatWindows>
</DockPanel>
<DockingManager>
<ResizingPanel Orientation="Horizontal">
<DockablePane ResizeWidth="200" Anchor="Left">
<DockableContent Name="ICSharpCode_SharpDevelop_Project_ProjectBrowserPad" AutoHide="false" />
<DockableContent Name="ICSharpCode_SharpDevelop_Gui_ToolsPad" AutoHide="false" />
</DockablePane>
<ResizingPanel Orientation="Vertical">
<DocumentPanePlaceHolder />
<DockablePane ResizeHeight="150" Anchor="Bottom">
<DockableContent Name="ICSharpCode_SharpDevelop_Gui_ErrorListPad" AutoHide="false" />
<DockableContent Name="ICSharpCode_SharpDevelop_Gui_TaskListPad" AutoHide="false" />
<DockableContent Name="ICSharpCode_SharpDevelop_Gui_CompilerMessageView" AutoHide="false" />
</DockablePane>
</ResizingPanel>
<DockablePane ResizeWidth="200" Anchor="Right">
<DockableContent Name="ICSharpCode_SharpDevelop_Gui_ClassBrowser_ClassBrowserPad" AutoHide="false" />
<DockableContent Name="ICSharpCode_SharpDevelop_Gui_PropertyPad" AutoHide="false" />
</DockablePane>
</ResizingPanel>
<Hidden />
<Windows />
</DockingManager>

136
data/resources/layouts/Plain.xml

@ -1,123 +1,13 @@ @@ -1,123 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!--DockPanel configuration file. Author: Weifen Luo, all rights reserved.-->
<!--!!! AUTOMATICALLY GENERATED FILE. DO NOT MODIFY !!!-->
<DockPanel FormatVersion="1.0" DockLeftPortion="0.196180555555556" DockRightPortion="0.172743055555556" DockTopPortion="0.25" DockBottomPortion="0.25" ActiveDocumentPane="-1" ActivePane="-1">
<Contents Count="30">
<Content ID="0" PersistString="ICSharpCode.SharpDevelop.Project.ProjectBrowserPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="1" PersistString="ICSharpCode.SharpDevelop.Gui.ClassBrowser.ClassBrowserPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="2" PersistString="ICSharpCode.SharpDevelop.Gui.ErrorListPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="3" PersistString="ICSharpCode.SharpDevelop.Gui.TaskListPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="4" PersistString="ICSharpCode.SharpDevelop.Gui.CompilerMessageView" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="5" PersistString="ICSharpCode.SharpDevelop.Gui.PropertyPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="6" PersistString="ICSharpCode.SharpDevelop.Gui.FileScout" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="7" PersistString="SearchAndReplace.SearchResultPanel" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="8" PersistString="ICSharpCode.SharpDevelop.Bookmarks.BookmarkPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="9" PersistString="ICSharpCode.CodeCoverage.CodeCoveragePad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="10" PersistString="ICSharpCode.SharpDevelop.Gui.DefinitionViewPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="11" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.BreakPointsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="12" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.CallStackPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="13" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.LoadedModulesPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="14" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.RunningThreadsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="15" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.LocalVarPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="16" PersistString="HtmlHelp2.HtmlHelp2TocPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="17" PersistString="HtmlHelp2.HtmlHelp2IndexPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="18" PersistString="HtmlHelp2.HtmlHelp2SearchPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="19" PersistString="HtmlHelp2.HtmlHelp2IndexResultsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="20" PersistString="HtmlHelp2.HtmlHelp2DynamicHelpPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="21" PersistString="ICSharpCode.WixBinding.SetupDialogListPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="22" PersistString="ICSharpCode.XmlEditor.XPathQueryPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="23" PersistString="ICSharpCode.UnitTesting.UnitTestsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="24" PersistString="ICSharpCode.SharpDevelop.Gui.ToolsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="25" PersistString="ClassDiagramAddin.ClassEditorPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="26" PersistString="FSharpBinding.FSharpInteractive" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="27" PersistString="Grunwald.BooBinding.InteractiveInterpreterPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="28" PersistString="ICSharpCode.PythonBinding.PythonConsolePad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="29" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.ConsolePad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
</Contents>
<Panes Count="5">
<Pane ID="0" DockState="DockRight" ActiveContent="-1">
<Contents Count="6">
<Content ID="0" RefID="5" />
<Content ID="1" RefID="1" />
<Content ID="2" RefID="12" />
<Content ID="3" RefID="13" />
<Content ID="4" RefID="23" />
<Content ID="5" RefID="25" />
</Contents>
</Pane>
<Pane ID="1" DockState="DockLeft" ActiveContent="-1">
<Contents Count="3">
<Content ID="0" RefID="0" />
<Content ID="1" RefID="6" />
<Content ID="2" RefID="24" />
</Contents>
</Pane>
<Pane ID="2" DockState="Float" ActiveContent="-1">
<Contents Count="5">
<Content ID="0" RefID="2" />
<Content ID="1" RefID="3" />
<Content ID="2" RefID="7" />
<Content ID="3" RefID="8" />
<Content ID="4" RefID="10" />
</Contents>
</Pane>
<Pane ID="3" DockState="DockBottom" ActiveContent="-1">
<Contents Count="12">
<Content ID="0" RefID="2" />
<Content ID="1" RefID="4" />
<Content ID="2" RefID="3" />
<Content ID="3" RefID="10" />
<Content ID="4" RefID="7" />
<Content ID="5" RefID="8" />
<Content ID="6" RefID="15" />
<Content ID="7" RefID="9" />
<Content ID="8" RefID="26" />
<Content ID="9" RefID="27" />
<Content ID="10" RefID="28" />
<Content ID="11" RefID="29" />
</Contents>
</Pane>
<Pane ID="4" DockState="DockRight" ActiveContent="-1">
<Contents Count="7">
<Content ID="0" RefID="20" />
<Content ID="1" RefID="16" />
<Content ID="2" RefID="17" />
<Content ID="3" RefID="18" />
<Content ID="4" RefID="14" />
<Content ID="5" RefID="19" />
<Content ID="6" RefID="11" />
</Contents>
</Pane>
</Panes>
<DockWindows>
<DockWindow ID="0" DockState="Document" ZOrderIndex="1">
<NestedPanes Count="0" />
</DockWindow>
<DockWindow ID="1" DockState="DockLeft" ZOrderIndex="4">
<NestedPanes Count="1">
<Pane ID="0" RefID="1" PrevPane="-1" Alignment="Bottom" Proportion="0.5" />
</NestedPanes>
</DockWindow>
<DockWindow ID="2" DockState="DockRight" ZOrderIndex="5">
<NestedPanes Count="2">
<Pane ID="0" RefID="0" PrevPane="-1" Alignment="Bottom" Proportion="0.5" />
<Pane ID="1" RefID="4" PrevPane="0" Alignment="Top" Proportion="0.353459972862958" />
</NestedPanes>
</DockWindow>
<DockWindow ID="3" DockState="DockTop" ZOrderIndex="3">
<NestedPanes Count="0" />
</DockWindow>
<DockWindow ID="4" DockState="DockBottom" ZOrderIndex="2">
<NestedPanes Count="1">
<Pane ID="0" RefID="3" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</NestedPanes>
</DockWindow>
</DockWindows>
<FloatWindows Count="1">
<FloatWindow ID="0" Bounds="367, 404, 300, 300" ZOrderIndex="0">
<NestedPanes Count="1">
<Pane ID="0" RefID="2" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</NestedPanes>
</FloatWindow>
</FloatWindows>
</DockPanel>
<DockingManager>
<DocumentPanePlaceHolder />
<Hidden>
<DockableContent Name="ICSharpCode_SharpDevelop_Project_ProjectBrowserPad" AutoHide="false" />
<DockableContent Name="ICSharpCode_SharpDevelop_Gui_ToolsPad" AutoHide="false" />
<DockableContent Name="ICSharpCode_SharpDevelop_Gui_ClassBrowser_ClassBrowserPad" AutoHide="false" />
<DockableContent Name="ICSharpCode_SharpDevelop_Gui_PropertyPad" AutoHide="false" />
<DockableContent Name="ICSharpCode_SharpDevelop_Gui_ErrorListPad" AutoHide="false" />
<DockableContent Name="ICSharpCode_SharpDevelop_Gui_TaskListPad" AutoHide="false" />
<DockableContent Name="ICSharpCode_SharpDevelop_Gui_CompilerMessageView" AutoHide="false" />
</Hidden>
<Windows />
</DockingManager>

3
src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin

@ -165,6 +165,7 @@ @@ -165,6 +165,7 @@
title = "${res:ICSharpCode.BooInterpreter}"
icon = "Boo.ProjectIcon"
shortcut = "Control|Shift|B"
class = "Grunwald.BooBinding.InteractiveInterpreterPad"/>
class = "Grunwald.BooBinding.InteractiveInterpreterPad"
defaultPosition = "Bottom, Hidden" />
</Path>
</AddIn>

22
src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/FSharpBinding.fsproj

@ -39,10 +39,19 @@ @@ -39,10 +39,19 @@
<RequiredTargetFramework>3.5</RequiredTargetFramework>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.VisualC" />
<Reference Include="Mono.Cecil">
<HintPath>..\..\..\..\..\Libraries\Mono.Cecil\Mono.Cecil.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="PresentationCFFRasterizer" />
<Reference Include="PresentationCore">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
<Private>False</Private>
</Reference>
<Reference Include="PresentationFramework">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
</Reference>
<Reference Include="System.Configuration">
<Private>False</Private>
</Reference>
@ -50,9 +59,17 @@ @@ -50,9 +59,17 @@
<RequiredTargetFramework>3.5</RequiredTargetFramework>
<Private>False</Private>
</Reference>
<Reference Include="System.Deployment" />
<Reference Include="System.Security">
<Private>False</Private>
</Reference>
<Reference Include="UIAutomationProvider">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
</Reference>
<Reference Include="WindowsBase">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
</Reference>
<Reference Include="WindowsFormsIntegration" />
<Compile Include="Src\project.fs" />
<Compile Include="Src\languagebinding.fs" />
<Compile Include="Src\fsi.fs" />
@ -75,11 +92,6 @@ @@ -75,11 +92,6 @@
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\..\Libraries\DockPanel_Src\WinFormsUI\WinFormsUI.csproj">
<Project>{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}</Project>
<Name>WinFormsUI</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\..\..\Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj">
<Project>{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}</Project>
<Name>ICSharpCode.TextEditor</Name>

2
src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonConsolePad.cs

@ -29,7 +29,7 @@ namespace ICSharpCode.PythonBinding @@ -29,7 +29,7 @@ namespace ICSharpCode.PythonBinding
host.Run();
}
public override Control Control {
public override object Content {
get { return textEditorControl; }
}

2
src/AddIns/BackendBindings/WixBinding/Project/Src/Commands/AddWixExtensionToProject.cs

@ -25,7 +25,7 @@ namespace ICSharpCode.WixBinding @@ -25,7 +25,7 @@ namespace ICSharpCode.WixBinding
// Display file dialog.
using (OpenFileDialog fileDialog = CreateOpenFileDialog()) {
if (DialogResult.OK == fileDialog.ShowDialog(WorkbenchSingleton.MainForm)) {
if (DialogResult.OK == fileDialog.ShowDialog(WorkbenchSingleton.MainWin32Window)) {
// Add files to project.
WixProject project = ((WixProject)folderNode.Project);
project.AddWixExtensions(fileDialog.FileNames);

2
src/AddIns/BackendBindings/WixBinding/Project/Src/Commands/AddWixItemToProjectBaseCommand.cs

@ -39,7 +39,7 @@ namespace ICSharpCode.WixBinding @@ -39,7 +39,7 @@ namespace ICSharpCode.WixBinding
// Display file dialog.
using (OpenFileDialog fileDialog = CreateOpenFileDialog(FileFilter)) {
if (DialogResult.OK == fileDialog.ShowDialog(WorkbenchSingleton.MainForm)) {
if (DialogResult.OK == fileDialog.ShowDialog(WorkbenchSingleton.MainWin32Window)) {
// Add files to project.
WixProject project = ((WixProject)folderNode.Project);
AddFiles(project, fileDialog.FileNames);

2
src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/PackageFilesView.cs

@ -31,7 +31,7 @@ namespace ICSharpCode.WixBinding @@ -31,7 +31,7 @@ namespace ICSharpCode.WixBinding
WixProject project;
bool reload;
public override Control Control {
public override object Content {
get {
return packageFilesControl;
}

2
src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/SetupDialogListPad.cs

@ -45,7 +45,7 @@ namespace ICSharpCode.WixBinding @@ -45,7 +45,7 @@ namespace ICSharpCode.WixBinding
}
}
public override Control Control {
public override object Content {
get {
return setupDialogListView;
}

2
src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/WixDialogDesigner.cs

@ -314,7 +314,7 @@ namespace ICSharpCode.WixBinding @@ -314,7 +314,7 @@ namespace ICSharpCode.WixBinding
}
public override System.Windows.Forms.Control ToolsControl {
public override object ToolsContent {
get {
return SetupDialogControlsToolBox;
}

3
src/AddIns/BackendBindings/WixBinding/Project/WixBinding.addin

@ -161,7 +161,8 @@ @@ -161,7 +161,8 @@
category = "Setup"
title = "${res:ICSharpCode.WixBinding.SetupDialogListPad.Title}"
icon = "Setup.Icons.16x16.SetupDialogsPad"
class = "ICSharpCode.WixBinding.SetupDialogListPad"/>
class = "ICSharpCode.WixBinding.SetupDialogListPad"
defaultPosition = "Bottom, Hidden" />
</Path>
<Path name = "/SharpDevelop/Pads/WixSetupDialogListPad/ContextMenu">

3
src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/ClassDiagramAddin.addin

@ -143,7 +143,8 @@ @@ -143,7 +143,8 @@
category = "Tools"
title = "Class Editor"
class = "ClassDiagramAddin.ClassEditorPad"
icon = "ClassDiagram.ClassEditor" />
icon = "ClassDiagram.ClassEditor"
defaultPosition = "Right, Hidden" />
</Path>
<BitmapResources file="Resources\Bitmaps.resources" />

2
src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramCommand.cs

@ -18,7 +18,7 @@ namespace ClassDiagramAddin @@ -18,7 +18,7 @@ namespace ClassDiagramAddin
{
protected ClassCanvas Canvas
{
get { return (ClassCanvas)((ClassDiagramViewContent)this.Owner).Control; }
get { return (ClassCanvas)((ClassDiagramViewContent)this.Owner).Content; }
}
}

12
src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassDiagramViewContent.cs

@ -44,8 +44,7 @@ namespace ClassDiagramAddin @@ -44,8 +44,7 @@ namespace ClassDiagramAddin
canvas.CanvasItemSelected += HandleItemSelected;
}
public override Control Control
{
public override object Content {
get { return canvas; }
}
@ -138,13 +137,6 @@ namespace ClassDiagramAddin @@ -138,13 +137,6 @@ namespace ClassDiagramAddin
}
}
public override void RedrawContent()
{
// TODO: Refresh the whole view control here, renew all resource strings
// Note that you do not need to recreate the control.
base.RedrawContent();
}
public override void Dispose()
{
ParserService.ParseInformationUpdated -= OnParseInformationUpdated;
@ -165,7 +157,7 @@ namespace ClassDiagramAddin @@ -165,7 +157,7 @@ namespace ClassDiagramAddin
PadDescriptor padDesc = WorkbenchSingleton.Workbench.GetPad(typeof(ClassEditorPad));
if (padDesc != null)
{
((ClassEditor)padDesc.PadContent.Control).SetClass(cci.RepresentedClassType);
((ClassEditor)padDesc.PadContent.Content).SetClass(cci.RepresentedClassType);
}
}
}

11
src/AddIns/DisplayBindings/ClassDiagram/ClassDiagramAddin/Src/ClassEditorPad.cs

@ -157,20 +157,11 @@ namespace ClassDiagramAddin @@ -157,20 +157,11 @@ namespace ClassDiagramAddin
/// <summary>
/// The <see cref="System.Windows.Forms.Control"/> representing the pad
/// </summary>
public override Control Control
public override object Content
{
get { return editor; }
}
/// <summary>
/// Refreshes the pad
/// </summary>
public override void RedrawContent()
{
// TODO: Refresh the whole pad control here, renew all resource strings whatever
// Note that you do not need to recreate the control.
}
/// <summary>
/// Cleans up all used resources
/// </summary>

2
src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/Src/AddNewClassCommand.cs

@ -27,7 +27,7 @@ namespace ClassWizard @@ -27,7 +27,7 @@ namespace ClassWizard
using (AddClassForm form = new AddClassForm())
{
form.Owner = (Form) WorkbenchSingleton.Workbench;
form.ShowDialog(WorkbenchSingleton.MainForm);
form.ShowDialog(WorkbenchSingleton.MainWin32Window);
}
}
}

8
src/AddIns/DisplayBindings/ClassDiagram/ClassWizard/Src/ClassesList.cs

@ -7,14 +7,14 @@ @@ -7,14 +7,14 @@
* To change this template use Tools | Options | Coding | Edit Standard Headers.
*/
using ICSharpCode.SharpDevelop.Gui;
using System;
using System.Collections.Generic;
using System.Windows.Forms;
using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Project;
using ICSharpCode.SharpDevelop.Gui.XmlForms;
using ICSharpCode.SharpDevelop.Dom;
using ICSharpCode.SharpDevelop.Gui.XmlForms;
using ICSharpCode.SharpDevelop.Project;
namespace ClassWizard
{
@ -147,7 +147,7 @@ namespace ClassWizard @@ -147,7 +147,7 @@ namespace ClassWizard
initialized = true;
}
classesList.ShowDialog();
classesList.ShowDialog(WorkbenchSingleton.MainWin32Window);
return classesList.DialogResult == DialogResult.OK;
}

2
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Commands/SideBarCommands.cs

@ -17,7 +17,7 @@ namespace ICSharpCode.FormsDesigner @@ -17,7 +17,7 @@ namespace ICSharpCode.FormsDesigner
public override void Run()
{
using (ConfigureSideBarDialog configureSideBarDialog = new ConfigureSideBarDialog()) {
if (configureSideBarDialog.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm) == DialogResult.OK) {
if (configureSideBarDialog.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window) == DialogResult.OK) {
ToolboxProvider.ReloadSideTabs(true);
}
}

4
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerViewContent.cs

@ -110,7 +110,7 @@ namespace ICSharpCode.FormsDesigner @@ -110,7 +110,7 @@ namespace ICSharpCode.FormsDesigner
// This is required on Vista, I don't know why it works correctly in XP
p.Font = Control.DefaultFont;
this.UserControl = this.p;
this.UserContent = this.p;
this.resourceStore = new ResourceStore(this);
@ -702,7 +702,7 @@ namespace ICSharpCode.FormsDesigner @@ -702,7 +702,7 @@ namespace ICSharpCode.FormsDesigner
UpdatePropertyPad();
}
public virtual Control ToolsControl {
public virtual object ToolsContent {
get { return ToolboxProvider.FormsDesignerSideBar; }
}

9
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/FormKeyHandler.cs

@ -70,16 +70,13 @@ namespace ICSharpCode.FormsDesigner @@ -70,16 +70,13 @@ namespace ICSharpCode.FormsDesigner
return false;
}
if (WorkbenchSingleton.Workbench.ActiveWorkbenchWindow == null ||
!WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ActiveViewContent.Control.ContainsFocus) {
return false;
}
FormsDesignerViewContent formDesigner = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ActiveViewContent as FormsDesignerViewContent;
FormsDesignerViewContent formDesigner = WorkbenchSingleton.Workbench.ActiveContent as FormsDesignerViewContent;
if (formDesigner == null || formDesigner.Host == null) {
return false;
}
if (!((Control)formDesigner.Content).ContainsFocus)
return false;
Keys keyPressed = (Keys)m.WParam.ToInt32() | Control.ModifierKeys;

2
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/AddComponentsDialog.cs

@ -221,7 +221,7 @@ namespace ICSharpCode.FormsDesigner.Gui @@ -221,7 +221,7 @@ namespace ICSharpCode.FormsDesigner.Gui
fdiag.Multiselect = true;
fdiag.CheckFileExists = true;
if (fdiag.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm) == DialogResult.OK) {
if (fdiag.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window) == DialogResult.OK) {
ControlDictionary["fileNameTextBox"].Text = string.Join(";", fdiag.FileNames);
}
}

2
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/UIService.cs

@ -52,7 +52,7 @@ namespace ICSharpCode.FormsDesigner.Services @@ -52,7 +52,7 @@ namespace ICSharpCode.FormsDesigner.Services
#region Dialog functions
public IWin32Window GetDialogOwnerWindow()
{
return WorkbenchSingleton.MainForm;
return WorkbenchSingleton.MainWin32Window;
}
public DialogResult ShowDialog(Form form)

2
src/AddIns/DisplayBindings/HexEditor/Project/Src/View/HexEditView.cs

@ -28,7 +28,7 @@ namespace HexEditor.View @@ -28,7 +28,7 @@ namespace HexEditor.View
file.ForceInitializeView(this);
}
public override System.Windows.Forms.Control Control {
public override object Content {
get { return hexEditContainer; }
}

2
src/AddIns/DisplayBindings/IconEditor/IconEditorAddIn/Src/IconViewContent.cs

@ -19,7 +19,7 @@ namespace ICSharpCode.IconEditorAddIn @@ -19,7 +19,7 @@ namespace ICSharpCode.IconEditorAddIn
{
EditorPanel editor = new EditorPanel();
public override Control Control {
public override object Content {
get {
return editor;
}

2
src/AddIns/DisplayBindings/ResourceEditor/Project/Src/Commands/AddNewFileCommand.cs

@ -32,7 +32,7 @@ namespace ResourceEditor @@ -32,7 +32,7 @@ namespace ResourceEditor
fdiag.Multiselect = true;
fdiag.CheckFileExists = true;
if (fdiag.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm) == DialogResult.OK) {
if (fdiag.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window) == DialogResult.OK) {
foreach (string filename in fdiag.FileNames) {
string oresname = Path.ChangeExtension(Path.GetFileName(filename), null);
if (oresname == "") oresname = "new";

2
src/AddIns/DisplayBindings/ResourceEditor/Project/Src/Commands/SaveEntryAsCommand.cs

@ -52,7 +52,7 @@ namespace ResourceEditor @@ -52,7 +52,7 @@ namespace ResourceEditor
return;
}
DialogResult dr = sdialog.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm);
DialogResult dr = sdialog.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window);
sdialog.Dispose();
if (dr != DialogResult.OK) {
return;

6
src/AddIns/DisplayBindings/ResourceEditor/Project/Src/DisplayDefinition.cs

@ -57,15 +57,11 @@ namespace ResourceEditor @@ -57,15 +57,11 @@ namespace ResourceEditor
public ResourceEditWrapper(OpenedFile file)
{
this.TabPageText = "Resource editor";
base.UserControl = resourceEditor;
base.UserContent = resourceEditor;
resourceEditor.ResourceList.Changed += new EventHandler(SetDirty);
this.Files.Add(file);
}
public override void RedrawContent()
{
}
public override void Dispose()
{
base.Dispose();

2
src/AddIns/DisplayBindings/ResourceEditor/Project/Src/ResourceEdit/BitmapView.cs

@ -42,7 +42,7 @@ namespace ResourceEditor @@ -42,7 +42,7 @@ namespace ResourceEditor
fileDialog.Filter = "All files (*.*)|*.*";
fileDialog.CheckFileExists = true;
if(fileDialog.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm) == DialogResult.OK) {
if(fileDialog.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window) == DialogResult.OK) {
try {
bitmap = new Bitmap(fileDialog.FileName);
} catch {

2
src/AddIns/DisplayBindings/SettingsEditor/Project/SettingsViewContent.cs

@ -36,7 +36,7 @@ namespace ICSharpCode.SettingsEditor @@ -36,7 +36,7 @@ namespace ICSharpCode.SettingsEditor
};
}
public override Control Control {
public override object Content {
get {
return view;
}

4
src/AddIns/DisplayBindings/WorkflowDesigner/Project/Src/PrimaryView/PrimaryViewContent.cs

@ -37,7 +37,7 @@ namespace WorkflowDesigner @@ -37,7 +37,7 @@ namespace WorkflowDesigner
}
public override System.Windows.Forms.Control Control {
public override object Content {
get {
return control;
}
@ -75,7 +75,7 @@ namespace WorkflowDesigner @@ -75,7 +75,7 @@ namespace WorkflowDesigner
}
#endregion
System.Windows.Forms.Control IToolsHost.ToolsControl {
object IToolsHost.ToolsContent {
get {
return WorkflowSideTabService.WorkflowSideBar;
}

4
src/AddIns/DisplayBindings/WorkflowDesigner/Project/Src/SecondaryView/SecondaryViewContent.cs

@ -34,7 +34,7 @@ namespace WorkflowDesigner @@ -34,7 +34,7 @@ namespace WorkflowDesigner
#endregion
#region Property Accessors
public override Control Control {
public override object Content {
get {
return control;
}
@ -58,7 +58,7 @@ namespace WorkflowDesigner @@ -58,7 +58,7 @@ namespace WorkflowDesigner
control.UnloadWorkflow();
}
System.Windows.Forms.Control IToolsHost.ToolsControl {
object IToolsHost.ToolsContent {
get {
return WorkflowSideTabService.WorkflowSideBar;
}

44
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/GetBitmapExtension.cs

@ -1,44 +0,0 @@ @@ -1,44 +0,0 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Windows;
using System.Windows.Interop;
using System.Windows.Markup;
using System.Windows.Media.Imaging;
using ICSharpCode.Core.WinForms;
namespace ICSharpCode.WpfDesign.AddIn
{
class GetBitmapExtension : MarkupExtension
{
public GetBitmapExtension(string key)
{
this.key = key;
}
static Dictionary<string, BitmapSource> cache = new Dictionary<string, BitmapSource>();
protected string key;
public override object ProvideValue(IServiceProvider sp)
{
lock (cache) {
BitmapSource result;
if (!cache.TryGetValue(key, out result)) {
result = GetBitmapSource();
result.Freeze();
cache[key] = result;
}
return result;
}
}
BitmapSource GetBitmapSource()
{
Bitmap bitmap = WinFormsResourceService.GetBitmap(key);
return Imaging.CreateBitmapSourceFromHBitmap(bitmap.GetHbitmap(), IntPtr.Zero,
Int32Rect.Empty, BitmapSizeOptions.FromEmptyOptions());
}
}
}

122
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/SharpDevelopElementHost.cs

@ -1,122 +0,0 @@ @@ -1,122 +0,0 @@
// <file>
// <copyright see="prj:///doc/copyright.txt"/>
// <license see="prj:///doc/license.txt"/>
// <author name="Daniel Grunwald"/>
// <version>$Revision$</version>
// </file>
using System;
using System.Windows;
using System.Windows.Forms.Integration;
using System.Windows.Input;
using System.Windows.Threading;
using ICSharpCode.SharpDevelop.Gui;
namespace ICSharpCode.WpfDesign.AddIn
{
/// <summary>
/// Hosts a WPF element inside a Windows.Forms application.
/// </summary>
public class SharpDevelopElementHost : ElementHost, IUndoHandler, IClipboardHandler
{
[ThreadStatic]
static bool registeredErrorHandler;
public SharpDevelopElementHost(WpfViewContent viewContent, UIElement child)
{
if (!registeredErrorHandler) {
registeredErrorHandler = true;
Dispatcher.CurrentDispatcher.UnhandledException += CurrentDispatcher_UnhandledException;
}
this.viewContent = viewContent;
this.Child = child;
}
WpfViewContent viewContent;
static void CurrentDispatcher_UnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
{
ICSharpCode.Core.MessageService.ShowError(e.Exception, "Unhandled WPF exception");
e.Handled = true;
}
bool IsEnabled(RoutedCommand command)
{
if (command.CanExecute(null, null)) return true;
return command.CanExecute(null, viewContent.DesignSurface);
}
void Run(RoutedCommand command)
{
if (command.CanExecute(null, null)) {
command.Execute(null, null);
} else {
command.Execute(null, viewContent.DesignSurface);
}
}
public bool EnableUndo {
get { return IsEnabled(ApplicationCommands.Undo); }
}
public bool EnableRedo {
get { return IsEnabled(ApplicationCommands.Redo); }
}
public void Undo()
{
Run(ApplicationCommands.Undo);
}
public void Redo()
{
Run(ApplicationCommands.Redo);
}
public bool EnableCut {
get { return IsEnabled(ApplicationCommands.Undo); }
}
public bool EnableCopy {
get { return IsEnabled(ApplicationCommands.Copy); }
}
public bool EnablePaste {
get { return IsEnabled(ApplicationCommands.Paste); }
}
public bool EnableDelete {
get { return IsEnabled(ApplicationCommands.Delete); }
}
public bool EnableSelectAll {
get { return IsEnabled(ApplicationCommands.SelectAll); }
}
public void Cut()
{
Run(ApplicationCommands.Cut);
}
public void Copy()
{
Run(ApplicationCommands.Copy);
}
public void Paste()
{
Run(ApplicationCommands.Paste);
}
public void Delete()
{
Run(ApplicationCommands.Delete);
}
public void SelectAll()
{
Run(ApplicationCommands.SelectAll);
}
}
}

12
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfViewContent.cs

@ -9,8 +9,6 @@ using System; @@ -9,8 +9,6 @@ using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Text;
using System.Windows.Forms;
using System.Windows.Forms.Integration;
using System.Windows.Markup;
using System.Xml;
@ -40,7 +38,6 @@ namespace ICSharpCode.WpfDesign.AddIn @@ -40,7 +38,6 @@ namespace ICSharpCode.WpfDesign.AddIn
this.editor = file.RegisteredViewContents[0] as TextEditorDisplayBindingWrapper;
}
ElementHost wpfHost;
DesignSurface designer;
List<Task> tasks = new List<Task>();
@ -63,8 +60,7 @@ namespace ICSharpCode.WpfDesign.AddIn @@ -63,8 +60,7 @@ namespace ICSharpCode.WpfDesign.AddIn
// initialize designer on first load
DragDropExceptionHandler.HandleException = ICSharpCode.Core.MessageService.ShowError;
designer = new DesignSurface();
wpfHost = new SharpDevelopElementHost(this, designer);
this.UserControl = wpfHost;
this.UserContent = designer;
InitPropertyEditor();
}
using (XmlTextReader r = new XmlTextReader(stream)) {
@ -134,14 +130,12 @@ namespace ICSharpCode.WpfDesign.AddIn @@ -134,14 +130,12 @@ namespace ICSharpCode.WpfDesign.AddIn
#region Property editor / SelectionChanged
ElementHost propertyEditorHost;
PropertyGridView propertyGridView;
void InitPropertyEditor()
{
propertyGridView = new PropertyGridView();
propertyEditorHost = new SharpDevelopElementHost(this, propertyGridView);
propertyContainer.PropertyGridReplacementControl = propertyEditorHost;
propertyContainer.PropertyGridReplacementContent = propertyGridView;
}
ICollection<DesignItem> oldItems = new DesignItem[0];
@ -177,7 +171,7 @@ namespace ICSharpCode.WpfDesign.AddIn @@ -177,7 +171,7 @@ namespace ICSharpCode.WpfDesign.AddIn
}
#endregion
public Control ToolsControl {
public object ToolsContent {
get { return WpfToolbox.Instance.ToolboxControl; }
}

7
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/WpfDesign.AddIn.csproj

@ -59,14 +59,12 @@ @@ -59,14 +59,12 @@
<Compile Include="Src\AbstractEventHandlerService.cs" />
<Compile Include="Src\CSharpEventHandlerService.cs" />
<Compile Include="Src\FileUriContext.cs" />
<Compile Include="Src\GetBitmapExtension.cs" />
<Compile Include="Src\IdeChooseClassService.cs" />
<Compile Include="Src\MyTypeFinder.cs" />
<Compile Include="Src\ObjectEditor.xaml.cs">
<DependentUpon>ObjectEditor.xaml</DependentUpon>
</Compile>
<Compile Include="Src\PropertyDescriptionService.cs" />
<Compile Include="Src\SharpDevelopElementHost.cs" />
<Compile Include="Src\WpfAndWinFormsTopLevelWindowService.cs" />
<Compile Include="Src\WpfDisplayBinding.cs" />
<Compile Include="Src\WpfSideTabItem.cs" />
@ -89,6 +87,11 @@ @@ -89,6 +87,11 @@
<Name>ICSharpCode.Core</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Main\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj">
<Project>{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}</Project>
<Name>ICSharpCode.Core.Presentation</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj">
<Project>{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}</Project>
<Name>ICSharpCode.Core.WinForms</Name>

10
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Configuration/AssemblyInfo.cs

@ -41,10 +41,10 @@ using System.Windows.Markup; @@ -41,10 +41,10 @@ using System.Windows.Markup;
// app, or any theme specific resource dictionaries)
)]
[assembly: XmlnsPrefix("http://sharpdevelop.net", "sd")]
[assembly: XmlnsPrefix("http://icsharpcode.net/sharpdevelop/wpfdesigner", "wpfdesigner")]
[assembly: XmlnsDefinition("http://sharpdevelop.net", "ICSharpCode.WpfDesign.Designer")]
[assembly: XmlnsDefinition("http://sharpdevelop.net", "ICSharpCode.WpfDesign.Designer.Controls")]
[assembly: XmlnsDefinition("http://sharpdevelop.net", "ICSharpCode.WpfDesign.Designer.PropertyGrid")]
[assembly: XmlnsDefinition("http://sharpdevelop.net", "ICSharpCode.WpfDesign.Designer.PropertyGrid.Editors")]
[assembly: XmlnsDefinition("http://icsharpcode.net/sharpdevelop/wpfdesigner", "ICSharpCode.WpfDesign.Designer")]
[assembly: XmlnsDefinition("http://icsharpcode.net/sharpdevelop/wpfdesigner", "ICSharpCode.WpfDesign.Designer.Controls")]
[assembly: XmlnsDefinition("http://icsharpcode.net/sharpdevelop/wpfdesigner", "ICSharpCode.WpfDesign.Designer.PropertyGrid")]
[assembly: XmlnsDefinition("http://icsharpcode.net/sharpdevelop/wpfdesigner", "ICSharpCode.WpfDesign.Designer.PropertyGrid.Editors")]

2
src/AddIns/DisplayBindings/XmlEditor/Project/Src/AssignStylesheetCommand.cs

@ -52,7 +52,7 @@ namespace ICSharpCode.XmlEditor @@ -52,7 +52,7 @@ namespace ICSharpCode.XmlEditor
dialog.FilterIndex = 1;
}
if (dialog.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm) == DialogResult.OK) {
if (dialog.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window) == DialogResult.OK) {
return dialog.FileName;
}
}

2
src/AddIns/DisplayBindings/XmlEditor/Project/Src/XPathQueryPad.cs

@ -38,7 +38,7 @@ namespace ICSharpCode.XmlEditor @@ -38,7 +38,7 @@ namespace ICSharpCode.XmlEditor
/// <summary>
/// The <see cref="System.Windows.Forms.Control"/> representing the pad.
/// </summary>
public override Control Control {
public override object Content {
get {
return xPathQueryControl;
}

2
src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlTreeView.cs

@ -44,7 +44,7 @@ namespace ICSharpCode.XmlEditor @@ -44,7 +44,7 @@ namespace ICSharpCode.XmlEditor
treeViewContainer.TreeView.ContextMenuStrip = treeViewContextMenuStrip;
}
public override Control Control {
public override object Content {
get {
return treeViewContainer;
}

2
src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlView.cs

@ -547,7 +547,7 @@ namespace ICSharpCode.XmlEditor @@ -547,7 +547,7 @@ namespace ICSharpCode.XmlEditor
#region AbstractViewContent implementation
public override Control Control {
public override object Content {
get {
return xmlEditor;
}

1
src/AddIns/DisplayBindings/XmlEditor/Project/Src/XslOutputView.cs

@ -27,7 +27,6 @@ namespace ICSharpCode.XmlEditor @@ -27,7 +27,6 @@ namespace ICSharpCode.XmlEditor
foreach (IViewContent content in WorkbenchSingleton.Workbench.ViewContentCollection) {
if (content is XslOutputView) {
LoggingService.Debug("XslOutputView instance exists.");
LoggingService.Debug("XslOutputView.IsDisposed=" + content.Control.IsDisposed.ToString());
return (XslOutputView)content;
}
}

3
src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.addin

@ -169,7 +169,8 @@ @@ -169,7 +169,8 @@
icon = "PadIcons.XPathQuery"
title = "${res:ICSharpCode.XmlEditor.XPathQueryPad.Title}"
insertafter = "UnitTestingPad"
class = "ICSharpCode.XmlEditor.XPathQueryPad"/>
class = "ICSharpCode.XmlEditor.XPathQueryPad"
defaultPosition = "Bottom, Hidden" />
</Path>
<!-- Menu options to turn off XPath Query result highlighting -->

7
src/AddIns/Misc/AddInManager/Project/Src/ManagerForm.cs

@ -32,10 +32,11 @@ namespace ICSharpCode.AddInManager @@ -32,10 +32,11 @@ namespace ICSharpCode.AddInManager
{
if (instance == null) {
instance = new ManagerForm();
#if !STANDALONE
instance.Owner = ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm;
#endif
#if STANDALONE
instance.Show();
#else
instance.Show(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window);
#endif
} else {
instance.Activate();
}

2
src/AddIns/Misc/AddinScout/Project/Src/AddInScoutViewContent.cs

@ -16,7 +16,7 @@ namespace AddInScout @@ -16,7 +16,7 @@ namespace AddInScout
{
Control control = null;
public override Control Control {
public override object Content {
get {
return control;
}

3
src/AddIns/Misc/CodeCoverage/Project/CodeCoverage.addin

@ -20,7 +20,8 @@ @@ -20,7 +20,8 @@
insertbefore = "DefinitionView"
icon = "CodeCoverage.Icons.16x16.Pad"
shortcut = "Control|Alt|G"
class = "ICSharpCode.CodeCoverage.CodeCoveragePad"/>
class = "ICSharpCode.CodeCoverage.CodeCoveragePad"
defaultPosition = "Bottom, Hidden" />
</Path>
<Path name = "/SharpDevelop/Pads/CodeCoveragePad/Toolbar">

2
src/AddIns/Misc/CodeCoverage/Project/Src/CodeCoveragePad.cs

@ -38,7 +38,7 @@ namespace ICSharpCode.CodeCoverage @@ -38,7 +38,7 @@ namespace ICSharpCode.CodeCoverage
}
}
public override Control Control {
public override object Content {
get {
return codeCoverageControl;
}

2
src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/Src/ComponentInspectorView.cs

@ -45,7 +45,7 @@ namespace ICSharpCode.ComponentInspector.AddIn @@ -45,7 +45,7 @@ namespace ICSharpCode.ComponentInspector.AddIn
}
}
public override Control Control {
public override object Content {
get {
return objectBrowser;
}

18
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.addin

@ -52,42 +52,48 @@ @@ -52,42 +52,48 @@
title = "${res:MainWindow.Windows.Debug.Breakpoints}"
icon = "PadIcons.BreakPoints"
shortcut = "Control|Alt|P"
class = "ICSharpCode.SharpDevelop.Gui.Pads.BreakPointsPad"/>
class = "ICSharpCode.SharpDevelop.Gui.Pads.BreakPointsPad"
defaultPosition = "Bottom, Hidden" />
<Pad id = "CallStackPad"
category = "Debugger"
title = "${res:MainWindow.Windows.Debug.CallStack}"
icon = "PadIcons.CallStack"
shortcut = "Control|Alt|C"
class = "ICSharpCode.SharpDevelop.Gui.Pads.CallStackPad"/>
class = "ICSharpCode.SharpDevelop.Gui.Pads.CallStackPad"
defaultPosition = "Bottom, Hidden" />
<Pad id = "LoadedModulesPad"
category = "Debugger"
title = "${res:MainWindow.Windows.Debug.Modules}"
icon = "PadIcons.LoadedModules"
shortcut = "Control|Alt|U"
class = "ICSharpCode.SharpDevelop.Gui.Pads.LoadedModulesPad"/>
class = "ICSharpCode.SharpDevelop.Gui.Pads.LoadedModulesPad"
defaultPosition = "Bottom, Hidden" />
<Pad id = "RunningThreadsPad"
category = "Debugger"
title = "${res:MainWindow.Windows.Debug.Threads}"
icon = "PadIcons.Threads"
shortcut = "Control|Alt|H"
class = "ICSharpCode.SharpDevelop.Gui.Pads.RunningThreadsPad"/>
class = "ICSharpCode.SharpDevelop.Gui.Pads.RunningThreadsPad"
defaultPosition = "Bottom, Hidden" />
<Pad id = "LocalVarPad"
category = "Debugger"
title = "${res:MainWindow.Windows.Debug.LocalVariables}"
icon = "PadIcons.LocalVariables"
shortcut = "Control|Alt|V"
class = "ICSharpCode.SharpDevelop.Gui.Pads.LocalVarPad"/>
class = "ICSharpCode.SharpDevelop.Gui.Pads.LocalVarPad"
defaultPosition = "Bottom, Hidden" />
<Pad id = "ConsolePad"
category = "Debugger"
title = "${res:MainWindow.Windows.Debug.Console}"
icon = "PadIcons.Output"
shortcut = "Control|Alt|N"
class = "ICSharpCode.SharpDevelop.Gui.Pads.ConsolePad"/>
class = "ICSharpCode.SharpDevelop.Gui.Pads.ConsolePad"
defaultPosition = "Bottom, Hidden" />
<Pad id = "WatchPad"
category = "Debugger"

17
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.csproj

@ -19,7 +19,8 @@ @@ -19,7 +19,8 @@
<FileAlignment>4096</FileAlignment>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<RunPostBuildEvent>Always</RunPostBuildEvent>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
<SourceAnalysisOverrideSettingsFile>"C:\Program Files\SharpDevelop\3.0\bin\..\AddIns\AddIns\Misc\SourceAnalysis\Settings.SourceAnalysis"</SourceAnalysisOverrideSettingsFile>
<SourceAnalysisOverrideSettingsFile>C:\Dokumente und Einstellungen\HP\Anwendungsdaten\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@ -40,11 +41,20 @@ @@ -40,11 +41,20 @@
<StartProgram>..\..\..\..\..\..\bin\SharpDevelop.exe</StartProgram>
</PropertyGroup>
<ItemGroup>
<Reference Include="PresentationCore">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
</Reference>
<Reference Include="PresentationFramework">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Configuration\AssemblyInfo.cs" />
@ -190,11 +200,6 @@ @@ -190,11 +200,6 @@
<Name>ICSharpCode.Core.WinForms</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\..\..\Main\ICSharpCode.SharpDevelop.Sda\ICSharpCode.SharpDevelop.Sda.csproj">
<Project>{80318B5F-A25D-45AB-8A95-EF31D2370A4C}</Project>
<Name>ICSharpCode.SharpDevelop.Sda</Name>
<Private>False</Private>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
<Import Project="PostBuildEvent.proj" />

5
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/CallStackPad.cs

@ -58,7 +58,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -58,7 +58,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
ColumnHeader name = new ColumnHeader();
ColumnHeader language = new ColumnHeader();
public override Control Control {
public override object Content {
get {
return callStackList;
}
@ -81,9 +81,10 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -81,9 +81,10 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
language.Width = 50;
RedrawContent();
ResourceService.LanguageChanged += delegate { RedrawContent(); };
}
public override void RedrawContent()
public void RedrawContent()
{
name.Text = ResourceService.GetString("Global.Name");
language.Text = ResourceService.GetString("MainWindow.Windows.Debug.CallStack.Language");

5
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LoadedModulesPad.cs

@ -59,7 +59,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -59,7 +59,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
ColumnHeader information = new ColumnHeader();
public override Control Control {
public override object Content {
get {
return loadedModulesList;
}
@ -86,9 +86,10 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -86,9 +86,10 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
information.Width = 130;
RedrawContent();
ResourceService.LanguageChanged += delegate { RedrawContent(); };
}
public override void RedrawContent()
public void RedrawContent()
{
name.Text = StringParser.Parse("${res:Global.Name}");
address.Text = StringParser.Parse("${res:MainWindow.Windows.Debug.Modules.AddressColumn}");

5
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LocalVarPad.cs

@ -61,7 +61,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -61,7 +61,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
/// <remarks>
/// This is not used anywhere, but it is neccessary to be overridden in children of AbstractPadContent.
/// </remarks>
public override Control Control {
public override object Content {
get {
return localVarList;
}
@ -100,9 +100,10 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -100,9 +100,10 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
localVarList.AutoRowHeight = true;
RedrawContent();
ResourceService.LanguageChanged += delegate { RedrawContent(); };
}
public override void RedrawContent()
public void RedrawContent()
{
nameColumn.Header = ResourceService.GetString("Global.Name");
nameColumn.Width = 250;

5
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/RunningThreadsPad.cs

@ -56,7 +56,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -56,7 +56,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
ColumnHeader priority = new ColumnHeader();
ColumnHeader breaked = new ColumnHeader();
public override Control Control {
public override object Content {
get {
return runningThreadsList;
}
@ -82,9 +82,10 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -82,9 +82,10 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
breaked.Width = 80;
RedrawContent();
ResourceService.LanguageChanged += delegate { RedrawContent(); };
}
public override void RedrawContent()
public void RedrawContent()
{
id.Text = ResourceService.GetString("Global.ID");
name.Text = ResourceService.GetString("Global.Name");

7
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/WatchPad.cs

@ -104,7 +104,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -104,7 +104,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
/// <remarks>
/// This is not used anywhere, but it is neccessary to be overridden in children of AbstractPadContent.
/// </remarks>
public override Control Control {
public override object Content {
get {
return watchList;
}
@ -148,7 +148,8 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -148,7 +148,8 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
watches = new List<TextNode>();
RedrawContent();
ResourceService.LanguageChanged += delegate { OnLanguageChanged(); };
OnLanguageChanged();
}
void watchList_DoubleClick(object sender, EventArgs e)
@ -177,7 +178,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -177,7 +178,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
watchList.EndUpdate();
}
public override void RedrawContent()
void OnLanguageChanged()
{
nameColumn.Header = ResourceService.GetString("Global.Name");
nameColumn.Width = 250;

20
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/WatchPadCommands.cs

@ -26,15 +26,15 @@ namespace Debugger.AddIn @@ -26,15 +26,15 @@ namespace Debugger.AddIn
if (this.Owner is WatchPad) {
WatchPad pad = (WatchPad)this.Owner;
((TreeViewAdv)pad.Control).BeginUpdate();
((TreeViewAdv)pad.Content).BeginUpdate();
TextNode text = new TextNode(MessageService.ShowInputBox(StringParser.Parse("${res:MainWindow.Windows.Debug.Watch.AddWatch}"),
StringParser.Parse("${res:MainWindow.Windows.Debug.Watch.EnterExpression}"),
""));
TreeViewVarNode node = new TreeViewVarNode(pad.Process, (TreeViewAdv)pad.Control, text);
TreeViewVarNode node = new TreeViewVarNode(pad.Process, (TreeViewAdv)pad.Content, text);
pad.Watches.Add(text);
((TreeViewAdv)pad.Control).Root.Children.Add(node);
((TreeViewAdv)pad.Control).EndUpdate();
((TreeViewAdv)pad.Content).Root.Children.Add(node);
((TreeViewAdv)pad.Content).EndUpdate();
((WatchPad)this.Owner).RefreshPad();
}
@ -50,18 +50,18 @@ namespace Debugger.AddIn @@ -50,18 +50,18 @@ namespace Debugger.AddIn
// TODO : Implement remove
TreeNodeAdv node = ((TreeViewAdv)pad.Control).SelectedNode;
TreeNodeAdv node = ((TreeViewAdv)pad.Content).SelectedNode;
if (node == null)
return;
while (node.Parent != ((TreeViewAdv)pad.Control).Root)
while (node.Parent != ((TreeViewAdv)pad.Content).Root)
{
node = node.Parent;
}
pad.Watches.RemoveAt(node.Index);
((TreeViewAdv)pad.Control).Root.Children.Remove(node);
((TreeViewAdv)pad.Content).Root.Children.Remove(node);
((WatchPad)this.Owner).RefreshPad();
}
@ -85,10 +85,10 @@ namespace Debugger.AddIn @@ -85,10 +85,10 @@ namespace Debugger.AddIn
if (this.Owner is WatchPad) {
WatchPad pad = (WatchPad)this.Owner;
((TreeViewAdv)pad.Control).BeginUpdate();
((TreeViewAdv)pad.Content).BeginUpdate();
pad.Watches.Clear();
((TreeViewAdv)pad.Control).Root.Children.Clear();
((TreeViewAdv)pad.Control).EndUpdate();
((TreeViewAdv)pad.Content).Root.Children.Clear();
((TreeViewAdv)pad.Content).EndUpdate();
}
}
}

2
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DebugeeExceptionForm.cs

@ -137,7 +137,7 @@ namespace ICSharpCode.SharpDevelop.Services @@ -137,7 +137,7 @@ namespace ICSharpCode.SharpDevelop.Services
form.exceptionDetails.Refresh();
form.buttonContinue.Enabled = canContinue;
form.ShowDialog(Gui.WorkbenchSingleton.MainForm);
form.ShowDialog(Gui.WorkbenchSingleton.MainWin32Window);
return form.result;
}
}

2
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/DebuggerEventForm.cs

@ -81,7 +81,7 @@ namespace ICSharpCode.SharpDevelop.Services @@ -81,7 +81,7 @@ namespace ICSharpCode.SharpDevelop.Services
form.textBox.Text = message;
form.pictureBox.Image = icon;
form.buttonContinue.Enabled = canContinue;
form.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm);
form.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window);
return form.result;
}
}

4
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Service/WindowsDebugger.cs

@ -189,7 +189,7 @@ namespace ICSharpCode.SharpDevelop.Services @@ -189,7 +189,7 @@ namespace ICSharpCode.SharpDevelop.Services
public void ShowAttachDialog()
{
using (AttachToProcessForm attachForm = new AttachToProcessForm()) {
if (attachForm.ShowDialog() == DialogResult.OK) {
if (attachForm.ShowDialog(WorkbenchSingleton.MainWin32Window) == DialogResult.OK) {
Attach(attachForm.Process);
}
}
@ -727,7 +727,7 @@ namespace ICSharpCode.SharpDevelop.Services @@ -727,7 +727,7 @@ namespace ICSharpCode.SharpDevelop.Services
public void JumpToCurrentLine()
{
WorkbenchSingleton.MainForm.Activate();
WorkbenchSingleton.MainWindow.Activate();
DebuggerService.RemoveCurrentLineMarker();
if (debuggedProcess != null) {
SourcecodeSegment nextStatement = debuggedProcess.NextStatement;

5
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/TreeModel/ErrorNode.cs

@ -10,7 +10,6 @@ using System.Collections.Generic; @@ -10,7 +10,6 @@ using System.Collections.Generic;
using System.Windows.Forms;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Sda;
using Debugger;
using Debugger.Expressions;
@ -48,9 +47,7 @@ namespace Debugger.AddIn.TreeModel @@ -48,9 +47,7 @@ namespace Debugger.AddIn.TreeModel
showError.Text = StringParser.Parse("${res:MainWindow.Windows.Debug.LocalVariables.ShowFullError}");
showError.Checked = false;
showError.Click += delegate {
using (ExceptionBox box = new ExceptionBox(error, null, false)) {
box.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm);
}
MessageService.ShowError(error, null);
};
menu.Items.AddRange(new ToolStripItem[] {

2
src/AddIns/Misc/HighlightingEditor/Project/Src/ColorButton.cs

@ -58,7 +58,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -58,7 +58,7 @@ namespace ICSharpCode.SharpDevelop.Gui
p = PointToScreen(p);
using (ColorPaletteDialog clDlg = new ColorPaletteDialog(p.X, p.Y)) {
clDlg.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm);
clDlg.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window);
if (clDlg.DialogResult == DialogResult.OK) {
CenterColor = clDlg.Color;
}

2
src/AddIns/Misc/HighlightingEditor/Project/Src/ColorDialog.cs

@ -133,7 +133,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -133,7 +133,7 @@ namespace ICSharpCode.SharpDevelop.Gui
{
using (ColorDialog colDialog = new ColorDialog()) {
colDialog.FullOpen = true;
if (colDialog.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm) == DialogResult.OK) {
if (colDialog.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window) == DialogResult.OK) {
selectedColor = colDialog.Color;
DialogResult = DialogResult.OK;
}

2
src/AddIns/Misc/HighlightingEditor/Project/Src/EditHighlightingPanel.cs

@ -182,7 +182,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels @@ -182,7 +182,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
HighlightItem item = (HighlightItem)userList.SelectedItem;
using (EditHighlightingDialog dlg = new EditHighlightingDialog(item.Node)) {
DialogResult res = dlg.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm);
DialogResult res = dlg.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window);
if (res == DialogResult.OK) {
using (XmlTextWriter writer = new XmlTextWriter(item.FileName, Encoding.UTF8)) {

3
src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.DynamicHelp.addin

@ -15,7 +15,8 @@ @@ -15,7 +15,8 @@
category = "Help2"
title = "${res:AddIns.HtmlHelp2.DynamicHelp}"
icon = "HtmlHelp2.16x16.DynamicHelp"
class = "HtmlHelp2.HtmlHelp2DynamicHelpPad"/>
class = "HtmlHelp2.HtmlHelp2DynamicHelpPad"
defaultPosition = "Right, Hidden" />
</Path>
<Path name = "/SharpDevelop/Workbench/MainMenu/Help">

12
src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.addin

@ -24,22 +24,26 @@ @@ -24,22 +24,26 @@
category = "Help2"
title = "${res:AddIns.HtmlHelp2.Contents}"
icon = "HtmlHelp2.16x16.Toc"
class = "HtmlHelp2.HtmlHelp2TocPad"/>
class = "HtmlHelp2.HtmlHelp2TocPad"
defaultPosition = "Right, Hidden" />
<Pad id = "IndexPad"
category = "Help2"
title = "${res:AddIns.HtmlHelp2.Index}"
icon = "HtmlHelp2.16x16.Index"
class = "HtmlHelp2.HtmlHelp2IndexPad"/>
class = "HtmlHelp2.HtmlHelp2IndexPad"
defaultPosition = "Right, Hidden" />
<Pad id = "SearchPad"
category = "Help2"
title = "${res:AddIns.HtmlHelp2.Search}"
icon = "HtmlHelp2.16x16.Search"
class = "HtmlHelp2.HtmlHelp2SearchPad"/>
class = "HtmlHelp2.HtmlHelp2SearchPad"
defaultPosition = "Right, Hidden" />
<Pad id = "IndexResultsPad"
category = "Help2"
title = "${res:AddIns.HtmlHelp2.IndexResults}"
icon = "HtmlHelp2.16x16.IndexResults"
class = "HtmlHelp2.HtmlHelp2IndexResultsPad"/>
class = "HtmlHelp2.HtmlHelp2IndexResultsPad"
defaultPosition = "Bottom, Hidden" />
</Path>
<Path name = "/SharpDevelop/Dialogs/OptionsDialog/ToolsOptions">

8
src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/DynamicHelpPad.cs

@ -43,16 +43,11 @@ namespace HtmlHelp2 @@ -43,16 +43,11 @@ namespace HtmlHelp2
private string debugPreElement = String.Empty;
private bool enableDebugInfo = HtmlHelp2Environment.Config.DynamicHelpDebugInfos;
public override Control Control
public override object Content
{
get { return dynamicHelpBrowser; }
}
public override void RedrawContent()
{
dynamicHelpBrowser.RedrawContent();
}
[PermissionSet(SecurityAction.LinkDemand, Name="Execution")]
public HtmlHelp2DynamicHelpPad()
{
@ -65,6 +60,7 @@ namespace HtmlHelp2 @@ -65,6 +60,7 @@ namespace HtmlHelp2
ProjectService.SolutionClosed += new EventHandler(this.SolutionClosed);
HtmlHelp2Environment.NamespaceReloaded += new EventHandler(this.NamespaceReloaded);
ResourceService.LanguageChanged += delegate { dynamicHelpBrowser.RedrawContent(); };
}
#region Dynamic Help Calls

8
src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexPad.cs

@ -33,7 +33,7 @@ namespace HtmlHelp2 @@ -33,7 +33,7 @@ namespace HtmlHelp2
{
MSHelp2IndexControl help2IndexControl;
public override Control Control
public override object Content
{
get { return help2IndexControl; }
}
@ -43,14 +43,10 @@ namespace HtmlHelp2 @@ -43,14 +43,10 @@ namespace HtmlHelp2
help2IndexControl.Dispose();
}
public override void RedrawContent()
{
help2IndexControl.RedrawContent();
}
public HtmlHelp2IndexPad()
{
help2IndexControl = new MSHelp2IndexControl();
ResourceService.LanguageChanged += delegate { help2IndexControl.RedrawContent(); };
}
}

9
src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexResultsPad.cs

@ -32,16 +32,11 @@ namespace HtmlHelp2 @@ -32,16 +32,11 @@ namespace HtmlHelp2
ColumnHeader title = new ColumnHeader();
ColumnHeader location = new ColumnHeader();
public override Control Control
public override object Content
{
get { return listView; }
}
public override void RedrawContent()
{
this.SetListViewHeader();
}
public ListView IndexResultsListView
{
get { return listView; }
@ -50,6 +45,8 @@ namespace HtmlHelp2 @@ -50,6 +45,8 @@ namespace HtmlHelp2
public HtmlHelp2IndexResultsPad()
{
this.SetListViewHeader();
ResourceService.LanguageChanged += delegate { SetListViewHeader(); };
listView.Columns.Add(title);
listView.Columns.Add(location);

8
src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/SearchPad.cs

@ -47,7 +47,7 @@ namespace HtmlHelp2 @@ -47,7 +47,7 @@ namespace HtmlHelp2
Label label2 = new Label();
bool searchIsBusy;
public override Control Control
public override object Content
{
get { return mainPanel; }
}
@ -57,11 +57,6 @@ namespace HtmlHelp2 @@ -57,11 +57,6 @@ namespace HtmlHelp2
searchTerm.Focus();
}
public override void RedrawContent()
{
this.RedrawContentInternal();
}
void RedrawContentInternal()
{
searchButton.Text = StringParser.Parse("${res:AddIns.HtmlHelp2.Search}");
@ -83,6 +78,7 @@ namespace HtmlHelp2 @@ -83,6 +78,7 @@ namespace HtmlHelp2
{
this.InitializeComponents();
this.UpdateControls();
ResourceService.LanguageChanged += delegate { RedrawContentInternal(); };
HtmlHelp2Environment.FilterQueryChanged += new EventHandler(FilterQueryChanged);
HtmlHelp2Environment.NamespaceReloaded += new EventHandler(NamespaceReloaded);

8
src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/TocPad.cs

@ -34,7 +34,7 @@ namespace HtmlHelp2 @@ -34,7 +34,7 @@ namespace HtmlHelp2
{
MSHelp2TocControl help2TocControl;
public override Control Control
public override object Content
{
get { return help2TocControl; }
}
@ -44,14 +44,10 @@ namespace HtmlHelp2 @@ -44,14 +44,10 @@ namespace HtmlHelp2
help2TocControl.Dispose();
}
public override void RedrawContent()
{
help2TocControl.RedrawContent();
}
public HtmlHelp2TocPad()
{
help2TocControl = new MSHelp2TocControl();
ResourceService.LanguageChanged += delegate { help2TocControl.RedrawContent(); };
}
public void SyncToc(string topic)

5
src/AddIns/Misc/PInvokeAddIn/Project/Src/InsertPInvokeSignaturesCommand.cs

@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
using System;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui;
namespace ICSharpCode.PInvokeAddIn
{
@ -15,7 +16,7 @@ namespace ICSharpCode.PInvokeAddIn @@ -15,7 +16,7 @@ namespace ICSharpCode.PInvokeAddIn
/// insert one or more of them into the code.
/// </summary>
public class InsertPInvokeSignaturesCommand : AbstractMenuCommand
{
{
/// <summary>
/// Starts the command.
/// </summary>
@ -23,7 +24,7 @@ namespace ICSharpCode.PInvokeAddIn @@ -23,7 +24,7 @@ namespace ICSharpCode.PInvokeAddIn
{
// Show PInvoke dialog.
using(InsertPInvokeSignaturesForm form = new InsertPInvokeSignaturesForm()) {
form.ShowDialog();
form.ShowDialog(WorkbenchSingleton.MainWin32Window);
}
}
}

2
src/AddIns/Misc/ReflectorAddIn/ReflectorAddIn/Project/Src/TextEditorContextMenuCommand.cs

@ -137,7 +137,7 @@ namespace ReflectorAddIn @@ -137,7 +137,7 @@ namespace ReflectorAddIn
Application.DoEvents();
Cursor.Current = Cursors.WaitCursor;
ReflectorController.TryGoTo(element, WorkbenchSingleton.MainForm);
ReflectorController.TryGoTo(element, WorkbenchSingleton.MainWin32Window);
} finally {
Cursor.Current = Cursors.Default;

5
src/AddIns/Misc/RegExpTk/Project/Src/Commands/MenuCommand.cs

@ -7,17 +7,16 @@ @@ -7,17 +7,16 @@
using System;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui;
namespace Plugins.RegExpTk {
public class RegExpTkCommand : AbstractMenuCommand
{
public override void Run()
{
RegExpTkDialog dialog = new RegExpTkDialog();
dialog.Owner = ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm;
dialog.Show();
dialog.Show(WorkbenchSingleton.MainWin32Window);
}
}
}

4
src/AddIns/Misc/RegExpTk/Project/Src/Dialogs/MainWindow.cs

@ -131,7 +131,7 @@ namespace Plugins.RegExpTk { @@ -131,7 +131,7 @@ namespace Plugins.RegExpTk {
void showGroupForm(Match match)
{
GroupForm groupform = new GroupForm(match);
groupform.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm);
groupform.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window);
}
void GroupListView_MouseUp(object sender, MouseEventArgs e)
@ -253,7 +253,7 @@ namespace Plugins.RegExpTk { @@ -253,7 +253,7 @@ namespace Plugins.RegExpTk {
sfd.DefaultExt = "dll";
sfd.CheckPathExists = true;
if (sfd.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm) == DialogResult.OK) {
if (sfd.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window) == DialogResult.OK) {
((TextBox)ControlDictionary["AssemblyFileCompileFileTextBox"]).Text = sfd.FileName;
}
}

2
src/AddIns/Misc/ResourceToolkit/Project/Src/CodeCompletion/NewResourceCodeCompletionData.cs

@ -48,7 +48,7 @@ namespace Hornung.ResourceToolkit.CodeCompletion @@ -48,7 +48,7 @@ namespace Hornung.ResourceToolkit.CodeCompletion
EditStringResourceDialog dialog = new EditStringResourceDialog(this.content, this.preEnteredName, null, true);
dialog.Text = this.Description;
if (dialog.ShowDialog(WorkbenchSingleton.MainForm) != DialogResult.OK) {
if (dialog.ShowDialog(WorkbenchSingleton.MainWin32Window) != DialogResult.OK) {
return false;
}

2
src/AddIns/Misc/ResourceToolkit/Project/Src/Commands/TextEditorContextMenuBuilder.cs

@ -100,7 +100,7 @@ namespace Hornung.ResourceToolkit.Commands @@ -100,7 +100,7 @@ namespace Hornung.ResourceToolkit.Commands
if (svalue == null) {
dialog.Text = String.Format(CultureInfo.CurrentCulture, StringParser.Parse("${res:Hornung.ResourceToolkit.CodeCompletion.AddNewDescription}"), result.ResourceFileContent.FileName);
}
if (dialog.ShowDialog(WorkbenchSingleton.MainForm) == DialogResult.OK) {
if (dialog.ShowDialog(WorkbenchSingleton.MainWin32Window) == DialogResult.OK) {
if (svalue == null) {
// Add new resource.
result.ResourceFileContent.Add(dialog.Key, dialog.Value);

2
src/AddIns/Misc/ResourceToolkit/Project/Src/Gui/UnusedResourceKeysViewContent.cs

@ -28,7 +28,7 @@ namespace Hornung.ResourceToolkit.Gui @@ -28,7 +28,7 @@ namespace Hornung.ResourceToolkit.Gui
ListView listView;
ToolStrip toolStrip;
public override System.Windows.Forms.Control Control {
public override object Content {
get {
return this.panel;
}

17
src/AddIns/Misc/SearchAndReplace/Project/Commands/SearchToolbarCommands.cs

@ -6,9 +6,9 @@ @@ -6,9 +6,9 @@
// </file>
using System;
using System.Windows.Forms;
using System.Windows.Controls;
using ICSharpCode.Core;
using ICSharpCode.Core.WinForms;
using System.Windows.Input;
namespace SearchAndReplace
{
@ -18,6 +18,7 @@ namespace SearchAndReplace @@ -18,6 +18,7 @@ namespace SearchAndReplace
public class FindComboBox : AbstractComboBoxCommand
{
ComboBox comboBox;
public FindComboBox()
{
}
@ -31,9 +32,9 @@ namespace SearchAndReplace @@ -31,9 +32,9 @@ namespace SearchAndReplace
comboBox.Text = SearchOptions.FindPattern;
}
void OnKeyPress(object sender, KeyPressEventArgs e)
void OnKeyPress(object sender, KeyEventArgs e)
{
if (e.KeyChar == '\r') {
if (e.Key == Key.Enter) {
CommitSearch();
e.Handled = true;
}
@ -60,10 +61,10 @@ namespace SearchAndReplace @@ -60,10 +61,10 @@ namespace SearchAndReplace
protected override void OnOwnerChanged(EventArgs e)
{
base.OnOwnerChanged(e);
ToolBarComboBox toolbarItem = (ToolBarComboBox)Owner;
comboBox = toolbarItem.ComboBox;
comboBox.DropDownStyle = ComboBoxStyle.DropDown;
comboBox.KeyPress += OnKeyPress;
comboBox = (ComboBox)Owner;
comboBox.IsEditable = true;
comboBox.KeyDown += OnKeyPress;
comboBox.Width = 130;
SearchOptions.Properties.PropertyChanged += new PropertyChangedEventHandler(SearchOptionsChanged);
RefreshComboBox();

2
src/AddIns/Misc/SearchAndReplace/Project/Engine/SearchReplaceManager.cs

@ -365,7 +365,7 @@ namespace SearchAndReplace @@ -365,7 +365,7 @@ namespace SearchAndReplace
if (monitor != null && monitor.IsCancelled)
return;
if (monitor != null) monitor.ShowingDialog = true;
MessageBox.Show(WorkbenchSingleton.MainForm,
MessageBox.Show(WorkbenchSingleton.MainWin32Window,
ResourceService.GetString("Dialog.NewProject.SearchReplace.SearchStringNotFound"),
ResourceService.GetString("Dialog.NewProject.SearchReplace.SearchStringNotFound.Title"),
MessageBoxButtons.OK,

3
src/AddIns/Misc/SearchAndReplace/Project/Gui/SearchAndReplaceDialog.cs

@ -36,7 +36,7 @@ namespace SearchAndReplace @@ -36,7 +36,7 @@ namespace SearchAndReplace
{
if (Instance == null) {
Instance = new SearchAndReplaceDialog(searchAndReplaceMode);
Instance.Show(WorkbenchSingleton.MainForm);
Instance.Show(WorkbenchSingleton.MainWin32Window);
} else {
if (searchAndReplaceMode == SearchAndReplaceMode.Search) {
Instance.searchButton.PerformClick();
@ -54,7 +54,6 @@ namespace SearchAndReplace @@ -54,7 +54,6 @@ namespace SearchAndReplace
public SearchAndReplaceDialog(SearchAndReplaceMode searchAndReplaceMode)
{
this.Owner = WorkbenchSingleton.MainForm;
this.FormBorderStyle = FormBorderStyle.FixedToolWindow;
this.ShowInTaskbar = false;
this.TopMost = false;

9
src/AddIns/Misc/SearchAndReplace/Project/SearchAndReplace.csproj

@ -36,6 +36,12 @@ @@ -36,6 +36,12 @@
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
<ItemGroup>
<Reference Include="PresentationCore">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
</Reference>
<Reference Include="PresentationFramework">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
@ -44,6 +50,9 @@ @@ -44,6 +50,9 @@
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
</Reference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\FindPanel.xfrm" />

2
src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/HistoryViewDisplayBinding/HistoryView.cs

@ -15,7 +15,7 @@ namespace ICSharpCode.Svn @@ -15,7 +15,7 @@ namespace ICSharpCode.Svn
{
HistoryViewPanel historyViewPanel;
public override Control Control {
public override object Content {
get {
return historyViewPanel;
}

3
src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/SvnGuiWrapper.cs

@ -11,6 +11,7 @@ using System.Text; @@ -11,6 +11,7 @@ using System.Text;
using System.Windows.Forms;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui;
using Microsoft.Win32;
namespace ICSharpCode.Svn
@ -46,7 +47,7 @@ namespace ICSharpCode.Svn @@ -46,7 +47,7 @@ namespace ICSharpCode.Svn
string path = GetPathFromRegistry("ProcPath");
if (path == null) {
using (TortoiseSvnNotFoundForm form = new TortoiseSvnNotFoundForm()) {
form.ShowDialog();
form.ShowDialog(WorkbenchSingleton.MainWin32Window);
}
} else {
try {

8
src/AddIns/Misc/SubversionAddIn/Project/Src/SvnClientWrapper.cs

@ -225,7 +225,7 @@ namespace ICSharpCode.Svn @@ -225,7 +225,7 @@ namespace ICSharpCode.Svn
LoggingService.Debug("PasswordPrompt");
try {
using (LoginDialog loginDialog = new LoginDialog(realm.Value, username.Value, maySave)) {
if (WorkbenchSingleton.SafeThreadFunction<Form, DialogResult>(loginDialog.ShowDialog, WorkbenchSingleton.MainForm) == DialogResult.OK) {
if (WorkbenchSingleton.SafeThreadFunction<IWin32Window, DialogResult>(loginDialog.ShowDialog, WorkbenchSingleton.MainWin32Window) == DialogResult.OK) {
cred = loginDialog.CreateCredential(pool);
}
}
@ -241,7 +241,7 @@ namespace ICSharpCode.Svn @@ -241,7 +241,7 @@ namespace ICSharpCode.Svn
LoggingService.Debug("SslServerTrustPrompt");
try {
using (SslServerTrustDialog sslServerTrustDialog = new SslServerTrustDialog(certInfo, failures, maySave)) {
if (WorkbenchSingleton.SafeThreadFunction<Form, DialogResult>(sslServerTrustDialog.ShowDialog, WorkbenchSingleton.MainForm) == DialogResult.OK) {
if (WorkbenchSingleton.SafeThreadFunction<IWin32Window, DialogResult>(sslServerTrustDialog.ShowDialog, WorkbenchSingleton.MainWin32Window) == DialogResult.OK) {
cred = sslServerTrustDialog.CreateCredential(pool);
}
}
@ -257,7 +257,7 @@ namespace ICSharpCode.Svn @@ -257,7 +257,7 @@ namespace ICSharpCode.Svn
LoggingService.Debug("SslServerTrustPrompt");
try {
using (ClientCertPassphraseDialog clientCertPassphraseDialog = new ClientCertPassphraseDialog(realm.Value, maySave)) {
if (WorkbenchSingleton.SafeThreadFunction<Form, DialogResult>(clientCertPassphraseDialog.ShowDialog, WorkbenchSingleton.MainForm) == DialogResult.OK) {
if (WorkbenchSingleton.SafeThreadFunction<IWin32Window, DialogResult>(clientCertPassphraseDialog.ShowDialog, WorkbenchSingleton.MainWin32Window) == DialogResult.OK) {
cred = clientCertPassphraseDialog.CreateCredential(pool);
}
}
@ -273,7 +273,7 @@ namespace ICSharpCode.Svn @@ -273,7 +273,7 @@ namespace ICSharpCode.Svn
LoggingService.Debug("SslServerTrustPrompt");
try {
using (ClientCertDialog clientCertDialog = new ClientCertDialog(realm.Value, maySave)) {
if (WorkbenchSingleton.SafeThreadFunction<Form, DialogResult>(clientCertDialog.ShowDialog, WorkbenchSingleton.MainForm) == DialogResult.OK) {
if (WorkbenchSingleton.SafeThreadFunction<IWin32Window, DialogResult>(clientCertDialog.ShowDialog, WorkbenchSingleton.MainWin32Window) == DialogResult.OK) {
cred = clientCertDialog.CreateCredential(pool);
}
}

2
src/AddIns/Misc/UnitTesting/Src/UnitTestsPad.cs

@ -73,7 +73,7 @@ namespace ICSharpCode.UnitTesting @@ -73,7 +73,7 @@ namespace ICSharpCode.UnitTesting
}
}
public override Control Control {
public override object Content {
get {
return panel;
}

3
src/AddIns/Misc/UnitTesting/UnitTesting.addin

@ -20,7 +20,8 @@ @@ -20,7 +20,8 @@
title = "${res:ICSharpCode.NUnitPad.NUnitPadContent.PadName}"
icon = "PadIcons.NUnitTest"
shortcut = "Control|Alt|T"
class = "ICSharpCode.UnitTesting.UnitTestsPad"/>
class = "ICSharpCode.UnitTesting.UnitTestsPad"
defaultPosition = "Right, Hidden" />
</Path>
<Path name = "/SharpDevelop/ViewContent/DefaultTextEditor/ClassMemberContextMenu">

BIN
src/Libraries/AvalonDock/AvalonDock.dll

Binary file not shown.

118
src/Libraries/DockPanel_Src/DockSample/AboutDialog.Designer.cs generated

@ -1,118 +0,0 @@ @@ -1,118 +0,0 @@
namespace DockSample
{
partial class AboutDialog
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.buttonOK = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.labelLibVersion = new System.Windows.Forms.Label();
this.labelAppVersion = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// buttonOK
//
this.buttonOK.DialogResult = System.Windows.Forms.DialogResult.Cancel;
this.buttonOK.Location = new System.Drawing.Point(240, 184);
this.buttonOK.Name = "buttonOK";
this.buttonOK.Size = new System.Drawing.Size(75, 23);
this.buttonOK.TabIndex = 0;
this.buttonOK.Text = "OK";
//
// label1
//
this.label1.Location = new System.Drawing.Point(24, 59);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(109, 16);
this.label1.TabIndex = 1;
this.label1.Text = "DockSample Version:";
//
// label2
//
this.label2.Location = new System.Drawing.Point(24, 119);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(272, 32);
this.label2.TabIndex = 2;
this.label2.Text = "Copyright 2007, Weifen Luo";
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(24, 81);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(128, 13);
this.label3.TabIndex = 3;
this.label3.Text = "DockPanel Suite Version:";
//
// labelLibVersion
//
this.labelLibVersion.Location = new System.Drawing.Point(148, 81);
this.labelLibVersion.Name = "labelLibVersion";
this.labelLibVersion.Size = new System.Drawing.Size(97, 13);
this.labelLibVersion.TabIndex = 4;
//
// labelAppVersion
//
this.labelAppVersion.Location = new System.Drawing.Point(129, 59);
this.labelAppVersion.Name = "labelAppVersion";
this.labelAppVersion.Size = new System.Drawing.Size(97, 13);
this.labelAppVersion.TabIndex = 5;
//
// AboutDialog
//
this.AcceptButton = this.buttonOK;
this.CancelButton = this.buttonOK;
this.ClientSize = new System.Drawing.Size(322, 215);
this.Controls.Add(this.labelAppVersion);
this.Controls.Add(this.labelLibVersion);
this.Controls.Add(this.label3);
this.Controls.Add(this.label2);
this.Controls.Add(this.label1);
this.Controls.Add(this.buttonOK);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "AboutDialog";
this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "About";
this.Load += new System.EventHandler(this.AboutDialog_Load);
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Button buttonOK;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label labelLibVersion;
private System.Windows.Forms.Label labelAppVersion;
}
}

26
src/Libraries/DockPanel_Src/DockSample/AboutDialog.cs

@ -1,26 +0,0 @@ @@ -1,26 +0,0 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Text;
using System.Windows.Forms;
using System.Reflection;
using WeifenLuo.WinFormsUI.Docking;
namespace DockSample
{
public partial class AboutDialog : Form
{
public AboutDialog()
{
InitializeComponent();
}
private void AboutDialog_Load(object sender, EventArgs e)
{
labelAppVersion.Text = typeof(MainForm).Assembly.GetName().Version.ToString();
labelLibVersion.Text = typeof(DockPanel).Assembly.GetName().Version.ToString();
}
}
}

120
src/Libraries/DockPanel_Src/DockSample/AboutDialog.resx

@ -1,120 +0,0 @@ @@ -1,120 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

113
src/Libraries/DockPanel_Src/DockSample/Customization/DockHelper.cs

@ -1,113 +0,0 @@ @@ -1,113 +0,0 @@
using System;
using System.Drawing;
using System.Windows.Forms;
using WeifenLuo.WinFormsUI.Docking;
namespace DockSample.Customization
{
internal class DockHelper
{
public static bool IsDockStateAutoHide(DockState dockState)
{
if (dockState == DockState.DockLeftAutoHide ||
dockState == DockState.DockRightAutoHide ||
dockState == DockState.DockTopAutoHide ||
dockState == DockState.DockBottomAutoHide)
return true;
else
return false;
}
public static bool IsDockStateDocked(DockState dockState)
{
return (dockState == DockState.DockLeft ||
dockState == DockState.DockRight ||
dockState == DockState.DockTop ||
dockState == DockState.DockBottom);
}
public static bool IsDockBottom(DockState dockState)
{
return (dockState == DockState.DockBottom || dockState == DockState.DockBottomAutoHide) ? true : false;
}
public static bool IsDockLeft(DockState dockState)
{
return (dockState == DockState.DockLeft || dockState == DockState.DockLeftAutoHide) ? true : false;
}
public static bool IsDockRight(DockState dockState)
{
return (dockState == DockState.DockRight || dockState == DockState.DockRightAutoHide) ? true : false;
}
public static bool IsDockTop(DockState dockState)
{
return (dockState == DockState.DockTop || dockState == DockState.DockTopAutoHide ) ? true : false;
}
public static bool IsDockStateValid(DockState dockState, DockAreas dockableAreas)
{
if (((dockableAreas & DockAreas.Float) == 0) &&
(dockState == DockState.Float))
return false;
else if (((dockableAreas & DockAreas.Document) == 0) &&
(dockState == DockState.Document))
return false;
else if (((dockableAreas & DockAreas.DockLeft) == 0) &&
(dockState == DockState.DockLeft || dockState == DockState.DockLeftAutoHide))
return false;
else if (((dockableAreas & DockAreas.DockRight) == 0) &&
(dockState == DockState.DockRight || dockState == DockState.DockRightAutoHide))
return false;
else if (((dockableAreas & DockAreas.DockTop) == 0) &&
(dockState == DockState.DockTop || dockState == DockState.DockTopAutoHide))
return false;
else if (((dockableAreas & DockAreas.DockBottom) == 0) &&
(dockState == DockState.DockBottom || dockState == DockState.DockBottomAutoHide))
return false;
else
return true;
}
public static bool IsDockWindowState(DockState state)
{
if (state == DockState.DockTop || state == DockState.DockBottom || state == DockState.DockLeft ||
state == DockState.DockRight || state == DockState.Document)
return true;
else
return false;
}
public static bool IsValidRestoreState(DockState state)
{
if (state == DockState.DockLeft || state == DockState.DockRight || state == DockState.DockTop ||
state == DockState.DockBottom || state == DockState.Document)
return true;
else
return false;
}
public static DockState ToggleAutoHideState(DockState state)
{
if (state == DockState.DockLeft)
return DockState.DockLeftAutoHide;
else if (state == DockState.DockRight)
return DockState.DockRightAutoHide;
else if (state == DockState.DockTop)
return DockState.DockTopAutoHide;
else if (state == DockState.DockBottom)
return DockState.DockBottomAutoHide;
else if (state == DockState.DockLeftAutoHide)
return DockState.DockLeft;
else if (state == DockState.DockRightAutoHide)
return DockState.DockRight;
else if (state == DockState.DockTopAutoHide)
return DockState.DockTop;
else if (state == DockState.DockBottomAutoHide)
return DockState.DockBottom;
else
return state;
}
}
}

55
src/Libraries/DockPanel_Src/DockSample/Customization/Extender.cs

@ -1,55 +0,0 @@ @@ -1,55 +0,0 @@
using System;
using System.Drawing;
using WeifenLuo.WinFormsUI.Docking;
namespace DockSample.Customization
{
public class Extender
{
public enum Schema
{
VS2005,
VS2003
}
private class VS2003DockPaneStripFactory : DockPanelExtender.IDockPaneStripFactory
{
public DockPaneStripBase CreateDockPaneStrip(DockPane pane)
{
return new VS2003DockPaneStrip(pane);
}
}
private class VS2003AutoHideStripFactory : DockPanelExtender.IAutoHideStripFactory
{
public AutoHideStripBase CreateAutoHideStrip(DockPanel panel)
{
return new VS2003AutoHideStrip(panel);
}
}
private class VS2003DockPaneCaptionFactory : DockPanelExtender.IDockPaneCaptionFactory
{
public DockPaneCaptionBase CreateDockPaneCaption(DockPane pane)
{
return new VS2003DockPaneCaption(pane);
}
}
public static void SetSchema(DockPanel dockPanel, Extender.Schema schema)
{
if (schema == Extender.Schema.VS2005)
{
dockPanel.Extender.AutoHideStripFactory = null;
dockPanel.Extender.DockPaneCaptionFactory = null;
dockPanel.Extender.DockPaneStripFactory = null;
}
else if (schema == Extender.Schema.VS2003)
{
dockPanel.Extender.DockPaneCaptionFactory = new VS2003DockPaneCaptionFactory();
dockPanel.Extender.AutoHideStripFactory = new VS2003AutoHideStripFactory();
dockPanel.Extender.DockPaneStripFactory = new VS2003DockPaneStripFactory();
}
}
}
}

619
src/Libraries/DockPanel_Src/DockSample/Customization/InertButton.cs

@ -1,619 +0,0 @@ @@ -1,619 +0,0 @@
using System;
using System.Drawing;
using System.Drawing.Imaging;
using System.Windows.Forms;
using System.ComponentModel;
namespace DockSample.Customization
{
internal class InertButton : Button
{
private enum RepeatClickStatus
{
Disabled,
Started,
Repeating,
Stopped
}
private class RepeatClickEventArgs : EventArgs
{
private static RepeatClickEventArgs _empty;
static RepeatClickEventArgs()
{
_empty = new RepeatClickEventArgs();
}
public new static RepeatClickEventArgs Empty
{
get { return _empty; }
}
}
private IContainer components = new Container();
private int m_borderWidth = 1;
private bool m_mouseOver = false;
private bool m_mouseCapture = false;
private bool m_isPopup = false;
private Image m_imageEnabled = null;
private Image m_imageDisabled = null;
private int m_imageIndexEnabled = -1;
private int m_imageIndexDisabled = -1;
private bool m_monochrom = true;
private ToolTip m_toolTip = null;
private string m_toolTipText = "";
private Color m_borderColor = Color.Empty;
public InertButton()
{
InternalConstruct(null, null);
}
public InertButton(Image imageEnabled)
{
InternalConstruct(imageEnabled, null);
}
public InertButton(Image imageEnabled, Image imageDisabled)
{
InternalConstruct(imageEnabled, imageDisabled);
}
private void InternalConstruct(Image imageEnabled, Image imageDisabled)
{
// Remember parameters
ImageEnabled = imageEnabled;
ImageDisabled = imageDisabled;
// Prevent drawing flicker by blitting from memory in WM_PAINT
SetStyle(ControlStyles.ResizeRedraw, true);
SetStyle(ControlStyles.UserPaint, true);
SetStyle(ControlStyles.AllPaintingInWmPaint, true);
// Prevent base class from trying to generate double click events and
// so testing clicks against the double click time and rectangle. Getting
// rid of this allows the user to press then release button very quickly.
//SetStyle(ControlStyles.StandardDoubleClick, false);
// Should not be allowed to select this control
SetStyle(ControlStyles.Selectable, false);
m_timer = new Timer();
m_timer.Enabled = false;
m_timer.Tick += new EventHandler(Timer_Tick);
}
protected override void Dispose(bool disposing)
{
if (disposing)
{
if (components != null)
components.Dispose();
}
base.Dispose(disposing);
}
public Color BorderColor
{
get { return m_borderColor; }
set
{
if (m_borderColor != value)
{
m_borderColor = value;
Invalidate();
}
}
}
private bool ShouldSerializeBorderColor()
{
return (m_borderColor != Color.Empty);
}
public int BorderWidth
{
get { return m_borderWidth; }
set
{
if (value < 1)
value = 1;
if (m_borderWidth != value)
{
m_borderWidth = value;
Invalidate();
}
}
}
public Image ImageEnabled
{
get
{
if (m_imageEnabled != null)
return m_imageEnabled;
try
{
if (ImageList == null || ImageIndexEnabled == -1)
return null;
else
return ImageList.Images[m_imageIndexEnabled];
}
catch
{
return null;
}
}
set
{
if (m_imageEnabled != value)
{
m_imageEnabled = value;
Invalidate();
}
}
}
private bool ShouldSerializeImageEnabled()
{
return (m_imageEnabled != null);
}
public Image ImageDisabled
{
get
{
if (m_imageDisabled != null)
return m_imageDisabled;
try
{
if (ImageList == null || ImageIndexDisabled == -1)
return null;
else
return ImageList.Images[m_imageIndexDisabled];
}
catch
{
return null;
}
}
set
{
if (m_imageDisabled != value)
{
m_imageDisabled = value;
Invalidate();
}
}
}
public int ImageIndexEnabled
{
get { return m_imageIndexEnabled; }
set
{
if (m_imageIndexEnabled != value)
{
m_imageIndexEnabled = value;
Invalidate();
}
}
}
public int ImageIndexDisabled
{
get { return m_imageIndexDisabled; }
set
{
if (m_imageIndexDisabled != value)
{
m_imageIndexDisabled = value;
Invalidate();
}
}
}
public bool IsPopup
{
get { return m_isPopup; }
set
{
if (m_isPopup != value)
{
m_isPopup = value;
Invalidate();
}
}
}
public bool Monochrome
{
get { return m_monochrom; }
set
{
if (value != m_monochrom)
{
m_monochrom = value;
Invalidate();
}
}
}
public bool RepeatClick
{
get { return (ClickStatus != RepeatClickStatus.Disabled); }
set { ClickStatus = RepeatClickStatus.Stopped; }
}
private RepeatClickStatus m_clickStatus = RepeatClickStatus.Disabled;
private RepeatClickStatus ClickStatus
{
get { return m_clickStatus; }
set
{
if (m_clickStatus == value)
return;
m_clickStatus = value;
if (ClickStatus == RepeatClickStatus.Started)
{
Timer.Interval = RepeatClickDelay;
Timer.Enabled = true;
}
else if (ClickStatus == RepeatClickStatus.Repeating)
Timer.Interval = RepeatClickInterval;
else
Timer.Enabled = false;
}
}
private int m_repeatClickDelay = 500;
public int RepeatClickDelay
{
get { return m_repeatClickDelay; }
set { m_repeatClickDelay = value; }
}
private int m_repeatClickInterval = 100;
public int RepeatClickInterval
{
get { return m_repeatClickInterval; }
set { m_repeatClickInterval = value; }
}
private Timer m_timer;
private Timer Timer
{
get { return m_timer; }
}
public string ToolTipText
{
get { return m_toolTipText; }
set
{
if (m_toolTipText != value)
{
if (m_toolTip == null)
m_toolTip = new ToolTip(this.components);
m_toolTipText = value;
m_toolTip.SetToolTip(this, value);
}
}
}
private void Timer_Tick(object sender, EventArgs e)
{
if (m_mouseCapture && m_mouseOver)
OnClick(RepeatClickEventArgs.Empty);
if (ClickStatus == RepeatClickStatus.Started)
ClickStatus = RepeatClickStatus.Repeating;
}
/// <exclude/>
protected override void OnMouseDown(MouseEventArgs e)
{
base.OnMouseDown(e);
if (e.Button != MouseButtons.Left)
return;
if (m_mouseCapture == false || m_mouseOver == false)
{
m_mouseCapture = true;
m_mouseOver = true;
//Redraw to show button state
Invalidate();
}
if (RepeatClick)
{
OnClick(RepeatClickEventArgs.Empty);
ClickStatus = RepeatClickStatus.Started;
}
}
/// <exclude/>
protected override void OnClick(EventArgs e)
{
if (RepeatClick && !(e is RepeatClickEventArgs))
return;
base.OnClick (e);
}
/// <exclude/>
protected override void OnMouseUp(MouseEventArgs e)
{
base.OnMouseUp(e);
if (e.Button != MouseButtons.Left)
return;
if (m_mouseOver == true || m_mouseCapture == true)
{
m_mouseOver = false;
m_mouseCapture = false;
// Redraw to show button state
Invalidate();
}
if (RepeatClick)
ClickStatus = RepeatClickStatus.Stopped;
}
/// <exclude/>
protected override void OnMouseMove(MouseEventArgs e)
{
base.OnMouseMove(e);
// Is mouse point inside our client rectangle
bool over = this.ClientRectangle.Contains(new Point(e.X, e.Y));
// If entering the button area or leaving the button area...
if (over != m_mouseOver)
{
// Update state
m_mouseOver = over;
// Redraw to show button state
Invalidate();
}
}
/// <exclude/>
protected override void OnMouseEnter(EventArgs e)
{
// Update state to reflect mouse over the button area
if (!m_mouseOver)
{
m_mouseOver = true;
// Redraw to show button state
Invalidate();
}
base.OnMouseEnter(e);
}
/// <exclude/>
protected override void OnMouseLeave(EventArgs e)
{
// Update state to reflect mouse not over the button area
if (m_mouseOver)
{
m_mouseOver = false;
// Redraw to show button state
Invalidate();
}
base.OnMouseLeave(e);
}
/// <exclude/>
protected override void OnPaint(PaintEventArgs e)
{
base.OnPaint(e);
DrawBackground(e.Graphics);
DrawImage(e.Graphics);
DrawText(e.Graphics);
DrawBorder(e.Graphics);
}
private void DrawBackground(Graphics g)
{
using (SolidBrush brush = new SolidBrush(BackColor))
{
g.FillRectangle(brush, ClientRectangle);
}
}
private void DrawImage(Graphics g)
{
Image image = this.Enabled ? ImageEnabled : ((ImageDisabled != null) ? ImageDisabled : ImageEnabled);
ImageAttributes imageAttr = null;
if (null == image)
return;
if (m_monochrom)
{
imageAttr = new ImageAttributes();
// transform the monochrom image
// white -> BackColor
// black -> ForeColor
ColorMap[] colorMap = new ColorMap[2];
colorMap[0] = new ColorMap();
colorMap[0].OldColor = Color.White;
colorMap[0].NewColor = this.BackColor;
colorMap[1] = new ColorMap();
colorMap[1].OldColor = Color.Black;
colorMap[1].NewColor = this.ForeColor;
imageAttr.SetRemapTable(colorMap);
}
Rectangle rect = new Rectangle(0, 0, image.Width, image.Height);
if ((!Enabled) && (null == ImageDisabled))
{
using (Bitmap bitmapMono = new Bitmap(image, ClientRectangle.Size))
{
if (imageAttr != null)
{
using (Graphics gMono = Graphics.FromImage(bitmapMono))
{
gMono.DrawImage(image, new Point[3] { new Point(0, 0), new Point(image.Width - 1, 0), new Point(0, image.Height - 1) }, rect, GraphicsUnit.Pixel, imageAttr);
}
}
ControlPaint.DrawImageDisabled(g, bitmapMono, 0, 0, this.BackColor);
}
}
else
{
// Three points provided are upper-left, upper-right and
// lower-left of the destination parallelogram.
Point[] pts = new Point[3];
pts[0].X = (Enabled && m_mouseOver && m_mouseCapture) ? 1 : 0;
pts[0].Y = (Enabled && m_mouseOver && m_mouseCapture) ? 1 : 0;
pts[1].X = pts[0].X + ClientRectangle.Width;
pts[1].Y = pts[0].Y;
pts[2].X = pts[0].X;
pts[2].Y = pts[1].Y + ClientRectangle.Height;
if (imageAttr == null)
g.DrawImage(image, pts, rect, GraphicsUnit.Pixel);
else
g.DrawImage(image, pts, rect, GraphicsUnit.Pixel, imageAttr);
}
}
private void DrawText(Graphics g)
{
if (Text == string.Empty)
return;
Rectangle rect = ClientRectangle;
rect.X += BorderWidth;
rect.Y += BorderWidth;
rect.Width -= 2 * BorderWidth;
rect.Height -= 2 * BorderWidth;
StringFormat stringFormat = new StringFormat();
if (TextAlign == ContentAlignment.TopLeft)
{
stringFormat.Alignment = StringAlignment.Near;
stringFormat.LineAlignment = StringAlignment.Near;
}
else if (TextAlign == ContentAlignment.TopCenter)
{
stringFormat.Alignment = StringAlignment.Center;
stringFormat.LineAlignment = StringAlignment.Near;
}
else if (TextAlign == ContentAlignment.TopRight)
{
stringFormat.Alignment = StringAlignment.Far;
stringFormat.LineAlignment = StringAlignment.Near;
}
else if (TextAlign == ContentAlignment.MiddleLeft)
{
stringFormat.Alignment = StringAlignment.Near;
stringFormat.LineAlignment = StringAlignment.Center;
}
else if (TextAlign == ContentAlignment.MiddleCenter)
{
stringFormat.Alignment = StringAlignment.Center;
stringFormat.LineAlignment = StringAlignment.Center;
}
else if (TextAlign == ContentAlignment.MiddleRight)
{
stringFormat.Alignment = StringAlignment.Far;
stringFormat.LineAlignment = StringAlignment.Center;
}
else if (TextAlign == ContentAlignment.BottomLeft)
{
stringFormat.Alignment = StringAlignment.Near;
stringFormat.LineAlignment = StringAlignment.Far;
}
else if (TextAlign == ContentAlignment.BottomCenter)
{
stringFormat.Alignment = StringAlignment.Center;
stringFormat.LineAlignment = StringAlignment.Far;
}
else if (TextAlign == ContentAlignment.BottomRight)
{
stringFormat.Alignment = StringAlignment.Far;
stringFormat.LineAlignment = StringAlignment.Far;
}
using (Brush brush = new SolidBrush(ForeColor))
{
g.DrawString(Text, Font, brush, rect, stringFormat);
}
}
private void DrawBorder(Graphics g)
{
ButtonBorderStyle bs;
// Decide on the type of border to draw around image
if (!this.Enabled)
bs = IsPopup ? ButtonBorderStyle.Outset : ButtonBorderStyle.Solid;
else if (m_mouseOver && m_mouseCapture)
bs = ButtonBorderStyle.Inset;
else if (IsPopup || m_mouseOver)
bs = ButtonBorderStyle.Outset;
else
bs = ButtonBorderStyle.Solid;
Color colorLeftTop;
Color colorRightBottom;
if (bs == ButtonBorderStyle.Solid)
{
colorLeftTop = this.BackColor;
colorRightBottom = this.BackColor;
}
else if (bs == ButtonBorderStyle.Outset)
{
colorLeftTop = m_borderColor.IsEmpty ? this.BackColor : m_borderColor;
colorRightBottom = this.BackColor;
}
else
{
colorLeftTop = this.BackColor;
colorRightBottom = m_borderColor.IsEmpty ? this.BackColor : m_borderColor;
}
ControlPaint.DrawBorder(g, this.ClientRectangle,
colorLeftTop, m_borderWidth, bs,
colorLeftTop, m_borderWidth, bs,
colorRightBottom, m_borderWidth, bs,
colorRightBottom, m_borderWidth, bs);
}
/// <exclude/>
protected override void OnEnabledChanged(EventArgs e)
{
base.OnEnabledChanged(e);
if (Enabled == false)
{
m_mouseOver = false;
m_mouseCapture = false;
if (RepeatClick && ClickStatus != RepeatClickStatus.Stopped)
ClickStatus = RepeatClickStatus.Stopped;
}
Invalidate();
}
}
}

133
src/Libraries/DockPanel_Src/DockSample/Customization/Resources.Designer.cs generated

@ -1,133 +0,0 @@ @@ -1,133 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.42
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace DockSample.Customization {
using System;
/// <summary>
/// A strongly-typed resource class, for looking up localized strings, etc.
/// </summary>
// This class was auto-generated by the StronglyTypedResourceBuilder
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources() {
}
/// <summary>
/// Returns the cached ResourceManager instance used by this class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DockSample.Customization.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// Overrides the current thread's CurrentUICulture property for all
/// resource lookups using this strongly typed resource class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
set {
resourceCulture = value;
}
}
internal static System.Drawing.Bitmap DockPaneCaption_AutoHideNo {
get {
object obj = ResourceManager.GetObject("DockPaneCaption_AutoHideNo", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
internal static System.Drawing.Bitmap DockPaneCaption_AutoHideYes {
get {
object obj = ResourceManager.GetObject("DockPaneCaption_AutoHideYes", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
internal static System.Drawing.Bitmap DockPaneCaption_CloseDisabled {
get {
object obj = ResourceManager.GetObject("DockPaneCaption_CloseDisabled", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
internal static System.Drawing.Bitmap DockPaneCaption_CloseEnabled {
get {
object obj = ResourceManager.GetObject("DockPaneCaption_CloseEnabled", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
internal static System.Drawing.Bitmap DockPaneStrip_CloseDisabled {
get {
object obj = ResourceManager.GetObject("DockPaneStrip_CloseDisabled", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
internal static System.Drawing.Bitmap DockPaneStrip_CloseEnabled {
get {
object obj = ResourceManager.GetObject("DockPaneStrip_CloseEnabled", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
internal static System.Drawing.Bitmap DockPaneStrip_ScrollLeftDisabled {
get {
object obj = ResourceManager.GetObject("DockPaneStrip_ScrollLeftDisabled", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
internal static System.Drawing.Bitmap DockPaneStrip_ScrollLeftEnabled {
get {
object obj = ResourceManager.GetObject("DockPaneStrip_ScrollLeftEnabled", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
internal static System.Drawing.Bitmap DockPaneStrip_ScrollRightDisabled {
get {
object obj = ResourceManager.GetObject("DockPaneStrip_ScrollRightDisabled", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
internal static System.Drawing.Bitmap DockPaneStrip_ScrollRightEnabled {
get {
object obj = ResourceManager.GetObject("DockPaneStrip_ScrollRightEnabled", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
}
}

151
src/Libraries/DockPanel_Src/DockSample/Customization/Resources.resx

@ -1,151 +0,0 @@ @@ -1,151 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="DockPaneCaption_AutoHideNo" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\DockPaneCaption_AutoHideNo.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="DockPaneCaption_AutoHideYes" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\DockPaneCaption_AutoHideYes.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="DockPaneCaption_CloseDisabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\DockPaneCaption_CloseDisabled.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="DockPaneCaption_CloseEnabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\DockPaneCaption_CloseEnabled.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="DockPaneStrip_CloseDisabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\DockPaneStrip_CloseDisabled.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="DockPaneStrip_CloseEnabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\DockPaneStrip_CloseEnabled.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="DockPaneStrip_ScrollLeftDisabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\DockPaneStrip_ScrollLeftDisabled.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="DockPaneStrip_ScrollLeftEnabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\DockPaneStrip_ScrollLeftEnabled.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="DockPaneStrip_ScrollRightDisabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\DockPaneStrip_ScrollRightDisabled.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="DockPaneStrip_ScrollRightEnabled" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\DockPaneStrip_ScrollRightEnabled.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

BIN
src/Libraries/DockPanel_Src/DockSample/Customization/Resources/DockIndicator_PaneDiamond.bmp

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

BIN
src/Libraries/DockPanel_Src/DockSample/Customization/Resources/DockIndicator_PaneDiamond_Bottom.bmp

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

BIN
src/Libraries/DockPanel_Src/DockSample/Customization/Resources/DockIndicator_PaneDiamond_Hotspot.bmp

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

BIN
src/Libraries/DockPanel_Src/DockSample/Customization/Resources/DockIndicator_PaneDiamond_HotspotIndex.bmp

Binary file not shown.

Before

Width:  |  Height:  |  Size: 90 B

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save