Merge master into roslyn

Conflicts:
	.gitmodules
	main/external/debugger-libs
	main/external/ikvm
	main/external/xwt
	main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj
	main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Gui/ResultsEditorExtension.cs
	main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeIssues/CodeAnalysisRunner.cs
	main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.addin.xml
	main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/MarkerPanel.cs
	main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/AbstractUsagesExtension.cs
	main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs
	main/src/addins/WindowsPlatform/WindowsPlatform/WindowsPlatform.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/MainToolbar.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/ExpandableObjectEditor.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/PropertyTextEditor.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/EditorManager.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid/PropertyEditorCell.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Services.cs

2 files changed, 12 insertions, 89 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksView.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksView.cs
index dab8c85d92..f8bf90cc9d 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksView.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksView.cs
@@ -60,6 +60,7 @@ namespace MonoDevelop.Ide.Tasks
 
 		MonoDevelop.Ide.Gui.Components.PadTreeView view;
 		ListStore store;
+		TreeModelSort sortModel;
 
 		Gdk.Color highPrioColor, normalPrioColor, lowPrioColor;
 
@@ -102,7 +103,9 @@ namespace MonoDevelop.Ide.Tasks
 				typeof (Gdk.Color),  // foreground color
 				typeof (int));       // font weight
 
-			view = new MonoDevelop.Ide.Gui.Components.PadTreeView (store);
+			sortModel = new TreeModelSort (store);
+
+			view = new MonoDevelop.Ide.Gui.Components.PadTreeView (sortModel);
 			view.RulesHint = true;
 			view.SearchColumn = (int)Columns.Description;
 			view.DoPopupMenu = (evt) => IdeApp.CommandService.ShowContextMenu (view, evt, CreateMenu ());
@@ -113,22 +116,16 @@ namespace MonoDevelop.Ide.Tasks
 			col.Clickable = false;
 
 			col = view.AppendColumn (GettextCatalog.GetString ("Description"), view.TextRenderer, "text", Columns.Description, "foreground-gdk", Columns.Foreground, "weight", Columns.Bold);
-			col.Clickable = true;
 			col.SortColumnId = (int)Columns.Description;
 			col.Resizable = true;
-			col.Clicked += Resort;
 
 			col = view.AppendColumn (GettextCatalog.GetString ("File"), view.TextRenderer, "text", Columns.File, "foreground-gdk", Columns.Foreground, "weight", Columns.Bold);
-			col.Clickable = true;
 			col.SortColumnId = (int)Columns.File;
 			col.Resizable = true;
-			col.Clicked += Resort;
 
 			col = view.AppendColumn (GettextCatalog.GetString ("Path"), view.TextRenderer, "text", Columns.Path, "foreground-gdk", Columns.Foreground, "weight", Columns.Bold);
-			col.Clickable = true;
 			col.SortColumnId = (int)Columns.Path;
 			col.Resizable = true;
-			col.Clicked += Resort;
 
 			LoadColumnsVisibility ();
 			
@@ -572,31 +569,6 @@ namespace MonoDevelop.Ide.Tasks
 			}
 		}
 
-		void Resort (object sender, EventArgs args)
-		{
-			TreeViewColumn col = (TreeViewColumn)sender;
-			foreach (TreeViewColumn c in view.Columns)
-			{
-				if (c != col) c.SortIndicator = false;
-			}
-			col.SortOrder = ReverseSortOrder (col);
-			col.SortIndicator = true;
-			store.SetSortColumnId (col.SortColumnId, col.SortOrder);
-		}
-		
-		static SortType ReverseSortOrder (TreeViewColumn col)
-		{
-			if (col.SortIndicator) {
-				if (col.SortOrder == SortType.Ascending)
-					return SortType.Descending;
-				else
-					return SortType.Ascending;
-			} else
-			{
-				return SortType.Ascending;
-			}
-		}
-		
 		Gdk.Color GetColorByPriority (TaskPriority prio)
 		{
 			switch (prio)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/UserTasksView.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/UserTasksView.cs
index 601f54308b..16ba0c9c36 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/UserTasksView.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/UserTasksView.cs
@@ -54,6 +54,7 @@ namespace MonoDevelop.Ide.Tasks
 
 		MonoDevelop.Ide.Gui.Components.PadTreeView view;
 		ListStore store;
+		TreeModelSort sortModel;
 		CellRendererText cellRendDesc;
 		
 		Gdk.Color highPrioColor, normalPrioColor, lowPrioColor;
@@ -76,8 +77,10 @@ namespace MonoDevelop.Ide.Tasks
 				typeof (TaskListEntry),	 // user task
 				typeof (Gdk.Color),  // foreground color
 				typeof (int));		 // font style
