Browse Source

Made Help addin use the default browser view content. (moved advanced toolbar from help addin to Base)

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@316 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 20 years ago
parent
commit
6284ddd531
  1. 355
      AddIns/ICSharpCode.SharpDevelop.addin
  2. 0
      data/resources/image/BitmapResources/BitmapResources-data/Icons.16x16.ArrowDown.png
  3. 0
      data/resources/image/BitmapResources/BitmapResources-data/Icons.16x16.ArrowLeftRight.png
  4. 0
      data/resources/image/BitmapResources/BitmapResources-data/Icons.16x16.ArrowUp.png
  5. 0
      data/resources/image/BitmapResources/BitmapResources-data/Icons.16x16.BrowserHome.gif
  6. 0
      data/resources/image/BitmapResources/BitmapResources-data/Icons.16x16.BrowserWindow.png
  7. 6
      data/resources/image/BitmapResources/BitmapResources.res
  8. 1
      src/AddIns/DisplayBindings/ResourceEditor/Project/Src/DisplayDefinition.cs
  9. 2
      src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditorAddInOptions.cs
  10. 3
      src/AddIns/DisplayBindings/XmlEditor/Project/XmlView.cs
  11. 1
      src/AddIns/Misc/AddinScout/Project/Src/AddInScoutViewContent.cs
  12. 6
      src/AddIns/Misc/HtmlHelp2/Project/Configuration/AssemblyInfo.cs
  13. 35
      src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.addin
  14. 12
      src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.csproj
  15. BIN
      src/AddIns/Misc/HtmlHelp2/Project/Resources/HtmlHelp2.16x16.Back.png
  16. BIN
      src/AddIns/Misc/HtmlHelp2/Project/Resources/HtmlHelp2.16x16.Forward.png
  17. BIN
      src/AddIns/Misc/HtmlHelp2/Project/Resources/HtmlHelp2.16x16.Refresh.png
  18. BIN
      src/AddIns/Misc/HtmlHelp2/Project/Resources/HtmlHelp2.16x16.SearchSite.gif
  19. BIN
      src/AddIns/Misc/HtmlHelp2/Project/Resources/HtmlHelp2.16x16.Stop.png
  20. 1
      src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexPad.cs
  21. 1
      src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexResultsPad.cs
  22. 2
      src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/SearchPad.cs
  23. 1
      src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/SearchResultsPad.cs
  24. 1
      src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/TocPad.cs
  25. 376
      src/AddIns/Misc/HtmlHelp2/Project/src/BrowserControl/Browser.cs
  26. 66
      src/AddIns/Misc/HtmlHelp2/Project/src/BrowserControl/HelpBrowserCommands.cs
  27. 57
      src/AddIns/Misc/HtmlHelp2/Project/src/BrowserControl/ShowHelpBrowser.cs
  28. 20
      src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Service.cs
  29. 50
      src/AddIns/Misc/StartPage/Project/Src/Main.cs
  30. 10
      src/AddIns/Misc/StartPage/Project/Src/StartPage.cs
  31. 2
      src/AddIns/Misc/StartPage/Project/StartPage.addin
  32. 2
      src/Libraries/ICSharpCode.Build.Tasks/Project/AssemblyInfo.cs
  33. 2
      src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
  34. 46
      src/Main/Base/Project/Src/Commands/HelpCommands.cs
  35. 84
      src/Main/Base/Project/Src/Gui/BrowserDisplayBinding/BrowserCommands.cs
  36. 34
      src/Main/Base/Project/Src/Gui/BrowserDisplayBinding/BrowserLocationConditionEvaluator.cs
  37. 252
      src/Main/Base/Project/Src/Gui/BrowserDisplayBinding/HtmlViewPane.cs
  38. 15
      src/Main/Base/Project/Src/Gui/BrowserDisplayBinding/SchemeExtension.cs
  39. 6
      src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageViewToolbarCommands.cs
  40. 1
      src/Main/Base/Project/Src/TextEditor/Gui/Editor/TextEditorDisplayBinding.cs
  41. 13
      src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/Gui/MenuCommand.cs
  42. 6
      src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/ToolBarItem/Gui/ToolBarComboBox.cs
  43. 9
      src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/ToolBarItem/Gui/ToolBarCommand.cs
  44. 1
      src/Main/Core/Project/Src/Services/FileUtility/FileUtility.cs
  45. BIN
      src/Main/StartUp/Project/Resources/BitmapResources.resources
  46. 3
      src/Main/StartUp/Project/SharpDevelopMain.cs
  47. 2
      src/SharpDevelop.sln

355
AddIns/ICSharpCode.SharpDevelop.addin

