From commit-watcher at mono-cvs.ximian.com  Wed Dec  1 00:51:55 2004
From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com)
Date: Wed,  1 Dec 2004 00:51:55 -0500 (EST)
Subject: [Monodevelop-patches-list] r2041 - in trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets: . FileSelector
Message-ID: <20041201055155.5796994764@mono-cvs.ximian.com>

Author: jluke
Date: 2004-12-01 00:51:55 -0500 (Wed, 01 Dec 2004)
New Revision: 2041

Modified:
   trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog
   trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/FileSelector/FileSelector.cs
Log:
2004-12-01  John Luke  <john.luke at gmail.com>

        * FileSelector/FileSelector.cs: improve this to take advantage
        of the FileChooser and remove my old hacks that were likely buggy
        use a switch for adding the buttons
        add ~/Projects as a MD specific bookmark



Modified: trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog	2004-11-26 05:50:07 UTC (rev 2040)
+++ trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog	2004-12-01 05:51:55 UTC (rev 2041)
@@ -1,3 +1,10 @@
+2004-12-01  John Luke  <john.luke at gmail.com>
+
+	* FileSelector/FileSelector.cs: improve this to take advantage
+	of the FileChooser and remove my old hacks that were likely buggy
+	use a switch for adding the buttons
+	add ~/Projects as a MD specific bookmark
+
 2004-10-29  Todd Berman  <tberman at off.net>
 
 	* FileSelector/FileSelector.cs: Add proper Save buttons.

Modified: trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/FileSelector/FileSelector.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/FileSelector/FileSelector.cs	2004-11-26 05:50:07 UTC (rev 2040)
+++ trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/FileSelector/FileSelector.cs	2004-12-01 05:51:55 UTC (rev 2041)
@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 using Gtk;
 
 using MonoDevelop.Services;
@@ -7,13 +6,9 @@
 
 namespace MonoDevelop.Gui.Widgets
 {
-	// basically just to remember the last directory
-	// we could do some if GTK2.4 then use new FileChooser
-	// but that is probably to be hacky at best
 	public class FileSelector : FileChooserDialog
 	{
 		const string LastPathProperty = "MonoDevelop.FileSelector.LastPath";
-		string lastPath;
 		PropertyService propertyService = (PropertyService) ServiceManager.GetService (typeof (PropertyService));
 
 		public FileSelector () : base (GettextCatalog.GetString ("Open file ..."), null, FileChooserAction.Open)
@@ -32,61 +27,43 @@
 
 		public FileSelector (string title, FileChooserAction action) : base (title, null, action)
 		{
-			if (action == FileChooserAction.SelectFolder) {
-				AddButton (Gtk.Stock.Cancel, ResponseType.Cancel);
-				AddButton ("Select Folder", ResponseType.Ok);
-			} else if (action == FileChooserAction.Save) {
-				AddButton (Gtk.Stock.Cancel, ResponseType.Cancel);
-				AddButton (Gtk.Stock.Save, ResponseType.Ok);
+			switch (action) {
+				case FileChooserAction.SelectFolder:
+					AddButton (Gtk.Stock.Cancel, ResponseType.Cancel);
+					AddButton ("Select Folder", ResponseType.Ok);
+					break;
+				case FileChooserAction.Save:
+					AddButton (Gtk.Stock.Cancel, ResponseType.Cancel);
+					AddButton (Gtk.Stock.Save, ResponseType.Ok);
+					break;
+				default:
+					break;
 			}
+
 			CommonSetup ();
 		}
 
 		void CommonSetup ()
 		{
 			// Restore the last active directory
-			string tmp = (string) propertyService.GetProperty (LastPathProperty);
-			if (tmp != null && tmp.Length > 0)
-			{
-				if (tmp.EndsWith ("/"))
-					lastPath = String.Format ("{0}", tmp.Trim ());
-				else
-					lastPath = String.Format ("{0}/", tmp.Trim ());
-			}
+			string last = (string) propertyService.GetProperty (LastPathProperty);
+			if (last != null && last.Length > 0)
+				this.SetCurrentFolder (last);
 			else
-			{
-				// FIXME: use ~/DefaultPath?
-				lastPath = Environment.GetEnvironmentVariable ("HOME");
-			}
+				this.SetCurrentFolder (Environment.GetFolderPath (Environment.SpecialFolder.Personal));
 
-			// Set the dir here, must end in "/" to work right
-			this.SetFilename (lastPath);
+			// add ~/Projects as a MD bookmark
+			this.AddShortcutFolder (System.IO.Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.Personal), "Projects"));
 
-			// Basically need to track if the directory has
-			// been changed in the simplest way possible
-			// I think that this always changes when the dir does
-			this.CurrentFolderChanged += OnOptionListChanged;
+			// FIXME: only set this once per-dialog
+			// perhaps in Dispose ()? or only when a file or dir is selected
+			this.CurrentFolderChanged += OnCurrentFolderChanged;
 		}
 
-		void OnOptionListChanged (object o, EventArgs args)
+		void OnCurrentFolderChanged (object o, EventArgs args)
 		{
-			UpdateLastDir ();
+			propertyService.SetProperty (LastPathProperty, this.CurrentFolder);
 		}
-
-		void UpdateLastDir ()
-		{
-			if (this.Filename == null || this.Filename == "")
-				return;
-			
-			if (this.Filename.EndsWith ("/") || Directory.Exists (this.Filename))
-				lastPath = this.Filename;
-			else
-				lastPath = System.IO.Path.GetDirectoryName (this.Filename);
-		
-			// Console.WriteLine ("storing: {0}", lastPath);
-			// FIXME: find a way to only set this once per-dialog
-			propertyService.SetProperty (LastPathProperty, lastPath);
-		}
 	}
 }
 



From commit-watcher at mono-cvs.ximian.com  Wed Dec  1 13:18:13 2004
From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com)
Date: Wed,  1 Dec 2004 13:18:13 -0500 (EST)
Subject: [Monodevelop-patches-list] r2042 - in trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets: . FileSelector
Message-ID: <20041201181813.6E6F794764@mono-cvs.ximian.com>

Author: jluke
Date: 2004-12-01 13:18:13 -0500 (Wed, 01 Dec 2004)
New Revision: 2042

Modified:
   trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog
   trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/FileSelector/FileSelector.cs
Log:
2004-12-01  John Luke  <john.luke at gmail.com>

        * FileSelector/FileSelector.cs: modified patch
        from Rubens Ramos <rubensr at users.sourceforge.net>
        to use the default path from the property service
        and make sure it exists before adding it as a bookmark



Modified: trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog	2004-12-01 05:51:55 UTC (rev 2041)
+++ trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog	2004-12-01 18:18:13 UTC (rev 2042)
@@ -1,5 +1,12 @@
 2004-12-01  John Luke  <john.luke at gmail.com>
 
+	* FileSelector/FileSelector.cs: modified patch
+	from Rubens Ramos <rubensr at users.sourceforge.net>
+	to use the default path from the property service
+	and make sure it exists before adding it as a bookmark
+
+2004-12-01  John Luke  <john.luke at gmail.com>
+
 	* FileSelector/FileSelector.cs: improve this to take advantage
 	of the FileChooser and remove my old hacks that were likely buggy
 	use a switch for adding the buttons

Modified: trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/FileSelector/FileSelector.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/FileSelector/FileSelector.cs	2004-12-01 05:51:55 UTC (rev 2041)
+++ trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/FileSelector/FileSelector.cs	2004-12-01 18:18:13 UTC (rev 2042)
@@ -10,6 +10,7 @@
 	{
 		const string LastPathProperty = "MonoDevelop.FileSelector.LastPath";
 		PropertyService propertyService = (PropertyService) ServiceManager.GetService (typeof (PropertyService));
+		FileUtilityService fileUtilityService = (FileUtilityService) ServiceManager.GetService (typeof (FileUtilityService));
 
 		public FileSelector () : base (GettextCatalog.GetString ("Open file ..."), null, FileChooserAction.Open)
 		{
@@ -52,9 +53,12 @@
 			else
 				this.SetCurrentFolder (Environment.GetFolderPath (Environment.SpecialFolder.Personal));
 
-			// add ~/Projects as a MD bookmark
-			this.AddShortcutFolder (System.IO.Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.Personal), "Projects"));
+			// add default project path as a MD bookmark
+			string pathName = propertyService.GetProperty ("MonoDevelop.Gui.Dialogs.NewProjectDialog.DefaultPath", fileUtilityService.GetDirectoryNameWithSeparator (Environment.GetFolderPath (Environment.SpecialFolder.Personal))).ToString ();
 
+			if (fileUtilityService.IsDirectory (pathName))
+				this.AddShortcutFolder (pathName);
+
 			// FIXME: only set this once per-dialog
 			// perhaps in Dispose ()? or only when a file or dir is selected
 			this.CurrentFolderChanged += OnCurrentFolderChanged;



From commit-watcher at mono-cvs.ximian.com  Wed Dec  1 13:25:51 2004
From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com)
Date: Wed,  1 Dec 2004 13:25:51 -0500 (EST)
Subject: [Monodevelop-patches-list] r2043 - in trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding: . SharpRefactoryVB
Message-ID: <20041201182551.D450494764@mono-cvs.ximian.com>

Author: tberman
Date: 2004-12-01 13:25:51 -0500 (Wed, 01 Dec 2004)
New Revision: 2043

Modified:
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/SharpRefactoryVB/
Log:
properly svn:ignore



Property changes on: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding
___________________________________________________________________
Name: svn:ignore
   + Makefile.in
Makefile
VBNetBinding.dll



Property changes on: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/VBNetBinding/SharpRefactoryVB
___________________________________________________________________
Name: svn:ignore
   + ICSharpCode.SharpRefactory.VB.dll
ICSharpCode.SharpRefactory.VB.dll.mdb
Makefile
Makefile.in




From commit-watcher at mono-cvs.ximian.com  Wed Dec  1 14:53:37 2004
From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com)
Date: Wed,  1 Dec 2004 14:53:37 -0500 (EST)
Subject: [Monodevelop-patches-list] r2044 - in trunk/MonoDevelop/Core/src: Libraries/MonoDevelop.Gui.Widgets Libraries/MonoDevelop.Gui.Widgets/FileBrowser Main/Base Main/Base/Gui/Pads/FileScout
Message-ID: <20041201195337.24C1094764@mono-cvs.ximian.com>

Author: jluke
Date: 2004-12-01 14:53:36 -0500 (Wed, 01 Dec 2004)
New Revision: 2044

Modified:
   trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog
   trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/FileBrowser/FileBrowser.cs
   trunk/MonoDevelop/Core/src/Main/Base/ChangeLog
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/FileScout/FileScout.cs
Log:
port the FileBrowser to GtkAction and UIManager


Modified: trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog	2004-12-01 18:25:51 UTC (rev 2043)
+++ trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog	2004-12-01 19:53:36 UTC (rev 2044)
@@ -1,5 +1,10 @@
 2004-12-01  John Luke  <john.luke at gmail.com>
 
+	* FileBrowser/FileBrowser.cs: port to GtkAction
+	some other small updates
+
+2004-12-01  John Luke  <john.luke at gmail.com>
+
 	* FileSelector/FileSelector.cs: modified patch
 	from Rubens Ramos <rubensr at users.sourceforge.net>
 	to use the default path from the property service

Modified: trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/FileBrowser/FileBrowser.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/FileBrowser/FileBrowser.cs	2004-12-01 18:25:51 UTC (rev 2043)
+++ trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/FileBrowser/FileBrowser.cs	2004-12-01 19:53:36 UTC (rev 2044)
@@ -31,8 +31,8 @@
 	public class FileBrowser : VBox
 	{
 		public DirectoryChangedEventHandler DirectoryChangedEvent;
-		private static GLib.GType gtype;
 
+		Gtk.UIManager uiManager;
 		private Gtk.TreeView tv;
 		private Gtk.ScrolledWindow scrolledwindow;
 		private Gtk.Button upbutton, homebutton;
@@ -50,7 +50,13 @@
 
 		PropertyService PropertyService = (PropertyService) ServiceManager.GetService (typeof (PropertyService));
 
-		public FileBrowser () : base (GType)
+		const string uiInfo = 
+			"<toolbar name=\"toolbar\">" +
+			"  <toolitem name=\"goUp\" action=\"goUp\" />" +
+			"  <toolitem name=\"home\" action=\"home\" />" +
+			"</toolbar>";
+
+		public FileBrowser ()
 		{
 			if (!Vfs.Initialized) {
 				Vfs.Init ();
@@ -61,24 +67,25 @@
 			scrolledwindow = new ScrolledWindow ();
 			scrolledwindow.VscrollbarPolicy = PolicyType.Automatic;
 			scrolledwindow.HscrollbarPolicy = PolicyType.Automatic;
+			scrolledwindow.ShadowType = ShadowType.In;
 
-			homebutton = new Button ();
-			homebutton.Add (new Image (Stock.Home, IconSize.SmallToolbar));
-			homebutton.Relief = ReliefStyle.None;
-			homebutton.Clicked += new EventHandler (OnHomeClicked);
+			ActionEntry[] actions = new ActionEntry[]
+			{
+				new ActionEntry ("goUp", Gtk.Stock.GoUp, null, null, GettextCatalog.GetString ("Up one level"), new EventHandler (OnUpClicked)),
+				new ActionEntry ("home", Gtk.Stock.Home, null, null, GettextCatalog.GetString ("Home"), new EventHandler (OnHomeClicked))
+			};
 
-			upbutton = new Button ();
-			upbutton.Add (new Image (Stock.GoUp, IconSize.SmallToolbar));
-			upbutton.Relief = ReliefStyle.None;
-			upbutton.Clicked += new EventHandler (OnUpClicked);
+			ActionGroup actionGroup = new ActionGroup ("navbar");
+			actionGroup.Add (actions);
 
-			entry = new Entry ();
-			entry.Activated += new EventHandler (OnEntryActivated);
+			uiManager = new UIManager ();
+			uiManager.InsertActionGroup (actionGroup, 0);
+			uiManager.AddWidget += new AddWidgetHandler (OnUIAdd);
+			uiManager.AddUiFromString (uiInfo);
 
-			Toolbar toolbar = new Toolbar ();
-			toolbar.AppendWidget (upbutton, GettextCatalog.GetString ("Up one level"), GettextCatalog.GetString ("Up one level"));
-			toolbar.AppendWidget (homebutton, GettextCatalog.GetString ("Home"), GettextCatalog.GetString ("Home"));
-			toolbar.AppendWidget (entry, GettextCatalog.GetString ("Location"), GettextCatalog.GetString ("Location"));
+			Toolbar tb = uiManager.GetWidget ("/ui/toolbar") as Toolbar;
+			tb.IconSize = Gtk.IconSize.SmallToolbar;
+			AddLocationEntry (tb);
 
 			IProperties p = (IProperties) PropertyService.GetProperty ("SharpDevelop.UI.SelectStyleOptions", new DefaultProperties ());
 			ignoreHidden = !p.GetProperty ("MonoDevelop.Gui.FileScout.ShowHidden", false);
@@ -101,7 +108,7 @@
 			tv.AppendColumn (directorycolumn);
 
 			store = new ListStore (typeof (Gdk.Pixbuf), typeof (string));
-			CurrentDir = Environment.GetEnvironmentVariable ("HOME");
+			CurrentDir = Environment.GetFolderPath (Environment.SpecialFolder.Personal);
 			tv.Model = store;
 
 			tv.RowActivated += new RowActivatedHandler (OnRowActivated);
@@ -110,8 +117,7 @@
 
 			scrolledwindow.Add (tv);
 			this.Homogeneous = false;
-			this.PackStart (toolbar, false, false, 0);
-			this.PackStart (scrolledwindow);
+			this.PackEnd (scrolledwindow);
 			this.ShowAll ();
 			init = true;
 		}
@@ -122,17 +128,11 @@
 		{
 			get { return ignoreHidden; }
 			set {
-				/* for some reasont his code crashes (NullReferenceException on the Populate() call
 				if (ignoreHidden != value) {
 					ignoreHidden = value; 
 					// redraw folder list
-					System.Console.WriteLine("before poplate call");
 					Populate ();
 				}
-				*/
-				
-				ignoreHidden = value;
-				Populate ();
 			}
 		}
 
@@ -157,16 +157,6 @@
 			}
 		}
 
