From ae0d2b3e51fbed0787531d54212801ad11aea526 Mon Sep 17 00:00:00 2001 From: Eusebiu Marcu Date: Sun, 3 Apr 2011 18:08:28 +0300 Subject: [PATCH] Put icon bookmark inside the Location column. Fix resize issue. Remove enable/disable all from BookmarkPad. Rename some namespaces. Fix jumping to bookmarks in the file. --- .../Pads/ParallelPad/SelectedFrameBookmark.cs | 2 +- .../Tooltips/DebuggerTooltipControl.xaml.cs | 1 - .../Tooltips/PinDebuggerControl.xaml.cs | 1 - .../Debugger.AddIn/Tooltips/PinningBinding.cs | 1 - .../Project/Engine/SearchReplaceManager.cs | 2 +- .../Base/Project/ICSharpCode.SharpDevelop.addin | 5 ++--- .../Project/Src/Bookmarks/BookmarkConverter.cs | 3 +-- .../Project/Src/Bookmarks/Commands/MenuCommands.cs | 12 ++++++------ .../Base/Project/Src/Bookmarks/Pad/BookmarkPad.cs | 6 +++--- .../Bookmarks/Pad/BookmarkPadToolbarCommands.cs | 6 +++--- .../Src/Bookmarks/Pad/Controls/ListViewPad.xaml | 14 ++++++-------- .../Src/Bookmarks/Pad/Controls/ListViewPad.xaml.cs | 7 ++++++- src/Main/Base/Project/Src/Bookmarks/SDBookmark.cs | 12 +++++++++++- .../Debugger/Tooltips/IPinDebuggerControl.cs | 4 ++-- .../Src/Services/Debugger/Tooltips/PinBookmark.cs | 2 +- 15 files changed, 43 insertions(+), 35 deletions(-) diff --git a/src/AddIns/Debugger/Debugger.AddIn/Pads/ParallelPad/SelectedFrameBookmark.cs b/src/AddIns/Debugger/Debugger.AddIn/Pads/ParallelPad/SelectedFrameBookmark.cs index 523458ea1e..204ae111c3 100644 --- a/src/AddIns/Debugger/Debugger.AddIn/Pads/ParallelPad/SelectedFrameBookmark.cs +++ b/src/AddIns/Debugger/Debugger.AddIn/Pads/ParallelPad/SelectedFrameBookmark.cs @@ -8,7 +8,7 @@ using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Bookmarks; using ICSharpCode.SharpDevelop.Editor; -namespace Debugger.AddIn.Pads.ParallelPad +namespace ICSharpCode.SharpDevelop.Bookmarks { public class SelectedFrameBookmark : SDMarkerBookmark { diff --git a/src/AddIns/Debugger/Debugger.AddIn/Tooltips/DebuggerTooltipControl.xaml.cs b/src/AddIns/Debugger/Debugger.AddIn/Tooltips/DebuggerTooltipControl.xaml.cs index b3fbf47370..f5463752d3 100644 --- a/src/AddIns/Debugger/Debugger.AddIn/Tooltips/DebuggerTooltipControl.xaml.cs +++ b/src/AddIns/Debugger/Debugger.AddIn/Tooltips/DebuggerTooltipControl.xaml.cs @@ -20,7 +20,6 @@ using ICSharpCode.SharpDevelop.Bookmarks; using ICSharpCode.SharpDevelop.Debugging; using ICSharpCode.SharpDevelop.Editor; using ICSharpCode.SharpDevelop.Gui; -using Services.Debugger.Tooltips; namespace Debugger.AddIn.Tooltips { diff --git a/src/AddIns/Debugger/Debugger.AddIn/Tooltips/PinDebuggerControl.xaml.cs b/src/AddIns/Debugger/Debugger.AddIn/Tooltips/PinDebuggerControl.xaml.cs index 5b0e713564..0ae3b19e08 100644 --- a/src/AddIns/Debugger/Debugger.AddIn/Tooltips/PinDebuggerControl.xaml.cs +++ b/src/AddIns/Debugger/Debugger.AddIn/Tooltips/PinDebuggerControl.xaml.cs @@ -17,7 +17,6 @@ using ICSharpCode.SharpDevelop.Debugging; using ICSharpCode.SharpDevelop.Editor; using ICSharpCode.SharpDevelop.Gui; using ICSharpCode.SharpDevelop.Services; -using Services.Debugger.Tooltips; namespace Debugger.AddIn.Tooltips { diff --git a/src/AddIns/Debugger/Debugger.AddIn/Tooltips/PinningBinding.cs b/src/AddIns/Debugger/Debugger.AddIn/Tooltips/PinningBinding.cs index fb5e0d5e47..9811669d03 100644 --- a/src/AddIns/Debugger/Debugger.AddIn/Tooltips/PinningBinding.cs +++ b/src/AddIns/Debugger/Debugger.AddIn/Tooltips/PinningBinding.cs @@ -9,7 +9,6 @@ using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Bookmarks; using ICSharpCode.SharpDevelop.Debugging; using ICSharpCode.SharpDevelop.Editor; -using Services.Debugger.Tooltips; namespace Debugger.AddIn.Tooltips { diff --git a/src/AddIns/Misc/SearchAndReplace/Project/Engine/SearchReplaceManager.cs b/src/AddIns/Misc/SearchAndReplace/Project/Engine/SearchReplaceManager.cs index 1a6a83cde1..f038f48cee 100644 --- a/src/AddIns/Misc/SearchAndReplace/Project/Engine/SearchReplaceManager.cs +++ b/src/AddIns/Misc/SearchAndReplace/Project/Engine/SearchReplaceManager.cs @@ -150,7 +150,7 @@ namespace SearchAndReplace return; } } - BookmarkManager.AddMark(new SDBookmark(result.FileName, textArea.Document.OffsetToPosition(result.Offset))); + BookmarkManager.AddMark(new Bookmark(result.FileName, textArea.Document.OffsetToPosition(result.Offset))); } } diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin index bcd7576a30..b4bbface61 100755 --- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin +++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin @@ -1978,17 +1978,16 @@ icon = "Bookmarks.GotoNext" tooltip = "${res:MainWindow.Windows.BookmarkPad.GotoNext.ToolTip}" class = "ICSharpCode.SharpDevelop.Bookmarks.NextBookmarkPadCommand"/> - + - GetBookmarks(IBookmarkMargin bookmarkMargin) + protected static List GetBookmarks(IBookmarkMargin bookmarkMargin) { - return (from b in bookmarkMargin.Bookmarks.OfType() + return (from b in bookmarkMargin.Bookmarks.OfType() where b.CanToggle orderby b.LineNumber select b).ToList(); @@ -40,12 +40,12 @@ namespace ICSharpCode.SharpDevelop.Bookmarks { protected override void Run(ITextEditor editor, IBookmarkMargin bookmarkMargin) { - BookmarkManager.ToggleBookmark(editor, editor.Caret.Line, + BookmarkManager.ToggleBookmark(editor, editor.Caret.Line, b => b.CanToggle && b.GetType() == typeof(SDBookmark), - location => new SDBookmark(editor.FileName, location)); + location => new Bookmark(editor.FileName, location)); } } - public class PrevBookmark : BookmarkMenuCommand + public class PrevBookmark : BookmarkMenuCommand { protected override void Run(ITextEditor editor, IBookmarkMargin bookmarkMargin) { @@ -81,7 +81,7 @@ namespace ICSharpCode.SharpDevelop.Bookmarks { protected override void Run(ITextEditor editor, IBookmarkMargin bookmarkMargin) { - var bookmarks = (from b in bookmarkMargin.Bookmarks.OfType() + var bookmarks = (from b in bookmarkMargin.Bookmarks.OfType() where b.CanToggle select b).ToList(); foreach (SDBookmark b in bookmarks) diff --git a/src/Main/Base/Project/Src/Bookmarks/Pad/BookmarkPad.cs b/src/Main/Base/Project/Src/Bookmarks/Pad/BookmarkPad.cs index 71cd7a1b78..d4047b6e4a 100644 --- a/src/Main/Base/Project/Src/Bookmarks/Pad/BookmarkPad.cs +++ b/src/Main/Base/Project/Src/Bookmarks/Pad/BookmarkPad.cs @@ -40,7 +40,7 @@ namespace ICSharpCode.SharpDevelop.Bookmarks { instance = this; myPanel.Children.Add(CreateToolBar()); - listView.HideColumns(3, 0); + listView.HideColumns(2, 0); } } @@ -96,9 +96,9 @@ namespace ICSharpCode.SharpDevelop.Bookmarks } } - public ListViewPadItemModel PrevItem { + public ListViewPadItemModel PreviousItem { get { - return this.listView.PrevItem; + return this.listView.PreviousItem; } } diff --git a/src/Main/Base/Project/Src/Bookmarks/Pad/BookmarkPadToolbarCommands.cs b/src/Main/Base/Project/Src/Bookmarks/Pad/BookmarkPadToolbarCommands.cs index 229395f037..03da5cdaae 100644 --- a/src/Main/Base/Project/Src/Bookmarks/Pad/BookmarkPadToolbarCommands.cs +++ b/src/Main/Base/Project/Src/Bookmarks/Pad/BookmarkPadToolbarCommands.cs @@ -56,7 +56,7 @@ namespace ICSharpCode.SharpDevelop.Bookmarks var bookmarkBase = (BookmarkPadBase)Owner; var nextItem = bookmarkBase.NextItem; - base.Run(nextItem); + Run(nextItem); } } @@ -65,9 +65,9 @@ namespace ICSharpCode.SharpDevelop.Bookmarks public override void Run() { var bookmarkBase = (BookmarkPadBase)Owner; - var prevItem = bookmarkBase.PrevItem; + var prevItem = bookmarkBase.PreviousItem; - base.Run(prevItem); + Run(prevItem); } } #endregion Goto Commands diff --git a/src/Main/Base/Project/Src/Bookmarks/Pad/Controls/ListViewPad.xaml b/src/Main/Base/Project/Src/Bookmarks/Pad/Controls/ListViewPad.xaml index b80d7d1c71..dbc714cc73 100644 --- a/src/Main/Base/Project/Src/Bookmarks/Pad/Controls/ListViewPad.xaml +++ b/src/Main/Base/Project/Src/Bookmarks/Pad/Controls/ListViewPad.xaml @@ -10,9 +10,11 @@ IsChecked="{Binding Path=IsChecked, Mode=TwoWay}" /> - + x:Key="InformationTemplate"> + + + + - + CellTemplate="{StaticResource InformationTemplate}" /> [TypeConverter(typeof(BookmarkConverter))] - public class SDBookmark : BookmarkBase + public abstract class SDBookmark : BookmarkBase { public SDBookmark(FileName fileName, Location location) : base(location) { @@ -91,4 +91,14 @@ namespace ICSharpCode.SharpDevelop.Bookmarks BookmarkManager.RemoveMark(this); } } + + /// + /// Bookmark class. + /// + public sealed class Bookmark : SDBookmark + { + public Bookmark(FileName fileName, Location location) : base(fileName, location) + { + } + } } diff --git a/src/Main/Base/Project/Src/Services/Debugger/Tooltips/IPinDebuggerControl.cs b/src/Main/Base/Project/Src/Services/Debugger/Tooltips/IPinDebuggerControl.cs index b3e531820c..835aaa0e25 100644 --- a/src/Main/Base/Project/Src/Services/Debugger/Tooltips/IPinDebuggerControl.cs +++ b/src/Main/Base/Project/Src/Services/Debugger/Tooltips/IPinDebuggerControl.cs @@ -5,9 +5,9 @@ using System; using System.Collections.Generic; using System.Windows; -using ICSharpCode.SharpDevelop.Debugging; +using ICSharpCode.SharpDevelop.Bookmarks; -namespace Services.Debugger.Tooltips +namespace ICSharpCode.SharpDevelop.Debugging { public interface IPinDebuggerControl { diff --git a/src/Main/Base/Project/Src/Services/Debugger/Tooltips/PinBookmark.cs b/src/Main/Base/Project/Src/Services/Debugger/Tooltips/PinBookmark.cs index cf758a382b..7a422636a0 100644 --- a/src/Main/Base/Project/Src/Services/Debugger/Tooltips/PinBookmark.cs +++ b/src/Main/Base/Project/Src/Services/Debugger/Tooltips/PinBookmark.cs @@ -13,7 +13,7 @@ using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Bookmarks; using ICSharpCode.SharpDevelop.Debugging; -namespace Services.Debugger.Tooltips +namespace ICSharpCode.SharpDevelop.Bookmarks { public class PinBookmark : SDBookmark {