@ -431,20 +431,20 @@ @@ -431,20 +431,20 @@
<Condition name = "Ownerstate" ownerstate = "Missing"/>
</Not>
<MenuItem id = "Add" label = "${res:ProjectComponent.ContextMenu.AddMenu}" type="Menu">
<MenuItem id = "New Item"
label = "New Item..."
icon = "Icons.16x16.NewDocumentIcon"
class = "ICSharpCode.SharpDevelop.Project.Commands.AddNewItemsToProject"/>
<MenuItem id = "Existing Item"
label = "Existing Item..."
class = "ICSharpCode.SharpDevelop.Project.Commands.AddExistingItemsToProject"/>
<MenuItem id = "NewFolder"
label = "${res:ProjectComponent.ContextMenu.NewFolder}"
icon = "Icons.16x16.NewFolderIcon"
class = "ICSharpCode.SharpDevelop.Project.Commands.AddNewFolderToProject"/>
<MenuItem id = "New Item"
label = "New Item..."
icon = "Icons.16x16.NewDocumentIcon"
class = "ICSharpCode.SharpDevelop.Project.Commands.AddNewItemsToProject"/>
<MenuItem id = "Existing Item"
label = "Existing Item..."
class = "ICSharpCode.SharpDevelop.Project.Commands.AddExistingItemsToProject"/>
<MenuItem id = "NewFolder"
label = "${res:ProjectComponent.ContextMenu.NewFolder}"
icon = "Icons.16x16.NewFolderIcon"
class = "ICSharpCode.SharpDevelop.Project.Commands.AddNewFolderToProject"/>
</MenuItem>
<MenuItem id = "AddSeparator" type = "Separator" />
<ComplexCondition>
<Or>
<Condition name = "Ownerstate" ownerstate = "InProject"/>
@ -514,7 +514,7 @@ @@ -514,7 +514,7 @@
type = "ComboBox"
tooltip = "${res:MainWindow.Windows.CompilerMessageView.ShowOutputFromComboBox.ToolTip}"
class = "ICSharpCode.SharpDevelop.Gui.ShowOutputFromComboBox"/>
<ToolbarItem id = "CategorySelectSeparator" type = "Separator"/>
<ToolbarItem id = "Clear"
@ -526,25 +526,25 @@ @@ -526,25 +526,25 @@
type = "CheckBox"
icon = "OutputPad.Toolbar.ToggleWordWrap"
tooltip = "${res:MainWindow.Windows.CompilerMessageView.ToggleWordWrapButton.ToolTip}"
class = "ICSharpCode.SharpDevelop.Gui.ToggleeMessageViewWordWrap"/>
class = "ICSharpCode.SharpDevelop.Gui.ToggleMessageViewWordWrap"/>
</Path>
<Path name = "/SharpDevelop/Pads/CompilerMessageView/ContextMenu">
<MenuItem id = "Copy"
label = "${res:XML.MainMenu.EditMenu.Copy}"
icon = "Icons.16x16.CopyIcon"
type = "Item"
shortcut = "Control|C"
class = "ICSharpCode.SharpDevelop.Commands.Copy"/>
<MenuItem id = "SelectAll"
label = "${res:XML.MainMenu.EditMenu.SelectAll}"
type = "Item"
shortcut = "Control|A"
class = "ICSharpCode.SharpDevelop.Commands.SelectAll"/>
<MenuItem id = "Clear"
icon = "OutputPad.Toolbar.ClearOutputWindow"
label = "Clear All"
class = "ICSharpCode.SharpDevelop.Gui.ClearOutputWindow"/>
<MenuItem id = "Copy"
label = "${res:XML.MainMenu.EditMenu.Copy}"
icon = "Icons.16x16.CopyIcon"
type = "Item"
shortcut = "Control|C"
class = "ICSharpCode.SharpDevelop.Commands.Copy"/>
<MenuItem id = "SelectAll"
label = "${res:XML.MainMenu.EditMenu.SelectAll}"
type = "Item"
shortcut = "Control|A"
class = "ICSharpCode.SharpDevelop.Commands.SelectAll"/>
<MenuItem id = "Clear"
icon = "OutputPad.Toolbar.ClearOutputWindow"
label = "Clear All"
class = "ICSharpCode.SharpDevelop.Gui.ClearOutputWindow"/>
</Path>
<Path name = "/SharpDevelop/Pads/ErrorList/Toolbar">
@ -590,7 +590,7 @@ @@ -590,7 +590,7 @@
icon = "Icons.16x16.FindInFiles"
tooltip = "${res:MainWindow.Windows.ClassBrowser.ClassViewSettingsButton.ToolTip}"
class = "ICSharpCode.SharpDevelop.Gui.SelectClassBrowserFilter">
<MenuItem id = "ShowProjectReferences"
type = "CheckBox"
label = "${res:MainWindow.Windows.ClassBrowser.ClassViewSettings.ShowProjectReferences.Label}"
@ -600,17 +600,17 @@ @@ -600,17 +600,17 @@
type = "CheckBox"
label = "${res:MainWindow.Windows.ClassBrowser.ClassViewSettings.ShowPublicMembers.Label}"
class = "ICSharpCode.SharpDevelop.Gui.ShowPublicMembers"/>
<MenuItem id = "ShowPrivateMembers"
type = "CheckBox"
label = "${res:MainWindow.Windows.ClassBrowser.ClassViewSettings.ShowPrivateMembers.Label}"
class = "ICSharpCode.SharpDevelop.Gui.ShowPrivateMembers"/>
<MenuItem id = "ShowProtectedMembers"
type = "CheckBox"
label = "${res:MainWindow.Windows.ClassBrowser.ClassViewSettings.ShowProtectedMembers.Label}"
class = "ICSharpCode.SharpDevelop.Gui.ShowProtectedMembers"/>
<MenuItem id = "ShowOtherMembers"
type = "CheckBox"
label = "${res:MainWindow.Windows.ClassBrowser.ClassViewSettings.ShowOtherMembers.Label}"
@ -649,9 +649,9 @@ @@ -649,9 +649,9 @@
class = "ICSharpCode.SharpDevelop.Commands.OpenFile"/>
<ToolbarItem id = "OpenProject"
tooltip = "${res:XML.MainMenu.FileMenu.Open.Project}"
icon = "Icons.16x16.OpenProjectIcon"
class = "ICSharpCode.SharpDevelop.Project.Commands.LoadSolution"
tooltip = "${res:XML.MainMenu.FileMenu.Open.Project}"
icon = "Icons.16x16.OpenProjectIcon"
class = "ICSharpCode.SharpDevelop.Project.Commands.LoadSolution"
/>
<Condition name = "ActiveWindowState" windowstate="Dirty,Untitled" nowindowstate="ViewOnly" action="Disable">
@ -695,7 +695,7 @@ @@ -695,7 +695,7 @@
icon = "Icons.16x16.RedoIcon"
tooltip = "${res:XML.MainMenu.EditMenu.Redo.Description}"
class = "ICSharpCode.SharpDevelop.Commands.Redo"/>
<ToolbarItem id = "CompileSeparator" type = "Separator"/>
<ComplexCondition action="Disable">
@ -719,9 +719,9 @@ @@ -719,9 +719,9 @@
icon = "Icons.16x16.BuildCurrentSelectedProject"
tooltip = "${res:XML.MainMenu.RunMenu.BuildProject.Description}"
class = "ICSharpCode.SharpDevelop.Project.Commands.Rebuild"/>
<ToolbarItem id = "DebuggerSeparator" type = "Separator" />
<Condition name="DebuggerSupports" debuggersupports = "Start">
<Condition name="IsProcessRunning" isdebugging="False" action="Disable">
<ToolbarItem id = "Run"
@ -739,19 +739,19 @@ @@ -739,19 +739,19 @@
class = "ICSharpCode.SharpDevelop.Project.Commands.ExecuteWithoutDebugger"/>
</Condition>
</Condition>
<Condition name="DebuggerSupports" debuggersupports = "Stop">
<Condition name="IsProcessRunning" isdebugging="True" action="Disable">
<ToolbarItem id = "Stop"
icon = "Icons.16x16.StopProcess"
tooltip = "${res:XML.MainMenu.DebugMenu.Stop.Description}"
class = "ICSharpCode.SharpDevelop.Project.Commands.StopDebuggingCommand"/>
icon = "Icons.16x16.StopProcess"
tooltip = "${res:XML.MainMenu.DebugMenu.Stop.Description}"
class = "ICSharpCode.SharpDevelop.Project.Commands.StopDebuggingCommand"/>
</Condition>
</Condition>
<Condition name="DebuggerSupports" debuggersupports = "ExecutionControl">
<ToolbarItem id = "ExecutionControlSeparator" type = "Separator" />
<Condition name="IsProcessRunning" isprocessrunning = "True" isdebugging = "True" action = "Disable">
<Condition name="IsProcessRunning" isprocessrunning = "True" isdebugging = "True" action = "Disable">
<ToolbarItem id = "Break"
icon = "Icons.16x16.Debug.Break"
tooltip = "Break the debugging process"
@ -760,7 +760,7 @@ @@ -760,7 +760,7 @@
<Condition name="IsProcessRunning" isprocessrunning = "False" isdebugging = "True" action = "Disable">
<ToolbarItem id = "Continue"
icon = "Icons.16x16.Debug.Continue"
tooltip = "${res:XML.MainMenu.DebugMenu.Continue.Description}"
tooltip = "${res:XML.MainMenu.DebugMenu.Continue.Description}"
class = "ICSharpCode.SharpDevelop.Project.Commands.ContinueDebuggingCommand"/>
</Condition>
</Condition>
@ -778,19 +778,19 @@ @@ -778,19 +778,19 @@
class = "ICSharpCode.SharpDevelop.Project.Commands.StepIntoDebuggingCommand"/>
<ToolbarItem id = "Step out"
icon = "Icons.16x16.Debug.StepOut"
tooltip = "Step out"
tooltip = "Step out"
class = "ICSharpCode.SharpDevelop.Project.Commands.StepOutDebuggingCommand"/>
</Condition>
</Condition>
<ToolbarItem id = "ChooseConfigurationSeparator" type = "Separator"/>
<ToolbarItem id = "ChooseConfigurationSeparator" type = "Separator"/>
</ComplexCondition>
<ToolbarItem id = "ChooseLayout"
type = "ComboBox"
class = "ICSharpCode.SharpDevelop.Commands.ChooseLayoutCommand" />
</Path>
<!-- end toolbars -->
<Path name = "/SharpDevelop/Workbench/OpenFileTab/ContextMenu">
<MenuItem id = "Close"
@ -833,7 +833,7 @@ @@ -833,7 +833,7 @@
class = "ICSharpCode.SharpDevelop.Commands.TabStrip.CopyPathName"/>
</ComplexCondition>
</Path>
<Path name = "/SharpDevelop/Views/PropertyPad/ContextMenu">
<MenuItem id = "ResetProperty"
label = "${res:ICSharpCode.SharpDevelop.Gui.Pads.PropertyPad.ContextMenu.Reset}"
@ -843,10 +843,6 @@ @@ -843,10 +843,6 @@
label = "${res:ICSharpCode.SharpDevelop.Gui.Pads.PropertyPad.ContextMenu.ShowDescription}"
class = "ICSharpCode.SharpDevelop.Gui.PropertyPadShowDescriptionCommand"/>
</Path>
<Path name = "/SharpDevelop/Workbench/MainMenu">
</Path>
<Path name = "/SharpDevelop/Dialogs/OptionsDialog">
<DialogPanel id = "UIOptions"
@ -885,25 +881,6 @@ @@ -885,25 +881,6 @@
</DialogPanel>
</Path>
<Path name = "/SharpDevelop/CompletionDatabaseWizard">
<DialogPanel id = "SetupPanel"
label = "${res:Dialog.Wizards.CodeCompletionDatabaseWizard.SetupPanel.Title}"
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.CompletionDatabaseWizard.SetupPanel"/>
<DialogPanel id = "ChooseLocationPanel"
label = "${res:Dialog.Wizards.CodeCompletionDatabaseWizard.ChooseLocationPanel.Title}"
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.CompletionDatabaseWizard.ChooseLocationPanel"/>
<DialogPanel id = "UseExistingFilePanel"
label = "${res:Dialog.Wizards.CodeCompletionDatabaseWizard.UseExistingFilePanel.Title}"
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.CompletionDatabaseWizard.UseExistingFilePanel"/>
<DialogPanel id = "CreateDatabasePanel"
label = "${res:Dialog.Wizards.CodeCompletionDatabaseWizard.CreateDatabasePanel.Title}"
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.CompletionDatabaseWizard.CreateDatabasePanel"/>
<DialogPanel id = "CreationSuccessful"
label = "${res:Dialog.Wizards.CodeCompletionDatabaseWizard.FinishedPanel.Title}"
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.CompletionDatabaseWizard.CreationFinishedPanel"/>
</Path>
<Path name = "/SharpDevelop/Workbench/SharpDevelopSideBar/ContextMenu">
<Condition name = "Ownerstate" ownerstate = "TabCanBeDeleted" action="Disable">
<MenuItem id = "DeleteTab"
@ -1131,13 +1108,13 @@ @@ -1131,13 +1108,13 @@
</MenuItem> <!-- end EDIT menu -->
<MenuItem id = "View" label = "${res:XML.MainMenu.ViewMenu}" type="Menu">
<MenuItem id = "MainViewMenuBuilder"
type = "Builder"
<MenuItem id = "MainViewMenuBuilder"
type = "Builder"
class = "ICSharpCode.SharpDevelop.Commands.MainViewMenuBuilder" />
<MenuItem id = "Tools" label = "${res:XML.MainMenu.ViewMenu.ToolsMenu}" type="Menu">
<MenuItem id = "ToolsViewMenuBuilder"
type = "Builder"
<MenuItem id = "ToolsViewMenuBuilder"
type = "Builder"
class = "ICSharpCode.SharpDevelop.Commands.ToolsViewMenuBuilder" />
</MenuItem>
@ -1156,11 +1133,11 @@ @@ -1156,11 +1133,11 @@
<MenuItem id = "SetAsStartupProject"
label = "${res:ProjectComponent.ContextMenu.SetAsStartupProject}"
class = "ICSharpCode.SharpDevelop.Project.Commands.SetAsStartupProject"/>
<MenuItem id = "Separator2" type = "Separator" />
<MenuItem id = "Options"
label = "${res:XML.MainMenu.ProjectMenu.Options}"
class = "ICSharpCode.SharpDevelop.Project.Commands.ViewProjectOptions"/>
<MenuItem id = "Options"
label = "${res:XML.MainMenu.ProjectMenu.Options}"
class = "ICSharpCode.SharpDevelop.Project.Commands.ViewProjectOptions"/>
</MenuItem>
</Condition> <!-- end PROJECT menu -->
@ -1235,10 +1212,10 @@ @@ -1235,10 +1212,10 @@
</Condition>
<Condition name="DebuggerSupports" debuggersupports = "StartWithoutDebugging">
<Condition name="IsProcessRunning" isdebugging="False" action="Disable">
<Condition name="IsProcessRunning" isdebugging="False" action="Disable">
<MenuItem id = "RunWithoutDebugger"
label = "${res:XML.MainMenu.DebugMenu.RunWithoutDebug}"
icon = "Icons.16x16.Debug.StartWithoutDebugging"
icon = "Icons.16x16.Debug.StartWithoutDebugging"
shortcut = "Control|F5"
class = "ICSharpCode.SharpDevelop.Project.Commands.ExecuteWithoutDebugger"/>
</Condition>
@ -1255,7 +1232,7 @@ @@ -1255,7 +1232,7 @@
<Condition name="DebuggerSupports" debuggersupports = "ExecutionControl">
<MenuItem id = "ExecutionControlSeparator" type = "Separator" />
<Condition name="IsProcessRunning" isprocessrunning = "True" isdebugging = "True" action = "Disable">
<Condition name="IsProcessRunning" isprocessrunning = "True" isdebugging = "True" action = "Disable">
<MenuItem id = "Break"
label = "Break"
icon = "Icons.16x16.Debug.Break"
@ -1270,7 +1247,7 @@ @@ -1270,7 +1247,7 @@
class = "ICSharpCode.SharpDevelop.Project.Commands.ContinueDebuggingCommand"/>
</Condition>
</Condition>
<Condition name="DebuggerSupports" debuggersupports = "Stepping">
<Condition name="IsProcessRunning" isprocessrunning = "False" isdebugging = "True" action = "Disable">
<MenuItem id = "BeforeSteppingSeparator" type = "Separator" />
@ -1293,7 +1270,7 @@ @@ -1293,7 +1270,7 @@
</Condition>
</ComplexCondition>
</MenuItem> <!-- end DEBUG menu -->
<MenuItem id = "Tools" label = "${res:XML.MainMenu.ToolMenu}" type="Menu">
<MenuItem id = "ToolBuilder" type="Builder" class = "ICSharpCode.SharpDevelop.Commands.ToolMenuBuilder" />
<MenuItem id = "Separator1" type = "Separator" />
@ -1344,7 +1321,7 @@ @@ -1344,7 +1321,7 @@
</Condition>
<MenuItem id = "ContentBuilder" type="Builder" class="ICSharpCode.SharpDevelop.Commands.OpenContentsMenuBuilder"/>
</MenuItem> <!-- end WINDOW menu -->
<MenuItem id = "Help" label = "${res:XML.MainMenu.HelpMenu}" type="Menu">
<MenuItem id = "DynamicHelp"
label = "${res:XML.MainMenu.HelpMenu.DynamicHelp}"
@ -1360,19 +1337,17 @@ @@ -1360,19 +1337,17 @@
icon = "Icons.16x16.TipOfTheDay"
class = "ICSharpCode.SharpDevelop.Commands.ViewTipOfTheDay" />
<!--
<MenuItem id = "Separator1" type = "Separator" />
<MenuItem id = "ViewGPL"
label = "${res:XML.MainMenu.HelpMenu.GPL}"
icon = "Icons.16x16.CopyLeftIcon"
class = "ICSharpCode.SharpDevelop.Commands.ViewGPL" />
<MenuItem id = "ViewReadme"
label = "${res:XML.MainMenu.HelpMenu.ReadMe}"
link = "home://../doc/ReadMe.rtf" />
<MenuItem id = "ViewStyleguide"
<MenuItem id = "ViewReadme"
label = "${res:XML.MainMenu.HelpMenu.ReadMe}"
link = "home://../doc/ReadMe.rtf" />
<MenuItem id = "ViewStyleguide"
label = "${res:XML.MainMenu.HelpMenu.StyleGuide}"
link = "home://../doc/CodingStyleGuide.pdf" />
link = "home://../doc/CodingStyleGuide.pdf" />
<MenuItem id = "Separator2" type = "Separator" />
<MenuItem id = "Web" label = "${res:XML.MainMenu.HelpMenu.WebMenu}" type="Menu">
<MenuItem id = "SharpDevelop" label = "SharpDevelop" type="Menu">
@ -1401,7 +1376,7 @@ @@ -1401,7 +1376,7 @@
<MenuItem id = "Mono" label = "Mono Project" icon = "Icons.16x16.WebSearchIcon" link = "http://www.go-mono.com" />
<MenuItem id = "DotGNU" label = "DotGNU" icon = "Icons.16x16.WebSearchIcon" link = "http://www.dotgnu.org" />
</MenuItem>
</MenuItem> -->
</MenuItem>
<MenuItem id = "Separator3" type = "Separator" />
<MenuItem id = "About"
label = "${res:XML.MainMenu.HelpMenu.About}"
@ -1410,15 +1385,15 @@ @@ -1410,15 +1385,15 @@
</MenuItem> <!-- end HELP menu -->
</Path> <!-- end Main Menu -->
<!-- TEXT EDITOR -->
<!-- TEXT EDITOR -->
<Path name = "/SharpDevelop/Dialogs/OptionsDialog/CodingOptions">
<DialogPanel id = "CodeTemplates"
label = "${res:Dialog.Options.CodeTemplatesText}"
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.CodeTemplatePanel"/>
</Path>
<Path name = "/SharpDevelop/Views/ProjectBrowser/ContextMenu">
<!-- AddIn to the Project Add Menu -->
<Condition name = "Ownerstate" ownerstate="ProjectSelected">
@ -1458,9 +1433,9 @@ @@ -1458,9 +1433,9 @@
<Path name = "/SharpDevelop/Workbench/DisplayBindings">
<DisplayBinding id = "Text"
insertafter = "Browser"
supportedformats = "Text Files,Source Files"
class = "ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.TextEditorDisplayBinding" />
insertafter = "Browser"
supportedformats = "Text Files,Source Files"
class = "ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.TextEditorDisplayBinding" />
</Path>
<Path name = "/SharpDevelop/ViewContent/DefaultTextEditor/ClassMemberContextMenu">
@ -1512,7 +1487,7 @@ @@ -1512,7 +1487,7 @@
icon = "Icons.16x16.CommentRegion"
label = "${res:XML.TextAreaContextMenu.CommentUncommentSelection}"
class= "ICSharpCode.SharpDevelop.DefaultEditor.Commands.CommentRegion"/>
<!-- <MenuItem id = "Uncomment"
<!-- <MenuItem id = "Uncomment"
icon = "Icons.16x16.UnCommentRegion"
label = "${res:XML.TextAreaContextMenu.UncommentSelection}"
class= "ICSharpCode.SharpDevelop.DefaultEditor.Commands.UncommentRegion"/>-->
@ -1535,37 +1510,37 @@ @@ -1535,37 +1510,37 @@
icon = "Icons.16x16.PropertiesIcon"
class ="ICSharpCode.SharpDevelop.DefaultEditor.Commands.ShowBufferOptions"/>
</Path>
<Path name = "/SharpDevelop/Workbench/ToolBar/Standard">
<ToolbarItem id = "SearchSeparator" type = "Separator"/>
<!-- <Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.ITextEditorControlProvider" action="Disable"> -->
<ToolbarItem id = "Comment"
icon = "Icons.16x16.CommentRegion"
tooltip = "${res:XML.TextAreaContextMenu.CommentUncommentSelection}"
class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.CommentRegion"/>
<!-- <ToolbarItem id = "Uncomment"
<ToolbarItem id = "SearchSeparator" type = "Separator"/>
<!-- <Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.ITextEditorControlProvider" action="Disable"> -->
<ToolbarItem id = "Comment"
icon = "Icons.16x16.CommentRegion"
tooltip = "${res:XML.TextAreaContextMenu.CommentUncommentSelection}"
class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.CommentRegion"/>
<!-- <ToolbarItem id = "Uncomment"
icon = "Icons.16x16.UnCommentRegion"
tooltip = "${res:XML.TextAreaContextMenu.UncommentSelection}"
class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.UncommentRegion"/> -->
<ToolbarItem id = "SearchSeparator2" type = "Separator"/>
<ToolbarItem id = "ToggleBookmark"
icon = "Bookmarks.ToggleMark"
tooltip = "${res:XML.MainMenu.SearchMenu.ToggleBookmark.Description}"
class = "ICSharpCode.SharpDevelop.Bookmarks.ToggleBookmark"/>
<ToolbarItem id = "PrevBookmark"
icon = "Bookmarks.GotoPrevInFile"
tooltip = "${res:XML.MainMenu.SearchMenu.PrevBookmark.Description}"
class = "ICSharpCode.SharpDevelop.Bookmarks.PrevBookmark"/>
<ToolbarItem id = "NextBookmark"
icon = "Bookmarks.GotoNextInFile"
tooltip = "${res:XML.MainMenu.SearchMenu.NextBookmark.Description}"
class = "ICSharpCode.SharpDevelop.Bookmarks.NextBookmark"/>
<ToolbarItem id = "ClearBookmarks"
icon = "Bookmarks.ClearAll"
tooltip = "${res:XML.MainMenu.SearchMenu.ClrBookmark.Description}"
class = "ICSharpCode.SharpDevelop.Bookmarks.ClearBookmarks"/>
<!-- </Condition> -->
<ToolbarItem id = "SearchSeparator2" type = "Separator"/>
<ToolbarItem id = "ToggleBookmark"
icon = "Bookmarks.ToggleMark"
tooltip = "${res:XML.MainMenu.SearchMenu.ToggleBookmark.Description}"
class = "ICSharpCode.SharpDevelop.Bookmarks.ToggleBookmark"/>
<ToolbarItem id = "PrevBookmark"
icon = "Bookmarks.GotoPrevInFile"
tooltip = "${res:XML.MainMenu.SearchMenu.PrevBookmark.Description}"
class = "ICSharpCode.SharpDevelop.Bookmarks.PrevBookmark"/>
<ToolbarItem id = "NextBookmark"
icon = "Bookmarks.GotoNextInFile"
tooltip = "${res:XML.MainMenu.SearchMenu.NextBookmark.Description}"
class = "ICSharpCode.SharpDevelop.Bookmarks.NextBookmark"/>
<ToolbarItem id = "ClearBookmarks"
icon = "Bookmarks.ClearAll"
tooltip = "${res:XML.MainMenu.SearchMenu.ClrBookmark.Description}"
class = "ICSharpCode.SharpDevelop.Bookmarks.ClearBookmarks"/>
<!-- </Condition> -->
</Path>
@ -1588,37 +1563,37 @@ @@ -1588,37 +1563,37 @@
class = "SearchAndReplace.Replace"/>
<MenuItem id = "SearchInFilesSeparator" type = "Separator" />
<!-- <Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.ITextEditorControlProvider" action="Disable"> -->
<MenuItem id = "ToggleBookmark"
label = "${res:XML.MainMenu.SearchMenu.ToggleBookmark}"
shortcut = "Control|F2"
icon = "Bookmarks.ToggleMark"
class = "ICSharpCode.SharpDevelop.Bookmarks.ToggleBookmark"/>
<MenuItem id = "PrevBookmark"
label = "${res:XML.MainMenu.SearchMenu.PrevBookmark}"
shortcut = "Alt|F2"
icon = "Bookmarks.GotoPrevInFile"
class = "ICSharpCode.SharpDevelop.Bookmarks.PrevBookmark"/>
<MenuItem id = "NextBookmark"
label = "${res:XML.MainMenu.SearchMenu.NextBookmark}"
shortcut = "F2"
icon = "Bookmarks.GotoNextInFile"
class = "ICSharpCode.SharpDevelop.Bookmarks.NextBookmark"/>
<MenuItem id = "ClearBookmarks"
label = "${res:XML.MainMenu.SearchMenu.ClrBookmark}"
icon = "Bookmarks.ClearAll"
class = "ICSharpCode.SharpDevelop.Bookmarks.EnableDisableAll"/>
<MenuItem id = "Separator2" type = "Separator" />
<MenuItem id = "GotoLineNr"
label = "${res:XML.MainMenu.SearchMenu.GotoLineNr}"
shortcut = "Control|G"
class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.GotoLineNumber"/>
<MenuItem id = "Separator3" type = "Separator" />
<MenuItem id = "GotoBrace"
label = "${res:XML.MainMenu.SearchMenu.GotoBrace}"
shortcut = "Control|B"
class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.GotoMatchingBrace"/>
<!-- </Condition> -->
<!-- <Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.ITextEditorControlProvider" action="Disable"> -->
<MenuItem id = "ToggleBookmark"
label = "${res:XML.MainMenu.SearchMenu.ToggleBookmark}"
shortcut = "Control|F2"
icon = "Bookmarks.ToggleMark"
class = "ICSharpCode.SharpDevelop.Bookmarks.ToggleBookmark"/>
<MenuItem id = "PrevBookmark"
label = "${res:XML.MainMenu.SearchMenu.PrevBookmark}"
shortcut = "Alt|F2"
icon = "Bookmarks.GotoPrevInFile"
class = "ICSharpCode.SharpDevelop.Bookmarks.PrevBookmark"/>
<MenuItem id = "NextBookmark"
label = "${res:XML.MainMenu.SearchMenu.NextBookmark}"
shortcut = "F2"
icon = "Bookmarks.GotoNextInFile"
class = "ICSharpCode.SharpDevelop.Bookmarks.NextBookmark"/>
<MenuItem id = "ClearBookmarks"
label = "${res:XML.MainMenu.SearchMenu.ClrBookmark}"
icon = "Bookmarks.ClearAll"
class = "ICSharpCode.SharpDevelop.Bookmarks.EnableDisableAll"/>
<MenuItem id = "Separator2" type = "Separator" />
<MenuItem id = "GotoLineNr"
label = "${res:XML.MainMenu.SearchMenu.GotoLineNr}"
shortcut = "Control|G"
class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.GotoLineNumber"/>
<MenuItem id = "Separator3" type = "Separator" />
<MenuItem id = "GotoBrace"
label = "${res:XML.MainMenu.SearchMenu.GotoBrace}"
shortcut = "Control|B"
class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.GotoMatchingBrace"/>
<!-- </Condition> -->
</MenuItem>
</Path>
@ -1712,6 +1687,50 @@ @@ -1712,6 +1687,50 @@
class = "ICSharpCode.SharpDevelop.DefaultEditor.Gui.OptionPanels.CodeCompletionPanel"/>
</Path>
<Path name = "/SharpDevelop/ViewContent/Browser/Toolbar">
<ToolbarItem id = "Back"
icon = "Icons.16x16.BrowserBefore"
tooltip = "${res:AddIns.HtmlHelp2.Back}"
class = "ICSharpCode.SharpDevelop.BrowserDisplayBinding.GoBack"/>
<ToolbarItem id = "Forward"
icon = "Icons.16x16.BrowserAfter"
tooltip = "${res:AddIns.HtmlHelp2.Forward}"
class = "ICSharpCode.SharpDevelop.BrowserDisplayBinding.GoForward"/>
<ToolbarItem id = "Stop"
icon = "Icons.16x16.BrowserCancel"
tooltip = "${res:AddIns.HtmlHelp2.Stop}"
class = "ICSharpCode.SharpDevelop.BrowserDisplayBinding.Stop"/>
<ToolbarItem id = "Refresh"
icon = "Icons.16x16.BrowserRefresh"
tooltip = "${res:AddIns.HtmlHelp2.Refresh}"
class = "ICSharpCode.SharpDevelop.BrowserDisplayBinding.Refresh"/>
<ToolbarItem id = "Separator" type = "Separator"/>
<ToolbarItem id = "GoHome"
icon = "Icons.16x16.BrowserHome"
tooltip = "${res:AddIns.HtmlHelp2.Homepage}"
class = "ICSharpCode.SharpDevelop.BrowserDisplayBinding.GoHome"/>
<ToolbarItem id = "GoSearch"
icon = "Icons.16x16.FindIcon"
tooltip = "${res:AddIns.HtmlHelp2.Search}"
class = "ICSharpCode.SharpDevelop.BrowserDisplayBinding.GoSearch"/>
<ToolbarItem id = "URLComboBox"
type = "ComboBox"
tooltip = "Enter URL"
class = "ICSharpCode.SharpDevelop.BrowserDisplayBinding.UrlComboBox"/>
<ToolbarItem id = "NewWindow"
icon = "Icons.16x16.BrowserWindow"
tooltip = "${res:AddIns.HtmlHelp2.NewWindow}"
class = "ICSharpCode.SharpDevelop.BrowserDisplayBinding.NewWindow"/>
</Path>
<Path name = "/SharpDevelop/Dialogs/OptionsDialog">
<DialogPanel id = "TextEditorOptions"
insertafter = "CodingOptions"
@ -1736,8 +1755,8 @@ @@ -1736,8 +1755,8 @@
<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.ITextEditorControlProvider" action="Disable">
<MenuItem id = "InsertColor"
insertafter = "Separator1" insertbefore = "InsertGuid"
label = "${res:XML.MainMenu.ToolMenu.InsColor}"
class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.ShowColorDialog"/>
label = "${res:XML.MainMenu.ToolMenu.InsColor}"
class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.ShowColorDialog"/>
<MenuItem id = "InsertGuid"
insertafter = "InsertColor"
insertbefore = "Separator2"
@ -1745,18 +1764,18 @@ @@ -1745,18 +1764,18 @@
label = "${res:XML.MainMenu.ToolMenu.InsGUID}"
class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.InsertGuidCommand"/>
<MenuItem id = "Separator2" type = "Separator" />
<MenuItem id = "GenerateCodeAction"
insertafter = "Separator2"
label = "${res:XML.MainMenu.ToolMenu.GenerateCode}"
label = "${res:XML.MainMenu.ToolMenu.GenerateCode}"
shortcut = "Alt|Insert"
class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.GenerateCodeAction"/>
class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.GenerateCodeAction"/>
<MenuItem id = "ShowQuickHelp"
insertafter = "GenerateCodeAction"
insertbefore = "Separator5"
label = "${res:XML.MainMenu.ToolMenu.QuickXmlDoc}"
label = "${res:XML.MainMenu.ToolMenu.QuickXmlDoc}"
shortcut = "Control|Q"
class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.QuickDocumentation"/>
class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.QuickDocumentation"/>
</Condition>
</Path>
@ -1773,7 +1792,7 @@ @@ -1773,7 +1792,7 @@
label = "[!] Any one character not in the set" />
</Path>
<!-- Note : Most actions are put directly into the control, because
<!-- Note : Most actions are put directly into the control, because
they're used for the standalone version too, only put keys in the
tree that are sharpdevelop specific, general keys put into TextAreaControl.GenerateDefaultActions -->
<Path name = "/AddIns/DefaultTextEditor/EditActions">
@ -1835,7 +1854,7 @@ @@ -1835,7 +1854,7 @@
<ToolbarItem id = "Find"
icon = "Icons.16x16.FindIcon"
tooltip = "Search"
class = "SearchAndReplace.Find"/>
class = "SearchAndReplace.Find"/>
<ToolbarItem id = "FindComboBox"
type = "ComboBox"