-		public static new GLib.GType GType
-		{
-			get
-			{
-				if (gtype == GLib.GType.Invalid)
-					gtype = RegisterGType (typeof (FileBrowser));
-				return gtype;
-			}
-		}
-
 		public void SelectFirst ()
 		{
 			tv.Selection.SelectPath (new TreePath ("0"));
@@ -176,7 +166,7 @@
 		{
 			store.Clear ();
 
-			// FIXME: never turns back on
+			ToolButton upbutton = uiManager.GetWidget ("/ui/toolbar/goUp") as Gtk.ToolButton;
 			if (System.IO.Path.GetPathRoot (CurrentDir) == CurrentDir)
 				upbutton.Sensitive = false;
 			else if (upbutton.Sensitive == false)
@@ -189,7 +179,7 @@
 			{
 				if (ignoreHidden)
 				{
-					if (!d.Name.StartsWith (".") && NotHidden(d.Name))
+					if (!d.Name.StartsWith (".") && NotHidden (d.Name))
 						store.AppendValues (FileIconLoader.GetPixbufForFile (System.IO.Path.Combine (CurrentDir, d.Name), 24, 24), d.Name);
 				}
 				else
@@ -209,7 +199,7 @@
 			{
 				if (ignoreHidden)
 				{
-					if (NotHidden (System.IO.Path.GetFileName(filesaux[cont])))
+					if (NotHidden (System.IO.Path.GetFileName (filesaux[cont])))
 					{
 						files.Add (filesaux[cont]);
 					}
@@ -224,22 +214,18 @@
 		private void OnRowActivated (object o, RowActivatedArgs args)
 		{
 			TreeIter iter;
-			store.GetIter (out iter, args.Path);
-			string file = (string) store.GetValue (iter, 1);
-			string newDir = System.IO.Path.Combine (currentDir, file);
-
-			if (Directory.Exists (newDir))
+			if (store.GetIter (out iter, args.Path))
 			{
-				CurrentDir = newDir;
+				string newDir = System.IO.Path.Combine (currentDir, (string) store.GetValue (iter, 1));
+				if (Directory.Exists (newDir))
+					CurrentDir = newDir;
 			}
 		}
 		
 		private void OnButtonRelease (object o, ButtonReleaseEventArgs args)
 		{
 			if (args.Event.Button == 3)
-			{
 				ShowPopup ();
-			}	
 		}
 
 		private void OnPopupMenu (object o, PopupMenuArgs args)
@@ -249,6 +235,7 @@
 
 		private void ShowPopup ()
 		{
+			// FIXME: port to Action API
 			Menu menu = new Menu ();
 			MenuItem openfilebrowser = new MenuItem (GettextCatalog.GetString ("Open with file browser"));
 			openfilebrowser.Activated += new EventHandler (OpenFileBrowser);
@@ -272,7 +259,7 @@
 			menu.Append (new MenuItem ());
 			menu.Append (openterminal);
 			menu.Append (openfilebrowser);
-			menu.Popup (null, null, null, IntPtr.Zero, 3, Global.CurrentEventTime);
+			menu.Popup ();
 			menu.ShowAll ();
 		}
 		
@@ -316,17 +303,15 @@
 		
 		private void OnHomeClicked (object o, EventArgs args)
 		{
-			CurrentDir = Environment.GetEnvironmentVariable ("HOME");
+			CurrentDir = Environment.GetFolderPath (Environment.SpecialFolder.Personal);
 		}
 
 		private void OnEntryActivated (object sender, EventArgs args)
 		{
 			if (Directory.Exists (entry.Text.Trim ()))
-				CurrentDir = entry.Text;
+				CurrentDir = entry.Text.Trim ();
 			else
-			{
     			messageService.ShowError (null, String.Format (GettextCatalog.GetString ("Cannot enter '{0}' folder"), entry.Text));
-			}
 		}
 
 		private void OnDirRename (object o, EventArgs args)
@@ -461,6 +446,22 @@
 		{
 			return !hiddenfolders.Contains (folder);
 		} 
+
+		void OnUIAdd (object sender, AddWidgetArgs a)
+		{
+			a.Widget.Show ();
+			this.PackStart (a.Widget, false, true, 0);
+		}
+
+		void AddLocationEntry (Toolbar tb)
+		{
+			entry = new Entry ();
+			entry.Activated += new EventHandler (OnEntryActivated);
+			entry.Show ();
+			ToolItem item = new ToolItem ();
+			item.Add (entry);
+			tb.Add (item);
+		}
 	}
 }
 

Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/ChangeLog	2004-12-01 18:25:51 UTC (rev 2043)
+++ trunk/MonoDevelop/Core/src/Main/Base/ChangeLog	2004-12-01 19:53:36 UTC (rev 2044)
@@ -1,3 +1,8 @@
+2004-12-01  John Luke  <john.luke at gmail.com>
+
+	* Gui/Pads/FileScout.cs: use ShadowType.In so the
+	FileBrowser doesn't look funny when it is the only pad
+
 2004-11-16  Todd Berman  <tberman at off.net>
 
 	* Internal/Project/Project/AbstractProject.cs: Make sure that

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/FileScout/FileScout.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/FileScout/FileScout.cs	2004-12-01 18:25:51 UTC (rev 2043)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/FileScout/FileScout.cs	2004-12-01 19:53:36 UTC (rev 2044)
@@ -47,6 +47,7 @@
 			treef.Add (fb);
 
 			Gtk.ScrolledWindow listsw = new Gtk.ScrolledWindow ();
+			listsw.ShadowType = Gtk.ShadowType.In;
 			listsw.Add (filelister);
 			
 			this.Pack1 (treef, true, true);



From commit-watcher at mono-cvs.ximian.com  Wed Dec  1 16:03:30 2004
From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com)
Date: Wed,  1 Dec 2004 16:03:30 -0500 (EST)
Subject: [Monodevelop-patches-list] r2045 - in trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets: . Navbar
Message-ID: <20041201210330.243AA94764@mono-cvs.ximian.com>

Author: jluke
Date: 2004-12-01 16:03:29 -0500 (Wed, 01 Dec 2004)
New Revision: 2045

Modified:
   trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog
   trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/Navbar/Navbar.cs
Log:
* Navbar/Navbar.cs: port to GtkAction
(seems to work, but all the Gecko stuff in MD crashes for me
but this and the gecko samples in other apps work)


Modified: trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog	2004-12-01 19:53:36 UTC (rev 2044)
+++ trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog	2004-12-01 21:03:29 UTC (rev 2045)
@@ -2,6 +2,7 @@
 
 	* FileBrowser/FileBrowser.cs: port to GtkAction
 	some other small updates
+	* Navbar/Navbar.cs: port to GtkAction
 
 2004-12-01  John Luke  <john.luke at gmail.com>
 

Modified: trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/Navbar/Navbar.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/Navbar/Navbar.cs	2004-12-01 19:53:36 UTC (rev 2044)
+++ trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/Navbar/Navbar.cs	2004-12-01 21:03:29 UTC (rev 2045)
@@ -4,64 +4,69 @@
 
 namespace MonoDevelop.Gui.Widgets
 {
-	public class Navbar : Toolbar
+	public class Navbar : VBox
 	{
-		static GLib.GType gtype;
-		Button back = new Button ();
-		Button forward = new Button ();
-		Button stop = new Button ();
-		Button reload = new Button ();
-		Button go = new Button ();
-		Gnome.Entry address = new Gnome.Entry ("address");
+		Entry address;
 
-		public static new GLib.GType GType
+		const string uiInfo = 
+            "<toolbar>" +
+            "  <toolitem name=\"back\" action=\"back\" />" +
+            "  <toolitem name=\"forward\" action=\"forward\" />" +
+            "  <toolitem name=\"stop\" action=\"stop\" />" +
+            "  <toolitem name=\"reload\" action=\"reload\" />" +
+            "  <toolitem name=\"go\" action=\"go\" />" +
+            "</toolbar>";
+
+		public Navbar () : this (Gtk.IconSize.SmallToolbar)
 		{
-			get {
-				if (gtype == GLib.GType.Invalid)
-					gtype = RegisterGType (typeof (Navbar));
-				return gtype;
-			}
 		}
 
-		public Navbar () : base (GType)
+		public Navbar (Gtk.IconSize size)
 		{
-			back.Relief = ReliefStyle.None;
-			back.Add (new Image (Stock.GoBack, IconSize.SmallToolbar));
-			back.Clicked += OnBackClicked;
+			address = new Entry ("address");
+			// FIXME: this doesnt't seem to work yet
+			// address.Completion = new EntryCompletion ();
+			address.WidthChars = 50;
+			address.Activated += OnGoUrl;
 
-			forward.Relief = ReliefStyle.None;
-			forward.Add (new Image (Stock.GoForward, IconSize.SmallToolbar));
-			forward.Clicked += OnForwardClicked;
+			ActionEntry[] actions = new ActionEntry[]
+			{
+				new ActionEntry ("back", Gtk.Stock.GoBack, null, null, GettextCatalog.GetString ("Go back"), new EventHandler (OnBackClicked)),
+				new ActionEntry ("forward", Gtk.Stock.GoForward, null, null, GettextCatalog.GetString ("Go forward"), new EventHandler (OnForwardClicked)),
+				new ActionEntry ("stop", Gtk.Stock.Stop, null, null, GettextCatalog.GetString ("Stop loading"), new EventHandler (OnStopClicked)),
+				new ActionEntry ("reload", Gtk.Stock.Refresh, null, null, GettextCatalog.GetString ("Address"), new EventHandler (OnReloadClicked)),
+				new ActionEntry ("go", Gtk.Stock.Ok, null, null, GettextCatalog.GetString ("Load address"), new EventHandler (OnGoUrl))
+			};
 
-			stop.Relief = ReliefStyle.None;
-			stop.Add (new Image (Stock.Stop, IconSize.SmallToolbar));
-			stop.Clicked += OnStopClicked;
+			ActionGroup ag = new ActionGroup ("navbarGroup");
+			ag.Add (actions);
 
-			reload.Relief = ReliefStyle.None;
-			reload.Add (new Image (Stock.Refresh, IconSize.SmallToolbar));
-			reload.Clicked += OnReloadClicked;
+			UIManager uim = new UIManager ();
+			uim.InsertActionGroup (ag, 0);
+			uim.AddWidget += OnAddWidget;
+			uim.AddUiFromString (uiInfo);
 
-			go.Relief = ReliefStyle.None;
-			go.Add (new Image (Stock.Ok, IconSize.SmallToolbar));
-			go.Clicked += OnGoUrl;
+			ToolItem item = new ToolItem ();
+			item.Add (address);
+	
+			Toolbar tb = uim.GetWidget ("/ui/toolbar") as Toolbar;
+			tb.IconSize = size;
+			tb.Add (item);
+			this.ShowAll ();
+		}
 
-			address.GtkEntry.WidthChars = 50;
-			address.GtkEntry.Activated += OnGoUrl;
-
-			this.AppendWidget (back, GettextCatalog.GetString ("Go back"), "");
-			this.AppendWidget (forward, GettextCatalog.GetString ("Go forward"), "");
-			this.AppendWidget (stop, GettextCatalog.GetString ("Stop loading"), "");
-			this.AppendWidget (reload, GettextCatalog.GetString ("Reload page"), "");
-			this.AppendWidget (address, GettextCatalog.GetString ("Address"), "");
-			this.AppendWidget (go, GettextCatalog.GetString ("Load address"), "");
+		void OnAddWidget (object sender, AddWidgetArgs a)
+		{
+			a.Widget.Show ();
+			this.Add (a.Widget);
 		}
 
 		public string Url {
 			get {
-				return address.GtkEntry.Text;
+				return address.Text;
 			}
 			set {
-				address.GtkEntry.Text = value;
+				address.Text = value;
 			}
 		}
 



From commit-watcher at mono-cvs.ximian.com  Thu Dec  2 19:44:13 2004
From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com)
Date: Thu,  2 Dec 2004 19:44:13 -0500 (EST)
Subject: [Monodevelop-patches-list] r2046 - in trunk/MonoDevelop/Core/src/Main/Base: . Gui/Pads/ClassScout/NodeBuilder
Message-ID: <20041203004413.1A5B894764@mono-cvs.ximian.com>

Author: lluis
Date: 2004-12-02 19:44:12 -0500 (Thu, 02 Dec 2004)
New Revision: 2046

Modified:
   trunk/MonoDevelop/Core/src/Main/Base/ChangeLog
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ClassScout/NodeBuilder/DefaultDotNetClassScoutNodeBuilder.cs
Log:
2004-12-03  Lluis Sanchez Gual  <lluis at novell.com>

	* Gui/Pads/ClassScout/NodeBuilder/DefaultDotNetClassScoutNodeBuilder.cs:
	UpdateClassTree: Changed parameter parentNode to projectNode,
	since this is what it is. DropPhantomNamespaces now deletes
	unexpanded namespaces if they are empty. This fixes bug #70149.



Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/ChangeLog	2004-12-01 21:03:29 UTC (rev 2045)
+++ trunk/MonoDevelop/Core/src/Main/Base/ChangeLog	2004-12-03 00:44:12 UTC (rev 2046)
@@ -1,3 +1,10 @@
+2004-12-03  Lluis Sanchez Gual  <lluis at novell.com>
+
+	* Gui/Pads/ClassScout/NodeBuilder/DefaultDotNetClassScoutNodeBuilder.cs:
+	UpdateClassTree: Changed parameter parentNode to projectNode,
+	since this is what it is. DropPhantomNamespaces now deletes
+	unexpanded namespaces if they are empty. This fixes bug #70149.
+
 2004-12-01  John Luke  <john.luke at gmail.com>
 
 	* Gui/Pads/FileScout.cs: use ShadowType.In so the

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ClassScout/NodeBuilder/DefaultDotNetClassScoutNodeBuilder.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ClassScout/NodeBuilder/DefaultDotNetClassScoutNodeBuilder.cs	2004-12-01 21:03:29 UTC (rev 2045)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ClassScout/NodeBuilder/DefaultDotNetClassScoutNodeBuilder.cs	2004-12-03 00:44:12 UTC (rev 2046)
@@ -50,32 +50,29 @@
 
 		private object locker = new object ();
 		
-		public void UpdateClassTree (TreeNode parentNode, ClassInformationEventArgs e)
+		public void UpdateClassTree (TreeNode projectNode, ClassInformationEventArgs e)
 		{
 			lock (locker) {
-				RemoveFromClassTree (parentNode, e.ClassInformation.Removed);
-				AddToClassTree (parentNode, e.FileName, e.ClassInformation.Added);
-				AddToClassTree (parentNode, e.FileName, e.ClassInformation.Modified);
+				RemoveFromClassTree (projectNode, e.ClassInformation.Removed);
+				AddToClassTree (projectNode, e.FileName, e.ClassInformation.Added);
+				AddToClassTree (projectNode, e.FileName, e.ClassInformation.Modified);
 			}
 		}
 		
-		public void RemoveFromClassTree (TreeNode parentNode, ClassCollection removed) {
+		void RemoveFromClassTree (TreeNode projectNode, ClassCollection removed)
+		{
 			ClassBrowserIconsService classBrowserIconService = (ClassBrowserIconsService)ServiceManager.GetService(typeof(ClassBrowserIconsService));
 			
-			TreeNode classNode = new TreeNode();
-			
 			foreach (IClass c in removed) {
-				classNode.Text = c.Name;
-				classNode.Image = classBrowserIconService.GetIcon (c);
 				// TODO: Perf check
-				TreeNode node = GetNodeByPath (c.Namespace, parentNode, false);
+				TreeNode node = GetNodeByPath (c.Namespace, projectNode, false);
 				if (node != null && !NeedsExpansion (node)) {
 					int oldIndex = FindNodeByName (node.Nodes, c.Name);
 					if (oldIndex >= 0) {
 						node.Nodes[oldIndex].Remove ();
 					}
-					DropPhantomNamespaces (c.Namespace, parentNode);
 				}
+				DropPhantomNamespaces (c.Namespace, projectNode);
 			}
 		}
 		
@@ -153,7 +150,7 @@
 			}
 		}
 		
-		public void AddToClassTree(TreeNode parentNode, string filename, ClassCollection classes)
+		void AddToClassTree(TreeNode parentNode, string filename, ClassCollection classes)
 		{
 			if (NeedsExpansion (parentNode)) return;
 			
@@ -247,18 +244,27 @@
 			return classNode;
 		}
 
-		public void DropPhantomNamespaces (string dir, TreeNode parentNode)
+		void DropPhantomNamespaces (string dir, TreeNode projectNode)
 		{
 			string[] full_path = dir.Split (new char[] { '.' });
 			for (int i = full_path.Length - 1; i != -1; i--)
 			{
-				TreeNode node = GetNodeByPath (String.Join (".", full_path, 0, i + 1), parentNode, false);
-				if (node != null && node.Nodes.Count == 0 && node != parentNode)
-					node.Remove ();
+				string ns = String.Join (".", full_path, 0, i + 1);
+				TreeNode node = GetNodeByPath (ns, projectNode, false);
+				if (node != null && node != projectNode) {
+					if (NeedsExpansion (node)) {
+						IParserService parserService  = (IParserService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IParserService));
+						ArrayList contents = parserService.GetNamespaceContents (projectNode.Tag as IProject, ns, false);
+						if (contents.Count == 0)
+							node.Remove ();
+					} else if (node.Nodes.Count == 0) {
+						node.Remove ();
+					}
+				}
 			}
 		}
 		
-		static public TreeNode GetNodeByPath(string directory, TreeNode parentNode, bool create)
+		static TreeNode GetNodeByPath (string directory, TreeNode parentNode, bool create)
 		{
 			ClassBrowserIconsService classBrowserIconService = (ClassBrowserIconsService)ServiceManager.GetService(typeof(ClassBrowserIconsService));
 
@@ -275,6 +281,9 @@
 					continue;
 				}
 
+				if (NeedsExpansion (curnode))
+					return null;
+
 				curnode = GetNodeByName (curnode.Nodes, path);
 				
 				if (curnode == null) {
@@ -288,8 +297,6 @@
 						return null;
 					}
 				}
