Browse Source

Fixed SD2-1608 - 'Bookmark All' is not implemented

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@5598 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
pull/1/head
Daniel Grunwald 16 years ago
parent
commit
3569587233
  1. 17
      src/AddIns/Misc/SearchAndReplace/Project/Engine/SearchReplaceManager.cs
  2. 2
      src/Main/Base/Project/Src/Bookmarks/BookmarkConverter.cs
  3. 4
      src/Main/Base/Project/Src/Bookmarks/SDBookmark.cs
  4. 5
      src/Main/Base/Project/Src/Bookmarks/SDMarkerBookmark.cs
  5. 2
      src/Main/Base/Project/Src/Editor/PermanentAnchor.cs
  6. 3
      src/Main/Base/Project/Src/Services/Debugger/BreakpointBookmark.cs
  7. 7
      src/Main/Base/Project/Src/Services/Debugger/CurrentLineBookmark.cs
  8. 12
      src/Main/StartUp/Project/SharpDevelopMain.cs

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

@ -5,14 +5,16 @@ @@ -5,14 +5,16 @@
// <version>$Revision$</version>
// </file>
using ICSharpCode.SharpDevelop.Editor.Search;
using System;
using System.Collections.Generic;
using System.Windows.Forms;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Bookmarks;
using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor;
using ICSharpCode.SharpDevelop.Editor;
using ICSharpCode.SharpDevelop.Editor.Search;
using ICSharpCode.SharpDevelop.Gui;
namespace SearchAndReplace
@ -146,11 +148,14 @@ namespace SearchAndReplace @@ -146,11 +148,14 @@ namespace SearchAndReplace
IDocumentLine segment = textArea.Document.GetLineForOffset(result.Offset);
int lineNr = segment.LineNumber;
// TODO: AVALONEDIT
throw new NotImplementedException();
// if (!textArea.Document.BookmarkManager.IsMarked(lineNr)) {
// textArea.Document.BookmarkManager.ToggleMarkAt(new TextLocation(result.Offset - segment.Offset, lineNr));
// }
foreach (var bookmark in BookmarkManager.GetBookmarks(result.FileName)) {
if (bookmark.CanToggle && bookmark.LineNumber == lineNr) {
// bookmark or breakpoint already exists at that line
return;
}
}
BookmarkManager.AddMark(new SDBookmark(result.FileName, textArea.Document.OffsetToPosition(result.Offset)));
}
}

2
src/Main/Base/Project/Src/Bookmarks/BookmarkConverter.cs

@ -31,7 +31,7 @@ namespace ICSharpCode.SharpDevelop.Bookmarks @@ -31,7 +31,7 @@ namespace ICSharpCode.SharpDevelop.Bookmarks
string[] v = ((string)value).Split('|');
if (v.Length != 8)
return null;
string fileName = v[1];
FileName fileName = FileName.Create(v[1]);
int lineNumber = int.Parse(v[2], culture);
int columnNumber = int.Parse(v[3], culture);
Debugging.BreakpointAction action = Debugging.BreakpointAction.Break;

4
src/Main/Base/Project/Src/Bookmarks/SDBookmark.cs

