Author: mkrueger
Date: 2008-02-08 05:44:07 -0500 (Fri, 08 Feb 2008)
New Revision: 95231
Modified:
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/ChangeLog
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.SourceEditorWidget.cs
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/gui.stetic
Log:
* gtk-gui/MonoDevelop.SourceEditor.SourceEditorWidget.cs,
MonoDevelop.SourceEditor/SourceEditorWidget.cs,
MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed highlighting
bug/code navigator combos.
Modified: trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/ChangeLog
2008-02-08 10:25:51 UTC (rev 95230)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/ChangeLog
2008-02-08 10:44:07 UTC (rev 95231)
@@ -1,5 +1,12 @@
2008-02-08 Mike Krüger <[EMAIL PROTECTED]>
+ * gtk-gui/MonoDevelop.SourceEditor.SourceEditorWidget.cs,
+ MonoDevelop.SourceEditor/SourceEditorWidget.cs,
+ MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed highlighting
+ bug/code navigator combos.
+
+2008-02-08 Mike Krüger <[EMAIL PROTECTED]>
+
* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs,
MonoDevelop.SourceEditor/SourceEditorWidget.cs,
MonoDevelop.SourceEditor/SourceEditorView.cs: Fixed sizing bug.
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-08 10:25:51 UTC (rev 95230)
+++
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
2008-02-08 10:44:07 UTC (rev 95231)
@@ -153,8 +153,8 @@
WorkbenchWindow.ShowNotification = false;
}
+ Document.MimeType =
IdeApp.Services.PlatformService.GetMimeTypeForUri (fileName);
Document.Text = File.ReadAllText (fileName);
- Document.MimeType =
IdeApp.Services.PlatformService.GetMimeTypeForUri (fileName);
ContentName = fileName;
lastSaveTime = File.GetLastWriteTime (ContentName);
// InitializeFormatter ();
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-08 10:25:51 UTC (rev 95230)
+++
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs
2008-02-08 10:44:07 UTC (rev 95231)
@@ -99,8 +99,8 @@
public SourceEditorWidget (SourceEditorView view)
{
this.view = view;
+ this.SetSizeRequest (32, 32);
this.Build();
- this.SetSizeRequest (32, 32);
this.textEditor = new
MonoDevelop.SourceEditor.ExtendibleTextEditor (view);
this.mainsw.Child = this.TextEditor;
this.mainsw.ButtonPressEvent += PrepareEvent;
@@ -130,12 +130,12 @@
membersCombo.AddAttribute (colr, "text", 1);
// Pack the controls into the editorbar just below the
file name tabs.
- EventBox tbox = new EventBox ();
- tbox.Add (classCombo);
- classBrowser.PackStart(tbox, true, true, 0);
- tbox = new EventBox ();
- tbox.Add (membersCombo);
- classBrowser.PackStart (tbox, true, true, 0);
+// EventBox tbox = new EventBox ();
+// tbox.Add (classCombo);
+// classBrowser.PackStart(tbox, true, true, 0);
+// tbox = new EventBox ();
+// tbox.Add (membersCombo);
+// classBrowser.PackStart (tbox, true, true, 0);
// Set up the data stores for the comboboxes
classStore = new ListStore(typeof(Gdk.Pixbuf),
typeof(string), typeof(IClass));
Modified:
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.SourceEditorWidget.cs
===================================================================
---
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.SourceEditorWidget.cs
2008-02-08 10:25:51 UTC (rev 95230)
+++
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/MonoDevelop.SourceEditor.SourceEditorWidget.cs
2008-02-08 10:44:07 UTC (rev 95231)
@@ -15,7 +15,7 @@
private Gtk.VBox editorBar;
- private Gtk.HBox classBrowser;
+ private Gtk.Table classBrowser;
private Gtk.ComboBox classCombo;
@@ -33,22 +33,25 @@
this.editorBar.Name = "editorBar";
this.editorBar.Spacing = 6;
// Container child editorBar.Gtk.Box+BoxChild
- this.classBrowser = new Gtk.HBox();
+ this.classBrowser = new Gtk.Table(((uint)(1)), ((uint)(2)), true);
this.classBrowser.Name = "classBrowser";
- this.classBrowser.Homogeneous = true;
- this.classBrowser.Spacing = 6;
- // Container child classBrowser.Gtk.Box+BoxChild
+ this.classBrowser.RowSpacing = ((uint)(6));
+ this.classBrowser.ColumnSpacing = ((uint)(6));
+ // Container child classBrowser.Gtk.Table+TableChild
this.classCombo = new Gtk.ComboBox();
this.classCombo.Name = "classCombo";
this.classBrowser.Add(this.classCombo);
- Gtk.Box.BoxChild w1 =
((Gtk.Box.BoxChild)(this.classBrowser[this.classCombo]));
- w1.Position = 0;
- // Container child classBrowser.Gtk.Box+BoxChild
+ Gtk.Table.TableChild w1 =
((Gtk.Table.TableChild)(this.classBrowser[this.classCombo]));
+ w1.YOptions = ((Gtk.AttachOptions)(4));
+ // Container child classBrowser.Gtk.Table+TableChild
this.membersCombo = new Gtk.ComboBox();
this.membersCombo.Name = "membersCombo";
this.classBrowser.Add(this.membersCombo);
- Gtk.Box.BoxChild w2 =
((Gtk.Box.BoxChild)(this.classBrowser[this.membersCombo]));
- w2.Position = 1;
+ Gtk.Table.TableChild w2 =
((Gtk.Table.TableChild)(this.classBrowser[this.membersCombo]));
+ w2.LeftAttach = ((uint)(1));
+ w2.RightAttach = ((uint)(2));
+ w2.XOptions = ((Gtk.AttachOptions)(4));
+ w2.YOptions = ((Gtk.AttachOptions)(4));
this.editorBar.Add(this.classBrowser);
Gtk.Box.BoxChild w3 =
((Gtk.Box.BoxChild)(this.editorBar[this.classBrowser]));
w3.Position = 0;
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-08 10:25:51 UTC (rev 95230)
+++
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/gtk-gui/gui.stetic
2008-02-08 10:44:07 UTC (rev 95231)
@@ -11,17 +11,20 @@
<widget-library name="../../../../build/bin/MonoDevelop.Projects.Gui.dll"
/>
<widget-library
name="../../../../build/AddIns/MonoDevelop.SourceEditor2.dll" internal="true" />
</import>
- <widget class="Gtk.Bin" id="MonoDevelop.SourceEditor.SourceEditorWidget"
design-size="300 300">
+ <widget class="Gtk.Bin" id="MonoDevelop.SourceEditor.SourceEditorWidget"
design-size="589 421">
<property name="MemberName" />
<child>
<widget class="Gtk.VBox" id="editorBar">
<property name="MemberName" />
<property name="Spacing">6</property>
<child>
- <widget class="Gtk.HBox" id="classBrowser">
+ <widget class="Gtk.Table" id="classBrowser">
<property name="MemberName" />
+ <property name="NRows">1</property>
+ <property name="NColumns">2</property>
<property name="Homogeneous">True</property>
- <property name="Spacing">6</property>
+ <property name="RowSpacing">6</property>
+ <property name="ColumnSpacing">6</property>
<child>
<widget class="Gtk.ComboBox" id="classCombo">
<property name="MemberName" />
@@ -29,8 +32,14 @@
<property name="Items" translatable="yes" />
</widget>
<packing>
- <property name="Position">0</property>
<property name="AutoSize">False</property>
+ <property name="YOptions">Fill</property>
+ <property name="XExpand">True</property>
+ <property name="XFill">True</property>
+ <property name="XShrink">False</property>
+ <property name="YExpand">False</property>
+ <property name="YFill">True</property>
+ <property name="YShrink">False</property>
</packing>
</child>
<child>
@@ -40,8 +49,17 @@
<property name="Items" translatable="yes" />
</widget>
<packing>
- <property name="Position">1</property>
- <property name="AutoSize">False</property>
+ <property name="LeftAttach">1</property>
+ <property name="RightAttach">2</property>
+ <property name="AutoSize">True</property>
+ <property name="XOptions">Fill</property>
+ <property name="YOptions">Fill</property>
+ <property name="XExpand">False</property>
+ <property name="XFill">True</property>
+ <property name="XShrink">False</property>
+ <property name="YExpand">False</property>
+ <property name="YFill">True</property>
+ <property name="YShrink">False</property>
</packing>
</child>
</widget>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
