[Monodevelop-patches-list] r844 - in trunk/MonoDevelop: . src/AddIns/DisplayBindings/SourceEditor src/AddIns/DisplayBindings/SourceEditor/Gui

[commit-watcher at mono-cvs.ximian.com]

Author: jluke
Date: 2004-02-09 14:01:19 -0500 (Mon, 09 Feb 2004)
New Revision: 844

Modified:
   trunk/MonoDevelop/configure.in
   trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs
   trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Makefile.am
Log:
fix the Options


Modified: trunk/MonoDevelop/configure.in
===================================================================
--- trunk/MonoDevelop/configure.in	2004-02-09 18:12:04 UTC (rev 843)
+++ trunk/MonoDevelop/configure.in	2004-02-09 19:01:19 UTC (rev 844)
@@ -35,6 +35,11 @@
 
 PKG_CHECK_MODULES(BASE_DEPENDENCIES, gtksourceview-1.0 >= $GTKSOURCEVIEW_REQUIRED_VERSION)
 
+dnl should this be a hard dep?
+dnl ORBIT2_REQUIRED_VERSION=2.8.3
+
+dnl PKG_CHECK_MODULES(BASE_DEPENDENCIES, ORBit-2.0 >= $ORBIT2_REQUIRED_VERSION)
+
 MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`"
 AC_SUBST(MOZILLA_HOME)
 

Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs	2004-02-09 18:12:04 UTC (rev 843)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs	2004-02-09 19:01:19 UTC (rev 844)
@@ -6,7 +6,8 @@
 using System.IO;
 using System.Runtime.InteropServices;
 using ICSharpCode.Core.AddIns.Conditions;
-using ICSharpCode.Core.AddIns;using MonoDevelop.SourceEditor.CodeCompletion;
+using ICSharpCode.Core.AddIns;
+using MonoDevelop.SourceEditor.CodeCompletion;
 using MonoDevelop.SourceEditor.InsightWindow;
 using MonoDevelop.EditorBindings.Properties;
 using MonoDevelop.EditorBindings.FormattingStrategy;
@@ -29,6 +30,8 @@
 		public SourceEditorView (SourceEditorBuffer buf, SourceEditor parent) : base (type)
 		{
 			this.ParentEditor = parent;
+			//FIXME: hook into the options
+			this.TabsWidth = 4;
 			Buffer = this.buf = buf;
 			AutoIndent = true;
 			SmartHomeEnd = true;

Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Makefile.am	2004-02-09 18:12:04 UTC (rev 843)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Makefile.am	2004-02-09 19:01:19 UTC (rev 844)
@@ -3,7 +3,9 @@
 all : $(DLL)
 
 $(DLL) : $(shell find . -name \*.cs)
-	mcs $(shell find . -name \*.cs) /out:$@ /t:library /r:gtk-sharp /r:gdk-sharp /r:gtksourceview-sharp /r:glib-sharp \
+	mcs $(shell find . -name \*.cs) /out:$@ /t:library \
+	/resource:../../../../data/resources/glade/EditorBindings.glade,EditorBindings.glade \
+	 /r:gtk-sharp /r:gdk-sharp /r:gtksourceview-sharp /r:glib-sharp \
 		/r:../../../../build/bin/MonoDevelop.Core.dll \
 		/r:../../../../build/bin/MonoDevelop.Base.dll \
 		/r:../../../../build/bin/MonoDevelop.Gui.Utils.dll \