Merge branch 'master' into newresolver

Conflicts:
	extras/GtkSourceViewEditor/MonoDevelop.SourceEditor.addin.xml
	extras/MonoDevelop.Database/MonoDevelop.Database.Components/Widgets/DataGrid/DataGrid.cs
	main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.addin.xml
	main/src/addins/NUnit/Makefile.am
	main/src/addins/NUnit/MonoDevelop.NUnit.csproj
	main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom.Serialization/ProjectCodeCompletionDatabase.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ListWindow.cs

7 files changed, 35 insertions, 186 deletions

diff --git a/main/src/addins/MonoDevelop.MacDev/Makefile.am b/main/src/addins/MonoDevelop.MacDev/Makefile.am
index f0691ec8f9..af9a5b258e 100644
--- a/main/src/addins/MonoDevelop.MacDev/Makefile.am
+++ b/main/src/addins/MonoDevelop.MacDev/Makefile.am
@@ -29,8 +29,6 @@ FILES =  \
 	AssemblyInfo.cs \
 	BindingProject/ObjcBindingProject.cs \
 	BindingProject/ObjcBindingProjectConfiguration.cs \
-	gtk-gui/generated.cs \
-	gtk-gui/MonoDevelop.MacDev.PlistEditor.CustomPropertiesWidget.cs \
 	MacBuildUtilities.cs \
 	MonoDevelop.MacDev.InterfaceBuilder/Collections.cs \
 	MonoDevelop.MacDev.InterfaceBuilder/IBConnectionRecord.cs \
@@ -103,9 +101,7 @@ FILES =  \
 	XcodeSyncing/XcodeSyncedItem.cs \
 	XcodeSyncing/XcodeSyncedType.cs 
 
-RES =  \
-	gtk-gui/gui.stetic \
-	MonoDevelop.MacDev.addin.xml
+RES = MonoDevelop.MacDev.addin.xml
 
 ICON_FILES =  \
 	icons/application-x-mono-develop-xib-48.png \
diff --git a/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.PlistEditor/CustomPropertiesWidget.cs b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.PlistEditor/CustomPropertiesWidget.cs
index 92b6fcd8b9..ae9f59ff97 100644
--- a/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.PlistEditor/CustomPropertiesWidget.cs
+++ b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.PlistEditor/CustomPropertiesWidget.cs
@@ -31,18 +31,19 @@ using MonoMac.Foundation;
 using System.Linq;
 using MonoDevelop.Components.Commands;
 using MonoDevelop.Ide;
+using Mono.TextEditor;
 
 namespace MonoDevelop.MacDev.PlistEditor
 {
 	[System.ComponentModel.ToolboxItem(true)]
-	public partial class CustomPropertiesWidget : Gtk.Bin, IPListDisplayWidget
+	public partial class CustomPropertiesWidget : VBox, IPListDisplayWidget
 	{
 		const string AddKeyNode = "Add new entry";
 		
 		TreeStore treeStore = new TreeStore (typeof(string), typeof (PObject));
 		Gtk.ListStore keyStore = new ListStore (typeof (string), typeof (PListScheme.Key));
 		Gtk.ListStore valueStore = new ListStore (typeof (string), typeof (string));
-		PopupTreeView treeview1;
+		PopupTreeView treeview;
 		PListScheme scheme;
 		HashSet<PObject> expandedObjects = new HashSet<PObject> ();
 		bool showDescriptions = true;
@@ -93,30 +94,16 @@ namespace MonoDevelop.MacDev.PlistEditor
 			return new PString ("<error>");
 		}
 		
-		class PopupTreeView : Gtk.TreeView
+		class PopupTreeView : MonoDevelop.Components.ContextMenuTreeView
 		{
 			CustomPropertiesWidget widget;
 			
 			public PopupTreeView (CustomPropertiesWidget widget)
 			{
 				this.widget = widget;
+				this.DoPopupMenu += ShowPopup;
 			}
-			
-			protected override bool OnPopupMenu ()
-			{
-				ShowPopup ();
-				return base.OnPopupMenu ();
-			}
-			
-			protected override bool OnButtonReleaseEvent (Gdk.EventButton evnt)
-			{
-				if (evnt.Button == 3) {
-					ShowPopup ();
-				}
-				return base.OnButtonReleaseEvent (evnt);
-			}
-
-			void ShowPopup ()
+			void ShowPopup (Gdk.EventButton evnt)
 			{
 				Gtk.TreeIter iter;
 				bool hasSelection = Selection.GetSelected (out iter);
@@ -179,8 +166,8 @@ namespace MonoDevelop.MacDev.PlistEditor
 					};
 					menu.Append (showDescItem);
 				}
-				IdeApp.CommandService.ShowContextMenu (menu, this);
 				menu.ShowAll ();
+				IdeApp.CommandService.ShowContextMenu (this, evnt, menu, this);
 			}
 
 			
