diff options
author | Mike Krüger <mkrueger@xamarin.com> | 2011-11-18 00:22:30 +0400 |
---|---|---|
committer | Mike Krüger <mkrueger@xamarin.com> | 2011-11-18 00:22:30 +0400 |
commit | 095f2d7ec19bc4f78ed0fa54d5ca5a4e9423f4ba (patch) | |
tree | 4b8f293a7dbc3bbbe600eda7694153d090f89b22 /main/src/addins/MonoDevelop.AssemblyBrowser | |
parent | ae607a1050d901ae22d95cd6023a0aed2c7601e9 (diff) | |
parent | 532138fa22ed040ed3a353d755c259163c77398f (diff) |
Merge branch 'master' into newresolver
Conflicts:
extras/GtkSourceViewEditor/MonoDevelop.SourceEditor.addin.xml
extras/MonoDevelop.Database/MonoDevelop.Database.Components/Widgets/DataGrid/DataGrid.cs
main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.addin.xml
main/src/addins/NUnit/Makefile.am
main/src/addins/NUnit/MonoDevelop.NUnit.csproj
main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom.Serialization/ProjectCodeCompletionDatabase.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ListWindow.cs
Diffstat (limited to 'main/src/addins/MonoDevelop.AssemblyBrowser')
-rw-r--r-- | main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs | 35 |
1 files changed, 13 insertions, 22 deletions
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs index 463d1e2222..e413e6a2e3 100644 --- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs +++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs @@ -67,7 +67,8 @@ namespace MonoDevelop.AssemblyBrowser } DocumentationPanel documentationPanel = new DocumentationPanel (); - Mono.TextEditor.TextEditor inspectEditor = new Mono.TextEditor.TextEditor (); + Mono.TextEditor.TextEditor inspectEditor; + public AssemblyBrowserWidget () { this.Build (); @@ -101,21 +102,18 @@ namespace MonoDevelop.AssemblyBrowser this.documentationLabel.ModifyBg (Gtk.StateType.Normal, new Gdk.Color (255, 255, 225)); this.documentationLabel.Wrap = true; - PropertyService.PropertyChanged += HandlePropertyChanged; - - var options = new Mono.TextEditor.TextEditorOptions (); - options.FontName = PropertyService.Get<string> ("FontName"); - options.ShowFoldMargin = false; - options.ShowIconMargin = false; - options.ShowInvalidLines = false; - options.ShowLineNumberMargin = false; - options.ShowSpaces = false; - options.ShowTabs = false; - options.HighlightCaretLine = true; - options.ColorScheme = PropertyService.Get ("ColorScheme", "Default"); - this.inspectEditor.Options = options; - + var options = new MonoDevelop.Ide.Gui.CommonTextEditorOptions () { + ShowFoldMargin = false, + ShowIconMargin = false, + ShowInvalidLines = false, + ShowLineNumberMargin = false, + ShowSpaces = false, + ShowTabs = false, + HighlightCaretLine = true, + }; + inspectEditor = new Mono.TextEditor.TextEditor (new Mono.TextEditor.Document (), options); inspectEditor.ButtonPressEvent += HandleInspectEditorButtonPressEvent; + this.inspectEditor.Document.ReadOnly = true; // this.inspectEditor.Document.SyntaxMode = new Mono.TextEditor.Highlighting.MarkupSyntaxMode (); this.inspectEditor.TextViewMargin.GetLink = delegate(Mono.TextEditor.MarginMouseEventArgs arg) { @@ -318,12 +316,6 @@ namespace MonoDevelop.AssemblyBrowser base.OnRealized (); TreeView.GrabFocus (); } - - void HandlePropertyChanged(object sender, MonoDevelop.Core.PropertyChangedEventArgs e) - { - if (e.Key == "ColorScheme") - ((Mono.TextEditor.TextEditorOptions)this.inspectEditor.Options).ColorScheme = PropertyService.Get ("ColorScheme", "Default"); - } ITreeNavigator SearchMember (IEntity member) { @@ -1049,7 +1041,6 @@ namespace MonoDevelop.AssemblyBrowser // this.searchEntry.Changed -= SearchEntryhandleChanged; this.searchTreeview.RowActivated -= SearchTreeviewhandleRowActivated; hpaned1.ExposeEvent -= HPaneExpose; - PropertyService.PropertyChanged -= HandlePropertyChanged; base.OnDestroyed (); } |