0
src/AddIns/Misc/HtmlHelp2/Project/Resources/HtmlHelp2.16x16.NextTopic.png → data/resources/image/BitmapResources/BitmapResources-data/Icons.16x16.ArrowDown.png

Before

Width:  |  Height:  |  Size: 227 B

After

Width:  |  Height:  |  Size: 227 B

0
src/AddIns/Misc/HtmlHelp2/Project/Resources/HtmlHelp2.16x16.SyncToc.png → data/resources/image/BitmapResources/BitmapResources-data/Icons.16x16.ArrowLeftRight.png

Before

Width:  |  Height:  |  Size: 236 B

After

Width:  |  Height:  |  Size: 236 B

0
src/AddIns/Misc/HtmlHelp2/Project/Resources/HtmlHelp2.16x16.PrevTopic.png → data/resources/image/BitmapResources/BitmapResources-data/Icons.16x16.ArrowUp.png

Before

Width:  |  Height:  |  Size: 228 B

After

Width:  |  Height:  |  Size: 228 B

0
src/AddIns/Misc/HtmlHelp2/Project/Resources/HtmlHelp2.16x16.Home.gif → data/resources/image/BitmapResources/BitmapResources-data/Icons.16x16.BrowserHome.gif

Before

Width:  |  Height:  |  Size: 1020 B