-			
-			view = new MonoDevelop.Ide.Gui.Components.PadTreeView (store);
+
+			sortModel = new TreeModelSort (store);
+
+			view = new MonoDevelop.Ide.Gui.Components.PadTreeView (sortModel);
 			view.RulesHint = true;
 			view.SearchColumn = (int)Columns.Description;
 			view.Selection.Changed += new EventHandler (SelectionChanged);
@@ -88,26 +91,20 @@ namespace MonoDevelop.Ide.Tasks
 			cellRendPriority.Editable = true;
 			cellRendPriority.Changed += new ComboSelectionChangedHandler (UserTaskPriorityEdited);
 			col = view.AppendColumn (GettextCatalog.GetString ("Priority"), cellRendPriority, "text", Columns.Priority, "foreground-gdk", Columns.Foreground, "weight", Columns.Bold);
-			col.Clickable = true;
 			col.Resizable = true;
-			TreeIterCompareFunc sortFunc = new TreeIterCompareFunc (PrioirtySortFunc);
-			store.SetSortFunc ((int)Columns.Priority, sortFunc);
-			col.Clicked += new EventHandler (UserTaskPriorityResort);
+			col.SortColumnId = (int)Columns.Priority;
 			
 			CellRendererToggle cellRendCompleted = new CellRendererToggle ();
 			cellRendCompleted.Toggled += new ToggledHandler (UserTaskCompletedToggled);
 			cellRendCompleted.Activatable = true;
 			col = view.AppendColumn (String.Empty, cellRendCompleted, "active", Columns.Completed);
-			col.Clickable = true;
-			col.Clicked += new EventHandler (UserTaskCompletedResort);
-			
+
 			cellRendDesc = view.TextRenderer;
 			cellRendDesc.Editable = true;
 			cellRendDesc.Edited += new EditedHandler (UserTaskDescEdited);
 			col = view.AppendColumn (GettextCatalog.GetString ("Description"), cellRendDesc, "text", Columns.Description, "strikethrough", Columns.Completed, "foreground-gdk", Columns.Foreground, "weight", Columns.Bold);
-			col.Clickable = true;
 			col.Resizable = true;
-			col.Clicked += new EventHandler (UserTaskDescResort);
+			col.SortColumnId = (int)Columns.Description;
 			
 			newButton = new Button ();
 			newButton.Label = GettextCatalog.GetString ("New Task");
@@ -288,28 +285,6 @@ namespace MonoDevelop.Ide.Tasks
 			}
 		}
 		
-		int PrioirtySortFunc (TreeModel model, TreeIter iter1, TreeIter iter2)
-		{
-			TaskPriority prio1 = (TaskPriority) Enum.Parse (typeof (TaskPriority), (string)model.GetValue (iter1, (int)Columns.Priority));
-			TaskPriority prio2 = (TaskPriority) Enum.Parse (typeof (TaskPriority), (string)model.GetValue (iter2, (int)Columns.Priority));
-
-			if (prio1 == prio2)
-				return 0;
-			return prio1 < prio2 ? 1 : -1;
-		}
-		
-		void UserTaskPriorityResort (object sender, EventArgs args)
-		{
-			TreeViewColumn col = view.Columns[(int)Columns.Priority];
-			foreach (TreeViewColumn c in view.Columns)
-			{
-				if (c != col) c.SortIndicator = false;
-			}
-			col.SortOrder = ReverseSortOrder (col);
-			col.SortIndicator = true;
-			store.SetSortColumnId ((int)Columns.Priority, col.SortOrder);
-		}
-		
 		void UserTaskCompletedToggled (object o, ToggledArgs args)
 		{
 			Gtk.TreeIter iter;
@@ -323,18 +298,6 @@ namespace MonoDevelop.Ide.Tasks
 			}
 		}
 		
-		void UserTaskCompletedResort (object sender, EventArgs args)
-		{
-			TreeViewColumn col = view.Columns[(int)Columns.Completed];
-			foreach (TreeViewColumn c in view.Columns)
-			{
-				if (c != col) c.SortIndicator = false;
-			}
-			col.SortOrder = ReverseSortOrder (col);
-			col.SortIndicator = true;
-			store.SetSortColumnId ((int)Columns.Completed, col.SortOrder);
-		}
-		
 		void UserTaskDescEdited (object o, EditedArgs args)
 		{
 			Gtk.TreeIter iter;
@@ -346,18 +309,6 @@ namespace MonoDevelop.Ide.Tasks
 			}
 		}
 		
-		void UserTaskDescResort (object sender, EventArgs args)
-		{
-			TreeViewColumn col = view.Columns[(int)Columns.Description];
-			foreach (TreeViewColumn c in view.Columns)
-			{
-				if (c != col) c.SortIndicator = false;
-			}
-			col.SortOrder = ReverseSortOrder (col);
-			col.SortIndicator = true;
-			store.SetSortColumnId ((int)Columns.Description, col.SortOrder);
-		}
-		
 		Gdk.Color GetColorByPriority (TaskPriority prio)
 		{
 			switch (prio)