-				else if (NeedsExpansion (curnode))
-					return null;
 				
 				parentNode = curnode;
 			}



From commit-watcher at mono-cvs.ximian.com  Fri Dec  3 13:31:33 2004
From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com)
Date: Fri,  3 Dec 2004 13:31:33 -0500 (EST)
Subject: [Monodevelop-patches-list] r2047 - in trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor: . CodeCompletion Gui
Message-ID: <20041203183133.B931F94764@mono-cvs.ximian.com>

Author: tberman
Date: 2004-12-03 13:31:33 -0500 (Fri, 03 Dec 2004)
New Revision: 2047

Modified:
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CompletionListWindow.cs
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CompletionWindow.cs
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs
Log:
2004-12-03  Todd Berman  <tberman at off.net>

	* Gui/SourceEditorBuffer.cs:
	* Gui/SourceEditorView.cs:
	* Gui/SourceEditorDisplayBinding.cs:
	* CodeCompletion/CompletionListWindow.cs:
	* CodeCompletion/CompletionWindow.cs: Update to new gtk# API.



Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2004-12-03 00:44:12 UTC (rev 2046)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2004-12-03 18:31:33 UTC (rev 2047)
@@ -1,3 +1,11 @@
+2004-12-03  Todd Berman  <tberman at off.net>
+
+	* Gui/SourceEditorBuffer.cs:
+	* Gui/SourceEditorView.cs:
+	* Gui/SourceEditorDisplayBinding.cs:
+	* CodeCompletion/CompletionListWindow.cs:
+	* CodeCompletion/CompletionWindow.cs: Update to new gtk# API.
+
 2004-11-24  Alp Toker  <alp at atoker.com>
 
 	* CodeCompletion/CodeCompletionData.cs:

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CompletionListWindow.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CompletionListWindow.cs	2004-12-03 00:44:12 UTC (rev 2046)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CompletionListWindow.cs	2004-12-03 18:31:33 UTC (rev 2047)
@@ -91,7 +91,7 @@
 				TextIter offsetIter = wnd.control.Buffer.GetIterAtMark (wnd.triggeringMark);
 				TextIter endIter = wnd.control.Buffer.GetIterAtOffset (offsetIter.Offset + wnd.PartialWord.Length);
 				wnd.control.Buffer.MoveMark (wnd.control.Buffer.InsertMark, offsetIter);
-				wnd.control.Buffer.Delete (offsetIter, endIter);
+				wnd.control.Buffer.Delete (ref offsetIter, ref endIter);
 				wnd.control.Buffer.InsertAtCursor (wnd.CompleteWord);
 			}
 			

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CompletionWindow.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CompletionWindow.cs	2004-12-03 00:44:12 UTC (rev 2046)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CompletionWindow.cs	2004-12-03 18:31:33 UTC (rev 2047)
@@ -59,7 +59,7 @@
 			TextIter offsetIter = control.Buffer.GetIterAtMark (triggeringMark);
 			if (startIter.Offset > offsetIter.Offset) {
 				int newPos = offsetIter.Offset;
-				control.Buffer.Delete (offsetIter, startIter);
+				control.Buffer.Delete (ref offsetIter, ref startIter);
 				control.Buffer.MoveMark (control.Buffer.InsertMark, control.Buffer.GetIterAtOffset (newPos));
 			}
 		}

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs	2004-12-03 00:44:12 UTC (rev 2046)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorBuffer.cs	2004-12-03 18:31:33 UTC (rev 2047)
@@ -166,14 +166,17 @@
 			if (GetIterAtMark (complete_end).Offset == 0)
 				return;
 			RemoveTag (complete_ahead, GetIterAtMark (InsertMark), GetIterAtMark (complete_end));
-			Delete (GetIterAtMark (InsertMark), GetIterAtMark (complete_end));
+			TextIter insertIter = GetIterAtMark (InsertMark);
+			TextIter completionEnd = GetIterAtMark (complete_end);
+			Delete (ref insertIter, ref completionEnd);
 			MoveMark (complete_end, GetIterAtOffset (0));
 		}
 
 		public void CompleteAhead (string what)
 		{
 			DropCompleteAhead ();
-			InsertWithTags (GetIterAtMark (InsertMark), what, new TextTag[] 
+			TextIter insertIter = GetIterAtMark (InsertMark);
+			InsertWithTags (ref insertIter, what, new TextTag[] 
 							{ complete_ahead });
 			TextIter it = GetIterAtMark (InsertMark);
 			MoveMark (complete_end, it);
@@ -645,7 +648,7 @@
 		public void Insert (int offset, string text)
 		{
 			TextIter put = GetIterAtOffset (offset);
-			Insert (put, text);
+			Insert (ref put, text);
 		}
 
 		public int GetLowerSelectionBounds ()
@@ -663,7 +666,7 @@
 		{
 			TextIter start = GetIterAtOffset (offset);
 			TextIter end = GetIterAtOffset (offset + length);
-			Delete (start, end);
+			Delete (ref start, ref end);
 		}
 
 		public void Replace (int offset, int length, string pattern)

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs	2004-12-03 00:44:12 UTC (rev 2046)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs	2004-12-03 18:31:33 UTC (rev 2047)
@@ -42,6 +42,8 @@
 				return true;
 			if (mimetype == "application/x-config")
 				return true;
+			if (mimetype == "application/x-aspx")
+				return true;
 			return false;
 		}
 		

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs	2004-12-03 00:44:12 UTC (rev 2046)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs	2004-12-03 18:31:33 UTC (rev 2047)
@@ -161,7 +161,7 @@
 			iter.LineOffset = 0;
 			TextIter end_iter = buf.GetIterAtLine (iter.Line);
 			end_iter.LineOffset = end_iter.CharsInLine;
-			buf.Delete (iter, end_iter);
+			buf.Delete (ref iter, ref end_iter);
 		}
 
 		void TriggerCodeComplete ()
@@ -374,7 +374,9 @@
 		{
 			int offset = buf.GetIterAtMark (buf.InsertMark).Offset;
 			int start = FindPrevWordStart (buf.Text, offset);
-			buf.Delete (buf.GetIterAtOffset (start), buf.GetIterAtOffset (offset));
+			TextIter startIter = buf.GetIterAtOffset (start);
+			TextIter offsetIter = buf.GetIterAtOffset (offset);
+			buf.Delete (ref startIter, ref offsetIter);
 			return start;
 		}
 
@@ -489,7 +491,7 @@
 			for (int l = y0; l <= y1; l ++) {
 				TextIter it = Buffer.GetIterAtLine (l);
 				if (!it.EndsLine())
-					Buffer.Insert (it, indent);
+					Buffer.Insert (ref it, indent);
 			}
 		}
 		
@@ -503,7 +505,7 @@
 				
 				if (c == '\t') {
 					end.ForwardChar ();
-					buf.Delete (start, end);
+					buf.Delete (ref start, ref end);
 					
 				} else if (c == ' ') {
 					int cnt = 0;
@@ -517,7 +519,7 @@
 					if (cnt == 0)
 						return;
 					
-					buf.Delete (start, end);
+					buf.Delete (ref start, ref end);
 				}
 			}
 		}
@@ -557,8 +559,8 @@
 			TextIter end = begin;
 			end.ForwardToLineEnd ();
 			
-			Buffer.Delete (begin, end);
-			Buffer.Insert (begin, txt);
+			Buffer.Delete (ref begin, ref end);
+			Buffer.Insert (ref begin, txt);
 		}
 		
 		IndentStyle IFormattableDocument.IndentStyle
@@ -585,7 +587,8 @@
 		
 		void IFormattableDocument.Insert (int offset, string text)
 		{
-			Buffer.Insert (Buffer.GetIterAtOffset (offset), text);
+			TextIter insertIter = Buffer.GetIterAtOffset (offset);
+			Buffer.Insert (ref insertIter, text);
 		}
 		
 		string IFormattableDocument.IndentString



From commit-watcher at mono-cvs.ximian.com  Fri Dec  3 16:53:20 2004
From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com)
Date: Fri,  3 Dec 2004 16:53:20 -0500 (EST)
Subject: [Monodevelop-patches-list] r2048 - in trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor: . CodeCompletion
Message-ID: <20041203215320.8644F94764@mono-cvs.ximian.com>

Author: alp
Date: 2004-12-03 16:53:20 -0500 (Fri, 03 Dec 2004)
New Revision: 2048