After

Width:  |  Height:  |  Size: 1020 B

0
src/AddIns/Misc/HtmlHelp2/Project/Resources/HtmlHelp2.16x16.NewWindow.png → data/resources/image/BitmapResources/BitmapResources-data/Icons.16x16.BrowserWindow.png

Before

Width:  |  Height:  |  Size: 263 B

After

Width:  |  Height:  |  Size: 263 B

6
data/resources/image/BitmapResources/BitmapResources.res

@ -52,6 +52,10 @@ Icons.16x16.OpenResourceFolder = ProjectBrowserIcons\Property @@ -52,6 +52,10 @@ Icons.16x16.OpenResourceFolder = ProjectBrowserIcons\Property
Icons.16x16.ClosedResourceFolder = ProjectBrowserIcons\PropertyFolder.Closed.png
Icons.16x16.ArrowLeftRight = BitmapResources-data\Icons.16x16.ArrowLeftRight.png
Icons.16x16.ArrowDown = BitmapResources-data\Icons.16x16.ArrowDown.png
Icons.16x16.ArrowUp = BitmapResources-data\Icons.16x16.ArrowUp.png
Icons.16x16.Debug.Start = DebuggerIcons\Icons.16x16.Debug.Start.png
Icons.16x16.Debug.StartWithoutDebugging = DebuggerIcons\Icons.16x16.Debug.StartWithoutDebugging.png
Icons.16x16.Debug.StopProcess = DebuggerIcons\Icons.16x16.Debug.StopProcess.png
@ -89,6 +93,8 @@ Icons.16x16.CloseAllDocuments = BitmapResources-data\Icons.1 @@ -89,6 +93,8 @@ Icons.16x16.CloseAllDocuments = BitmapResources-data\Icons.1
Icons.16x16.HtmlElements.InputRadioElement = BitmapResources-data\Icons.16x16.HtmlElements.InputRadioElement.png
Icons.16x16.FormsDesigner.SendToBack = BitmapResources-data\Icons.16x16.FormsDesigner.SendToBack.png
Icons.16x16.BrowserAfter = BitmapResources-data\Icons.16x16.BrowserAfter.png
Icons.16x16.BrowserHome = BitmapResources-data\Icons.16x16.BrowserHome.gif
Icons.16x16.BrowserWindow = BitmapResources-data\Icons.16x16.BrowserWindow.png
Icons.SharpDevelopIcon = BitmapResources-data\Icons.SharpDevelopIcon.ico
Icons.16x16.HtmlElements.InputPasswordElement = BitmapResources-data\Icons.16x16.HtmlElements.InputPasswordElement.png
Icons.16x16.HtmlElements.InputCheckBoxElement = BitmapResources-data\Icons.16x16.HtmlElements.InputCheckBoxElement.png

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

@ -79,6 +79,7 @@ namespace ResourceEditor @@ -79,6 +79,7 @@ namespace ResourceEditor
public override void Dispose()
{
base.Dispose();
resourceEditor.Dispose();
}

2
src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditorAddInOptions.cs

@ -53,7 +53,7 @@ namespace ICSharpCode.XmlEditor @@ -53,7 +53,7 @@ namespace ICSharpCode.XmlEditor
public static event PropertyChangedEventHandler PropertyChanged {
add { Properties.PropertyChanged += value; }
remove { Properties.PropertyChanged += value; }
remove { Properties.PropertyChanged -= value; }
}
#region Properties

3
src/AddIns/DisplayBindings/XmlEditor/Project/XmlView.cs

@ -162,12 +162,13 @@ namespace ICSharpCode.XmlEditor @@ -162,12 +162,13 @@ namespace ICSharpCode.XmlEditor
public override void Dispose()
{
base.Dispose();
((Form)ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.Workbench).Activated -= new EventHandler(GotFocusEvent);
XmlEditorAddInOptions.PropertyChanged -= PropertyChanged;
XmlSchemaManager.UserSchemaAdded -= new EventHandler(UserSchemaAdded);
XmlSchemaManager.UserSchemaRemoved -= new EventHandler(UserSchemaRemoved);
xmlEditor.Dispose();
}

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

@ -35,6 +35,7 @@ namespace AddInScout @@ -35,6 +35,7 @@ namespace AddInScout
public override void Dispose()
{
base.Dispose();
control.Dispose();
}