@@ -248,10 +235,9 @@ namespace MonoDevelop.MacDev.PlistEditor
 		public CustomPropertiesWidget (PListScheme scheme)
 		{
 			this.scheme = scheme = scheme ?? PListScheme.Empty;
-			this.Build ();
-			treeview1 = new PopupTreeView  (this);
-			treeview1.HeadersClickable = true;
-			this.vbox1.PackStart (treeview1, true, true, 0);
+			treeview = new PopupTreeView  (this);
+			treeview.HeadersClickable = true;
+			this.PackStart (treeview, true, true, 0);
 			ShowAll ();
 			
 			var keyRenderer = new CellRendererCombo ();
@@ -297,7 +283,7 @@ namespace MonoDevelop.MacDev.PlistEditor
 				renderer.Sensitive = true;
 				renderer.Text = key != null && ShowDescriptions ? GettextCatalog.GetString (key.Description) : id;
 			});
-			treeview1.AppendColumn (col);
+			treeview.AppendColumn (col);
 			
 			var iconSize = IconSize.Menu;
 			col = new TreeViewColumn { MinWidth = 25, Resizable = true, Sizing = Gtk.TreeViewColumnSizing.Autosize };
@@ -305,7 +291,7 @@ namespace MonoDevelop.MacDev.PlistEditor
 			var removeRenderer = new CellRendererButton (ImageService.GetPixbuf ("gtk-remove", IconSize.Menu));
 			removeRenderer.Clicked += delegate {
 				TreeIter iter;
-				bool hasSelection = treeview1.Selection.GetSelected (out iter);
+				bool hasSelection = treeview.Selection.GetSelected (out iter);
 				PObject obj = null;
 				if (hasSelection) {
 					obj = (PObject)treeStore.GetValue (iter, 1);
@@ -314,13 +300,13 @@ namespace MonoDevelop.MacDev.PlistEditor
 			};
 			col.PackEnd (removeRenderer, false);
 			col.SetCellDataFunc (removeRenderer, delegate(TreeViewColumn tree_column, CellRenderer cell, TreeModel tree_model, TreeIter iter) {
-				removeRenderer.Visible = treeview1.Selection.IterIsSelected (iter) && !AddKeyNode.Equals (treeStore.GetValue (iter, 0));
+				removeRenderer.Visible = treeview.Selection.IterIsSelected (iter) && !AddKeyNode.Equals (treeStore.GetValue (iter, 0));
 			});
 			
 			var addRenderer = new CellRendererButton (ImageService.GetPixbuf ("gtk-add", IconSize.Menu));
 			addRenderer.Clicked += delegate {
 				Gtk.TreeIter iter = Gtk.TreeIter.Zero;
-				if (!treeview1.Selection.GetSelected (out iter))
+				if (!treeview.Selection.GetSelected (out iter))
 					return;
 				
 				PObject obj = null;
@@ -345,15 +331,15 @@ namespace MonoDevelop.MacDev.PlistEditor
 			
 			col.PackEnd (addRenderer, false);
 			col.SetCellDataFunc (addRenderer, delegate(TreeViewColumn tree_column, CellRenderer cell, TreeModel tree_model, TreeIter iter) {
-				addRenderer.Visible = treeview1.Selection.IterIsSelected (iter) && AddKeyNode.Equals (treeStore.GetValue (iter, 0));
+				addRenderer.Visible = treeview.Selection.IterIsSelected (iter) && AddKeyNode.Equals (treeStore.GetValue (iter, 0));
 			});
-			treeview1.AppendColumn (col);
+			treeview.AppendColumn (col);
 			
-			treeview1.RowExpanded += delegate(object o, RowExpandedArgs args) {
+			treeview.RowExpanded += delegate(object o, RowExpandedArgs args) {
 				var obj = (PObject)treeStore.GetValue (args.Iter, 1);
 				expandedObjects.Add (obj);
 			};
-			treeview1.RowCollapsed += delegate(object o, RowCollapsedArgs args) {
+			treeview.RowCollapsed += delegate(object o, RowCollapsedArgs args) {
 				var obj = (PObject)treeStore.GetValue (args.Iter, 1);
 				expandedObjects.Remove (obj);
 			};
@@ -381,7 +367,7 @@ namespace MonoDevelop.MacDev.PlistEditor
 					oldObj.Replace (CreateNewObject (args.NewText));
 			};
 			
-			treeview1.AppendColumn (GettextCatalog.GetString ("Type"), comboRenderer, delegate(TreeViewColumn tree_column, CellRenderer cell, TreeModel tree_model, TreeIter iter) {
+			treeview.AppendColumn (GettextCatalog.GetString ("Type"), comboRenderer, delegate(TreeViewColumn tree_column, CellRenderer cell, TreeModel tree_model, TreeIter iter) {
 				var renderer = (CellRendererCombo)cell;
 				string id = (string)tree_model.GetValue (iter, 0) ?? "";
 				var key   = scheme.GetKey (id);
@@ -453,7 +439,7 @@ namespace MonoDevelop.MacDev.PlistEditor
 			};*/
 			
 			
-			treeview1.AppendColumn (GettextCatalog.GetString ("Value"), propRenderer, delegate(TreeViewColumn tree_column, CellRenderer cell, TreeModel tree_model, TreeIter iter) {
+			treeview.AppendColumn (GettextCatalog.GetString ("Value"), propRenderer, delegate(TreeViewColumn tree_column, CellRenderer cell, TreeModel tree_model, TreeIter iter) {
 				var renderer = (CellRendererCombo)cell;
 				var obj      = (PObject)tree_model.GetValue (iter, 1);
 				if (obj == null) {
@@ -464,8 +450,8 @@ namespace MonoDevelop.MacDev.PlistEditor
 				renderer.Editable = !(obj is PArray || obj is PDictionary || obj is PData);
 				obj.RenderValue (this, renderer);
 			});
-			treeview1.EnableGridLines = TreeViewGridLines.Horizontal;
-			treeview1.Model = treeStore;
+			treeview.EnableGridLines = TreeViewGridLines.Horizontal;
+			treeview.Model = treeStore;
 		}
 
 		bool GetIsExpanded (Gtk.TreeIter iter, TreeStore treeStore)
@@ -473,7 +459,7 @@ namespace MonoDevelop.MacDev.PlistEditor
 			if (TreeIter.Zero.Equals (iter))
 				return  false;
 			var path = treeStore.GetPath (iter);
-			return path != null ? treeview1.GetRowExpanded (path) : false;
+			return path != null ? treeview.GetRowExpanded (path) : false;
 		}
 		
 		Dictionary<PObject, Gtk.TreeIter> iterTable = new Dictionary<PObject, Gtk.TreeIter> ();
@@ -498,7 +484,7 @@ namespace MonoDevelop.MacDev.PlistEditor
 				if (item.Value is PDictionary)
 					AddToTree (treeStore, subIter, (PDictionary)item.Value);
 				if (expandedObjects.Contains (item.Value))
-					treeview1.ExpandRow (treeStore.GetPath (subIter), true);
+					treeview.ExpandRow (treeStore.GetPath (subIter), true);
 			}
 			AddCreateNewEntry (iter);
 			
@@ -516,7 +502,7 @@ namespace MonoDevelop.MacDev.PlistEditor
 			RemoveChildren (iter);
 			AddToTree (treeStore, iter, dict);
 			if (isExpanded)
-				treeview1.ExpandRow (treeStore.GetPath (iter), false);
+				treeview.ExpandRow (treeStore.GetPath (iter), false);
 		}
 		
 		HashSet<PObject> rebuildArrays = new HashSet<PObject> ();
@@ -536,7 +522,7 @@ namespace MonoDevelop.MacDev.PlistEditor
 				if (item is PDictionary)
 					AddToTree (treeStore, subIter, (PDictionary)item);
 				if (expandedObjects.Contains (item))
-					treeview1.ExpandRow (treeStore.GetPath (subIter), true);
+					treeview.ExpandRow (treeStore.GetPath (subIter), true);
 			}
 
 			AddCreateNewEntry  (iter);
@@ -555,7 +541,7 @@ namespace MonoDevelop.MacDev.PlistEditor
 			RemoveChildren (iter);
 			AddToTree (treeStore, iter, arr);
 			if (isExpanded)
-				treeview1.ExpandRow (treeStore.GetPath (iter), false);
+				treeview.ExpandRow (treeStore.GetPath (iter), false);
 		}
 
 		void RemoveChildren (Gtk.TreeIter iter)
diff --git a/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.PlistEditor/PListEditorViewContent.cs b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.PlistEditor/PListEditorViewContent.cs
index 1efd494e5a..7be1d08f93 100644
--- a/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.PlistEditor/PListEditorViewContent.cs
+++ b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.PlistEditor/PListEditorViewContent.cs
@@ -41,15 +41,21 @@ namespace MonoDevelop.MacDev.PlistEditor
 	{
 		PObjectContainer pobject;
 		IPListDisplayWidget widget;
+		Gtk.Widget control;
 		
-		public override Gtk.Widget Control { get { return (Gtk.Widget)widget; } }
+		public override Gtk.Widget Control { get { return control; } }
 		
 		public PListEditorViewContent (IPlistEditingHandler handler, Project proj)
 		{
 			if (handler != null) {
 				widget =  new PListEditorWidget (handler, proj);
+				control = (Gtk.Widget) widget;
 			} else {
 				widget = new CustomPropertiesWidget ();
+				var csw =  new MonoDevelop.Components.CompactScrolledWindow ();
+				csw.Show ();
+				csw.AddWithViewport ((Gtk.Widget)widget);
+				control = csw;
 			}
 		}
 		
diff --git a/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.csproj b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.csproj
index f976ef51cb..c5964f14ef 100644
--- a/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.csproj
+++ b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.csproj
@@ -123,8 +123,6 @@
     <Compile Include="XcodeSyncing\XcodeSyncContext.cs" />
     <Compile Include="AppleSdkSettingsPanel.cs" />
     <Compile Include="AppleSdkSettings.cs" />
-    <Compile Include="gtk-gui\generated.cs" />
-    <Compile Include="gtk-gui\MonoDevelop.MacDev.PlistEditor.CustomPropertiesWidget.cs" />
     <Compile Include="MonoDevelop.MacDev.PlistEditor\PListEditorWidget.cs" />
     <Compile Include="MonoDevelop.MacDev.PlistEditor\PListEditorDisplayBinding.cs" />
     <Compile Include="MonoDevelop.MacDev.PlistEditor\PListEditorViewContent.cs" />
@@ -149,9 +147,6 @@
     <EmbeddedResource Include="MonoDevelop.MacDev.addin.xml">
       <LogicalName>MonoDevelop.MacDev.addin.xml</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="gtk-gui\gui.stetic">
-      <LogicalName>gui.stetic</LogicalName>
-    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <None Include="icons\application-x-mono-develop-xib.svg" />
diff --git a/main/src/addins/MonoDevelop.MacDev/gtk-gui/MonoDevelop.MacDev.PlistEditor.CustomPropertiesWidget.cs b/main/src/addins/MonoDevelop.MacDev/gtk-gui/MonoDevelop.MacDev.PlistEditor.CustomPropertiesWidget.cs
deleted file mode 100644
index 706bb9e7be..0000000000
--- a/main/src/addins/MonoDevelop.MacDev/gtk-gui/MonoDevelop.MacDev.PlistEditor.CustomPropertiesWidget.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-
-// This file has been generated by the GUI designer. Do not modify.
-namespace MonoDevelop.MacDev.PlistEditor
-{
-	public partial class CustomPropertiesWidget
-	{
-		private global::Gtk.VBox vbox1;
-		
-		protected virtual void Build ()
-		{
-			global::Stetic.Gui.Initialize (this);
-			// Widget MonoDevelop.MacDev.PlistEditor.CustomPropertiesWidget
-			global::Stetic.BinContainer.Attach (this);
-			this.Name = "MonoDevelop.MacDev.PlistEditor.CustomPropertiesWidget";
-			// Container child MonoDevelop.MacDev.PlistEditor.CustomPropertiesWidget.Gtk.Container+ContainerChild
-			this.vbox1 = new global::Gtk.VBox ();
-			this.vbox1.Name = "vbox1";
-			this.vbox1.Spacing = 6;
-			this.Add (this.vbox1);
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
-			}
-			this.Hide ();
-		}
-	}
-}
diff --git a/main/src/addins/MonoDevelop.MacDev/gtk-gui/generated.cs b/main/src/addins/MonoDevelop.MacDev/gtk-gui/generated.cs
deleted file mode 100644
index 8d3a3ae5d9..0000000000
--- a/main/src/addins/MonoDevelop.MacDev/gtk-gui/generated.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-
-// This file has been generated by the GUI designer. Do not modify.
-namespace Stetic
-{
-	internal class Gui
-	{
-		private static bool initialized;
-		
-		internal static void Initialize (Gtk.Widget iconRenderer)
-		{
-			if ((Stetic.Gui.initialized == false)) {
-				Stetic.Gui.initialized = true;
-			}
-		}
-	}
-	
-	internal class BinContainer
-	{
-		private Gtk.Widget child;
-		private Gtk.UIManager uimanager;
-		
-		public static BinContainer Attach (Gtk.Bin bin)
-		{
-			BinContainer bc = new BinContainer ();
-			bin.SizeRequested += new Gtk.SizeRequestedHandler (bc.OnSizeRequested);
-			bin.SizeAllocated += new Gtk.SizeAllocatedHandler (bc.OnSizeAllocated);
-			bin.Added += new Gtk.AddedHandler (bc.OnAdded);
-			return bc;
-		}
-		
-		private void OnSizeRequested (object sender, Gtk.SizeRequestedArgs args)
-		{
-			if ((this.child != null)) {
-				args.Requisition = this.child.SizeRequest ();
-			}
-		}
-		
-		private void OnSizeAllocated (object sender, Gtk.SizeAllocatedArgs args)
-		{
-			if ((this.child != null)) {
-				this.child.Allocation = args.Allocation;
-			}
-		}
-		
-		private void OnAdded (object sender, Gtk.AddedArgs args)
-		{
-			this.child = args.Widget;
-		}
-		
-		public void SetUiManager (Gtk.UIManager uim)
-		{
-			this.uimanager = uim;
-			this.child.Realized += new System.EventHandler (this.OnRealized);
-		}
-		
-		private void OnRealized (object sender, System.EventArgs args)
-		{
-			if ((this.uimanager != null)) {
-				Gtk.Widget w;
-				w = this.child.Toplevel;
-				if (((w != null) && typeof(Gtk.Window).IsInstanceOfType (w))) {
-					((Gtk.Window)(w)).AddAccelGroup (this.uimanager.AccelGroup);
-					this.uimanager = null;
-				}
-			}
-		}
-	}
-	
-	internal class ActionGroups
-	{
-		public static Gtk.ActionGroup GetActionGroup (System.Type type)
-		{
-			return Stetic.ActionGroups.GetActionGroup (type.FullName);
-		}
-		
-		public static Gtk.ActionGroup GetActionGroup (string name)
-		{
-			return null;
-		}
-	}
-}
diff --git a/main/src/addins/MonoDevelop.MacDev/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.MacDev/gtk-gui/gui.stetic
deleted file mode 100644
index a009c73ea1..0000000000
--- a/main/src/addins/MonoDevelop.MacDev/gtk-gui/gui.stetic
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<stetic-interface>
-  <configuration>
-    <images-root-path>..</images-root-path>
-    <target-gtk-version>2.12</target-gtk-version>
-  </configuration>
-  <import>
-    <widget-library name="../../../../build/AddIns/MacPlatform.dll" />
-    <widget-library name="../../../../build/bin/MonoDevelop.Ide.dll" />
-    <widget-library name="../../../../build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll" />
-    <widget-library name="../../../../build/bin/Mono.TextEditor.dll" />
-    <widget-library name="../../../../build/AddIns/MonoDevelop.MacDev/MonoDevelop.MacDev.dll" internal="true" />
-  </import>
-  <widget class="Gtk.Bin" id="MonoDevelop.MacDev.PlistEditor.CustomPropertiesWidget" design-size="503 416">
-    <property name="MemberName" />
-    <property name="Visible">False</property>
-    <child>
-      <widget class="Gtk.VBox" id="vbox1">
-        <property name="MemberName" />
-        <property name="Spacing">6</property>
-        <child>
-          <placeholder />
-        </child>
-      </widget>
-    </child>
-  </widget>
-</stetic-interface>
\ No newline at end of file