Browse Source

- removed language selection box from all console except debugger console

- fixed bug in BeginReadOnlySectionProvider

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@4896 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Siegfried Pammer 16 years ago
parent
commit
cd8c81ebd0
  1. 5
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.addin
  2. 15
      src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/ConsolePad.cs
  3. 10
      src/Main/Base/Project/Src/Gui/Pads/AbstractConsolePad.cs

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

@ -175,10 +175,9 @@ @@ -175,10 +175,9 @@
</Condition>
</Path>
<Path name="/SharpDevelop/Pads/CommonConsole/ToolBar">
<Path name="/SharpDevelop/Pads/ConsolePad/ToolBar">
<Include id="StandardCommands" path="/SharpDevelop/Pads/CommonConsole/ToolBar" />
<ToolbarItem class="ICSharpCode.SharpDevelop.Gui.Pads.SelectLanguageCommand"
type="ComboBox" id="SelectLanguageCommand" />
</Path>
</AddIn>

15
src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/ConsolePad.cs

@ -6,15 +6,19 @@ @@ -6,15 +6,19 @@
// </file>
using System;
using System.Collections;
using System.Windows.Controls;
using Debugger;
using Debugger.AddIn;
using ICSharpCode.Core;
using ICSharpCode.Core.Presentation;
using ICSharpCode.NRefactory;
using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Debugging;
using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
using ICSharpCode.SharpDevelop.Services;
using ICSharpCode.TextEditor;
using System.Windows.Controls;
namespace ICSharpCode.SharpDevelop.Gui.Pads
{
@ -22,6 +26,8 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -22,6 +26,8 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
{
SupportedLanguage language;
const string debuggerConsoleToolBarTreePath = "/SharpDevelop/Pads/ConsolePad/ToolBar";
public SupportedLanguage SelectedLanguage {
get { return language; }
set {
@ -96,7 +102,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -96,7 +102,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
}
public ConsolePad()
{
{
WindowsDebugger debugger = (WindowsDebugger)DebuggerService.CurrentDebugger;
debugger.ProcessSelected += delegate(object sender, ProcessEventArgs e) {
@ -104,5 +110,10 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads @@ -104,5 +110,10 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
};
this.Process = debugger.DebuggedProcess;
}
protected override ToolBar BuildToolBar()
{
return ToolBarService.CreateToolBar(this, debuggerConsoleToolBarTreePath);
}
}
}

10
src/Main/Base/Project/Src/Gui/Pads/AbstractConsolePad.cs

@ -41,7 +41,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -41,7 +41,7 @@ namespace ICSharpCode.SharpDevelop.Gui
this.console = new ConsoleControl();
// creating the toolbar accesses the WordWrap property, so we must do this after creating the console
this.toolbar = ToolBarService.CreateToolBar(this, toolBarTreePath);
this.toolbar = BuildToolBar();
this.toolbar.SetValue(DockPanel.DockProperty, Dock.Top);
this.panel.Children.Add(toolbar);
@ -56,6 +56,11 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -56,6 +56,11 @@ namespace ICSharpCode.SharpDevelop.Gui
this.InitializeConsole();
}
protected virtual ToolBar BuildToolBar()
{
return ToolBarService.CreateToolBar(this, toolBarTreePath);
}
public virtual ITextEditor TextEditor {
get {
return console.TextEditor;
@ -310,6 +315,9 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -310,6 +315,9 @@ namespace ICSharpCode.SharpDevelop.Gui
public IEnumerable<ISegment> GetDeletableSegments(ISegment segment)
{
if (segment.EndOffset < this.EndOffset)
return Enumerable.Empty<ISegment>();
return new[] {
new TextSegment() {
StartOffset = Math.Max(this.EndOffset, segment.Offset),

Loading…
Cancel
Save