6
src/AddIns/Misc/HtmlHelp2/Project/Configuration/AssemblyInfo.cs

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
using System.Reflection;
using System.Reflection;
using System.Runtime.CompilerServices;
// Information about this assembly is defined by the following
@ -12,7 +12,7 @@ using System.Runtime.CompilerServices; @@ -12,7 +12,7 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Cube")]
[assembly: AssemblyProduct("SharpDevelop")]
[assembly: AssemblyCopyright("Copyright © 2005 Mathias Simmack")]
[assembly: AssemblyCopyright("Copyright ? 2005 Mathias Simmack")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@ -23,7 +23,7 @@ using System.Runtime.CompilerServices; @@ -23,7 +23,7 @@ using System.Runtime.CompilerServices;
// You can specify all values by your own or you can build default build and revision
// numbers with the '*' character (the default):
[assembly: AssemblyVersion("2.0.0.4")]
[assembly: AssemblyVersion("2.0.0.1")]
// The following attributes specify the key for the sign of your assembly. See the
// .NET Framework documentation for more information about signing.

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

@ -56,7 +56,7 @@ @@ -56,7 +56,7 @@
shortcut = "Control|F1"
class = "HtmlHelp2.ShowDynamicHelpMenuCommand"/> -->
<MenuItem id = "TocPadCommand"
insertafter = "DynamicHelp"
insertafter = "Separator1"
label = "${res:AddIns.HtmlHelp2.Contents}"
icon = "HtmlHelp2.16x16.Toc"
shortcut = "Control|Alt|F1"
@ -79,7 +79,7 @@ @@ -79,7 +79,7 @@
shortcut = "Control|Alt|F"
class = "HtmlHelp2.ShowFavoritesMenuCommand"
insertafter = "SearchPadCommand"/>
<MenuItem id = "HtmlHelp2Separator2"
<MenuItem id = "HtmlHelp2Separator1"
type = "Separator"
insertafter = "FavoritesPadCommand"/>
<MenuItem id = "IndexResultsPadCommand"
@ -87,19 +87,36 @@ @@ -87,19 +87,36 @@
icon = "HtmlHelp2.16x16.IndexResults"
shortcut = "Shift|Alt|F2"
class = "HtmlHelp2.ShowIndexResultsMenuCommand"
insertafter = "HtmlHelp2Separator2"/>
insertafter = "HtmlHelp2Separator1"/>
<MenuItem id = "SearchResultsPadCommand"
label = "${res:AddIns.HtmlHelp2.SearchResults}"
icon = "HtmlHelp2.16x16.SearchResults"
shortcut = "Shift|Alt|F3"
class = "HtmlHelp2.ShowSearchResultsMenuCommand"
insertbefore = "Separator1"
insertafter = "IndexResultsPadCommand"/>
<MenuItem id = "HtmlHelp2Separator2"
type = "Separator"
insertafter = "SearchResultsPadCommand"
insertbefore = "ViewGPL"/>
</Path>
<!--<Path name = "/SharpDevelop/Workbench/DisplayBindings">
<DisplayBinding id = "HtmlHelp2BrowserControlBinding"
supportedformats = "Web Pages"
class = "HtmlHelp2Browser.HtmlHelp2BrowserControlBinding"/>
</Path> -->
<Path name = "/SharpDevelop/ViewContent/Browser/Toolbar">
<Condition name = "BrowserLocation" urlRegex = "^ms-help:\/\/" action="Exclude">
<ToolbarItem id = "SyncHelpTopic"
icon = "Icons.16x16.ArrowLeftRight"
tooltip = "${res:AddIns.HtmlHelp2.SyncTOC}"
class = "HtmlHelp2.SyncTocCommand"
insertafter = "NewWindow"/>
<ToolbarItem id = "PreviousHelpTopic"
icon = "Icons.16x16.ArrowUp"
tooltip = "${res:AddIns.HtmlHelp2.PreviousTopic}"
class = "HtmlHelp2.PreviousTopicCommand"
insertafter = "SyncHelpTopic"/>
<ToolbarItem id = "NextHelpTopic"
icon = "Icons.16x16.ArrowDown"
tooltip = "${res:AddIns.HtmlHelp2.NextTopic}"
class = "HtmlHelp2.NextTopicCommand"
insertafter = "PreviousHelpTopic"/>
</Condition>
</Path>
</AddIn>

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

@ -42,7 +42,6 @@ @@ -42,7 +42,6 @@
<Compile Include="src\BaseControls\IndexResultsPad.cs" />
<Compile Include="src\BaseControls\SearchPad.cs" />
<Compile Include="src\BaseControls\SearchResultsPad.cs" />
<Compile Include="src\BrowserControl\Browser.cs" />
<Compile Include="src\BrowserControl\ShowHelpBrowser.cs" />
<None Include="HtmlHelp2.addin">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@ -62,16 +61,7 @@ @@ -62,16 +61,7 @@
<EmbeddedResource Include="Resources\HtmlHelp2Options.xfrm" />
<EmbeddedResource Include="Resources\HtmlHelp2.16x16.TextZoom.png" />
<EmbeddedResource Include="Resources\HtmlHelp2.16x16.AddToFavorites.png" />
<EmbeddedResource Include="Resources\HtmlHelp2.16x16.Back.png" />
<EmbeddedResource Include="Resources\HtmlHelp2.16x16.Forward.png" />
<EmbeddedResource Include="Resources\HtmlHelp2.16x16.Home.gif" />
<EmbeddedResource Include="Resources\HtmlHelp2.16x16.NewWindow.png" />
<EmbeddedResource Include="Resources\HtmlHelp2.16x16.NextTopic.png" />
<EmbeddedResource Include="Resources\HtmlHelp2.16x16.PrevTopic.png" />
<EmbeddedResource Include="Resources\HtmlHelp2.16x16.Refresh.png" />
<EmbeddedResource Include="Resources\HtmlHelp2.16x16.SearchSite.gif" />
<EmbeddedResource Include="Resources\HtmlHelp2.16x16.Stop.png" />
<EmbeddedResource Include="Resources\HtmlHelp2.16x16.SyncToc.png" />
<Compile Include="src\BrowserControl\HelpBrowserCommands.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">

BIN
src/AddIns/Misc/HtmlHelp2/Project/Resources/HtmlHelp2.16x16.Back.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 227 B

BIN
src/AddIns/Misc/HtmlHelp2/Project/Resources/HtmlHelp2.16x16.Forward.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 226 B

BIN
src/AddIns/Misc/HtmlHelp2/Project/Resources/HtmlHelp2.16x16.Refresh.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 700 B

BIN
src/AddIns/Misc/HtmlHelp2/Project/Resources/HtmlHelp2.16x16.SearchSite.gif

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

BIN
src/AddIns/Misc/HtmlHelp2/Project/Resources/HtmlHelp2.16x16.Stop.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 730 B

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

@ -17,7 +17,6 @@ namespace HtmlHelp2 @@ -17,7 +17,6 @@ namespace HtmlHelp2
using MSHelpControls;
using MSHelpServices;
using HtmlHelp2Service;
using HtmlHelp2Browser;
public class ShowIndexMenuCommand : AbstractMenuCommand

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

@ -14,7 +14,6 @@ namespace HtmlHelp2 @@ -14,7 +14,6 @@ namespace HtmlHelp2
using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Gui;
using MSHelpServices;
using HtmlHelp2Browser;
using HtmlHelp2Service;

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

@ -112,7 +112,7 @@ namespace HtmlHelp2 @@ -112,7 +112,7 @@ namespace HtmlHelp2
hiliteTopics.Top = reuseMatches.Top + reuseMatches.Height - 4;
hiliteTopics.Text = StringParser.Parse("${res:AddIns.HtmlHelp2.HighlightMatches}");
hiliteTopics.TextAlign = ContentAlignment.MiddleLeft;
hiliteTopics.Enabled = HtmlHelp2Environment.IsReady;
hiliteTopics.Enabled = true;
panel3.Dock = DockStyle.Fill;

1
src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/SearchResultsPad.cs

@ -14,7 +14,6 @@ namespace HtmlHelp2 @@ -14,7 +14,6 @@ namespace HtmlHelp2
using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Gui;
using MSHelpServices;
using HtmlHelp2Browser;
using HtmlHelp2Service;

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

@ -20,7 +20,6 @@ namespace HtmlHelp2 @@ -20,7 +20,6 @@ namespace HtmlHelp2
using MSHelpControls;
using MSHelpServices;
using HtmlHelp2Service;
using HtmlHelp2Browser;
public class ShowTocMenuCommand : AbstractMenuCommand

376
src/AddIns/Misc/HtmlHelp2/Project/src/BrowserControl/Browser.cs

@ -1,376 +0,0 @@ @@ -1,376 +0,0 @@
/* ***********************************************************
*
* Help 2.0 Environment for SharpDevelop
* Browser Control
* Based on "HtmlViewPane.cs" by Mike Krueger
*
* ********************************************************* */
//#define ChangeTopics_BringPadToFront
namespace HtmlHelp2Browser
{
using System;
using System.ComponentModel;
using System.Drawing;
using System.Runtime.InteropServices;
using System.Windows.Forms;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.BrowserDisplayBinding;
using HtmlHelp2;
using HtmlHelp2Service;
public class HtmlHelp2BrowserPane : AbstractViewContent
{
protected HtmlHelp2BrowserControl help2Browser;
public override Control Control {
get {
return help2Browser;
}
}
public override bool IsDirty {
get {
return false;
}
set {
}
}
public override bool IsViewOnly {
get {
return true;
}
}
public HtmlHelp2BrowserPane(string fileName)
{
help2Browser = new HtmlHelp2BrowserControl();
help2Browser.AxWebBrowser.DocumentTitleChanged += new EventHandler(TitleChanged);
if(fileName != null) this.Load(fileName);
else this.Load("about:blank");
}
public override void Load(string url)
{
help2Browser.Navigate(url);
this.FileName = url;
}
public override void Save(string url)
{
Load(url);
}
void TitleChanged(object sender, EventArgs e)
{
this.TitleName = help2Browser.AxWebBrowser.DocumentTitle;
this.FileName = help2Browser.AxWebBrowser.Url.ToString();
}
}
public class HtmlHelp2BrowserControl : UserControl
{
ExtendedWebBrowser axWebBrowser = null;
ToolStripButton goBack = new ToolStripButton();
ToolStripButton goForward = new ToolStripButton();
ToolStripButton stopSite = new ToolStripButton();
ToolStripButton refreshSite = new ToolStripButton();
ToolStripButton homePage = new ToolStripButton();
ToolStripButton searchPage = new ToolStripButton();
ToolStripButton addToFavorites = new ToolStripButton();
ToolStripComboBox urlTextbox = new ToolStripComboBox();
ToolStripButton newWindow = new ToolStripButton();
ToolStripButton syncToc = new ToolStripButton();
ToolStripButton prevTocTopic = new ToolStripButton();
ToolStripButton nextTocTopic = new ToolStripButton();
// int zoomFactor = 2;
public WebBrowser AxWebBrowser
{
get {
return axWebBrowser;
}
}
public HtmlHelp2BrowserControl()
{
Size = new Size(800, 800);
Dock = DockStyle.Fill;
axWebBrowser = new ExtendedWebBrowser();
axWebBrowser.Dock = DockStyle.Fill;
axWebBrowser.StatusTextChanged += new EventHandler(this.StatusTextChanged);
axWebBrowser.Navigating += new WebBrowserNavigatingEventHandler(this.BeforeNavigating);
axWebBrowser.DocumentCompleted += new WebBrowserDocumentCompletedEventHandler(this.DocumentCompleted);
axWebBrowser.NewWindowExtended += new NewWindowExtendedEventHandler(this.NewBrowserWindow);
Controls.Add(axWebBrowser);
ToolStrip toolStrip = new ToolStrip();
toolStrip.Dock = DockStyle.Top;
toolStrip.AllowItemReorder = false;
Controls.Add(toolStrip);
toolStrip.Items.Add(goBack);
goBack.Click += new EventHandler(this.GoBack);
goBack.Enabled = false;
goBack.ImageIndex = 0;
toolStrip.Items.Add(goForward);
goForward.Click += new EventHandler(this.GoForward);
goForward.Enabled = false;
goForward.ImageIndex = 1;
toolStrip.Items.Add(stopSite);
stopSite.Click += new EventHandler(this.StopPageLoading);
stopSite.Enabled = false;
stopSite.ImageIndex = 2;
toolStrip.Items.Add(refreshSite);
refreshSite.Click += new EventHandler(this.RefreshPage);
refreshSite.ImageIndex = 3;
toolStrip.Items.Add(homePage);
homePage.Click += new EventHandler(this.CallHomepage);
homePage.ImageIndex = 4;
toolStrip.Items.Add(new ToolStripSeparator());
toolStrip.Items.Add(searchPage);
searchPage.Click += new EventHandler(this.CallSearchpage);
searchPage.ImageIndex = 5;
toolStrip.Items.Add(addToFavorites);
addToFavorites.Click += new EventHandler(this.AddToHelpFavorites);
addToFavorites.Enabled = false;
addToFavorites.ImageIndex = 6;
toolStrip.Items.Add(new ToolStripSeparator());
toolStrip.Items.Add(urlTextbox);
urlTextbox.AutoCompleteMode = AutoCompleteMode.Suggest;
urlTextbox.AutoCompleteSource = AutoCompleteSource.HistoryList;
urlTextbox.DropDownWidth = 300;
urlTextbox.Size = new Size(300, toolStrip.Items[0].Height);
urlTextbox.KeyDown += new KeyEventHandler(this.UrlTextboxKeyDown);
urlTextbox.SelectedIndexChanged += new EventHandler(this.UrlTextboxSelectedIndexChanged);
toolStrip.Items.Add(new ToolStripSeparator());
toolStrip.Items.Add(newWindow);
newWindow.Click += new EventHandler(this.NewHelpWindow);
newWindow.ImageIndex = 7;
toolStrip.Items.Add(syncToc);
syncToc.Click += new EventHandler(this.SyncToc);
syncToc.Enabled = false;
syncToc.ImageIndex = 8;
toolStrip.Items.Add(new ToolStripSeparator());
toolStrip.Items.Add(prevTocTopic);
prevTocTopic.Click += new EventHandler(this.PreviousTocTopic);
prevTocTopic.Enabled = false;
prevTocTopic.ImageIndex = 9;
toolStrip.Items.Add(nextTocTopic);
nextTocTopic.Click += new EventHandler(this.NextTocTopic);
nextTocTopic.Enabled = false;
nextTocTopic.ImageIndex = 10;
// TODO: name those buttons :o)
toolStrip.ImageList = new ImageList();
toolStrip.ImageList.Images.Add(ResourcesHelper.GetBitmap("HtmlHelp2.16x16.Back.png"));
toolStrip.ImageList.Images.Add(ResourcesHelper.GetBitmap("HtmlHelp2.16x16.Forward.png"));
toolStrip.ImageList.Images.Add(ResourcesHelper.GetBitmap("HtmlHelp2.16x16.Stop.png"));
toolStrip.ImageList.Images.Add(ResourcesHelper.GetBitmap("HtmlHelp2.16x16.Refresh.png"));
toolStrip.ImageList.Images.Add(ResourcesHelper.GetBitmap("HtmlHelp2.16x16.Home.gif"));
toolStrip.ImageList.Images.Add(ResourcesHelper.GetBitmap("HtmlHelp2.16x16.SearchSite.gif"));
toolStrip.ImageList.Images.Add(ResourcesHelper.GetBitmap("HtmlHelp2.16x16.AddToFavorites.png"));
toolStrip.ImageList.Images.Add(ResourcesHelper.GetBitmap("HtmlHelp2.16x16.NewWindow.png"));
toolStrip.ImageList.Images.Add(ResourcesHelper.GetBitmap("HtmlHelp2.16x16.SyncToc.png"));
toolStrip.ImageList.Images.Add(ResourcesHelper.GetBitmap("HtmlHelp2.16x16.PrevTopic.png"));
toolStrip.ImageList.Images.Add(ResourcesHelper.GetBitmap("HtmlHelp2.16x16.NextTopic.png"));
}
#region WebBrowser Events
private void StatusTextChanged(object sender, EventArgs e)
{
StatusBarService.SetMessage(axWebBrowser.StatusText);
}
private void BeforeNavigating(object sender, WebBrowserNavigatingEventArgs e)
{
stopSite.Enabled = true;
}
private void DocumentCompleted(object sender, WebBrowserDocumentCompletedEventArgs e)
{
// try {
// object arg = System.Reflection.Missing.Value;
// object dummy = 0;
//
// axWebBrowser.ExecWB(SHDocVw.OLECMDID.OLECMDID_ZOOM,
// SHDocVw.OLECMDEXECOPT.OLECMDEXECOPT_PROMPTUSER,
// ref arg,
// ref dummy);
//
// zoomFactor = (int)dummy;
// }
// catch {
// }
PadDescriptor toc = WorkbenchSingleton.Workbench.GetPad(typeof(HtmlHelp2TocPad));
// update URL textbox
string currentUrl = e.Url.ToString();
urlTextbox.Text = currentUrl;
// update toolbar
goBack.Enabled = axWebBrowser.CanGoBack;
goForward.Enabled = axWebBrowser.CanGoForward;
stopSite.Enabled = false;
addToFavorites.Enabled = currentUrl.StartsWith("ms-help://");
syncToc.Enabled = addToFavorites.Enabled;
prevTocTopic.Enabled = (toc == null || ((HtmlHelp2TocPad)toc.PadContent).IsNotFirstNode);
nextTocTopic.Enabled = (toc == null || ((HtmlHelp2TocPad)toc.PadContent).IsNotLastNode);
// hilite (full-text search only!)
ShowHelpBrowser.HighlightDocument();
}
private void NewBrowserWindow(object sender, NewWindowExtendedEventArgs e)
{
HtmlHelp2BrowserPane help2Browser = new HtmlHelp2BrowserPane("");
WorkbenchSingleton.Workbench.ShowView(help2Browser);
help2Browser.WorkbenchWindow.SelectWindow();
ExtendedWebBrowser newBrowser = (ExtendedWebBrowser)((HtmlHelp2BrowserControl)help2Browser.Control).AxWebBrowser;
newBrowser.Navigate(e.Url);
e.Cancel = true;
}
#endregion
#region Toolbar Command
public void Navigate(string url)
{
this.AddTermToList(url);
axWebBrowser.Navigate(url);
}
private void GoBack(object sender, EventArgs e)
{
if(axWebBrowser.CanGoBack) axWebBrowser.GoBack();
}
private void GoForward(object sender, EventArgs e)
{
if(axWebBrowser.CanGoForward) axWebBrowser.GoForward();
}
private void StopPageLoading(object sender, EventArgs e)
{
axWebBrowser.Stop();
}
private void RefreshPage(object sender, EventArgs e)
{
axWebBrowser.Refresh();
}
private void CallHomepage(object sender, EventArgs e)
{
this.Navigate(HtmlHelp2Environment.DefaultPage);
}
private void CallSearchpage(object sender, EventArgs e)
{
this.Navigate(HtmlHelp2Environment.SearchPage);
}
private void AddToHelpFavorites(object sender, EventArgs e)
{
PadDescriptor favorites = WorkbenchSingleton.Workbench.GetPad(typeof(HtmlHelp2FavoritesPad));
if(favorites != null) {
((HtmlHelp2FavoritesPad)favorites.PadContent).AddToFavorites(axWebBrowser.DocumentTitle, axWebBrowser.Url.ToString());
}
}
private void NewHelpWindow(object sender, EventArgs e)
{
if(axWebBrowser.Url != null) {
HtmlHelp2BrowserPane newPage = ShowHelpBrowser.CreateNewHelp2BrowserView();
newPage.Load(axWebBrowser.Url.ToString());
}
}
private void SyncToc(object sender, EventArgs e)
{
if(axWebBrowser.Url != null) {
PadDescriptor toc = WorkbenchSingleton.Workbench.GetPad(typeof(HtmlHelp2TocPad));
if(toc != null) {
((HtmlHelp2TocPad)toc.PadContent).SyncToc(axWebBrowser.Url.ToString());
toc.BringPadToFront();
}
}
}
private void PreviousTocTopic(object sender, EventArgs e)
{
PadDescriptor toc = WorkbenchSingleton.Workbench.GetPad(typeof(HtmlHelp2TocPad));
if(toc != null) {
((HtmlHelp2TocPad)toc.PadContent).GetPrevFromNode();
#if ChangeTopics_BringPadToFront
((HtmlHelp2TocPad)toc.PadContent).BringPadToFront();
#endif
}
}
private void NextTocTopic(object sender, EventArgs e)
{
PadDescriptor toc = WorkbenchSingleton.Workbench.GetPad(typeof(HtmlHelp2TocPad));
if(toc != null) {
((HtmlHelp2TocPad)toc.PadContent).GetNextFromNode();
#if ChangeTopics_BringPadToFront
((HtmlHelp2TocPad)toc.PadContent).BringPadToFront();
#endif
}
}
// public void ZoomText()
// {
//// try {
//// zoomFactor = (zoomFactor == 4)?0:zoomFactor+1;
//// object zoomArg = zoomFactor;
//// object dummy = System.Reflection.Missing.Value;
////
//// axWebBrowser.ExecWB(SHDocVw.OLECMDID.OLECMDID_ZOOM,
//// SHDocVw.OLECMDEXECOPT.OLECMDEXECOPT_PROMPTUSER,
//// ref zoomArg,
//// ref dummy);
//// }
//// catch {
//// }
// }
#endregion
#region UrlTextbox
private void UrlTextboxKeyDown(object sender, KeyEventArgs e)
{
if(e.KeyCode == Keys.Enter && urlTextbox.Text != "") {
this.AddTermToList(urlTextbox.Text);
this.Navigate(urlTextbox.Text);
}
}
private void UrlTextboxSelectedIndexChanged(object sender, EventArgs e)
{
string selectedUrl = urlTextbox.SelectedItem.ToString();
if(selectedUrl != "") {
this.Navigate(selectedUrl);
}
}
private void AddTermToList(string searchText)
{
if(searchText == "") return;
if(urlTextbox.Items.IndexOf(searchText) == -1) {
urlTextbox.Items.Insert(0, searchText);
if(urlTextbox.Items.Count > 10) urlTextbox.Items.RemoveAt(10);
urlTextbox.SelectedIndex = 0;
}
}
#endregion
}
}

66
src/AddIns/Misc/HtmlHelp2/Project/src/BrowserControl/HelpBrowserCommands.cs

@ -0,0 +1,66 @@ @@ -0,0 +1,66 @@
/*
* Created by SharpDevelop.
* User: Daniel Grunwald
* Date: 05.08.2005
* Time: 18:41
*/
using System;
using System.Drawing;
using System.Windows.Forms;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Project;
using ICSharpCode.SharpDevelop.BrowserDisplayBinding;
namespace HtmlHelp2
{
public abstract class HelpToolbarCommand : AbstractCommand
{
public HtmlHelp2TocPad TocPad {
get {
return (HtmlHelp2TocPad)WorkbenchSingleton.Workbench.GetPad(typeof(HtmlHelp2TocPad)).PadContent;
}
}
public WebBrowser Browser {
get {
return ((HtmlViewPane)Owner).WebBrowser;
}
}
public void BringTocPadToFront()
{
WorkbenchSingleton.Workbench.GetPad(typeof(HtmlHelp2TocPad)).BringPadToFront();
}
}
public class SyncTocCommand : HelpToolbarCommand
{
public override void Run()
{
TocPad.SyncToc(Browser.Url.ToString());
BringTocPadToFront();
}
}
public class PreviousTopicCommand : HelpToolbarCommand
{
public override void Run()
{
TocPad.GetPrevFromNode();
BringTocPadToFront();
}
}
public class NextTopicCommand : HelpToolbarCommand
{
public override void Run()
{
TocPad.GetNextFromNode();
BringTocPadToFront();
}
}
}

57
src/AddIns/Misc/HtmlHelp2/Project/src/BrowserControl/ShowHelpBrowser.cs

@ -11,11 +11,10 @@ namespace HtmlHelp2 @@ -11,11 +11,10 @@ namespace HtmlHelp2
{
using System;
using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.BrowserDisplayBinding;
using MSHelpServices;
using HtmlHelp2Browser;
public sealed class ShowHelpBrowser
public static class ShowHelpBrowser
{
static bool hiliteMatches = false;
static IHxTopic lastTopic = null;
@ -39,7 +38,7 @@ namespace HtmlHelp2 @@ -39,7 +38,7 @@ namespace HtmlHelp2
{
hiliteMatches = hiliteMatchingWords;
lastTopic = topic;
HtmlHelp2BrowserPane help2Browser = GetActiveHelp2BrowserView();
BrowserPane help2Browser = GetActiveHelp2BrowserView();
if(help2Browser != null) {
help2Browser.Load(topicUrl);
@ -47,52 +46,40 @@ namespace HtmlHelp2 @@ -47,52 +46,40 @@ namespace HtmlHelp2
}
}
public static HtmlHelp2BrowserPane GetActiveHelp2BrowserView()
public static BrowserPane GetActiveHelp2BrowserView()
{
HtmlHelp2BrowserPane tempPane = null;
IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow;
if(window != null && window.ActiveViewContent is HtmlHelp2BrowserPane) {
tempPane = (HtmlHelp2BrowserPane)window.ActiveViewContent;
return tempPane;
if(window != null) {
BrowserPane browserPane = window.ActiveViewContent as BrowserPane;
if (browserPane != null && browserPane.Url.Scheme == "ms-help")
return browserPane;
}
foreach(IViewContent view in WorkbenchSingleton.Workbench.ViewContentCollection) {
if(view is HtmlHelp2BrowserPane) {
tempPane = (HtmlHelp2BrowserPane)view;
return tempPane;
}
BrowserPane browserPane = view as BrowserPane;
if (browserPane != null && browserPane.Url.Scheme == "ms-help")
return browserPane;
}
tempPane = CreateNewHelp2BrowserView();
return tempPane;
return CreateNewHelp2BrowserView();
}
public static HtmlHelp2BrowserPane CreateNewHelp2BrowserView()
public static BrowserPane CreateNewHelp2BrowserView()
{
HtmlHelp2BrowserPane tempPane = new HtmlHelp2BrowserPane("");
BrowserPane tempPane = new BrowserPane();
WorkbenchSingleton.Workbench.ShowView(tempPane);
return tempPane;
}
public static void HighlightDocument()
{
if(hiliteMatches && lastTopic != null) {
try {
IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow;
if(window != null && window.ActiveViewContent is HtmlHelp2BrowserPane) {
HtmlHelp2BrowserPane help2Browser = (HtmlHelp2BrowserPane)window.ActiveViewContent;
HtmlHelp2BrowserControl browserControl = (HtmlHelp2BrowserControl)help2Browser.Control;
lastTopic.HighlightDocument(browserControl.AxWebBrowser.Document);
}
}
catch {
// FIXME: HighlightDocument is called nowhere
if (hiliteMatches && lastTopic != null) {
IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow;
if(window != null && window.ActiveViewContent is BrowserPane) {
BrowserPane help2Browser = (BrowserPane)window.ActiveViewContent;
lastTopic.HighlightDocument(help2Browser.HtmlViewPane.WebBrowser.Document.DomDocument);
}
}
}
ShowHelpBrowser()
{
}
}
}

20
src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Service.cs

@ -26,7 +26,7 @@ namespace HtmlHelp2Service @@ -26,7 +26,7 @@ namespace HtmlHelp2Service
static IHxRegFilterList namespaceFilters = null;
static IHxQuery fulltextSearch = null;
static IHxQuery dynamicHelp = null;
static string fidalgoNamespaceName = "Corsavy";
static string fidalgoNamespaceName = "Fidalgo";
static string currentSelectedFilterQuery = "";
static string currentSelectedFilterName = "";
static string defaultPage = "about:blank";
@ -175,12 +175,8 @@ namespace HtmlHelp2Service @@ -175,12 +175,8 @@ namespace HtmlHelp2Service
private static void ReloadDefaultPages()
{
try {
defaultPage = GetDefaultPage("HomePage", "DefaultPage", "about:blank");
searchPage = GetDefaultPage("SearchHelpPage", "SearchWebPage", "http://msdn.microsoft.com");
}
catch {
}
defaultPage = GetDefaultPage("HomePage", "DefaultPage", "about:blank");
searchPage = GetDefaultPage("SearchHelpPage", "SearchWebPage", "http://msdn.microsoft.com");
}
private static string GetDefaultPage(string pageName, string alternatePageName, string defaultValue)
@ -197,13 +193,15 @@ namespace HtmlHelp2Service @@ -197,13 +193,15 @@ namespace HtmlHelp2Service
topics = namedUrlIndex.GetTopicsFromString(alternatePageName, 0);
}
if(topics.Count > 0) resultString = topics.ItemAt(1).URL;
else resultString = defaultValue;
if(topics.Count > 0)
resultString = topics.ItemAt(1).URL;
if (resultString == null || resultString.Length == 0)
resultString = defaultValue;
return resultString;
}
catch {
return "";
return defaultValue;
}
}
@ -248,7 +246,7 @@ namespace HtmlHelp2Service @@ -248,7 +246,7 @@ namespace HtmlHelp2Service
if(namespaceFilters.Count == 0) filterCombobox.Items.Add(StringParser.Parse("${res:AddIns.HtmlHelp2.DefaultEmptyFilter}"));
if(currentSelectedFilterName == "") filterCombobox.SelectedIndex = 0;
else filterCombobox.SelectedIndex = filterCombobox.Items.IndexOf(currentSelectedFilterName);
else filterCombobox.SelectedIndex = filterCombobox.Items.IndexOf(currentSelectedFilterName);
}
catch {
}

