diff options
| author | Mike Krüger <mkrueger@novell.com> | 2011-05-18 09:48:05 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@novell.com> | 2011-05-18 09:48:05 +0400 |
| commit | cfa360de2f3ec8dd9608a2e407ac060f191a7d10 (patch) | |
| tree | 849c34eba41ab37ef511ea7bd5d368f4a49a4f85 /main/src/addins/CBinding | |
| parent | 853ceda238782cc5e95a5042803e9cef4c594b4f (diff) | |
Implemented 'Bug 693873 - Obsolete methods should be marked in the
quick nav/breadcrumb of the text editor'.
Needed to change the breadcrumb interface to provide a pango markup
instead of text to provide the 'strikethrough' capability. It makes
the path bar more flexible overall.
Diffstat (limited to 'main/src/addins/CBinding')
| -rw-r--r-- | main/src/addins/CBinding/Gui/CTextEditorExtension.cs | 4 | ||||
| -rw-r--r-- | main/src/addins/CBinding/Parser/CompilationUnitDataProvider.cs | 4 | ||||
| -rw-r--r-- | main/src/addins/CBinding/Parser/DataProvider.cs | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/main/src/addins/CBinding/Gui/CTextEditorExtension.cs b/main/src/addins/CBinding/Gui/CTextEditorExtension.cs index e30477d877..406e9ea1f4 100644 --- a/main/src/addins/CBinding/Gui/CTextEditorExtension.cs +++ b/main/src/addins/CBinding/Gui/CTextEditorExtension.cs @@ -704,11 +704,11 @@ namespace CBinding if (reg == null) { entry = new PathEntry (GettextCatalog.GetString ("No region")); } else { - entry = new PathEntry (CompilationUnitDataProvider.Pixbuf, reg.Name); + entry = new PathEntry (CompilationUnitDataProvider.Pixbuf, GLib.Markup.EscapeText (reg.Name)); } entry.Position = EntryPosition.Right; } else { - entry = new PathEntry (ImageService.GetPixbuf (((IMember)node).StockIcon, Gtk.IconSize.Menu), amb.GetString ((IMember)node, OutputFlags.IncludeGenerics | OutputFlags.IncludeParameters | OutputFlags.ReformatDelegates)); + entry = new PathEntry (ImageService.GetPixbuf (((IMember)node).StockIcon, Gtk.IconSize.Menu), amb.GetString ((IMember)node, OutputFlags.IncludeGenerics | OutputFlags.IncludeParameters | OutputFlags.ReformatDelegates | OutputFlags.IncludeMarkup)); } entry.Tag = node; result.Insert (0, entry); diff --git a/main/src/addins/CBinding/Parser/CompilationUnitDataProvider.cs b/main/src/addins/CBinding/Parser/CompilationUnitDataProvider.cs index bce4897e7d..8aa03d35e0 100644 --- a/main/src/addins/CBinding/Parser/CompilationUnitDataProvider.cs +++ b/main/src/addins/CBinding/Parser/CompilationUnitDataProvider.cs @@ -54,9 +54,9 @@ namespace CBinding.Parser #region IListDataProvider implementation public void Reset () { } - public string GetText (int n) + public string GetMarkup (int n) { - return Document.ParsedDocument.UserRegions.ElementAt (n).Name; + return GLib.Markup.EscapeText (Document.ParsedDocument.UserRegions.ElementAt (n).Name); } internal static Gdk.Pixbuf Pixbuf diff --git a/main/src/addins/CBinding/Parser/DataProvider.cs b/main/src/addins/CBinding/Parser/DataProvider.cs index ddd28e481d..e102a39302 100644 --- a/main/src/addins/CBinding/Parser/DataProvider.cs +++ b/main/src/addins/CBinding/Parser/DataProvider.cs @@ -84,9 +84,9 @@ namespace CBinding.Parser return amb.GetString (x, OutputFlags.IncludeGenerics | OutputFlags.IncludeParameters | OutputFlags.ReformatDelegates); }// GetString - public string GetText (int n) + public string GetMarkup (int n) { - return GetString (amb, memberList[n]); + return GLib.Markup.EscapeText (GetString (amb, memberList[n])); }// GetText public Gdk.Pixbuf GetIcon (int n) |