@ -18,9 +18,9 @@ namespace ICSharpCode.SharpDevelop.Bookmarks @@ -18,9 +18,9 @@ namespace ICSharpCode.SharpDevelop.Bookmarks
[TypeConverter(typeof(BookmarkConverter))]
public class SDBookmark : BookmarkBase
{
public SDBookmark(string fileName, Location location) : base(location)
public SDBookmark(FileName fileName, Location location) : base(location)
{
this.fileName = FileName.Create(fileName);
this.fileName = fileName;
}
FileName fileName;

5
src/Main/Base/Project/Src/Bookmarks/SDMarkerBookmark.cs

@ -5,9 +5,10 @@ @@ -5,9 +5,10 @@
// <version>$Revision$</version>
// </file>
using ICSharpCode.NRefactory;
using System;
using ICSharpCode.AvalonEdit.Document;
using ICSharpCode.Core;
using ICSharpCode.NRefactory;
using ICSharpCode.SharpDevelop.Editor;
namespace ICSharpCode.SharpDevelop.Bookmarks
@ -17,7 +18,7 @@ namespace ICSharpCode.SharpDevelop.Bookmarks @@ -17,7 +18,7 @@ namespace ICSharpCode.SharpDevelop.Bookmarks
/// </summary>
public abstract class SDMarkerBookmark : SDBookmark
{
public SDMarkerBookmark(string fileName, Location location) : base(fileName, location)
public SDMarkerBookmark(FileName fileName, Location location) : base(fileName, location)
{
//SetMarker();
}

2
src/Main/Base/Project/Src/Editor/PermanentAnchor.cs

@ -265,7 +265,7 @@ namespace ICSharpCode.SharpDevelop.Editor @@ -265,7 +265,7 @@ namespace ICSharpCode.SharpDevelop.Editor
}
/// <summary>
/// Tells detached permanent anchors to attach to the specified text editor.
/// Tells attached permanent anchors to detach from the specified text editor.
/// </summary>
public static void DetachDocument(FileName fileName, IDocument document)
{

3
src/Main/Base/Project/Src/Services/Debugger/BreakpointBookmark.cs

@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
using System;
using System.Windows.Media;
using ICSharpCode.Core;
using ICSharpCode.NRefactory;
using ICSharpCode.SharpDevelop.Bookmarks;
using ICSharpCode.SharpDevelop.Editor;
@ -85,7 +86,7 @@ namespace ICSharpCode.SharpDevelop.Debugging @@ -85,7 +86,7 @@ namespace ICSharpCode.SharpDevelop.Debugging
set { tooltip = value; }
}
public BreakpointBookmark(string fileName, Location location, BreakpointAction action, string scriptLanguage, string script) : base(fileName, location)
public BreakpointBookmark(FileName fileName, Location location, BreakpointAction action, string scriptLanguage, string script) : base(fileName, location)
{
this.action = action;
this.scriptLanguage = scriptLanguage;

7
src/Main/Base/Project/Src/Services/Debugger/CurrentLineBookmark.cs

@ -6,11 +6,12 @@ @@ -6,11 +6,12 @@
// </file>
using System;
using System.Windows.Media;
using ICSharpCode.Core;
using ICSharpCode.NRefactory;
using ICSharpCode.SharpDevelop.Bookmarks;
using ICSharpCode.SharpDevelop.Editor;
using ICSharpCode.SharpDevelop.Gui;
using System.Windows.Media;
namespace ICSharpCode.SharpDevelop.Debugging
{
@ -32,7 +33,7 @@ namespace ICSharpCode.SharpDevelop.Debugging @@ -32,7 +33,7 @@ namespace ICSharpCode.SharpDevelop.Debugging
Remove();
}
public static void SetPosition(string fileName, IDocument document, int makerStartLine, int makerStartColumn, int makerEndLine, int makerEndColumn)
public static void SetPosition(FileName fileName, IDocument document, int makerStartLine, int makerStartColumn, int makerEndLine, int makerEndColumn)
{
Remove();
@ -71,7 +72,7 @@ namespace ICSharpCode.SharpDevelop.Debugging @@ -71,7 +72,7 @@ namespace ICSharpCode.SharpDevelop.Debugging
}
}
public CurrentLineBookmark(string fileName, Location location) : base(fileName, location)
public CurrentLineBookmark(FileName fileName, Location location) : base(fileName, location)
{
this.IsSaved = false;
this.IsVisibleInBookmarkPad = false;

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

@ -101,6 +101,9 @@ namespace ICSharpCode.SharpDevelop @@ -101,6 +101,9 @@ namespace ICSharpCode.SharpDevelop
noLogo = true;
}
if (!CheckEnvironment())
return;
if (!noLogo) {
SplashScreenForm.ShowSplashScreen();
}
@ -113,6 +116,15 @@ namespace ICSharpCode.SharpDevelop @@ -113,6 +116,15 @@ namespace ICSharpCode.SharpDevelop
}
}
static bool CheckEnvironment()
{
if (Environment.Version < new Version(4, 0, 30128)) {
MessageBox.Show("This version of SharpDevelop requires .NET 4 RC. You are using: " + Environment.Version);
return false;
}
return true;
}
static void RunApplication()
{
// The output encoding differs based on whether SharpDevelop is a console app (debug mode)

Loading…
Cancel
Save