50
src/AddIns/Misc/StartPage/Project/Src/Main.cs

@ -18,39 +18,37 @@ using ICSharpCode.SharpDevelop.BrowserDisplayBinding; @@ -18,39 +18,37 @@ using ICSharpCode.SharpDevelop.BrowserDisplayBinding;
namespace ICSharpCode.StartPage
{
/// <summary>
/// This is the ViewContent implementation for the Start Page.
/// </summary>
public class StartPageView : BrowserPane
{
public StartPageView() : base(new Uri("startpage://start/"))
{
ProjectService.SolutionLoaded += HandleCombineOpened;
}
void HandleCombineOpened(object sender, SolutionEventArgs e)
{
WorkbenchWindow.CloseWindow(true);
}
public override void Dispose()
{
ProjectService.SolutionLoaded -= HandleCombineOpened;
base.Dispose();
}
}
public class ShowStartPageCommand : AbstractMenuCommand
{
static bool isFirstStartPage = true;
public override void Run()
{
if (isFirstStartPage) {
isFirstStartPage = false;
ProjectService.SolutionLoaded += delegate {
// close all start pages when loading a solution
foreach (IViewContent v in WorkbenchSingleton.Workbench.ViewContentCollection.ToArray()) {
BrowserPane b = v as BrowserPane;
if (b != null) {
if (b.Url.Scheme == "startpage") {
b.WorkbenchWindow.CloseWindow(true);
}
}
}
};
}
foreach (IViewContent view in WorkbenchSingleton.Workbench.ViewContentCollection) {
if (view is StartPageView) {
view.WorkbenchWindow.SelectWindow();
return;
BrowserPane b = view as BrowserPane;
if (b != null) {
if (b.Url.Scheme == "startpage") {
view.WorkbenchWindow.SelectWindow();
return;
}
}
}
WorkbenchSingleton.Workbench.ShowView(new StartPageView());
WorkbenchSingleton.Workbench.ShowView(new BrowserPane(new Uri("startpage://start/")));
}
}
}

10
src/AddIns/Misc/StartPage/Project/Src/StartPage.cs

@ -36,5 +36,15 @@ namespace ICSharpCode.StartPage @@ -36,5 +36,15 @@ namespace ICSharpCode.StartPage
pane.WebBrowser.DocumentText = page.Render(host);
}
}
public void GoHome(HtmlViewPane pane)
{
pane.Navigate("startpage://start/");
}
public void GoSearch(HtmlViewPane pane)
{
pane.Navigate(HtmlViewPane.DefaultSearchUrl);
}
}
}

2
src/AddIns/Misc/StartPage/Project/StartPage.addin

@ -14,13 +14,13 @@ @@ -14,13 +14,13 @@
insertafter = "ViewItemsSeparator"
insertbefore = "StartPageSeparator"
label = "${res:XML.MainMenu.ViewMenu.ShowStartPage}"
icon = "Icons.16x16.BrowserWindow"
class = "ICSharpCode.StartPage.ShowStartPageCommand"/>
<MenuItem id = "StartPageSeparator"
insertbefore = "FullScreen"
type = "Separator"/>
</Path>
<!-- TODO: Conditional to reflect Settings option -->
<Path name = "/Workspace/AutostartNothingLoaded">
<Class id = "ShowStartPageCommand"
class = "ICSharpCode.StartPage.ShowStartPageCommand"/>

2
src/Libraries/ICSharpCode.Build.Tasks/Project/AssemblyInfo.cs

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
// <file>
// <file>
// <copyright see="prj:///doc/copyright.txt">2002-2005 AlphaSierraPapa</copyright>
// <license see="prj:///doc/license.txt">GNU General Public License</license>
// <owner name="Daniel Grunwald" email="daniel@danielgrunwald.de"/>