Modified:
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CompletionListWindow.cs
Log:
2004-12-03  Alp Toker  <alp at atoker.com>

	* CodeCompletion/CompletionListWindow.cs: Fix tooltip positioning.


Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2004-12-03 18:31:33 UTC (rev 2047)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2004-12-03 21:53:20 UTC (rev 2048)
@@ -1,3 +1,7 @@
+2004-12-03  Alp Toker  <alp at atoker.com>
+
+	* CodeCompletion/CompletionListWindow.cs: Fix tooltip positioning.
+
 2004-12-03  Todd Berman  <tberman at off.net>
 
 	* Gui/SourceEditorBuffer.cs:

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CompletionListWindow.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CompletionListWindow.cs	2004-12-03 18:31:33 UTC (rev 2047)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CompletionListWindow.cs	2004-12-03 21:53:20 UTC (rev 2048)
@@ -122,6 +122,8 @@
 		{
 			ICompletionData data = completionData[List.Selection];
 			
+			declarationviewwindow.Hide ();
+			
 			// FIXME: This code is buggy, and generates a bad placement sometimes when you jump a lot.
 			// but it is better than 0,0
 			// This code is for sizing the treeview properly.
@@ -165,13 +167,14 @@
 			if (declarationviewwindow.DescriptionMarkup.Length == 0)
 				return;
 
+			declarationviewwindow.Multiple = (ccdata.Overloads != 0);
 			int dvwWidth, dvwHeight;
 			declarationviewwindow.Move (this.Screen.Width+1, vert);
 
+			declarationviewwindow.ReshowWithInitialSize ();
 			declarationviewwindow.ShowAll ();
 			declarationviewwindow.Multiple = (ccdata.Overloads != 0);
 
-			//FIXME: GetSize returns the size /before/ the window was automatically shrunk
 			declarationviewwindow.GdkWindow.GetSize (out dvwWidth, out dvwHeight);
 
 			if (this.Screen.Width <= horiz + dvwWidth) {



From commit-watcher at mono-cvs.ximian.com  Fri Dec  3 22:44:43 2004
From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com)
Date: Fri,  3 Dec 2004 22:44:43 -0500 (EST)
Subject: [Monodevelop-patches-list] r2049 - in trunk/MonoDevelop/Core/src/Main/Base: . Commands Gui/BrowserDisplayBinding Gui/Components Gui/Dialogs Gui/Pads/FileScout
Message-ID: <20041204034443.BB31B94764@mono-cvs.ximian.com>

Author: jluke
Date: 2004-12-03 22:44:43 -0500 (Fri, 03 Dec 2004)
New Revision: 2049

Modified:
   trunk/MonoDevelop/Core/src/Main/Base/ChangeLog
   trunk/MonoDevelop/Core/src/Main/Base/Commands/MenuItemBuilders.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Components/SdMenuCommand.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/SharpDevelopAboutPanels.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/WordCountDialog.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/FileScout/FileList.cs
Log:
2004-12-03  John Luke  <john.luke at cfl.rr.com>

        * Commands/MenuItemBuilders.cs:
        * Gui/Components/SdMenuCommand.cs: use AccelMap instead of Accel.Map*
        * Gui/Dialogs/SharpDevelopAboutPanels.cs:
        * Gui/Dialogs/CommonAboutDialog.cs:
        * Gui/Dialogs/WordCountDialog.cs:
        * Gui/Pads/FileScout/FileList.cs:
        * Gui/BrowserDisplayBinding/HtmlViewPane.cs: remove obsolete GType stuff,
        use ComboBox instead of obsolete OptionMenu



Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/ChangeLog	2004-12-03 21:53:20 UTC (rev 2048)
+++ trunk/MonoDevelop/Core/src/Main/Base/ChangeLog	2004-12-04 03:44:43 UTC (rev 2049)
@@ -1,3 +1,14 @@
+2004-12-03  John Luke  <john.luke at cfl.rr.com>
+
+	* Commands/MenuItemBuilders.cs:
+	* Gui/Components/SdMenuCommand.cs: use AccelMap instead of Accel.Map*
+	* Gui/Dialogs/SharpDevelopAboutPanels.cs: 
+	* Gui/Dialogs/CommonAboutDialog.cs:
+	* Gui/Dialogs/WordCountDialog.cs:
+	* Gui/Pads/FileScout/FileList.cs:
+	* Gui/BrowserDisplayBinding/HtmlViewPane.cs: remove obsolete GType stuff,
+	use ComboBox instead of obsolete OptionMenu
+
 2004-12-03  Lluis Sanchez Gual  <lluis at novell.com>
 
 	* Gui/Pads/ClassScout/NodeBuilder/DefaultDotNetClassScoutNodeBuilder.cs:

Modified: trunk/MonoDevelop/Core/src/Main/Base/Commands/MenuItemBuilders.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Commands/MenuItemBuilders.cs	2004-12-03 21:53:20 UTC (rev 2048)
+++ trunk/MonoDevelop/Core/src/Main/Base/Commands/MenuItemBuilders.cs	2004-12-04 03:44:43 UTC (rev 2049)
@@ -238,10 +238,10 @@
 				item.Description = GettextCatalog.GetString ("Activate this window");
 				if (i + 1 <= 9) {
 					string accel_path = "<MonoDevelop>/MainWindow/OpenContents_" + (i + 1).ToString ();
-					if (!Gtk.Accel.MapLookupEntry (accel_path, new Gtk.AccelKey ())) {
-						Gtk.Accel.MapAddEntry (accel_path, Gdk.Keyval.FromName ((i + 1).ToString ()), Gdk.ModifierType.Mod1Mask);
+					if (!Gtk.AccelMap.LookupEntry (accel_path, new Gtk.AccelKey ())) {
+						Gtk.AccelMap.AddEntry (accel_path, Gdk.Keyval.FromName ((i + 1).ToString ()), Gdk.ModifierType.Mod1Mask);
 					} else {
-						Gtk.Accel.MapChangeEntry (accel_path, Gdk.Keyval.FromName ((i + 1).ToString()), Gdk.ModifierType.Mod1Mask, true);
+						Gtk.AccelMap.ChangeEntry (accel_path, Gdk.Keyval.FromName ((i + 1).ToString()), Gdk.ModifierType.Mod1Mask, true);
 					}
 					item.AccelPath = accel_path;
 				}

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs	2004-12-03 21:53:20 UTC (rev 2048)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs	2004-12-04 03:44:43 UTC (rev 2049)
@@ -142,7 +142,6 @@
 		Navbar nav = new Navbar ();
 		
 		bool loading = false;
-		static GLib.GType gtype;
 		
 		public MozillaControl MozillaControl {
 			get {
@@ -150,18 +149,8 @@
 			}
 		}
 		
-		public static new GLib.GType GType
+		public HtmlViewPane (bool showNavigation)
 		{
-			get
-			{
-				if (gtype == GLib.GType.Invalid)
-					gtype = RegisterGType (typeof (HtmlViewPane));
-				return gtype;
-			}
-		}
-		
-		public HtmlViewPane(bool showNavigation) : base (GType)
-		{
 			Shadow = Gtk.ShadowType.In;
 			VBox mainbox = new VBox (false, 2);
 			status = (SdStatusBar) statusbarService.ProgressMonitor;

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Components/SdMenuCommand.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Components/SdMenuCommand.cs	2004-12-03 21:53:20 UTC (rev 2048)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Components/SdMenuCommand.cs	2004-12-04 03:44:43 UTC (rev 2049)
@@ -113,8 +113,8 @@
 					ckey = Gdk.Keyval.FromName (key);
 				}
 			}
-			if (!Gtk.Accel.MapLookupEntry (accel_path, new Gtk.AccelKey()) ) {
-				Gtk.Accel.MapAddEntry (accel_path, ckey, mod);
+			if (!Gtk.AccelMap.LookupEntry (accel_path, new Gtk.AccelKey()) ) {
+				Gtk.AccelMap.AddEntry (accel_path, ckey, mod);
 				this.AccelPath = accel_path;
 			}
 		}

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs	2004-12-03 21:53:20 UTC (rev 2048)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs	2004-12-04 03:44:43 UTC (rev 2049)
@@ -21,7 +21,6 @@
 {
 	public class ScrollBox : DrawingArea
 	{
-		static GLib.GType gtype;
 		Pixbuf image;
 		string text;
 		int scroll = -220;
@@ -35,18 +34,8 @@
 			get { return hndlr; }
 		}
 		
-		public static new GLib.GType GType
+		public ScrollBox ()
 		{
-			get
-			{
-				if (gtype == GLib.GType.Invalid)
-					gtype = RegisterGType (typeof (ScrollBox));
-				return gtype;
-			}
-		}
-		
-		public ScrollBox() : base (GType)
-		{
 			this.SetSizeRequest (400, 220);
 			this.Realized += new EventHandler (OnRealized);
 			this.ExposeEvent += new ExposeEventHandler (OnExposed);
@@ -118,7 +107,6 @@
 	
 	public class CommonAboutDialog : Dialog
 	{
-		static GLib.GType gtype;
 		static FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
 		
 		AuthorAboutTabPage aatp;
@@ -127,17 +115,8 @@
 		
 		//static PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
 		
-		public static new GLib.GType GType
+		public CommonAboutDialog ()
 		{
-			get {
-				if (gtype == GLib.GType.Invalid)
-					gtype = RegisterGType (typeof (CommonAboutDialog));
-				return gtype;
-			}
-		}
-		
-		public CommonAboutDialog () : base (GType)
-		{
 			this.Title = GettextCatalog.GetString ("About MonoDevelop");
 			this.TransientFor = (Gtk.Window) WorkbenchSingleton.Workbench;
 			aboutPictureScrollBox = new ScrollBox ();

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/SharpDevelopAboutPanels.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/SharpDevelopAboutPanels.cs	2004-12-03 21:53:20 UTC (rev 2048)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/SharpDevelopAboutPanels.cs	2004-12-04 03:44:43 UTC (rev 2049)
@@ -22,24 +22,13 @@
 {
 	public class AboutMonoDevelopTabPage : VBox
 	{
-		static GLib.GType gtype;
 		Label versionLabel = new Label ();
 		Label sponsorLabel = new Label ();
 		Label licenseLabel = new Label ();
 		Label copyrightLabel = new Label ();
 		
-		public static new GLib.GType GType
+		public AboutMonoDevelopTabPage ()
 		{
-			get
-			{
-				if (gtype == GLib.GType.Invalid)
-					gtype = RegisterGType (typeof (AboutMonoDevelopTabPage));
-				return gtype;
-			}
-		}
-		
-		public AboutMonoDevelopTabPage() : base (GType)
-		{
 			Version v = Assembly.GetEntryAssembly().GetName().Version;
 			versionLabel.Markup = String.Format ("<b>{0}</b>\n    {1}", GettextCatalog.GetString("Version"), v.Major + "." + v.Minor);
 			HBox hboxVersion = new HBox ();
@@ -137,24 +126,13 @@
 	
 	public class VersionInformationTabPage : VBox
 	{
-		private static GLib.GType gtype;
 		private TreeView listView;
 		private Button button;
 		private TreeStore store;
 		private Clipboard clipboard;
 		
-		public static new GLib.GType GType
+		public VersionInformationTabPage ()
 		{
-			get
-			{
-				if (gtype == GLib.GType.Invalid)
-					gtype = RegisterGType (typeof (VersionInformationTabPage));
-				return gtype;
-			}
-		}
-
-		public VersionInformationTabPage() : base (GType)
-		{
 			TreeView listView = new TreeView ();
 			listView.RulesHint = true;
 			listView.AppendColumn (GettextCatalog.GetString ("Name"), new CellRendererText (), "text", 0);

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/WordCountDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/WordCountDialog.cs	2004-12-03 21:53:20 UTC (rev 2048)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/WordCountDialog.cs	2004-12-04 03:44:43 UTC (rev 2049)
@@ -21,13 +21,12 @@
 {
 	public class WordCountDialog : Dialog
 	{
-		static GLib.GType gtype;
 		ScrolledWindow scrolledwindow;
 		TreeView resultListView;
 		TreeStore store;
+		ComboBox locationComboBox;
 		ArrayList items;
 		Report total;
-		int selectedIndex = 0;
 		
 		StringParserService stringParserService = (StringParserService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(StringParserService));
 		MessageService messageService = (MessageService)MonoDevelop.Core.Services.ServiceManager.GetService (typeof(MessageService));
@@ -91,7 +90,7 @@
 			items = new ArrayList();
 			total = null;
 			
-			switch (selectedIndex) {
+			switch (locationComboBox.Active) {
 				case 0: {// current file
 					IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow;
 					if (window != null) {
@@ -266,18 +265,8 @@
 			//UpdateList ((TreeViewColumn)e.Column);
 		}
 		
-		public static new GLib.GType GType
+		public WordCountDialog ()
 		{
-			get
-			{
-				if (gtype == GLib.GType.Invalid)
-					gtype = RegisterGType (typeof (WordCountDialog));
-				return gtype;
-			}
-		}
-		
-		public WordCountDialog() : base (GType)
-		{
 			this.BorderWidth = 6;
 			this.TransientFor = (Window) WorkbenchSingleton.Workbench;
 			this.HasSeparator = false;
@@ -333,23 +322,16 @@
 			Label l = new Label (GettextCatalog.GetString ("_Count where"));
 			hbox.PackStart (l);
 			
-			OptionMenu locationComboBox = new OptionMenu ();
-			locationComboBox.Changed += new EventHandler (OnOptionChanged);
-			Menu m = new Menu ();
-			m.Append (new MenuItem (GettextCatalog.GetString ("Current file")));
-			m.Append (new MenuItem (GettextCatalog.GetString ("All open files")));
-			m.Append (new MenuItem (GettextCatalog.GetString ("Whole solution")));
-			locationComboBox.Menu = m;
+			locationComboBox = ComboBox.NewText ();
+			locationComboBox.AppendText (GettextCatalog.GetString ("Current file"));
+			locationComboBox.AppendText (GettextCatalog.GetString ("All open files"));
+			locationComboBox.AppendText (GettextCatalog.GetString ("Whole solution"));
 			hbox.PackStart (locationComboBox);
 			
 			scrolledwindow.Add(resultListView);
 			this.VBox.PackStart (hbox, false, true, 0);
 			this.VBox.PackStart (scrolledwindow, true, true, 6);
 		}
-		
-		private void OnOptionChanged (object o, EventArgs args)
-		{
-			selectedIndex = ((OptionMenu) o).History;
-		}
 	}
 }
+

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/FileScout/FileList.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/FileScout/FileList.cs	2004-12-03 21:53:20 UTC (rev 2048)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/FileScout/FileList.cs	2004-12-04 03:44:43 UTC (rev 2049)
@@ -19,7 +19,6 @@
 {
 	public class FileList : Gtk.TreeView
 	{
-		private static GLib.GType gtype;
 		private FileSystemWatcher watcher;
 		private ArrayList Items;
 		private Gtk.TreeStore store;
@@ -27,18 +26,8 @@
 		FileListItem selectedItem = null;
 		Gtk.TreeIter selectedIter;
 		
-		public static new GLib.GType GType
+		public FileList ()
 		{
-			get
-			{
-				if (gtype == GLib.GType.Invalid)
-					gtype = RegisterGType (typeof (FileList));
-				return gtype;
-			}	
-		}
-
-		public FileList() : base (GType)
-		{
 			Items = new ArrayList ();
 			FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
 			



From commit-watcher at mono-cvs.ximian.com  Fri Dec  3 23:03:53 2004
From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com)
Date: Fri,  3 Dec 2004 23:03:53 -0500 (EST)
Subject: [Monodevelop-patches-list] r2050 - in trunk/MonoDevelop/Core/src/Main/StartUp: . Dialogs
Message-ID: <20041204040353.1BF6F94764@mono-cvs.ximian.com>

Author: jluke
Date: 2004-12-03 23:03:52 -0500 (Fri, 03 Dec 2004)
New Revision: 2050

Modified:
   trunk/MonoDevelop/Core/src/Main/StartUp/ChangeLog
   trunk/MonoDevelop/Core/src/Main/StartUp/Dialogs/ExceptionBox.cs
   trunk/MonoDevelop/Core/src/Main/StartUp/Makefile.am
   trunk/MonoDevelop/Core/src/Main/StartUp/MonoDevelopMain.cs
Log:
2004-12-03  John Luke  <john.luke at gmail.com>

        * Dialogs/ExceptionDialog.cs: remove obsolete gtype stuff
        * MonoDevelopMain.cs: comment out unused code
        * Makefile.am: remove ExceptionDialog from build



Modified: trunk/MonoDevelop/Core/src/Main/StartUp/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/Main/StartUp/ChangeLog	2004-12-04 03:44:43 UTC (rev 2049)
+++ trunk/MonoDevelop/Core/src/Main/StartUp/ChangeLog	2004-12-04 04:03:52 UTC (rev 2050)
@@ -1,3 +1,9 @@
+2004-12-03  John Luke  <john.luke at gmail.com>
+
+	* Dialogs/ExceptionDialog.cs: remove obsolete gtype stuff
+	* MonoDevelopMain.cs: comment out unused code
+	* Makefile.am: remove ExceptionDialog from build
+
 2004-09-18  Todd Berman  <tberman at off.net>
 
 	* MonoDevelopMain.cs: Check if Build and Revision are not 0, and if

Modified: trunk/MonoDevelop/Core/src/Main/StartUp/Dialogs/ExceptionBox.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/StartUp/Dialogs/ExceptionBox.cs	2004-12-04 03:44:43 UTC (rev 2049)
+++ trunk/MonoDevelop/Core/src/Main/StartUp/Dialogs/ExceptionBox.cs	2004-12-04 04:03:52 UTC (rev 2050)
@@ -19,8 +19,8 @@
 	}
 	public delegate void ButtonHandler(ExceptionDialog eb, DialogResult dr);
 	
-	public class ExceptionDialog:Gtk.Window {
-	
+	public class ExceptionDialog : Gtk.Window
+	{
 		private Gtk.Fixed fixedcontainer;
 		private Gtk.Button continueButton;
 		private Gtk.Button ignoreButton;
@@ -33,14 +33,8 @@
 		private Gtk.Image image;
 		private Exception exceptionThrown;
 		private ButtonHandler buttonhandler;
-		static GLib.GType type;
 
-
-		static ExceptionDialog() {
-			type = RegisterGType(typeof(ExceptionDialog));
-		}
-
-		public ExceptionDialog(Exception e):base(type)
+		public ExceptionDialog (Exception e) : base ("Exception raised error")
 		{
 				this.exceptionThrown = e;
 				InitializeComponent();
@@ -193,7 +187,6 @@
 			//
 			// this
 			//
-			this.Title = "Exception raised error";
 			this.Resizable = false;
 			this.WindowPosition = Gtk.WindowPosition.Center;
 			this.Add(fixedcontainer);

Modified: trunk/MonoDevelop/Core/src/Main/StartUp/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/Main/StartUp/Makefile.am	2004-12-04 03:44:43 UTC (rev 2049)
+++ trunk/MonoDevelop/Core/src/Main/StartUp/Makefile.am	2004-12-04 04:03:52 UTC (rev 2050)
@@ -4,7 +4,6 @@
 MonoDevelopMain.cs \
 MonoDevelopOptions.cs \
 Dialogs/AddInTreeSettingsHandler.cs \
-Dialogs/ExceptionBox.cs \
 AssemblyInfo.cs
 
 build_sources = $(addprefix $(srcdir)/, $(FILES))

Modified: trunk/MonoDevelop/Core/src/Main/StartUp/MonoDevelopMain.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/StartUp/MonoDevelopMain.cs	2004-12-04 03:44:43 UTC (rev 2049)
+++ trunk/MonoDevelop/Core/src/Main/StartUp/MonoDevelopMain.cs	2004-12-04 04:03:52 UTC (rev 2050)
@@ -41,6 +41,8 @@
 			}
 		}
 
+/* unused code
+
 		static void ShowErrorBox(object sender, ThreadExceptionEventArgs eargs)
 		{
 			ExceptionDialog ed;
@@ -53,6 +55,7 @@
 		static void DialogResultHandler(ExceptionDialog ed, DialogResult dr) {
 			ed.Destroy();			
 		}
+*/
 
 		/// <summary>
 		/// Starts the core of MonoDevelop.



From commit-watcher at mono-cvs.ximian.com  Sat Dec  4 15:01:44 2004
From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com)
Date: Sat,  4 Dec 2004 15:01:44 -0500 (EST)
Subject: [Monodevelop-patches-list] r2051 - trunk/md-website/include
Message-ID: <20041204200144.195D894764@mono-cvs.ximian.com>

Author: deboald
Date: 2004-12-04 15:01:43 -0500 (Sat, 04 Dec 2004)
New Revision: 2051

Modified:
   trunk/md-website/include/header.ascx
Log:
wiki fix on main page


Modified: trunk/md-website/include/header.ascx
===================================================================
--- trunk/md-website/include/header.ascx	2004-12-04 04:03:52 UTC (rev 2050)
+++ trunk/md-website/include/header.ascx	2004-12-04 20:01:43 UTC (rev 2051)
@@ -53,7 +53,7 @@
 	<li><a href="/contribute.aspx">Contribute</a></li>
 	<li><a href="/tutorial.aspx">Tutorials</a></li>
 	<li><a href="/faq.aspx">FAQ</a></li>
-        <li><a href="/wiki/">Wiki</a></li>
+        <li><a href="http://deobald.glcn.com/wiki/">Wiki</a></li>
       </ul>
       <br />
       <a href="http://www.cityhost.ca/">



From commit-watcher at mono-cvs.ximian.com  Sun Dec  5 04:39:18 2004
From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com)
Date: Sun,  5 Dec 2004 04:39:18 -0500 (EST)
Subject: [Monodevelop-patches-list] r2052 - in trunk/MonoDevelop/Core/src/Main/Base: . Internal/Project/Combine
Message-ID: <20041205093918.1353C94764@mono-cvs.ximian.com>

Author: jba
Date: 2004-12-05 04:39:17 -0500 (Sun, 05 Dec 2004)
New Revision: 2052

Modified:
   trunk/MonoDevelop/Core/src/Main/Base/ChangeLog
   trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Combine/Combine.cs
Log:
2004-12-05  John BouAntoun  <jba-mono at optusnet.com.au>

* Internal/Project/Combine/Combine.cs: made it work with mono  svn head 
Posix OEE



Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/ChangeLog	2004-12-04 20:01:43 UTC (rev 2051)
+++ trunk/MonoDevelop/Core/src/Main/Base/ChangeLog	2004-12-05 09:39:17 UTC (rev 2052)
@@ -1,3 +1,7 @@
+2004-12-05  John BouAntoun  <jba-mono at optusnet.com.au>
+
+	* Internal/Project/Combine/Combine.cs: made it work with mono svn head Posix OEE
+
 2004-12-03  John Luke  <john.luke at cfl.rr.com>
 
 	* Commands/MenuItemBuilders.cs:

Modified: trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Combine/Combine.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Combine/Combine.cs	2004-12-04 20:01:43 UTC (rev 2051)
+++ trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Combine/Combine.cs	2004-12-05 09:39:17 UTC (rev 2052)
@@ -15,10 +15,11 @@
 using System.CodeDom.Compiler;
 using System.ComponentModel;
 
-using Mono.Posix;
 #if MONO_POSIX_OEE
-using FileMode = Mono.Posix.FilePermissions;
+using Mono.Unix;
+using FileMode = Mono.Unix.FilePermissions;
 #else
+using Mono.Posix;
 using FileMode = Mono.Posix.FileMode;
 #endif
 



From commit-watcher at mono-cvs.ximian.com  Mon Dec  6 10:43:16 2004
From: commit-watcher at mono-cvs.ximian.com (commit-watcher at mono-cvs.ximian.com)
Date: Mon,  6 Dec 2004 10:43:16 -0500 (EST)
Subject: [Monodevelop-patches-list] r2053 - in trunk/MonoDevelop/Core/src/Main/Base: . Commands Commands/ClassBrowserCommands Commands/ProjectBrowserCommands Commands/VBConverter Gui Gui/BrowserDisplayBinding Gui/Components Gui/Components/LocalizedPropertyGrid Gui/Components/SideBar Gui/Dialogs Gui/Dialogs/CombineConfiguration Gui/Dialogs/OptionPanels Gui/Dialogs/OptionPanels/IDEOptions Gui/Dialogs/OptionPanels/ProjectOptions Gui/Dialogs/ReferenceDialog Gui/Dialogs/Wizard Gui/ErrorHandlers Gui/Pads Gui/Pads/ClassScout Gui/Pads/ClassScout/NodeBuilder Gui/Pads/FileScout Gui/Pads/HelpBrowser Gui/Pads/ProjectBrowser Gui/Pads/ProjectBrowser/BrowserNode Gui/Pads/ProjectBrowser/NodeBuilder Gui/Workbench Gui/Workbench/Layouts Services Services/File
Message-ID: <20041206154316.DFF1094764@mono-cvs.ximian.com>

Author: lluis
Date: 2004-12-06 10:43:16 -0500 (Mon, 06 Dec 2004)
New Revision: 2053

Added:
   trunk/MonoDevelop/Core/src/Main/Base/Gui/GuiService.cs
   trunk/MonoDevelop/Core/src/Main/Base/Services/Runtime.cs
Removed:
   trunk/MonoDevelop/Core/src/Main/Base/Services/ClassBrowserIcons/
Modified:
   trunk/MonoDevelop/Core/src/Main/Base/ChangeLog
   trunk/MonoDevelop/Core/src/Main/Base/Commands/AutostartCommands.cs
   trunk/MonoDevelop/Core/src/Main/Base/Commands/ClassBrowserCommands/ClassBrowserCommands.cs
   trunk/MonoDevelop/Core/src/Main/Base/Commands/CustomStringTagProvider.cs
   trunk/MonoDevelop/Core/src/Main/Base/Commands/FileCommands.cs
   trunk/MonoDevelop/Core/src/Main/Base/Commands/HelpCommands.cs
   trunk/MonoDevelop/Core/src/Main/Base/Commands/MenuItemBuilders.cs
   trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectBrowserCommands/CombineNodeCommands.cs
   trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectBrowserCommands/FolderNodeCommands.cs
   trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectBrowserCommands/GeneralNodeCommands.cs
   trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectBrowserCommands/ProjectNodeCommands.cs
   trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectBrowserCommands/ReferenceFolderNodeCommands.cs
   trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectBrowserCommands/ResourceFolderNodeCommands.cs
   trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectCommands.cs
   trunk/MonoDevelop/Core/src/Main/Base/Commands/RunCommands.cs
   trunk/MonoDevelop/Core/src/Main/Base/Commands/ToolsCommands.cs
   trunk/MonoDevelop/Core/src/Main/Base/Commands/VBConverter/ConvertBuffer.cs
   trunk/MonoDevelop/Core/src/Main/Base/Commands/VBConverter/ConvertProject.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/AbstractViewContent.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/BrowserDisplayBinding/HtmlViewPane.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Components/LocalizedPropertyGrid/LocalizedPropertyDescriptor.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Components/SdMenu.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Components/SdMenuCheckBox.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Components/SdMenuCommand.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Components/SideBar/SharpDevelopSideTabItem.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/CombineConfiguration/CombineBuildOptions.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/CommonAboutDialog.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/DirtyFilesDialog.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/NewFileDialog.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/NewProjectDialog.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/OptionPanels/EditTemplateDialog.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/OptionPanels/ExternalToolPanel.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/BuildPanel.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/CodeGenerationPanel.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/LoadSavePanel.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/ProjectAndCombinePanel.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/OptionPanels/IDEOptions/SelectStylePanel.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/CompileFileProjectOptions.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/DeployFileOptions.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/OptionPanels/ProjectOptions/GeneralProjectOptions.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/ProjectOptionsDialog.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/ReferenceDialog/AssemblyReferencePanel.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/ReferenceDialog/GacReferencePanel.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/ReferenceDialog/ProjectReferencePanel.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/SharpDevelopAboutPanels.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/TipOfTheDay.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/TreeViewOptions.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/ViewGPLDialog.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/Wizard/StatusPanel.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/Wizard/WizardDialog.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Dialogs/WordCountDialog.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/ErrorHandlers/GenericError.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ClassScout/ClassScout.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ClassScout/NodeBuilder/DefaultDotNetClassScoutNodeBuilder.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/FileScout/FileList.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/FileScout/FileScout.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/HelpBrowser/HelpViewer.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/HelpBrowser/MonodocTreePad.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/OpenTaskView.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/AbstractBrowserNode.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/CombineBrowserNode.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/DirectoryNode.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/FileNode.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/ProjectBrowserNode.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/ReferenceNode.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ProjectBrowser/NodeBuilder/DefaultDotNetNodeBuilder.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/ProjectBrowser/ProjectBrowserView.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Pads/SideBarView.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/PixbufList.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Workbench/DefaultWorkbench.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs
   trunk/MonoDevelop/Core/src/Main/Base/Gui/WorkbenchSingleton.cs
   trunk/MonoDevelop/Core/src/Main/Base/Makefile.am
   trunk/MonoDevelop/Core/src/Main/Base/Services/File/DefaultFileService.cs
   trunk/MonoDevelop/Core/src/Main/Base/Services/IconService.cs
   trunk/MonoDevelop/Core/src/Main/Base/Services/ResourceService.cs
Log:
2004-12-06  Lluis Sanchez Gual  <lluis at novell.com>

	* Services/Runtime.cs: Root class that gives access to all services.
	* Gui/GuiService.cs: Root class that gives access to some gui-related
	services.
	* Services/ClassBrowserIcons/ClassBrowserIconsService.cs: Moved to
	IconService.cs.
	* Services/ResourceService.cs: Format.
	* Services/IconService.cs: Moved here methods from ClassBrowserIcons.
	* Makefile.am: Added new files.
	* *.cs: Removed all calls to ServiceManager.GetService (some files
	are still missing).



Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/ChangeLog	2004-12-05 09:39:17 UTC (rev 2052)
+++ trunk/MonoDevelop/Core/src/Main/Base/ChangeLog	2004-12-06 15:43:16 UTC (rev 2053)
@@ -1,3 +1,16 @@
+2004-12-06  Lluis Sanchez Gual  <lluis at novell.com>
+
+	* Services/Runtime.cs: Root class that gives access to all services.
+	* Gui/GuiService.cs: Root class that gives access to some gui-related
+	services.
+	* Services/ClassBrowserIcons/ClassBrowserIconsService.cs: Moved to
+	IconService.cs.
+	* Services/ResourceService.cs: Format.
+	* Services/IconService.cs: Moved here methods from ClassBrowserIcons.
+	* Makefile.am: Added new files.
+	* *.cs: Removed all calls to ServiceManager.GetService (some files
+	are still missing).
+
 2004-12-05  John BouAntoun  <jba-mono at optusnet.com.au>
 
 	* Internal/Project/Combine/Combine.cs: made it work with mono svn head Posix OEE

Modified: trunk/MonoDevelop/Core/src/Main/Base/Commands/AutostartCommands.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Commands/AutostartCommands.cs	2004-12-05 09:39:17 UTC (rev 2052)
+++ trunk/MonoDevelop/Core/src/Main/Base/Commands/AutostartCommands.cs	2004-12-06 15:43:16 UTC (rev 2053)
@@ -38,8 +38,7 @@
 	{
 		public override void Run()
 		{
-			DefaultParserService parserService = (DefaultParserService)ServiceManager.GetService(typeof(DefaultParserService));
-			parserService.StartParserThread();
+			((DefaultParserService)Runtime.ParserService).StartParserThread();
 		}
 	}
 
@@ -50,19 +49,14 @@
 		public override void Run()
 		{
 			// register string tag provider (TODO: move to add-in tree :)
-			StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
-			stringParserService.RegisterStringTagProvider(new MonoDevelop.Commands.SharpDevelopStringTagProvider());
+			Runtime.StringParserService.RegisterStringTagProvider(new MonoDevelop.Commands.SharpDevelopStringTagProvider());
 			
-			PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
-			
-			IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
-			
 			// load previous combine
-			if ((bool)propertyService.GetProperty("SharpDevelop.LoadPrevProjectOnStartup", false)) {
+			if ((bool)Runtime.Properties.GetProperty("SharpDevelop.LoadPrevProjectOnStartup", false)) {
 	                        RecentOpen recentOpen = ((IFileService)MonoDevelop.Core.Services.ServiceManager.GetService (typeof (IFileService))).RecentOpen;
 
 				if (recentOpen.RecentProject != null && recentOpen.RecentProject.Length > 0) { 
-					projectService.OpenCombine(recentOpen.RecentProject[0].ToString());
+					Runtime.ProjectService.OpenCombine(recentOpen.RecentProject[0].ToString());
 				}
 			}
 			
@@ -72,7 +66,7 @@
 					case ".CMBX":
 					case ".PRJX":
 						try {
-							projectService.OpenCombine(file);
+							Runtime.ProjectService.OpenCombine (file);
 						} catch (Exception e) {
 							CombineLoadError.HandleError(e, file);
 						}
@@ -80,8 +74,7 @@
 						break;
 					default:
 						try {
-							IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
-							fileService.OpenFile(file);
+							Runtime.FileService.OpenFile (file);
 						
 						} catch (Exception e) {
 							Console.WriteLine("unable to open file {0} exception was :\n{1}", file, e.ToString());
@@ -91,7 +84,7 @@
 			}
 			
 			((Gtk.Window)WorkbenchSingleton.Workbench).ShowAll ();
-			WorkbenchSingleton.Workbench.SetMemento ((IXmlConvertable)propertyService.GetProperty (workbenchMemento, new WorkbenchMemento ()));
+			WorkbenchSingleton.Workbench.SetMemento ((IXmlConvertable)Runtime.Properties.GetProperty (workbenchMemento, new WorkbenchMemento ()));
 			((Gtk.Window)WorkbenchSingleton.Workbench).Visible = true;
 			WorkbenchSingleton.Workbench.RedrawAllComponents ();
 			((Gtk.Window)WorkbenchSingleton.Workbench).Present ();

Modified: trunk/MonoDevelop/Core/src/Main/Base/Commands/ClassBrowserCommands/ClassBrowserCommands.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Commands/ClassBrowserCommands/ClassBrowserCommands.cs	2004-12-05 09:39:17 UTC (rev 2052)
+++ trunk/MonoDevelop/Core/src/Main/Base/Commands/ClassBrowserCommands/ClassBrowserCommands.cs	2004-12-06 15:43:16 UTC (rev 2053)
@@ -40,8 +40,7 @@
 			AbstractClassScoutNode node = browser.SelectedNode as AbstractClassScoutNode;
 			
 			if (node != null) {
-				IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
-				messageService.ShowWarning(GettextCatalog.GetString ("Not implemented"));
+				Runtime.MessageService.ShowWarning(GettextCatalog.GetString ("Not implemented"));
 			}
 		}
 	}

Modified: trunk/MonoDevelop/Core/src/Main/Base/Commands/CustomStringTagProvider.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Commands/CustomStringTagProvider.cs	2004-12-05 09:39:17 UTC (rev 2052)
+++ trunk/MonoDevelop/Core/src/Main/Base/Commands/CustomStringTagProvider.cs	2004-12-06 15:43:16 UTC (rev 2053)
@@ -28,7 +28,7 @@
 {
 	public class SharpDevelopStringTagProvider :  IStringTagProvider 
 	{
-		IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
+		IProjectService projectService = Runtime.ProjectService;
 		
 		public string[] Tags {
 			get {

Modified: trunk/MonoDevelop/Core/src/Main/Base/Commands/FileCommands.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Commands/FileCommands.cs	2004-12-05 09:39:17 UTC (rev 2052)
+++ trunk/MonoDevelop/Core/src/Main/Base/Commands/FileCommands.cs	2004-12-06 15:43:16 UTC (rev 2053)
@@ -50,8 +50,6 @@
 
 	public class SaveFile : AbstractMenuCommand
 	{
-		static PropertyService PropertyService = (PropertyService)ServiceManager.GetService (typeof (PropertyService));
-		
 		public override void Run()
 		{
 			IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow;
@@ -75,15 +73,13 @@
 						SaveFileAs sfa = new SaveFileAs();
 						sfa.Run();
 					} else {						
-						IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
-						FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
-						projectService.MarkFileDirty(window.ViewContent.ContentName);
+						Runtime.ProjectService.MarkFileDirty(window.ViewContent.ContentName);
 						string fileName = window.ViewContent.ContentName;
 						// save backup first						
-						if((bool) PropertyService.GetProperty ("SharpDevelop.CreateBackupCopy", false)) {
-							fileUtilityService.ObservedSave(new NamedFileOperationDelegate(window.ViewContent.Save), fileName + "~");
+						if((bool) Runtime.Properties.GetProperty ("SharpDevelop.CreateBackupCopy", false)) {
+							Runtime.FileUtilityService.ObservedSave (new NamedFileOperationDelegate(window.ViewContent.Save), fileName + "~");
 						}
-						fileUtilityService.ObservedSave(new NamedFileOperationDelegate(window.ViewContent.Save), fileName);
+						Runtime.FileUtilityService.ObservedSave (new NamedFileOperationDelegate(window.ViewContent.Save), fileName);
 					}
 				}
 			}
@@ -108,8 +104,7 @@
 			IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow;
 			
 			if (window != null && window.ViewContent.ContentName != null && !window.ViewContent.IsViewOnly) {
-				IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
-				if (messageService.AskQuestion(GettextCatalog.GetString ("Are you sure that you want to reload the file?"))) {
+				if (Runtime.MessageService.AskQuestion(GettextCatalog.GetString ("Are you sure that you want to reload the file?"))) {
 					IXmlConvertable memento = null;
 					if (window.ViewContent is IMementoCapable) {
 						memento = ((IMementoCapable)window.ViewContent).CreateMemento();
@@ -125,8 +120,6 @@
 	
 	public class SaveFileAs : AbstractMenuCommand
 	{
-		static PropertyService PropertyService = (PropertyService)ServiceManager.GetService (typeof (PropertyService));
-		
 		public override void Run()
 		{
 			IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow;
@@ -160,22 +153,19 @@
 					fdiag.Hide ();
 				
 					if (response == (int)Gtk.ResponseType.Ok) {
-						IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
-						FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
-						if (!fileUtilityService.IsValidFileName(filename)) {
-							IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
-							messageService.ShowMessage(String.Format (GettextCatalog.GetString ("File name {0} is invalid"), filename));
+						if (!Runtime.FileUtilityService.IsValidFileName (filename)) {
+							Runtime.MessageService.ShowMessage(String.Format (GettextCatalog.GetString ("File name {0} is invalid"), filename));
 							return;
 						}
 
 					// save backup first
-					if((bool) PropertyService.GetProperty ("SharpDevelop.CreateBackupCopy", false)) {
-						fileUtilityService.ObservedSave(new NamedFileOperationDelegate(window.ViewContent.Save), filename + "~");
+					if((bool) Runtime.Properties.GetProperty ("SharpDevelop.CreateBackupCopy", false)) {
+						Runtime.FileUtilityService.ObservedSave (new NamedFileOperationDelegate(window.ViewContent.Save), filename + "~");
 					}
 					
 					// do actual save
-					if (fileUtilityService.ObservedSave(new NamedFileOperationDelegate(window.ViewContent.Save), filename) == FileOperationResult.OK) {
-						fileService.RecentOpen.AddLastFile (filename, null);
+					if (Runtime.FileUtilityService.ObservedSave (new NamedFileOperationDelegate(window.ViewContent.Save), filename) == FileOperationResult.OK) {
+						Runtime.FileService.RecentOpen.AddLastFile (filename, null);
 					}
 				}
 			}
@@ -186,8 +176,6 @@
 	{
 		public override void Run()
 		{
-			FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
-			
 			foreach (IViewContent content in WorkbenchSingleton.Workbench.ViewContentCollection) {
 				if (content.IsViewOnly) {
 					continue;
@@ -208,10 +196,9 @@
 								fileName = Path.ChangeExtension(fileName, "");
 							}
 
-							if (fileUtilityService.ObservedSave(new NamedFileOperationDelegate(content.Save), fileName) == FileOperationResult.OK)
+							if (Runtime.FileUtilityService.ObservedSave (new NamedFileOperationDelegate(content.Save), fileName) == FileOperationResult.OK)
 							{
-								IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
-								messageService.ShowMessage(fileName, GettextCatalog.GetString ("File saved"));
+								Runtime.MessageService.ShowMessage(fileName, GettextCatalog.GetString ("File saved"));
 							}
 						}
 					
@@ -220,7 +207,7 @@
 				}
 				else
 				{
-					fileUtilityService.ObservedSave(new FileOperationDelegate(content.Save), content.ContentName);
+					Runtime.FileUtilityService.ObservedSave (new FileOperationDelegate(content.Save), content.ContentName);
 				}
 			}
 		}
@@ -228,8 +215,6 @@
 	
 	public class OpenCombine : AbstractMenuCommand
 	{
-		static PropertyService PropertyService = (PropertyService)ServiceManager.GetService (typeof (PropertyService));
-		
 		public override void Run()
 		{
 			using (FileSelector fs = new FileSelector (GettextCatalog.GetString ("File to Open"))) {
@@ -241,19 +226,15 @@
 					switch (Path.GetExtension(name).ToUpper()) {
 						case ".CMBX": // Don't forget the 'recent' projects if you chance something here
 						case ".PRJX":
-							IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
-							
 							try {
-								//projectService.OpenCombine(name);
-								IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
-								fileService.OpenFile(name);
+								//Runtime.ProjectService.OpenCombine(name);
+								Runtime.FileService.OpenFile(name);
 							} catch (Exception ex) {
 								CombineLoadError.HandleError(ex, name);
 							}
 							break;
 						default:
-							IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
-							messageService.ShowError(String.Format (GettextCatalog.GetString ("Can't open file {0} as project"), name));
+							Runtime.MessageService.ShowError(String.Format (GettextCatalog.GetString ("Can't open file {0} as project"), name));
 							break;
 					}
 				}
@@ -263,8 +244,6 @@
 	
 	public class OpenFile : AbstractMenuCommand
 	{
-		static PropertyService PropertyService = (PropertyService)ServiceManager.GetService (typeof (PropertyService));
-		
 		public override void Run()
 		{
 			//string[] fileFilters  = (string[])(AddInTreeSingleton.AddInTree.GetTreeNode("/SharpDevelop/Workbench/FileFilter").BuildChildItems(this)).ToArray(typeof(string));
@@ -302,15 +281,13 @@
 				string name = fs.Filename;
 				fs.Hide ();
 				if (response == (int)Gtk.ResponseType.Ok) {
-					IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
-					IProjectService proj = (IProjectService)ServiceManager.GetService (typeof (IProjectService));
 					switch (System.IO.Path.GetExtension (name).ToUpper()) {
 					case ".PRJX":
 					case ".CMBX":
-						proj.OpenCombine (name);
+						Runtime.ProjectService.OpenCombine (name);
 						break;
 					default:
-						fileService.OpenFile(name);
+						Runtime.FileService.OpenFile(name);
 						break;
 					}
 				}	
@@ -322,9 +299,7 @@
 	{
 		public override void Run()
 		{
-			IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
-			
-			projectService.CloseCombine();
+			Runtime.ProjectService.CloseCombine();
 		}
 	}
 		
@@ -400,12 +375,9 @@
 		public override void Run()
 		{			
 			try {
-				IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
-				IMessageService messageService = (IMessageService) MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IMessageService));
-				
-				if (fileService.RecentOpen.RecentFile != null && fileService.RecentOpen.RecentFile.Length > 0 && messageService.AskQuestion(GettextCatalog.GetString ("Are you sure you want to clear recent files list?"), GettextCatalog.GetString ("Clear recent files")))
+				if (Runtime.FileService.RecentOpen.RecentFile != null && Runtime.FileService.RecentOpen.RecentFile.Length > 0 && Runtime.MessageService.AskQuestion(GettextCatalog.GetString ("Are you sure you want to clear recent files list?"), GettextCatalog.GetString ("Clear recent files")))
 				{
-					fileService.RecentOpen.ClearRecentFiles();
+					Runtime.FileService.RecentOpen.ClearRecentFiles();
 				}
 			} catch {}
 		}
@@ -416,12 +388,9 @@
 		public override void Run()
 		{			
 			try {
-				IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
-				IMessageService messageService = (IMessageService) MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IMessageService));
-				
-				if (fileService.RecentOpen.RecentProject != null && fileService.RecentOpen.RecentProject.Length > 0 && messageService.AskQuestion(GettextCatalog.GetString ("Are you sure you want to clear recent projects list?"), GettextCatalog.GetString ("Clear recent projects")))
+				if (Runtime.FileService.RecentOpen.RecentProject != null && Runtime.FileService.RecentOpen.RecentProject.Length > 0 && Runtime.MessageService.AskQuestion(GettextCatalog.GetString ("Are you sure you want to clear recent projects list?"), GettextCatalog.GetString ("Clear recent projects")))
 				{
-					fileService.RecentOpen.ClearRecentProjects();
+					Runtime.FileService.RecentOpen.ClearRecentProjects();
 				}
 			} catch {}
 		}

Modified: trunk/MonoDevelop/Core/src/Main/Base/Commands/HelpCommands.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Commands/HelpCommands.cs	2004-12-05 09:39:17 UTC (rev 2052)
+++ trunk/MonoDevelop/Core/src/Main/Base/Commands/HelpCommands.cs	2004-12-06 15:43:16 UTC (rev 2053)
@@ -24,8 +24,7 @@
 	{
 		public override void Run()
 		{
-			FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
-			string fileName = fileUtilityService.SharpDevelopRootPath + 
+			string fileName = Runtime.FileUtilityService.SharpDevelopRootPath + 
 			              Path.DirectorySeparatorChar + "doc" +
 			              Path.DirectorySeparatorChar + "help" +
 			              Path.DirectorySeparatorChar + "sharpdevelop.chm";
@@ -54,8 +53,7 @@
 		
 		public override void Run()
 		{
-			IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
-			fileService.OpenFile(site);
+			Runtime.FileService.OpenFile (site);
 		}
 	}
 	
@@ -71,13 +69,11 @@
 		
 		public override void Run()
 		{
-			FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
-			string file = site.StartsWith("home://") ? fileUtilityService.GetDirectoryNameWithSeparator(fileUtilityService.SharpDevelopRootPath) + "bin" + Path.DirectorySeparatorChar + site.Substring(7).Replace('/', Path.DirectorySeparatorChar) : site;
+			string file = site.StartsWith("home://") ? Runtime.FileUtilityService.GetDirectoryNameWithSeparator (Runtime.FileUtilityService.SharpDevelopRootPath) + "bin" + Path.DirectorySeparatorChar + site.Substring(7).Replace('/', Path.DirectorySeparatorChar) : site;
 			try {
 				Process.Start(file);
 			} catch (Exception) {
-				IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
-				messageService.ShowError(String.Format (GettextCatalog.GetString ("Can not execute or view {0}\n Please check that the file exists and that you can open this file."), file));
+				Runtime.MessageService.ShowError(String.Format (GettextCatalog.GetString ("Can not execute or view {0}\n Please check that the file exists and that you can open this file."), file));
 			}
 		}
 	}

Modified: trunk/MonoDevelop/Core/src/Main/Base/Commands/MenuItemBuilders.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Commands/MenuItemBuilders.cs	2004-12-05 09:39:17 UTC (rev 2052)
+++ trunk/MonoDevelop/Core/src/Main/Base/Commands/MenuItemBuilders.cs	2004-12-06 15:43:16 UTC (rev 2053)
@@ -46,11 +46,8 @@
 		
 		public Gtk.MenuItem[] BuildSubmenu(ConditionCollection conditionCollection, object owner)
 		{
-			IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
-			StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
+			RecentOpen recentOpen = Runtime.FileService.RecentOpen;
 			
-			RecentOpen recentOpen = fileService.RecentOpen;
-			
 			if (recentOpen.RecentFile != null && recentOpen.RecentFile.Length > 0) {
 				RFMItem[] items = new RFMItem[recentOpen.RecentFile.Length];
 				
@@ -73,8 +70,7 @@
 		void LoadRecentFile(object sender, EventArgs e)
 		{
 			SdMenuCommand item = (SdMenuCommand)sender;
-			IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
-			fileService.OpenFile(item.Tag.ToString());
+			Runtime.FileService.OpenFile (item.Tag.ToString());
 		}
 	}
 	
@@ -89,11 +85,8 @@
 		
 		public Gtk.MenuItem[] BuildSubmenu(ConditionCollection conditionCollection, object owner)
 		{
-			IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
-			StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
+			RecentOpen recentOpen = Runtime.FileService.RecentOpen;
 			
-			RecentOpen recentOpen = fileService.RecentOpen;
-			
 			if (recentOpen.RecentProject != null && recentOpen.RecentProject.Length > 0) {
 				RPMItem[] items = new RPMItem[recentOpen.RecentProject.Length];
 				for (int i = 0; i < recentOpen.RecentProject.Length; ++i) {
@@ -115,14 +108,13 @@
 		void LoadRecentProject(object sender, EventArgs e)
 		{
 			SdMenuCommand item = (SdMenuCommand)sender;
-			IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
 			
 			//FIXME:THIS IS BROKEN!!
 			
 			string filename = item.Tag.ToString();
 			
 			try {
-				projectService.OpenCombine(filename);
+				Runtime.ProjectService.OpenCombine(filename);
 			} catch (Exception ex) {
 				CombineLoadError.HandleError(ex, filename);
 			}
@@ -151,10 +143,7 @@
 		void ToolEvt(object sender, EventArgs e)
 		{
 			SdMenuCommand item = (SdMenuCommand)sender;
-			IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
-			StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
-			FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
-			MessageService messageService =(MessageService)ServiceManager.GetService(typeof(MessageService));
+			StringParserService stringParserService = Runtime.StringParserService;
 			
 			for (int i = 0; i < ToolLoader.Tool.Count; ++i) {
 				if (item.Text == ToolLoader.Tool[i].ToString()) {
@@ -166,7 +155,7 @@
 					string args = stringParserService.Parse(tool.Arguments);
 					// prompt for args if needed
 					if (tool.PromptForArguments) {
-						args = messageService.GetTextResponse(String.Format (GettextCatalog.GetString ("Enter any arguments you want to use while launching tool, {0}:"), tool.MenuCommand), String.Format (GettextCatalog.GetString ("Command Arguments for {0}"), tool.MenuCommand), args);
+						args = Runtime.MessageService.GetTextResponse(String.Format (GettextCatalog.GetString ("Enter any arguments you want to use while launching tool, {0}:"), tool.MenuCommand), String.Format (GettextCatalog.GetString ("Command Arguments for {0}"), tool.MenuCommand), args);
 							
 						// if user selected cancel string will be null
 						if (args == null) {
@@ -193,7 +182,8 @@
 						// FIXME: need to find a way to wire the console output into the output window if specified
 						Process.Start(startinfo);
 						
-					} catch (Exception ex) {								messageService.ShowError(ex, String.Format (GettextCatalog.GetString ("External program execution failed.\nError while starting:\n '{0} {1}'"), command, args));
+					} catch (Exception ex) {
+						Runtime.MessageService.ShowError(ex, String.Format (GettextCatalog.GetString ("External program execution failed.\nError while starting:\n '{0} {1}'"), command, args));
 					}
 					break;
 				}
@@ -321,8 +311,7 @@
 					finfo.BuildAction = BuildAction.Compile;
 				}
 			}
-			IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
-			projectService.SaveCombine();
+			Runtime.ProjectService.SaveCombine();
 		}
 		
 		void ChangeDeployInclude(object sender, EventArgs e)
@@ -341,8 +330,7 @@
 					node.Project.DeployInformation.AddExcludedFile(finfo.Name);
 				}
 			}
-			IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
-			projectService.SaveCombine();
+			Runtime.ProjectService.SaveCombine();
 		}
 	}
 	

Modified: trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectBrowserCommands/CombineNodeCommands.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectBrowserCommands/CombineNodeCommands.cs	2004-12-05 09:39:17 UTC (rev 2052)
+++ trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectBrowserCommands/CombineNodeCommands.cs	2004-12-06 15:43:16 UTC (rev 2053)
@@ -33,15 +33,11 @@
 		NewProjectDialog npdlg;
 		ProjectBrowserView browser;
 		CombineBrowserNode node;
-		MessageService msg;
-		IProjectService projectService;
 
 		public override void Run()
 		{
-			projectService = (IProjectService)ServiceManager.GetService(typeof(IProjectService));
 			browser     = (ProjectBrowserView)Owner;
 			node        = browser.SelectedNode as CombineBrowserNode;
-			msg             = (MessageService)ServiceManager.GetService (typeof (MessageService));
 			
 			if (node != null) {
 				npdlg = new NewProjectDialog(false);
@@ -54,13 +50,13 @@
 			try 
 			{
 				int newNodeIndex = node.Nodes.Add(ProjectBrowserView.BuildProjectTreeNode((IProject)node.Combine.AddEntry(npdlg.NewProjectLocation)));
-				projectService.SaveCombine();
+				Runtime.ProjectService.SaveCombine ();
 			// expand to the new node
 				node.Nodes[newNodeIndex].Expand();
 			}
 			catch
 			{
-				msg.ShowError (GettextCatalog.GetString ("Invalid Project File"));
+				Runtime.MessageService.ShowError (GettextCatalog.GetString ("Invalid Project File"));
 			}
 			npdlg = null;
 		}	
@@ -68,18 +64,14 @@
 		
 	public class AddNewCombineToCombine : AbstractMenuCommand
 	{
-		IProjectService projectService;
 		ProjectBrowserView browser;
 		CombineBrowserNode node;
-		MessageService msg;
 		NewProjectDialog npdlg;
 
 		public override void Run()
 		{
-			projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
 			browser = (ProjectBrowserView)Owner;
 			node    = browser.SelectedNode as CombineBrowserNode;
-			msg         = (MessageService)ServiceManager.GetService (typeof (MessageService));
 			
 			if (node != null) {
 				npdlg = new NewProjectDialog(false);
@@ -92,14 +84,14 @@
 			try 
 			{
 				int newNodeIndex = node.Nodes.Add(ProjectBrowserView.BuildCombineTreeNode((Combine)node.Combine.AddEntry(npdlg.NewCombineLocation)));
-				projectService.SaveCombine();
+				Runtime.ProjectService.SaveCombine ();
 				
 				// expand to the new node
 				node.Nodes[newNodeIndex].Expand();
 			}
 			catch
 			{
-				msg.ShowError (GettextCatalog.GetString ("Invalid Solution File"));
+				Runtime.MessageService.ShowError (GettextCatalog.GetString ("Invalid Solution File"));
 			}
 			npdlg = null;
 		}
@@ -109,7 +101,6 @@
 	{
 		public override void Run()
 		{
-			IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
 			ProjectBrowserView browser = (ProjectBrowserView)Owner;
 			CombineBrowserNode node    = browser.SelectedNode as CombineBrowserNode;
 			PropertyService propertyService = (PropertyService)ServiceManager.GetService (typeof (PropertyService));
@@ -127,7 +118,7 @@
 							} else {
 								newNodeIndex = node.Nodes.Add(ProjectBrowserView.BuildCombineTreeNode((Combine)obj));
 							}
-							projectService.SaveCombine();
+							Runtime.ProjectService.SaveCombine ();
 						
 							if (newNodeIndex > -1) {
 								// expand to the new node
@@ -136,7 +127,7 @@
 						}
 						catch 
 						{
-							((MessageService)ServiceManager.GetService (typeof (MessageService))).ShowError (GettextCatalog.GetString ("Invalid Project File"));
+							Runtime.MessageService.ShowError (GettextCatalog.GetString ("Invalid Project File"));
 						}
 					}
 
@@ -150,7 +141,6 @@
 	{
 		public override void Run()
 		{
-			IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
 			ProjectBrowserView browser = (ProjectBrowserView)Owner;
 			CombineBrowserNode node    = browser.SelectedNode as CombineBrowserNode;
 			PropertyService propertyService = (PropertyService)ServiceManager.GetService (typeof (PropertyService));
@@ -169,7 +159,7 @@
 							} else {
 								newNodeIndex = node.Nodes.Add(ProjectBrowserView.BuildCombineTreeNode((Combine)obj));
 							}
-							projectService.SaveCombine();
+							Runtime.ProjectService.SaveCombine ();
 							
 							if (newNodeIndex > -1) {
 								// expand to the new node
@@ -178,7 +168,7 @@
 						}
 						catch 
 						{
-							((MessageService)ServiceManager.GetService (typeof (MessageService))).ShowError (GettextCatalog.GetString ("Invalid Solution File"));
+							Runtime.MessageService.ShowError (GettextCatalog.GetString ("Invalid Solution File"));
 						}
 					}
 
@@ -192,7 +182,6 @@
 	{
 		public override void Run()
 		{
-			IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
 			ProjectBrowserView browser = (ProjectBrowserView)Owner;
 			CombineBrowserNode node    = browser.SelectedNode as CombineBrowserNode;
 			
@@ -207,7 +196,7 @@
 			//		optionsDialog.TransientFor = (Gtk.Window)WorkbenchSingleton.Workbench;
 					optionsDialog.Run ();
 			//		optionsDialog.Hide ();
-					projectService.SaveCombine();
+					Runtime.ProjectService.SaveCombine ();
 				}
 			}
 	}

Modified: trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectBrowserCommands/FolderNodeCommands.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectBrowserCommands/FolderNodeCommands.cs	2004-12-05 09:39:17 UTC (rev 2052)
+++ trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectBrowserCommands/FolderNodeCommands.cs	2004-12-06 15:43:16 UTC (rev 2053)
@@ -77,7 +77,7 @@
 								}
 								catch 
 								{
-									((MessageService)ServiceManager.GetService (typeof (MessageService))).ShowError (GettextCatalog.GetString ("An error occurred while attempt to move/copy that file. Please check your permissions."));
+									Runtime.MessageService.ShowError (GettextCatalog.GetString ("An error occurred while attempt to move/copy that file. Please check your permissions."));
 								}
 							}
 						}
@@ -123,13 +123,12 @@
 			string extension = Path.GetExtension(window.ViewContent.UntitledName);
 				
 			// first try the default untitled name of the viewcontent filename
-			FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
-			string fileName = fileUtilityService.GetDirectoryNameWithSeparator(baseFolderPath) + baseName +  extension;
+			string fileName = Runtime.FileUtilityService.GetDirectoryNameWithSeparator(baseFolderPath) + baseName +  extension;
 				
 			// if it is already in the project, or it does exists we try to get a name that is
 			// untitledName + Numer + extension
 			while (node.Project.IsFileInProject(fileName) || System.IO.File.Exists(fileName)) {
-				fileName = fileUtilityService.GetDirectoryNameWithSeparator(baseFolderPath) + baseName + count.ToString() + extension;
+				fileName = Runtime.FileUtilityService.GetDirectoryNameWithSeparator(baseFolderPath) + baseName + count.ToString() + extension;
 				++count;
 			}
 				
@@ -157,8 +156,7 @@
 			browser.SelectedNode = newNode;
 			browser.StartLabelEdit();
 				
-			IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
-			projectService.SaveCombine();
+			Runtime.ProjectService.SaveCombine();
 			
 		}
 	}
@@ -190,9 +188,7 @@
 			string baseFolderPath = SearchBasePath(selectedNode);
 			
 			if (baseFolderPath != null && baseFolderPath.Length > 0) {
-				FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
-				
-				string directoryName = fileUtilityService.GetDirectoryNameWithSeparator(baseFolderPath) + GettextCatalog.GetString("New Folder");
+				string directoryName = Runtime.FileUtilityService.GetDirectoryNameWithSeparator(baseFolderPath) + GettextCatalog.GetString("New Folder");
 				int    index         = -1;
 				
 				if (Directory.Exists(directoryName)) {

Modified: trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectBrowserCommands/GeneralNodeCommands.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectBrowserCommands/GeneralNodeCommands.cs	2004-12-05 09:39:17 UTC (rev 2052)
+++ trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectBrowserCommands/GeneralNodeCommands.cs	2004-12-06 15:43:16 UTC (rev 2053)
@@ -33,7 +33,6 @@
 		{
 			ProjectBrowserView  browser = (ProjectBrowserView)Owner;
 			AbstractBrowserNode node    = browser.SelectedNode as AbstractBrowserNode;
-			IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
 			
 			if (node.IsEditing) { // TODO : throw remove key to the browser component.
 				return;
@@ -42,7 +41,7 @@
 			if (node != null && node.Parent != null) {
 				if (node.RemoveNode()) {
 					node.Parent.Nodes.Remove(node);
-					projectService.SaveCombine();
+					Runtime.ProjectService.SaveCombine();
 				}
 			}
 		}

Modified: trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectBrowserCommands/ProjectNodeCommands.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectBrowserCommands/ProjectNodeCommands.cs	2004-12-05 09:39:17 UTC (rev 2052)
+++ trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectBrowserCommands/ProjectNodeCommands.cs	2004-12-06 15:43:16 UTC (rev 2053)
@@ -37,8 +37,7 @@
 				Combine combine                = node.Combine;
 				combine.SingleStartProjectName = node.Project.Name;
 				combine.SingleStartupProject   = true;
-				IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
-				projectService.SaveCombine();
+				Runtime.ProjectService.SaveCombine();
 			}
 		}
 	}

Modified: trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectBrowserCommands/ReferenceFolderNodeCommands.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectBrowserCommands/ReferenceFolderNodeCommands.cs	2004-12-05 09:39:17 UTC (rev 2052)
+++ trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectBrowserCommands/ReferenceFolderNodeCommands.cs	2004-12-06 15:43:16 UTC (rev 2053)
@@ -47,8 +47,7 @@
 					}
 					
 					DefaultDotNetNodeBuilder.InitializeReferences(node, project);
-					IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
-					projectService.SaveCombine();
+					Runtime.ProjectService.SaveCombine();
 				}
 				selDialog.Hide ();
 			}
@@ -85,9 +84,6 @@
 			
 			if (node != null) {
 				IProject project = ((ProjectBrowserNode)node.Parent).Project;
-				FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
-				IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
-				IParserService parserService = (IParserService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IParserService));					
 			
 /*				using (AddWebReferenceDialog refDialog = new AddWebReferenceDialog(project)) {
 					if (refDialog.ShowDialog() == DialogResult.OK) {						

Modified: trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectBrowserCommands/ResourceFolderNodeCommands.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectBrowserCommands/ResourceFolderNodeCommands.cs	2004-12-05 09:39:17 UTC (rev 2052)
+++ trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectBrowserCommands/ResourceFolderNodeCommands.cs	2004-12-06 15:43:16 UTC (rev 2053)
@@ -57,15 +57,13 @@
 				
 					foreach (string file in files) {
 						if (!System.IO.File.Exists (file)) {
-							IMessageService messageService = (IMessageService) ServiceManager.GetService (typeof (IMessageService));
-							messageService.ShowError (String.Format (GettextCatalog.GetString ("Resource file '{0}' does not exist"), file));
+							Runtime.MessageService.ShowError (String.Format (GettextCatalog.GetString ("Resource file '{0}' does not exist"), file));
 							goto show_dialog;
 						}
 					}
 				
-					IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
 					foreach (string fileName in files) {
-						ProjectFile fileInformation = projectService.AddFileToProject(project, fileName, BuildAction.EmbedAsResource);
+						ProjectFile fileInformation = Runtime.ProjectService.AddFileToProject(project, fileName, BuildAction.EmbedAsResource);
 					
 						AbstractBrowserNode newResNode = new FileNode(fileInformation);
 						newResNode.Image = Stock.ResourceFileIcon;
@@ -73,7 +71,7 @@
 					}
 
 					node.Expand();
-					projectService.SaveCombine();
+					Runtime.ProjectService.SaveCombine ();
 				}
 			}
 		}

Modified: trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectCommands.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectCommands.cs	2004-12-05 09:39:17 UTC (rev 2052)
+++ trunk/MonoDevelop/Core/src/Main/Base/Commands/ProjectCommands.cs	2004-12-06 15:43:16 UTC (rev 2053)
@@ -25,19 +25,14 @@
 	{
 		public override void Run()
 		{
-			IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
-			
-			if (projectService.CurrentSelectedProject != null) {
-				LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(LanguageBindingService));
-				ILanguageBinding csc = languageBindingService.GetBindingPerLanguageName(projectService.CurrentSelectedProject.ProjectType);
-				string assembly = csc.GetCompiledOutputName(projectService.CurrentSelectedProject);
+			if (Runtime.ProjectService.CurrentSelectedProject != null) {
+				ILanguageBinding csc = Runtime.Languages.GetBindingPerLanguageName (Runtime.ProjectService.CurrentSelectedProject.ProjectType);
+				string assembly = csc.GetCompiledOutputName (Runtime.ProjectService.CurrentSelectedProject);
 				
 				if (!File.Exists(assembly)) {
-					IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
-					messageService.ShowError(GettextCatalog.GetString ("Assembly not Found (Compile the project first)"));
+					Runtime.MessageService.ShowError (GettextCatalog.GetString ("Assembly not Found (Compile the project first)"));
 				} else {
-					FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
-					string command = fileUtilityService.SharpDevelopRootPath + 
+					string command = Runtime.FileUtilityService.SharpDevelopRootPath + 
 					                 Path.DirectorySeparatorChar + "bin" + 
 					                 Path.DirectorySeparatorChar + "nunit" + 
 					                 Path.DirectorySeparatorChar + "nunit-gui.exe";
@@ -52,8 +47,7 @@
 	{
 		public override void Run()
 		{
-			IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
-			IProject        selectedProject = projectService.CurrentSelectedProject;
+			IProject selectedProject = Runtime.ProjectService.CurrentSelectedProject;
 			if (selectedProject == null) {
 				return;
 			}
@@ -63,10 +57,10 @@
 			
 			ProjectOptionsDialog optionsDialog = new ProjectOptionsDialog(selectedProject, generalOptionsNode, configurationPropertiesNode);
 			if (optionsDialog.Run() == (int)Gtk.ResponseType.Ok) {
-					projectService.MarkProjectDirty(projectService.CurrentSelectedProject);
+					Runtime.ProjectService.MarkProjectDirty (selectedProject);
 			}
 			
-			projectService.SaveCombine();
+			Runtime.ProjectService.SaveCombine();
 		}
 	}
 	
@@ -74,14 +68,13 @@
 	{
 		public override void Run()
 		{
-			IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
 			foreach (IViewContent viewContent in WorkbenchSingleton.Workbench.ViewContentCollection) {
 				if (viewContent.IsDirty) {
 					viewContent.Save();
 				}
 			}
-			if (projectService.CurrentSelectedProject != null) {
-				DeployInformation.Deploy(projectService.CurrentSelectedProject);
+			if (Runtime.ProjectService.CurrentSelectedProject != null) {
+				DeployInformation.Deploy (Runtime.ProjectService.CurrentSelectedProject);
 			}
 		}
 	}
@@ -91,13 +84,10 @@
 		public override void Run()
 		{
 			try {
-				IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
-				
-				if (projectService.CurrentSelectedProject != null) {
-					LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(LanguageBindingService));
-					ILanguageBinding csc = languageBindingService.GetBindingPerLanguageName(projectService.CurrentSelectedProject.ProjectType);
+				if (Runtime.ProjectService.CurrentSelectedProject != null) {
+					ILanguageBinding csc = Runtime.Languages.GetBindingPerLanguageName (Runtime.ProjectService.CurrentSelectedProject.ProjectType);
 					
-					string assembly    = csc.GetCompiledOutputName(projectService.CurrentSelectedProject);
+					string assembly    = csc.GetCompiledOutputName (Runtime.ProjectService.CurrentSelectedProject);
 					string projectFile = Path.ChangeExtension(assembly, ".ndoc");
 					if (!File.Exists(projectFile)) {
 						StreamWriter sw = File.CreateText(projectFile);
@@ -163,15 +153,14 @@
 						sw.WriteLine("    				</project>");
 						sw.Close();
 					}
-					FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
-					string command = fileUtilityService.SharpDevelopRootPath +
+					string command = Runtime.FileUtilityService.SharpDevelopRootPath +
 					Path.DirectorySeparatorChar + "bin" +
 					Path.DirectorySeparatorChar + "ndoc" +
 					Path.DirectorySeparatorChar + "NDocGui.exe";
 					string args    = '"' + projectFile + '"';
 					
 					ProcessStartInfo psi = new ProcessStartInfo(command, args);
-					psi.WorkingDirectory = fileUtilityService.SharpDevelopRootPath +
+					psi.WorkingDirectory = Runtime.FileUtilityService.SharpDevelopRootPath +
 					Path.DirectorySeparatorChar + "bin" +
 					Path.DirectorySeparatorChar + "ndoc";
 					psi.UseShellExecute = false;

Modified: trunk/MonoDevelop/Core/src/Main/Base/Commands/RunCommands.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Commands/RunCommands.cs	2004-12-05 09:39:17 UTC (rev 2052)
+++ trunk/MonoDevelop/Core/src/Main/Base/Commands/RunCommands.cs	2004-12-06 15:43:16 UTC (rev 2053)
@@ -20,7 +20,6 @@
 using Gtk;
 using System.Diagnostics;
 
-using MonoDevelop.Core.Services;
 using MonoDevelop.Core.AddIns;
 
 using MonoDevelop.Core.Properties;
@@ -40,13 +39,10 @@
 		
 		public static void ShowAfterCompileStatus()
 		{
-			TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
-			IStatusBarService statusBarService = (IStatusBarService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IStatusBarService));
-			if (!taskService.SomethingWentWrong) {
-				statusBarService.SetMessage(GettextCatalog.GetString ("Successful"));
+			if (!Runtime.TaskService.SomethingWentWrong) {
+				Runtime.Gui.StatusBar.SetMessage (GettextCatalog.GetString ("Successful"));
 			} else {
-				StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
-				statusBarService.SetMessage(String.Format (GettextCatalog.GetString ("{0} errors, {1} warnings"), taskService.Errors.ToString (), taskService.Warnings.ToString ()));
+				Runtime.Gui.StatusBar.SetMessage (String.Format (GettextCatalog.GetString ("{0} errors, {1} warnings"), Runtime.TaskService.Errors.ToString (), Runtime.TaskService.Warnings.ToString ()));
 			}
 		}
 		
@@ -56,22 +52,19 @@
 				CombineEntry.BuildProjects = 0;
 				CombineEntry.BuildErrors   = 0;
 				
-				TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
-				IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
-				StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
+				TaskService taskService = Runtime.TaskService;
+				IProjectService projectService = Runtime.ProjectService;
 				try {
 					if (projectService.CurrentOpenCombine != null) {
 						projectService.CompileCombine();
 						ShowAfterCompileStatus();
 					} else {
 						if (WorkbenchSingleton.Workbench.ActiveWorkbenchWindow != null) {
-							LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(LanguageBindingService));
-							ILanguageBinding binding = languageBindingService.GetBindingPerFileName(WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.ContentName);
+							ILanguageBinding binding = Runtime.Languages.GetBindingPerFileName(WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.ContentName);
 							
 							if (binding != null) {
 								if (binding == null || !binding.CanCompile(WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.ContentName)) {
-									IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
-									messageService.ShowError(String.Format (GettextCatalog.GetString ("Language binding {0} can't compile {1}"), binding.Language, WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.ContentName));
+									Runtime.MessageService.ShowError(String.Format (GettextCatalog.GetString ("Language binding {0} can't compile {1}"), binding.Language, WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.ContentName));
 								} else {
 									new SaveFile().Run();
 									ICompilerResult res = binding.CompileFile(WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.ContentName);
@@ -84,16 +77,14 @@
 									ShowAfterCompileStatus();
 								}
 							} else {
-								IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
-								messageService.ShowError(GettextCatalog.GetString ("No source file for compilation found. Please save unsaved files"));
+								Runtime.MessageService.ShowError(GettextCatalog.GetString ("No source file for compilation found. Please save unsaved files"));
 							}
 						}
 					}
 					taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("---------------------- Done ----------------------\n\nBuild: {0} succeeded, {1} failed\n"), CombineEntry.BuildProjects.ToString (), CombineEntry.BuildErrors.ToString ());
 				} catch (Exception e) {
 					Console.WriteLine (e);
-					IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
-					messageService.ShowError(e, GettextCatalog.GetString ("Error while compiling"));
+					Runtime.MessageService.ShowError(e, GettextCatalog.GetString ("Error while compiling"));
 				}
 				projectService.OnEndBuild();
 			//}
@@ -107,12 +98,9 @@
 		public override void Run()
 		{
 			lock (CompileLockObject) {
-				TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
-				IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
-				
-				if (projectService.CurrentOpenCombine != null) {
-					taskService.CompilerOutput = String.Empty;
-					projectService.OnStartBuild();
+				if (Runtime.ProjectService.CurrentOpenCombine != null) {
+					Runtime.TaskService.CompilerOutput = String.Empty;
+					Runtime.ProjectService.OnStartBuild();
 					RunWithWait();
 					//Thread t = new Thread(new ThreadStart(CompileThread));
 					//t.IsBackground  = true;
@@ -129,9 +117,8 @@
 			lock (Compile.CompileLockObject) {
 				CombineEntry.BuildProjects = 0;
 				CombineEntry.BuildErrors   = 0;
-				TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
-				IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
-				StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
+				TaskService taskService = Runtime.TaskService;
+				IProjectService projectService = Runtime.ProjectService;
 				try {
 					
 					if (projectService.CurrentOpenCombine != null) {
@@ -139,13 +126,11 @@
 						Compile.ShowAfterCompileStatus();
 					} else {
 						if (WorkbenchSingleton.Workbench.ActiveWorkbenchWindow != null) {
-							LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(LanguageBindingService));
-							ILanguageBinding binding = languageBindingService.GetBindingPerFileName(WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.ContentName);
+							ILanguageBinding binding = Runtime.Languages.GetBindingPerFileName(WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.ContentName);
 							
 							if (binding != null) {
 								if (binding == null || !binding.CanCompile(WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.ContentName)) {
-									IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
-									messageService.ShowError(String.Format (GettextCatalog.GetString ("Language binding {0} can't compile {1}"), binding.Language, WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.ContentName));
+									Runtime.MessageService.ShowError(String.Format (GettextCatalog.GetString ("Language binding {0} can't compile {1}"), binding.Language, WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.ContentName));
 								} else {
 									new SaveFile().Run();
 									ICompilerResult res = binding.CompileFile(WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.ContentName);
@@ -158,16 +143,14 @@
 									Compile.ShowAfterCompileStatus();
 								}
 							} else {
-								IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
-								messageService.ShowError(GettextCatalog.GetString ("No source file for compilation found. Please save unsaved files"));
+								Runtime.MessageService.ShowError(GettextCatalog.GetString ("No source file for compilation found. Please save unsaved files"));
 							}
 						}
 					}
 					taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("---------------------- Done ----------------------\n\nBuild: {0} succeeded, {1} failed\n"), CombineEntry.BuildProjects.ToString(), CombineEntry.BuildErrors.ToString());
 				} catch (Exception e) {
 					Console.WriteLine (e);
-					IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
-					messageService.ShowError(e, GettextCatalog.GetString ("Error while compiling"));
+					Runtime.MessageService.ShowError (e, GettextCatalog.GetString ("Error while compiling"));
 				}
 				projectService.OnEndBuild();
 			}
@@ -176,12 +159,10 @@
 		public override void Run()
 		{
 //			if (Monitor.TryEnter(Compile.CompileLockObject)) {
-				TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
-				IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
-				if (projectService.CurrentOpenCombine != null) {
+				if (Runtime.ProjectService.CurrentOpenCombine != null) {
 	
-					taskService.CompilerOutput = String.Empty;
-					projectService.OnStartBuild();
+					Runtime.TaskService.CompilerOutput = String.Empty;
+					Runtime.ProjectService.OnStartBuild();
 					CompileThread ();
 					//Thread t = new Thread(new ThreadStart(CompileThread));
 					//t.IsBackground  = true;
@@ -198,54 +179,47 @@
 		bool RunThread()
 		{
 			lock (Compile.CompileLockObject) {
-				TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
-				IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
-				IStatusBarService statusBarService = (IStatusBarService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IStatusBarService));
+				IProjectService projectService = Runtime.ProjectService;
 				try {
-					statusBarService.SetMessage(GettextCatalog.GetString ("Executing"));
+					Runtime.Gui.StatusBar.SetMessage(GettextCatalog.GetString ("Executing"));
 					if (projectService.CurrentOpenCombine != null) {
 						try {
 							if (projectService.NeedsCompiling) {
 								projectService.CompileCombine();
 							}
-							if (taskService.Errors == 0) {
+							if (Runtime.TaskService.Errors == 0) {
 								projectService.OnBeforeStartProject();
 								projectService.CurrentOpenCombine.Execute();
 							}
 							
 						} catch (NoStartupCombineDefinedException) {
-							IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
-							messageService.ShowError(GettextCatalog.GetString ("Cannot execute Run command, cannot find startup project.\nPlease define a startup project for the combine in the combine properties."));
+							Runtime.MessageService.ShowError(GettextCatalog.GetString ("Cannot execute Run command, cannot find startup project.\nPlease define a startup project for the combine in the combine properties."));
 						}
 					} else {
 						if (WorkbenchSingleton.Workbench.ActiveWorkbenchWindow != null) {
 							new Compile().RunWithWait();
-							if (taskService.Errors == 0) {
-								LanguageBindingService languageBindingService = (LanguageBindingService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(LanguageBindingService));
-								ILanguageBinding binding = languageBindingService.GetBindingPerFileName(WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.ContentName);
+							if (Runtime.TaskService.Errors == 0) {
+								ILanguageBinding binding = Runtime.Languages.GetBindingPerFileName(WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.ContentName);
 								if (binding != null) {
 									projectService.OnBeforeStartProject();
 									binding.Execute(WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent.ContentName);
 								} else {
-									IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
-									messageService.ShowError(GettextCatalog.GetString ("No runnable executable found."));
+									Runtime.MessageService.ShowError(GettextCatalog.GetString ("No runnable executable found."));
 								}
 							}
 						}
 					}
 				} catch (Exception e) {
-					IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
-					messageService.ShowError(e, GettextCatalog.GetString ("Error while running"));
+					Runtime.MessageService.ShowError(e, GettextCatalog.GetString ("Error while running"));
 				}
-				statusBarService.SetMessage(GettextCatalog.GetString ("Ready"));
+				Runtime.Gui.StatusBar.SetMessage(GettextCatalog.GetString ("Ready"));
 				return false;
 			}
 		}
 		
 		public override void Run()
 		{
-			IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
-			if (projectService.CurrentOpenCombine != null) {
+			if (Runtime.ProjectService.CurrentOpenCombine != null) {
 				RunThread(); // TODO FIXME PEDRO
 				
 				//Thread t = new Thread(new ThreadStart(RunThread));
@@ -260,14 +234,11 @@
 		public override void Run()
 		{
 			lock (Compile.CompileLockObject) {
-				TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
-				IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IProjectService));
-				IStatusBarService statusBarService = (IStatusBarService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IStatusBarService));
+				TaskService taskService = Runtime.TaskService;
+				IProjectService projectService = Runtime.ProjectService;
 				
 				if (projectService.CurrentSelectedProject != null) {
 					try {
-						StringParserService stringParserService = (StringParserService)ServiceManager.GetService(typeof(StringParserService));
-						
 						CombineEntry.BuildProjects = 0;
 						CombineEntry.BuildErrors   = 0;
 						taskService.CompilerOutput = String.Empty;
@@ -277,8 +248,7 @@
 						projectService.CompileProject(projectService.CurrentSelectedProject);
 						taskService.CompilerOutput += String.Format (GettextCatalog.GetString ("---------------------- Done ----------------------\n\nBuild: {0} succeeded, {1} failed\n"), CombineEntry.BuildProjects.ToString(), CombineEntry.BuildErrors.ToString());
 					} catch (Exception e) {
-						IMessageService messageService =(IMessageService)ServiceManager.GetService(typeof(IMessageService));
-						messageService.ShowError(e, String.Format (GettextCatalog.GetString ("Error while compiling project {0}"), projectService.CurrentSelectedProject.Name));
+						Runtime.MessageService.ShowError(e, String.Format (GettextCatalog.GetString ("Error while compiling project {0}"), projectService.CurrentSelectedProject.Name));
 					}
 					projectService.OnEndBuild();
 				}
@@ -292,14 +262,11 @@
 		public override void Run()
 		{
 			lock (Compile.CompileLockObject) {
-				TaskService taskService = (TaskService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(TaskService));
-				IProjectService projectService = (IProjectSer