Author: mkrueger
Date: 2008-02-12 12:25:07 -0500 (Tue, 12 Feb 2008)
New Revision: 95532
Added:
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/HighlightPropertiesSemanticRule.cs
Modified:
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/ChangeLog
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/Makefile.am
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.mdp
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtendibleTextEditor.cs
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorOptions.cs
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/gui.stetic
Log:
* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs,
gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs,
gtk-gui/gui.stetic,
MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs,
Makefile.am, MonoDevelop.SourceEditor.mdp,
MonoDevelop.SourceEditor/SourceEditorWidget.cs,
MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
MonoDevelop.SourceEditor/HighlightPropertiesSemanticRule.cs,
MonoDevelop.SourceEditor/SourceEditorView.cs,
MonoDevelop.SourceEditor/SourceEditorOptions.cs: Worked on semantic
highlighting - properties can now be shown as italic. (Enable it in
the syntax highlighting panel)
Modified: trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/ChangeLog
2008-02-12 17:23:47 UTC (rev 95531)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/ChangeLog
2008-02-12 17:25:07 UTC (rev 95532)
@@ -1,5 +1,20 @@
2008-02-12 Mike Krüger <[EMAIL PROTECTED]>
+ * gtk-gui/MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs,
+ gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs,
+ gtk-gui/gui.stetic,
+ MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs,
Makefile.am,
+ MonoDevelop.SourceEditor.mdp,
+ MonoDevelop.SourceEditor/SourceEditorWidget.cs,
+ MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
+ MonoDevelop.SourceEditor/HighlightPropertiesSemanticRule.cs,
+ MonoDevelop.SourceEditor/SourceEditorView.cs,
+ MonoDevelop.SourceEditor/SourceEditorOptions.cs: Worked on semantic
+ highlighting - properties can now be shown as italic. (Enable it in
the
+ syntax highlighting panel)
+
+2008-02-12 Mike Krüger <[EMAIL PROTECTED]>
+
* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs: Improved auto insert
bracket.
Modified:
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/Makefile.am
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/Makefile.am
2008-02-12 17:23:47 UTC (rev 95531)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/Makefile.am
2008-02-12 17:25:07 UTC (rev 95532)
@@ -33,6 +33,7 @@
MonoDevelop.SourceEditor.OptionPanels/MarkerPanel.cs \
MonoDevelop.SourceEditor/EditActions.cs \
MonoDevelop.SourceEditor/ExtendibleTextEditor.cs \
+ MonoDevelop.SourceEditor/HighlightPropertiesSemanticRule.cs \
MonoDevelop.SourceEditor/LanguageItemWindow.cs \
MonoDevelop.SourceEditor/SourceEditorDisplayBinding.cs \
MonoDevelop.SourceEditor/SourceEditorOptions.cs \
Modified:
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtendibleTextEditor.cs
===================================================================
---
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtendibleTextEditor.cs
2008-02-12 17:23:47 UTC (rev 95531)
+++
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtendibleTextEditor.cs
2008-02-12 17:25:07 UTC (rev 95532)
@@ -105,6 +105,13 @@
this.OptionsChanged (null, null);
}
+ protected override void OptionsChanged (object sender,
EventArgs args)
+ {
+ if (view.Control != null)
+
((SourceEditorWidget)view.Control).IsClassBrowserVisible =
SourceEditorOptions.Options.EnableQuickFinder;
+ base.OptionsChanged (sender, args);
+ }
+
protected override bool OnKeyPressEvent (Gdk.EventKey evnt)
{
bool result = true;
@@ -265,30 +272,30 @@
return null;
}
- ILanguageItem GetLanguageItem (int offset)
+ public ILanguageItem GetLanguageItem (int offset)
{
string txt = this.Document.Buffer.Text;
string fileName = view.ContentName;
if (fileName == null)
fileName = view.UntitledName;
-
+
IParserContext ctx = view.GetParserContext ();
if (ctx == null)
return null;
-
+
IExpressionFinder expressionFinder = null;
if (fileName != null)
expressionFinder = ctx.GetExpressionFinder
(fileName);
-
+
string expression = expressionFinder == null ?
TextUtilities.GetExpressionBeforeOffset (view, offset) :
expressionFinder.FindFullExpression (txt, offset).Expression;
if (expression == null)
return null;
int lineNumber =
this.Document.Splitter.OffsetToLineNumber (offset);
LineSegment line = this.Document.GetLine (lineNumber);
-
+
return ctx.ResolveIdentifier (expression, lineNumber +
1, line.Offset + 1, fileName, txt);
- }
+ }
protected override bool OnLeaveNotifyEvent (Gdk.EventCrossing
evnt)
Added:
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/HighlightPropertiesSemanticRule.cs
===================================================================
---
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/HighlightPropertiesSemanticRule.cs
2008-02-12 17:23:47 UTC (rev 95531)
+++
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/HighlightPropertiesSemanticRule.cs
2008-02-12 17:25:07 UTC (rev 95532)
@@ -0,0 +1,111 @@
+//
+// HighlightPropertiesSemanticRule.cs
+//
+// Author:
+// Mike Krüger <[EMAIL PROTECTED]>
+//
+// Copyright (C) 2008 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Collections.Generic;
+
+using Mono.TextEditor;
+using Mono.TextEditor.Highlighting;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Projects;
+using MonoDevelop.Projects.Parser;
+using MonoDevelop.Projects.Gui.Completion;
+
+namespace MonoDevelop.SourceEditor
+{
+ class HighlightPropertiesRule : SemanticRule
+ {
+ IParserContext GetParserContext (Mono.TextEditor.Document
document)
+ {
+ IParserDatabase pdb =
IdeApp.ProjectOperations.ParserDatabase;
+ Project project =
IdeApp.ProjectOperations.CurrentSelectedProject;
+ if (project != null)
+ return pdb.GetProjectParserContext (project);
+ return pdb.GetFileParserContext (document.FileName);
+ }
+
+ string expression;
+ ILanguageItem GetLanguageItem (Mono.TextEditor.Document
document, int offset)
+ {
+ IParserContext ctx = GetParserContext (document);
+ if (ctx == null)
+ return null;
+
+ IExpressionFinder expressionFinder = null;
+ if (document.FileName != null)
+ expressionFinder = ctx.GetExpressionFinder
(document.FileName);
+ if (expressionFinder == null)
+ return null;
+ string txt = document.Buffer.Text;
+ expression = expressionFinder.FindFullExpression (txt,
offset).Expression;
+ if (expression == null)
+ return null;
+ int lineNumber = document.Splitter.OffsetToLineNumber
(offset);
+ LineSegment line = document.GetLine (lineNumber);
+
+ return ctx.ResolveIdentifier (expression, lineNumber +
1, line.Offset + 1, document.FileName, null);
+ }
+
+ public override void Analyze (Mono.TextEditor.Document doc,
LineSegment line, List<Chunk> chunks, int startOffset, int endOffset)
+ {
+ for (int j = 0; j < chunks.Count; j++) {
+ Chunk chunk = chunks[j];
+ if (chunk.Style.Color.Pixel != 0)
+ continue;
+ for (int i = chunk.Offset; i < chunk.EndOffset;
i++) {
+ char charBefore = i == chunk.Offset ?
'E' : doc.Buffer.GetCharAt (i - 1);
+ if (Char.IsLetter (doc.Buffer.GetCharAt
(i)) && !Char.IsLetterOrDigit (charBefore)) {
+ } else {
+ continue;
+ }
+
+ ILanguageItem item = GetLanguageItem
(doc, i);
+ if (item is IProperty) {
+ int propertyLength =
item.Name.Length;
+
+ // Chunk property
+ Chunk propertyChunk = new Chunk
(i, propertyLength, new ChunkStyle ());
+ propertyChunk.Style.Italic =
true;
+ propertyChunk.Style.Color =
chunk.Style.Color;
+ chunks.Insert (j + 1,
propertyChunk);
+ j++;
+
+ // Chunk after property
+ if (chunk.EndOffset -
propertyChunk.EndOffset > 0) {
+ Chunk newChunk = new
Chunk (propertyChunk.EndOffset, chunk.EndOffset - propertyChunk.EndOffset,
chunk.Style);
+ chunks.Insert (j + 1,
newChunk);
+ }
+
+ // Shorten current chunk
+ chunk.Length =
propertyChunk.Offset - chunk.Offset;
+ }
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
Modified:
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorOptions.cs
===================================================================
---
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorOptions.cs
2008-02-12 17:23:47 UTC (rev 95531)
+++
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorOptions.cs
2008-02-12 17:25:07 UTC (rev 95532)
@@ -24,14 +24,19 @@
// THE SOFTWARE.
using System;
+using System.Collections.Generic;
using Pango;
using Mono.TextEditor;
+using Mono.TextEditor.Highlighting;
using MonoDevelop.Core;
using MonoDevelop.Ide.Gui;
using MonoDevelop.Ide.Gui.Content;
+using MonoDevelop.Projects;
+using MonoDevelop.Projects.Parser;
+using MonoDevelop.Projects.Gui.Completion;
namespace MonoDevelop.SourceEditor
{
@@ -61,12 +66,32 @@
}
static bool initialized = false;
+
public static void Init ()
{
- if (!initialized) {
- Mono.TextEditor.TextEditorOptions.Options = new
SourceEditorOptions ();
- initialized = true;
+ if (initialized)
+ return;
+ Mono.TextEditor.TextEditorOptions.Options = new
SourceEditorOptions ();
+ initialized = true;
+ Mono.TextEditor.TextEditorOptions.Changed += delegate {
+ if
(SourceEditorOptions.Options.EnableSemanticHighlighting) {
+ SyntaxModeService.GetSyntaxMode
("text/x-csharp").AddSemanticRule (new HighlightPropertiesRule ());
+ } else {
+ SyntaxModeService.GetSyntaxMode
("text/x-csharp").RemoveSemanticRule (typeof (HighlightPropertiesRule));
+ }
+ };
+ }
+
+ public bool EnableSemanticHighlighting {
+ get {
+ return PropertyService.Get
("EnableSemanticHighlighting", false);
}
+ set {
+ if (value != TabsToSpaces) {
+ PropertyService.Set
("EnableSemanticHighlighting", value);
+ OnChanged (EventArgs.Empty);
+ }
+ }
}
public override bool TabsToSpaces {
Modified:
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
===================================================================
---
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
2008-02-12 17:23:47 UTC (rev 95531)
+++
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
2008-02-12 17:25:07 UTC (rev 95532)
@@ -95,6 +95,9 @@
fileSystemWatcher.Created +=
(FileSystemEventHandler)MonoDevelop.Core.Gui.DispatchService.GuiDispatch (new
FileSystemEventHandler (OnFileChanged));
fileSystemWatcher.Changed +=
(FileSystemEventHandler)MonoDevelop.Core.Gui.DispatchService.GuiDispatch (new
FileSystemEventHandler (OnFileChanged));
widget.ShowAll ();
+ this.ContentNameChanged += delegate {
+ this.Document.FileName = this.ContentName;
+ };
}
public override void Save (string fileName)
Modified:
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs
===================================================================
---
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs
2008-02-12 17:23:47 UTC (rev 95531)
+++
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs
2008-02-12 17:25:07 UTC (rev 95532)
@@ -70,7 +70,7 @@
}
}
-#region ITextEditorExtension
+ #region ITextEditorExtension
object ITextEditorExtension.GetExtensionCommandTarget ()
{
return null;
@@ -89,7 +89,7 @@
this.TextEditor.SimulateKeyPress (key, modifier);
return true;
}
-#endregion
+ #endregion
void PrepareEvent (object sender, ButtonPressEventArgs args)
{
@@ -147,7 +147,6 @@
classCombo.Changed += new EventHandler (ClassChanged);
IdeApp.ProjectOperations.ParserDatabase.ParseInformationChanged += new
ParseInformationEventHandler(UpdateClassBrowser);
-
UpdateLineCol ();
CaretModeChanged (this, EventArgs.Empty);
this.Focused += delegate {
@@ -155,6 +154,7 @@
CaretModeChanged (this, EventArgs.Empty);
};
IdeApp.ProjectOperations.ParserDatabase.ParseInformationChanged +=
OnParseInformationChanged;
+// this.IsClassBrowserVisible =
SourceEditorOptions.Options.EnableQuickFinder;
this.textEditor.FireOptionsChange ();
// this.d += delegate {
// this.textEditor.Destroy ();
@@ -162,7 +162,7 @@
}
-#region Error underlining
+ #region Error underlining
Dictionary<int, Error> errors = new Dictionary<int, Error> ();
uint resetTimerId;
ICompilationUnit lastCu = null;
@@ -304,7 +304,7 @@
errors [info.Line] = error;
error.AddToLine ();
}
-#endregion
+ #endregion
public override void Dispose ()
{
Modified:
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs
===================================================================
---
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs
2008-02-12 17:23:47 UTC (rev 95531)
+++
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs
2008-02-12 17:25:07 UTC (rev 95532)
@@ -120,6 +120,9 @@
public virtual void LoadPanelContents()
{
this.enableHighlightingCheckbutton.Active =
SourceEditorOptions.Options.EnableSyntaxHighlighting;
+ this.enableSemanticHighlightingCheckbutton.Active =
SourceEditorOptions.Options.EnableSemanticHighlighting;
+ this.enableHighlightingCheckbutton.Toggled +=
EnableHighlightingCheckbuttonToggled;
+ EnableHighlightingCheckbuttonToggled (this,
EventArgs.Empty);
styleStore.Clear ();
TreeIter selectedIter = styleStore.AppendValues
(GetMarkup (GettextCatalog.GetString ("Default"), GettextCatalog.GetString
("The default color sheme.")), "Default");
foreach (string styleName in SyntaxModeService.Styles) {
@@ -131,9 +134,15 @@
styleTreeview.Selection.SelectIter (selectedIter);
}
+ void EnableHighlightingCheckbuttonToggled (object sender,
EventArgs e)
+ {
+ this.enableSemanticHighlightingCheckbutton.Sensitive =
this.enableHighlightingCheckbutton.Active;
+ }
+
public virtual bool StorePanelContents()
{
SourceEditorOptions.Options.EnableSyntaxHighlighting =
this.enableHighlightingCheckbutton.Active;
+ SourceEditorOptions.Options.EnableSemanticHighlighting
= this.enableSemanticHighlightingCheckbutton.Active;
TreeIter selectedIter;
if (styleTreeview.Selection.GetSelected (out
selectedIter)) {
SourceEditorOptions.Options.ColorSheme =
(string)this.styleStore.GetValue (selectedIter, 1);
Modified:
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.mdp
===================================================================
---
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.mdp
2008-02-12 17:23:47 UTC (rev 95531)
+++
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.mdp
2008-02-12 17:25:07 UTC (rev 95532)
@@ -39,6 +39,7 @@
<File name="MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs"
subtype="Code" buildaction="Compile" />
<File name="MonoDevelop.SourceEditor.OptionPanels/MarkerPanel.cs"
subtype="Code" buildaction="Compile" />
<File name="MonoDevelop.SourceEditor.addin.xml" subtype="Code"
buildaction="EmbedAsResource" />
+ <File name="MonoDevelop.SourceEditor/HighlightPropertiesSemanticRule.cs"
subtype="Code" buildaction="Compile" />
</Contents>
<References>
<ProjectReference type="Project" localcopy="False" refto="Mono.TextEditor"
/>
Modified:
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs
===================================================================
---
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs
2008-02-12 17:23:47 UTC (rev 95531)
+++
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs
2008-02-12 17:25:07 UTC (rev 95532)
@@ -96,7 +96,6 @@
this.radiobutton1 = new
Gtk.RadioButton(Mono.Unix.Catalog.GetString("_Default monospace"));
this.radiobutton1.CanFocus = true;
this.radiobutton1.Name = "radiobutton1";
- this.radiobutton1.Active = true;
this.radiobutton1.DrawIndicator = true;
this.radiobutton1.UseUnderline = true;
this.radiobutton1.Group = new GLib.SList(System.IntPtr.Zero);
Modified:
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs
===================================================================
---
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs
2008-02-12 17:23:47 UTC (rev 95531)
+++
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs
2008-02-12 17:25:07 UTC (rev 95532)
@@ -23,6 +23,8 @@
private Gtk.CheckButton enableHighlightingCheckbutton;
+ private Gtk.CheckButton enableSemanticHighlightingCheckbutton;
+
private Gtk.Label GtkLabel4;
private Gtk.Frame frame4;
@@ -76,6 +78,18 @@
w1.Position = 0;
w1.Expand = false;
w1.Fill = false;
+ // Container child vbox6.Gtk.Box+BoxChild
+ this.enableSemanticHighlightingCheckbutton = new Gtk.CheckButton();
+ this.enableSemanticHighlightingCheckbutton.CanFocus = true;
+ this.enableSemanticHighlightingCheckbutton.Name =
"enableSemanticHighlightingCheckbutton";
+ this.enableSemanticHighlightingCheckbutton.Label =
Mono.Unix.Catalog.GetString("E_nable semantic highlighting");
+ this.enableSemanticHighlightingCheckbutton.DrawIndicator = true;
+ this.enableSemanticHighlightingCheckbutton.UseUnderline = true;
+ this.vbox6.Add(this.enableSemanticHighlightingCheckbutton);
+ Gtk.Box.BoxChild w2 =
((Gtk.Box.BoxChild)(this.vbox6[this.enableSemanticHighlightingCheckbutton]));
+ w2.Position = 1;
+ w2.Expand = false;
+ w2.Fill = false;
this.GtkAlignment3.Add(this.vbox6);
this.frame5.Add(this.GtkAlignment3);
this.GtkLabel4 = new Gtk.Label();
@@ -84,10 +98,10 @@
this.GtkLabel4.UseMarkup = true;
this.frame5.LabelWidget = this.GtkLabel4;
this.vbox4.Add(this.frame5);
- Gtk.Box.BoxChild w4 =
((Gtk.Box.BoxChild)(this.vbox4[this.frame5]));
- w4.Position = 0;
- w4.Expand = false;
- w4.Fill = false;
+ Gtk.Box.BoxChild w5 =
((Gtk.Box.BoxChild)(this.vbox4[this.frame5]));
+ w5.Position = 0;
+ w5.Expand = false;
+ w5.Fill = false;
// Container child vbox4.Gtk.Box+BoxChild
this.frame4 = new Gtk.Frame();
this.frame4.Name = "frame4";
@@ -106,19 +120,19 @@
this.scrolledwindow1.Name = "scrolledwindow1";
this.scrolledwindow1.ShadowType = ((Gtk.ShadowType)(1));
// Container child scrolledwindow1.Gtk.Container+ContainerChild
- Gtk.Viewport w5 = new Gtk.Viewport();
- w5.ShadowType = ((Gtk.ShadowType)(0));
+ Gtk.Viewport w6 = new Gtk.Viewport();
+ w6.ShadowType = ((Gtk.ShadowType)(0));
// Container child GtkViewport.Gtk.Container+ContainerChild
this.styleTreeview = new Gtk.TreeView();
this.styleTreeview.CanFocus = true;
this.styleTreeview.Name = "styleTreeview";
this.styleTreeview.HeadersVisible = false;
this.styleTreeview.HeadersClickable = true;
- w5.Add(this.styleTreeview);
- this.scrolledwindow1.Add(w5);
+ w6.Add(this.styleTreeview);
+ this.scrolledwindow1.Add(w6);
this.vbox5.Add(this.scrolledwindow1);
- Gtk.Box.BoxChild w8 =
((Gtk.Box.BoxChild)(this.vbox5[this.scrolledwindow1]));
- w8.Position = 0;
+ Gtk.Box.BoxChild w9 =
((Gtk.Box.BoxChild)(this.vbox5[this.scrolledwindow1]));
+ w9.Position = 0;
// Container child vbox5.Gtk.Box+BoxChild
this.hbox2 = new Gtk.HBox();
this.hbox2.Name = "hbox2";
@@ -131,10 +145,10 @@
this.button1.UseUnderline = true;
this.button1.Label = "gtk-add";
this.hbox2.Add(this.button1);
- Gtk.Box.BoxChild w9 =
((Gtk.Box.BoxChild)(this.hbox2[this.button1]));
- w9.Position = 1;
- w9.Expand = false;
- w9.Fill = false;
+ Gtk.Box.BoxChild w10 =
((Gtk.Box.BoxChild)(this.hbox2[this.button1]));
+ w10.Position = 1;
+ w10.Expand = false;
+ w10.Fill = false;
// Container child hbox2.Gtk.Box+BoxChild
this.button2 = new Gtk.Button();
this.button2.CanFocus = true;
@@ -143,15 +157,15 @@
this.button2.UseUnderline = true;
this.button2.Label = "gtk-remove";
this.hbox2.Add(this.button2);
- Gtk.Box.BoxChild w10 =
((Gtk.Box.BoxChild)(this.hbox2[this.button2]));
- w10.Position = 2;
- w10.Expand = false;
- w10.Fill = false;
- this.vbox5.Add(this.hbox2);
- Gtk.Box.BoxChild w11 =
((Gtk.Box.BoxChild)(this.vbox5[this.hbox2]));
- w11.Position = 1;
+ Gtk.Box.BoxChild w11 =
((Gtk.Box.BoxChild)(this.hbox2[this.button2]));
+ w11.Position = 2;
w11.Expand = false;
w11.Fill = false;
+ this.vbox5.Add(this.hbox2);
+ Gtk.Box.BoxChild w12 =
((Gtk.Box.BoxChild)(this.vbox5[this.hbox2]));
+ w12.Position = 1;
+ w12.Expand = false;
+ w12.Fill = false;
this.GtkAlignment.Add(this.vbox5);
this.frame4.Add(this.GtkAlignment);
this.GtkLabel3 = new Gtk.Label();
@@ -160,8 +174,8 @@
this.GtkLabel3.UseMarkup = true;
this.frame4.LabelWidget = this.GtkLabel3;
this.vbox4.Add(this.frame4);
- Gtk.Box.BoxChild w14 =
((Gtk.Box.BoxChild)(this.vbox4[this.frame4]));
- w14.Position = 1;
+ Gtk.Box.BoxChild w15 =
((Gtk.Box.BoxChild)(this.vbox4[this.frame4]));
+ w15.Position = 1;
this.Add(this.vbox4);
if ((this.Child != null)) {
this.Child.ShowAll();
Modified:
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/gui.stetic
===================================================================
---
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/gui.stetic
2008-02-12 17:23:47 UTC (rev 95531)
+++
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/gui.stetic
2008-02-12 17:25:07 UTC (rev 95532)
@@ -166,7 +166,6 @@
<property name="MemberName" />
<property name="CanFocus">True</property>
<property name="Label" translatable="yes">_Default
monospace</property>
- <property name="Active">True</property>
<property name="DrawIndicator">True</property>
<property name="HasLabel">True</property>
<property name="UseUnderline">True</property>
@@ -657,6 +656,22 @@
<property name="Fill">False</property>
</packing>
</child>
+ <child>
+ <widget class="Gtk.CheckButton"
id="enableSemanticHighlightingCheckbutton">
+ <property name="MemberName" />
+ <property name="CanFocus">True</property>
+ <property name="Label" translatable="yes">E_nable
semantic highlighting</property>
+ <property name="DrawIndicator">True</property>
+ <property name="HasLabel">True</property>
+ <property name="UseUnderline">True</property>
+ </widget>
+ <packing>
+ <property name="Position">1</property>
+ <property name="AutoSize">True</property>
+ <property name="Expand">False</property>
+ <property name="Fill">False</property>
+ </packing>
+ </child>
</widget>
</child>
</widget>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