2
src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj

@ -688,6 +688,8 @@ @@ -688,6 +688,8 @@
<Compile Include="Src\TextEditor\Commands\ClassBookmarkMenuBuilder.cs" />
<Compile Include="Src\TextEditor\Commands\ParserBookmarkMenuBuilderBase.cs" />
<Compile Include="Src\TextEditor\SearchAndReplace\Engine\SearchStrategy\BoyerMooreSearchStrategy.cs" />
<Compile Include="Src\Gui\BrowserDisplayBinding\BrowserCommands.cs" />
<Compile Include="Src\Gui\BrowserDisplayBinding\BrowserLocationConditionEvaluator.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Libraries\DockPanel_Src\WinFormsUI\WinFormsUI.csproj">

46
src/Main/Base/Project/Src/Commands/HelpCommands.cs

@ -16,7 +16,6 @@ using ICSharpCode.SharpDevelop.Gui; @@ -16,7 +16,6 @@ using ICSharpCode.SharpDevelop.Gui;
namespace ICSharpCode.SharpDevelop.Commands
{
public class ShowSensitiveHelp : AbstractMenuCommand
{
public override void Run()
@ -41,10 +40,10 @@ namespace ICSharpCode.SharpDevelop.Commands @@ -41,10 +40,10 @@ namespace ICSharpCode.SharpDevelop.Commands
public override void Run()
{
string fileName = FileUtility.SharpDevelopRootPath +
Path.DirectorySeparatorChar + "doc" +
Path.DirectorySeparatorChar + "help" +
Path.DirectorySeparatorChar + "sharpdevelop.chm";
string fileName = FileUtility.SharpDevelopRootPath +
Path.DirectorySeparatorChar + "doc" +
Path.DirectorySeparatorChar + "help" +
Path.DirectorySeparatorChar + "sharpdevelop.chm";
if (FileUtility.TestFileExists(fileName)) {
Help.ShowHelp((Form)WorkbenchSingleton.Workbench, fileName);
((Form)WorkbenchSingleton.Workbench).Select();
@ -63,40 +62,27 @@ namespace ICSharpCode.SharpDevelop.Commands @@ -63,40 +62,27 @@ namespace ICSharpCode.SharpDevelop.Commands
}
}
public class GotoWebSite : AbstractMenuCommand
{
string site;
public GotoWebSite(string site)
{
this.site = site;
}
public override void Run()
{
FileService.OpenFile(site);
}
}
public class GotoLink : AbstractMenuCommand
public class LinkCommand : AbstractMenuCommand
{
string site;
public GotoLink(string site)
public LinkCommand(string site)
{
this.site = site;
}
public override void Run()
{
string file = site.StartsWith("home://") ? FileUtility.Combine(FileUtility.SharpDevelopRootPath, "bin", site.Substring(7).Replace('/', Path.DirectorySeparatorChar)) : site;
try {
Process.Start(file);
} catch (Exception) {
MessageService.ShowError("Can't execute/view " + file + "\n Please check that the file exists and that you can open this file.");
if (site.StartsWith("home://")) {
string file = FileUtility.Combine(FileUtility.SharpDevelopRootPath, "bin", site.Substring(7).Replace('/', Path.DirectorySeparatorChar));
try {
Process.Start(file);
} catch (Exception) {
MessageService.ShowError("Can't execute/view " + file + "\n Please check that the file exists and that you can open this file.");
}
} else {
FileService.OpenFile(site);
}
}
}

84
src/Main/Base/Project/Src/Gui/BrowserDisplayBinding/BrowserCommands.cs

@ -0,0 +1,84 @@ @@ -0,0 +1,84 @@
/*
* Created by SharpDevelop.
* User: Daniel Grunwald
* Date: 05.08.2005
* Time: 14:35
*/
using System;
using System.Windows.Forms;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui;
namespace ICSharpCode.SharpDevelop.BrowserDisplayBinding
{
public class GoBack : AbstractCommand
{
public override void Run()
{
((HtmlViewPane)Owner).WebBrowser.GoBack();
}
}
public class GoForward : AbstractCommand
{
public override void Run()
{
((HtmlViewPane)Owner).WebBrowser.GoForward();
}
}
public class Stop : AbstractCommand
{
public override void Run()
{
((HtmlViewPane)Owner).WebBrowser.Stop();
}
}
public class Refresh : AbstractCommand
{
public override void Run()
{
if ((Control.ModifierKeys & Keys.Control) == Keys.Control)
((HtmlViewPane)Owner).WebBrowser.Refresh(WebBrowserRefreshOption.Completely);
else
((HtmlViewPane)Owner).WebBrowser.Refresh();
}
}
public class GoHome : AbstractCommand
{
public override void Run()
{
((HtmlViewPane)Owner).GoHome();
}
}
public class GoSearch : AbstractCommand
{
public override void Run()
{
((HtmlViewPane)Owner).GoSearch();
}
}
public class UrlComboBox : AbstractComboBoxCommand
{
protected override void OnOwnerChanged(EventArgs e)
{
base.OnOwnerChanged(e);
ToolBarComboBox toolbarItem = (ToolBarComboBox)Owner;
toolbarItem.ComboBox.Width *= 3;
((HtmlViewPane)toolbarItem.Caller).SetUrlComboBox(toolbarItem.ComboBox);
}
}
public class NewWindow : AbstractCommand
{
public override void Run()
{
WorkbenchSingleton.Workbench.ShowView(new BrowserPane());
}
}
}

34
src/Main/Base/Project/Src/Gui/BrowserDisplayBinding/BrowserLocationConditionEvaluator.cs

@ -0,0 +1,34 @@ @@ -0,0 +1,34 @@
/*
* Created by SharpDevelop.
* User: Daniel Grunwald
* Date: 05.08.2005
* Time: 19:37
*/
using System;
using System.Text.RegularExpressions;
using ICSharpCode.Core;
namespace ICSharpCode.SharpDevelop.BrowserDisplayBinding
{
/// <summary>
/// Description of BrowserLocationConditionEvaluator.
/// </summary>
public class BrowserLocationConditionEvaluator : IConditionEvaluator
{
public bool IsValid(object caller, Condition condition)
{
HtmlViewPane pane = (HtmlViewPane)caller;
Uri uri = pane.Url;
if (uri == null)
return false;
string url = uri.ToString();
string pattern = condition.Properties["urlRegex"];
string options = condition.Properties["options"];
if (options != null && options.Length > 0)
return Regex.IsMatch(url, pattern, (RegexOptions)Enum.Parse(typeof(RegexOptions), options, true));
else
return Regex.IsMatch(url, pattern);
}
}
}

252
src/Main/Base/Project/Src/Gui/BrowserDisplayBinding/HtmlViewPane.cs

@ -20,7 +20,13 @@ namespace ICSharpCode.SharpDevelop.BrowserDisplayBinding @@ -20,7 +20,13 @@ namespace ICSharpCode.SharpDevelop.BrowserDisplayBinding
{
public class BrowserPane : AbstractViewContent
{
protected HtmlViewPane htmlViewPane;
HtmlViewPane htmlViewPane;
public HtmlViewPane HtmlViewPane {
get {
return htmlViewPane;
}
}
public override Control Control {
get {
@ -47,6 +53,7 @@ namespace ICSharpCode.SharpDevelop.BrowserDisplayBinding @@ -47,6 +53,7 @@ namespace ICSharpCode.SharpDevelop.BrowserDisplayBinding
htmlViewPane = new HtmlViewPane(showNavigation);
htmlViewPane.WebBrowser.DocumentTitleChanged += new EventHandler(TitleChange);
htmlViewPane.Closed += PaneClosed;
TitleChange(null, null);
}
public BrowserPane(Uri uri) : this(true)
@ -74,6 +81,12 @@ namespace ICSharpCode.SharpDevelop.BrowserDisplayBinding @@ -74,6 +81,12 @@ namespace ICSharpCode.SharpDevelop.BrowserDisplayBinding
Load(url);
}
public Uri Url {
get {
return htmlViewPane.Url;
}
}
void PaneClosed(object sender, EventArgs e)
{
WorkbenchWindow.CloseWindow(true);
@ -82,6 +95,8 @@ namespace ICSharpCode.SharpDevelop.BrowserDisplayBinding @@ -82,6 +95,8 @@ namespace ICSharpCode.SharpDevelop.BrowserDisplayBinding
void TitleChange(object sender, EventArgs e)
{
string title = htmlViewPane.WebBrowser.DocumentTitle;
if (title != null)
title = title.Trim();
if (title == null || title.Length == 0)
TitleName = "Browser";
else
@ -93,9 +108,7 @@ namespace ICSharpCode.SharpDevelop.BrowserDisplayBinding @@ -93,9 +108,7 @@ namespace ICSharpCode.SharpDevelop.BrowserDisplayBinding
{
ExtendedWebBrowser webBrowser = null;
Panel topPanel = new Panel();
ToolBar toolBar = new ToolBar();
TextBox urlTextBox = new TextBox();
ToolStrip toolStrip;
// string lastUrl = null;
@ -130,69 +143,17 @@ namespace ICSharpCode.SharpDevelop.BrowserDisplayBinding @@ -130,69 +143,17 @@ namespace ICSharpCode.SharpDevelop.BrowserDisplayBinding
Dock = DockStyle.Fill;
Size = new Size(500, 500);
if (showNavigation) {
topPanel.Size = new Size(Width, 25);
topPanel.Dock = DockStyle.Top;
Controls.Add(topPanel);
toolBar.Dock = DockStyle.None;
for (int i = 0; i < 4; ++i) {
ToolBarButton toolBarButton = new ToolBarButton();
toolBarButton.ImageIndex = i;
toolBar.Buttons.Add(toolBarButton);
}
toolBar.ImageList = new ImageList();
toolBar.ImageList.ColorDepth = ColorDepth.Depth32Bit;
toolBar.ImageList.Images.Add(ResourceService.GetBitmap("Icons.16x16.BrowserBefore"));
toolBar.ImageList.Images.Add(ResourceService.GetBitmap("Icons.16x16.BrowserAfter"));
toolBar.ImageList.Images.Add(ResourceService.GetBitmap("Icons.16x16.BrowserCancel"));
toolBar.ImageList.Images.Add(ResourceService.GetBitmap("Icons.16x16.BrowserRefresh"));
toolBar.Appearance = ToolBarAppearance.Flat;
toolBar.Divider = false;
toolBar.ButtonClick += new ToolBarButtonClickEventHandler(ToolBarClick);
toolBar.Location = new Point(0, 0);
toolBar.Size = new Size(4*toolBar.ButtonSize.Width, 25);
topPanel.Controls.Add(toolBar);
urlTextBox.Location = new Point(4*toolBar.ButtonSize.Width, 2);
urlTextBox.Size = new Size(Width - (4*toolBar.ButtonSize.Width) - 1, 21);
urlTextBox.Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top;
urlTextBox.KeyPress += new KeyPressEventHandler(KeyPressEvent);
topPanel.Controls.Add(urlTextBox);
}
webBrowser = new ExtendedWebBrowser();
// axWebBrowser.BeginInit();
// if (showNavigation) {
// int height = 48;
// axWebBrowser.Location = new Point(0, height);
// axWebBrowser.Size = new Size(Width, Height - height);
// axWebBrowser.Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Bottom | AnchorStyles.Top;
// axWebBrowser.Dock = DockStyle.Fill;
// } else {
webBrowser.Dock = DockStyle.Fill;
// }
webBrowser.Navigating += WebBrowserNavigating;
webBrowser.NewWindowExtended += NewWindow;
webBrowser.Navigated += WebBrowserNavigated;
Controls.Add(webBrowser);
if (showNavigation) {
Controls.Add(topPanel);
toolStrip = ToolbarService.CreateToolStrip(this, "/SharpDevelop/ViewContent/Browser/Toolbar");
Controls.Add(toolStrip);
}
// axWebBrowser.EndInit();
}
void NewWindow(object sender, NewWindowExtendedEventArgs e)
@ -201,32 +162,33 @@ namespace ICSharpCode.SharpDevelop.BrowserDisplayBinding @@ -201,32 +162,33 @@ namespace ICSharpCode.SharpDevelop.BrowserDisplayBinding
WorkbenchSingleton.Workbench.ShowView(new BrowserPane(e.Url));
}
void WebBrowserNavigated(object sender, WebBrowserNavigatedEventArgs e)
static ArrayList descriptors;
public static ISchemeExtension GetScheme(string name)
{
urlTextBox.Text = webBrowser.Url.ToString();
if (descriptors == null) {
descriptors = AddInTree.BuildItems("/SharpDevelop/Views/Browser/SchemeExtensions", null, false);
}
foreach (SchemeExtensionDescriptor descriptor in descriptors) {
if (string.Equals(name, descriptor.SchemeName, StringComparison.OrdinalIgnoreCase)) {
return descriptor.Extension;
}
}
return null;
}
static ArrayList descriptors;
void WebBrowserNavigating(object sender, WebBrowserNavigatingEventArgs e)
{
try {
if (descriptors == null) {
AddInTreeNode treeNode = null;
try {
treeNode = AddInTree.GetTreeNode("/SharpDevelop/Views/Browser/SchemeExtensions");
} catch (Exception) {
}
if (treeNode != null) {
descriptors = treeNode.BuildChildItems(null);
} else {
descriptors = new ArrayList();
}
}
string scheme = e.Url.Scheme;
foreach (SchemeExtensionDescriptor descriptor in descriptors) {
if (string.Equals(scheme, descriptor.SchemeName, StringComparison.OrdinalIgnoreCase)) {
descriptor.InterceptNavigate(this, e);
ISchemeExtension extension = GetScheme(e.Url.Scheme);
if (extension != null) {
extension.InterceptNavigate(this, e);
if (e.TargetFrameName.Length == 0) {
if (e.Cancel == true) {
dummyUrl = e.Url.ToString();
} else if (e.Url.ToString() != "about:blank") {
dummyUrl = null;
}
}
}
} catch (Exception ex) {
@ -234,43 +196,127 @@ namespace ICSharpCode.SharpDevelop.BrowserDisplayBinding @@ -234,43 +196,127 @@ namespace ICSharpCode.SharpDevelop.BrowserDisplayBinding
}
}
void KeyPressEvent(object sender, KeyPressEventArgs ex)
public void Navigate(string name)
{
if (ex.KeyChar == '\r') {
ex.Handled = true;
Navigate(urlTextBox.Text);
webBrowser.Navigate(new Uri(name));
}
public void Navigate(Uri url)
{
webBrowser.Navigate(url);
}
public const string DefaultHomepage = "http://www.icsharpcode.net/";
public const string DefaultSearchUrl = "http://www.google.com/";
public void GoHome()
{
ISchemeExtension extension = GetScheme(Url.Scheme);
if (extension != null) {
extension.GoHome(this);
} else {
Navigate(DefaultHomepage);
}
}
void ToolBarClick(object sender, ToolBarButtonClickEventArgs e)
public void GoSearch()
{
try {
switch(toolBar.Buttons.IndexOf(e.Button)) {
case 0:
webBrowser.GoBack();
break;
case 1:
webBrowser.GoForward();
break;
case 2:
webBrowser.Stop();
break;
case 3:
webBrowser.Refresh();
break;
}
} catch (Exception) {
ISchemeExtension extension = GetScheme(Url.Scheme);
if (extension != null) {
extension.GoSearch(this);
} else {
Navigate(DefaultSearchUrl);
}
}
public void Navigate(string name)
Control urlBox;
public void SetUrlComboBox(ComboBox comboBox)
{
webBrowser.Navigate(new Uri(name));
SetUrlBox(comboBox);
comboBox.DropDownStyle = ComboBoxStyle.DropDown;
comboBox.Items.Clear();
comboBox.Items.AddRange(PropertyService.Get("Browser.URLBoxHistory", new string[0]));
comboBox.AutoCompleteMode = AutoCompleteMode.Suggest;
comboBox.AutoCompleteSource = AutoCompleteSource.HistoryList;
}
public void Navigate(Uri url)
public void SetUrlBox(Control urlBox)
{
webBrowser.Navigate(url);
this.urlBox = urlBox;
urlBox.KeyUp += UrlBoxKeyUp;
}
void UrlBoxKeyUp(object sender, KeyEventArgs e)
{
Control ctl = (Control)sender;
if (e.KeyData == Keys.Return) {
e.Handled = true;
UrlBoxNavigate(ctl);
}
}
void UrlBoxNavigate(Control ctl)
{
string text = ctl.Text.Trim();
if (text.IndexOf(':') < 0) {
text = "http://" + text;
}
Navigate(text);
ComboBox comboBox = ctl as ComboBox;
if (comboBox != null) {
comboBox.Items.Remove(text);
comboBox.Items.Insert(0, text);
// Add to URLBoxHistory:
string[] history = PropertyService.Get("Browser.URLBoxHistory", new string[0]);
int pos = Array.IndexOf(history, text);
if (pos < 0 && history.Length >= 20) {
pos = history.Length - 1; // remove last entry and insert new at the beginning
}
if (pos < 0) {
// insert new item
string[] newHistory = new string[history.Length + 1];
history.CopyTo(newHistory, 1);
history = newHistory;
} else {
for (int i = pos; i > 0; i--) {
history[i] = history[i - 1];
}
}
history[0] = text;
PropertyService.Set("Browser.URLBoxHistory", history);
}
}
string dummyUrl;
public Uri Url {
get {
if (webBrowser.Url == null)
return null;
if (dummyUrl != null && webBrowser.Url.ToString() == "about:blank") {
return new Uri(dummyUrl);
} else {
return webBrowser.Url;
}
}
}
void WebBrowserNavigated(object sender, WebBrowserNavigatedEventArgs e)
{
// do not use e.Url (frames!)
string url = webBrowser.Url.ToString();
if (dummyUrl != null && url == "about:blank") {
urlBox.Text = dummyUrl;
} else {
urlBox.Text = url;
}
// Update toolbar:
foreach (object o in toolStrip.Items) {
IStatusUpdate up = o as IStatusUpdate;
if (up != null)
up.UpdateStatus();
}
}
}
}

15
src/Main/Base/Project/Src/Gui/BrowserDisplayBinding/SchemeExtension.cs

@ -16,6 +16,8 @@ namespace ICSharpCode.SharpDevelop.BrowserDisplayBinding @@ -16,6 +16,8 @@ namespace ICSharpCode.SharpDevelop.BrowserDisplayBinding
public interface ISchemeExtension
{
void InterceptNavigate(HtmlViewPane pane, WebBrowserNavigatingEventArgs e);
void GoHome(HtmlViewPane pane);
void GoSearch(HtmlViewPane pane);
}
public class SchemeExtensionDescriptor
@ -38,14 +40,15 @@ namespace ICSharpCode.SharpDevelop.BrowserDisplayBinding @@ -38,14 +40,15 @@ namespace ICSharpCode.SharpDevelop.BrowserDisplayBinding
schemeName = codon.Id;
}
ISchemeExtension ext;
ISchemeExtension extension;
public void InterceptNavigate(HtmlViewPane pane, WebBrowserNavigatingEventArgs e)
{
if (ext == null) {
ext = (ISchemeExtension)codon.AddIn.CreateObject(codon.Properties["class"]);
public ISchemeExtension Extension {
get {
if (extension == null) {
extension = (ISchemeExtension)codon.AddIn.CreateObject(codon.Properties["class"]);
}
return extension;
}
ext.InterceptNavigate(pane, e);
}
}

6
src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/CompilerMessageViewToolbarCommands.cs

@ -21,7 +21,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -21,7 +21,7 @@ namespace ICSharpCode.SharpDevelop.Gui
{
ComboBox comboBox;
protected override void OnOwnerChanged(EventArgs e)
protected override void OnOwnerChanged(EventArgs e)
{
base.OnOwnerChanged(e);
ToolBarComboBox toolbarItem = (ToolBarComboBox)Owner;
@ -73,7 +73,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -73,7 +73,7 @@ namespace ICSharpCode.SharpDevelop.Gui
}
}
public class ToggleeMessageViewWordWrap : AbstractCheckableMenuCommand
public class ToggleMessageViewWordWrap : AbstractCheckableMenuCommand
{
ToolBarCheckBox checkBox;
@ -93,11 +93,9 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -93,11 +93,9 @@ namespace ICSharpCode.SharpDevelop.Gui
}
}
public override void Run()
{
IsChecked = !IsChecked;
}
}
}

1
src/Main/Base/Project/Src/TextEditor/Gui/Editor/TextEditorDisplayBinding.cs

@ -282,6 +282,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor @@ -282,6 +282,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor
public override void Dispose()
{
base.Dispose();
((Form)ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.Workbench).Activated -= new EventHandler(GotFocusEvent);
if (this.watcher != null) {
this.watcher.Dispose();

13
src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/Gui/MenuCommand.cs

@ -40,16 +40,25 @@ namespace ICSharpCode.Core @@ -40,16 +40,25 @@ namespace ICSharpCode.Core
}
}
// HACK: find a better way to allow the host app to process link commands
public static Converter<string, ICommand> LinkCommandCreator;
void CreateCommand()
{
try {
menuCommand = (ICommand)codon.AddIn.CreateObject(codon.Properties["class"]);
if (codon.Properties["link"] != null) {
if (LinkCommandCreator == null)
throw new NotSupportedException("MenuCommand.LinkCommandCreator is not set, cannot create LinkCommands.");
menuCommand = LinkCommandCreator(codon.Properties["link"]);
} else {
menuCommand = (ICommand)codon.AddIn.CreateObject(codon.Properties["class"]);
}
menuCommand.Owner = caller;
} catch (Exception e) {
MessageService.ShowError(e, "Can't create menu command : " + codon.Id);
}
}
public MenuCommand(Codon codon, object caller) : this(codon, caller, false)
{

6
src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/ToolBarItem/Gui/ToolBarComboBox.cs

@ -21,6 +21,12 @@ namespace ICSharpCode.Core @@ -21,6 +21,12 @@ namespace ICSharpCode.Core
string description = String.Empty;
IComboBoxCommand menuCommand = null;
public object Caller {
get {
return caller;
}
}
public string Description {
get {
return description;

9
src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/ToolBarItem/Gui/ToolBarCommand.cs

@ -45,7 +45,9 @@ namespace ICSharpCode.Core @@ -45,7 +45,9 @@ namespace ICSharpCode.Core
Image = ResourceService.GetBitmap(codon.Properties["icon"]);
}
menuCommand = codon.AddIn.CreateObject(codon.Properties["class"]) as ICommand;
menuCommand = (ICommand)codon.AddIn.CreateObject(codon.Properties["class"]);
if (menuCommand != null)
menuCommand.Owner = caller;
UpdateStatus();
}
@ -53,10 +55,7 @@ namespace ICSharpCode.Core @@ -53,10 +55,7 @@ namespace ICSharpCode.Core
protected override void OnClick(System.EventArgs e)
{
base.OnClick(e);
if (codon != null) {
if (menuCommand == null) {
menuCommand = codon.AddIn.CreateObject(codon.Properties["class"]) as ICommand;
}
if (menuCommand != null) {
menuCommand.Run();
}
}

1
src/Main/Core/Project/Src/Services/FileUtility/FileUtility.cs

@ -440,7 +440,6 @@ namespace ICSharpCode.Core @@ -440,7 +440,6 @@ namespace ICSharpCode.Core
// Observe LOAD functions
public static FileOperationResult ObservedLoad(FileOperationDelegate loadFile, string fileName, string message, FileErrorPolicy policy)
{
System.Diagnostics.Debug.Assert(IsValidFileName(fileName));
try {
loadFile();
OnFileLoaded(new FileNameEventArgs(fileName));

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

Binary file not shown.

3
src/Main/StartUp/Project/SharpDevelopMain.cs

@ -157,6 +157,7 @@ namespace ICSharpCode.SharpDevelop @@ -157,6 +157,7 @@ namespace ICSharpCode.SharpDevelop
AddInTree.ConditionEvaluators.Add("ProjectActive", new ProjectActiveConditionEvaluator());
AddInTree.ConditionEvaluators.Add("ProjectOpen", new ProjectOpenConditionEvaluator());
AddInTree.ConditionEvaluators.Add("TextContent", new ICSharpCode.SharpDevelop.DefaultEditor.Conditions.TextContentConditionEvaluator());
AddInTree.ConditionEvaluators.Add("BrowserLocation", new ICSharpCode.SharpDevelop.BrowserDisplayBinding.BrowserLocationConditionEvaluator());
AddInTree.Doozers.Add("DialogPanel", new DialogPanelDoozer());
AddInTree.Doozers.Add("DisplayBinding", new DisplayBindingDoozer());
@ -167,6 +168,8 @@ namespace ICSharpCode.SharpDevelop @@ -167,6 +168,8 @@ namespace ICSharpCode.SharpDevelop
AddInTree.Doozers.Add("SyntaxMode", new ICSharpCode.SharpDevelop.DefaultEditor.Codons.SyntaxModeDoozer());
AddInTree.Doozers.Add("BrowserSchemeExtension", new ICSharpCode.SharpDevelop.BrowserDisplayBinding.SchemeExtensionDoozer());
MenuCommand.LinkCommandCreator = delegate(string link) { return new LinkCommand(link); };
PropertyService.Load();
StringParser.RegisterStringTagProvider(new SharpDevelopStringTagProvider());

2
src/SharpDevelop.sln

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# SharpDevelop 2.0.0.309
# SharpDevelop 2.0.0.315
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{14A277EE-7DF1-4529-B639-7D1EF334C1C5}"
ProjectSection(SolutionItems) = postProject
EndProjectSection

Loading…
Cancel
Save