Add sorting to outline pad.

* Extract PriorityList as standalone class and use in outline preferences and DebuggerOptionsPanelWidget.

3 files changed, 42 insertions, 145 deletions

diff --git a/main/src/addins/MonoDevelop.Debugger/gtk-gui/MonoDevelop.Debugger.DebuggerOptionsPanelWidget.cs b/main/src/addins/MonoDevelop.Debugger/gtk-gui/MonoDevelop.Debugger.DebuggerOptionsPanelWidget.cs
index 9c10031309..aa43a7d049 100644
--- a/main/src/addins/MonoDevelop.Debugger/gtk-gui/MonoDevelop.Debugger.DebuggerOptionsPanelWidget.cs
+++ b/main/src/addins/MonoDevelop.Debugger/gtk-gui/MonoDevelop.Debugger.DebuggerOptionsPanelWidget.cs
@@ -5,25 +5,35 @@ namespace MonoDevelop.Debugger
 	public partial class DebuggerOptionsPanelWidget
 	{
 		private global::Gtk.Notebook notebook1;
+
 		private global::Gtk.VBox vbox3;
+
 		private global::Gtk.CheckButton projectCodeOnly;
+
 		private global::Gtk.CheckButton checkAllowEval;
+
 		private global::Gtk.CheckButton checkToString;
+
 		private global::Gtk.CheckButton checkShowBaseGroup;
+
 		private global::Gtk.CheckButton checkGroupPrivate;
+
 		private global::Gtk.CheckButton checkGroupStatic;
+
 		private global::Gtk.Table tableEval;
+
 		private global::Gtk.Label label60;
+
 		private global::Gtk.SpinButton spinTimeout;
+
 		private global::Gtk.Label label4;
+
 		private global::Gtk.VBox vbox2;
+
 		private global::Gtk.Label label2;
-		private global::Gtk.HBox hbox1;
-		private global::Gtk.ScrolledWindow GtkScrolledWindow;
-		private global::Gtk.TreeView engineList;
-		private global::Gtk.VBox vbox4;
-		private global::Gtk.Button buttonUp;
-		private global::Gtk.Button buttonDown;
+
+		private global::MonoDevelop.Ide.Gui.Components.PriorityList prioritylist;
+
 		private global::Gtk.Label label1;
 
 		protected virtual void Build ()
@@ -36,7 +46,7 @@ namespace MonoDevelop.Debugger
 			this.notebook1 = new global::Gtk.Notebook ();
 			this.notebook1.CanFocus = true;
 			this.notebook1.Name = "notebook1";
-			this.notebook1.CurrentPage = 0;
+			this.notebook1.CurrentPage = 1;
 			// Container child notebook1.Gtk.Notebook+NotebookChild
 			this.vbox3 = new global::Gtk.VBox ();
 			this.vbox3.Name = "vbox3";
@@ -51,7 +61,7 @@ namespace MonoDevelop.Debugger
 			this.projectCodeOnly.DrawIndicator = true;
 			this.projectCodeOnly.UseUnderline = true;
 			this.vbox3.Add (this.projectCodeOnly);
-			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.projectCodeOnly]));
+			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.projectCodeOnly]));
 			w1.Position = 0;
 			w1.Expand = false;
 			w1.Fill = false;
@@ -64,7 +74,7 @@ namespace MonoDevelop.Debugger
 			this.checkAllowEval.DrawIndicator = true;
 			this.checkAllowEval.UseUnderline = true;
 			this.vbox3.Add (this.checkAllowEval);
-			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.checkAllowEval]));
+			global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.checkAllowEval]));
 			w2.Position = 1;
 			w2.Expand = false;
 			w2.Fill = false;
@@ -76,7 +86,7 @@ namespace MonoDevelop.Debugger
 			this.checkToString.DrawIndicator = true;
 			this.checkToString.UseUnderline = true;
 			this.vbox3.Add (this.checkToString);
-			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.checkToString]));
+			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.checkToString]));
 			w3.Position = 2;
 			w3.Expand = false;
 			w3.Fill = false;
@@ -88,7 +98,7 @@ namespace MonoDevelop.Debugger
 			this.checkShowBaseGroup.DrawIndicator = true;
 			this.checkShowBaseGroup.UseUnderline = true;
 			this.vbox3.Add (this.checkShowBaseGroup);
-			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.checkShowBaseGroup]));
+			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.checkShowBaseGroup]));
 			w4.Position = 3;
 			w4.Expand = false;
 			w4.Fill = false;
@@ -100,7 +110,7 @@ namespace MonoDevelop.Debugger
 			this.checkGroupPrivate.DrawIndicator = true;
 			this.checkGroupPrivate.UseUnderline = true;
 			this.vbox3.Add (this.checkGroupPrivate);
-			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.checkGroupPrivate]));
+			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.checkGroupPrivate]));
 			w5.Position = 4;
 			w5.Expand = false;
 			w5.Fill = false;
@@ -112,7 +122,7 @@ namespace MonoDevelop.Debugger
 			this.checkGroupStatic.DrawIndicator = true;
 			this.checkGroupStatic.UseUnderline = true;
 			this.vbox3.Add (this.checkGroupStatic);
-			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.checkGroupStatic]));
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.checkGroupStatic]));
 			w6.Position = 5;
 			w6.Expand = false;
 			w6.Fill = false;
@@ -124,10 +134,10 @@ namespace MonoDevelop.Debugger
 			// Container child tableEval.Gtk.Table+TableChild
 			this.label60 = new global::Gtk.Label ();
 			this.label60.Name = "label60";
-			this.label60.Xalign = 0F;
+			this.label60.Xalign = 0f;
 			this.label60.LabelProp = global::Mono.Unix.Catalog.GetString ("Evaluation Timeout:");
 			this.tableEval.Add (this.label60);
-			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.tableEval [this.label60]));
+			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.tableEval[this.label60]));
 			w7.XOptions = ((global::Gtk.AttachOptions)(4));
 			w7.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child tableEval.Gtk.Table+TableChild
@@ -138,13 +148,13 @@ namespace MonoDevelop.Debugger
 			this.spinTimeout.ClimbRate = 100;
 			this.spinTimeout.Numeric = true;
 			this.tableEval.Add (this.spinTimeout);
-			global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.tableEval [this.spinTimeout]));
+			global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.tableEval[this.spinTimeout]));
 			w8.LeftAttach = ((uint)(1));
 			w8.RightAttach = ((uint)(2));
 			w8.XOptions = ((global::Gtk.AttachOptions)(4));
 			w8.YOptions = ((global::Gtk.AttachOptions)(4));
 			this.vbox3.Add (this.tableEval);
-			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.tableEval]));
+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox3[this.tableEval]));
 			w9.Position = 6;
 			w9.Expand = false;
 			w9.Fill = false;
@@ -164,70 +174,23 @@ namespace MonoDevelop.Debugger
 			this.label2 = new global::Gtk.Label ();
 			this.label2.WidthRequest = 417;
 			this.label2.Name = "label2";
-			this.label2.Xalign = 0F;
+			this.label2.Xalign = 0f;
 			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("This priority list will be used by MonoDevelop when selecting the engine to be used for debugging an application.");
 			this.label2.Wrap = true;
 			this.vbox2.Add (this.label2);
-			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.label2]));
+			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.label2]));
 			w11.Position = 0;
 			w11.Expand = false;
 			w11.Fill = false;
 			// Container child vbox2.Gtk.Box+BoxChild
-			this.hbox1 = new global::Gtk.HBox ();
-			this.hbox1.Name = "hbox1";
-			this.hbox1.Spacing = 6;
-			// Container child hbox1.Gtk.Box+BoxChild
-			this.GtkScrolledWindow = new global::Gtk.ScrolledWindow ();
-			this.GtkScrolledWindow.Name = "GtkScrolledWindow";
-			this.GtkScrolledWindow.ShadowType = ((global::Gtk.ShadowType)(1));
-			// Container child GtkScrolledWindow.Gtk.Container+ContainerChild
-			this.engineList = new global::Gtk.TreeView ();
-			this.engineList.CanFocus = true;
-			this.engineList.Name = "engineList";
-			this.engineList.HeadersVisible = false;
-			this.GtkScrolledWindow.Add (this.engineList);
-			this.hbox1.Add (this.GtkScrolledWindow);
-			global::Gtk.Box.BoxChild w13 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.GtkScrolledWindow]));
-			w13.Position = 0;
-			// Container child hbox1.Gtk.Box+BoxChild
-			this.vbox4 = new global::Gtk.VBox ();
-			this.vbox4.Name = "vbox4";
-			this.vbox4.Spacing = 6;
-			// Container child vbox4.Gtk.Box+BoxChild
-			this.buttonUp = new global::Gtk.Button ();
-			this.buttonUp.CanFocus = true;
-			this.buttonUp.Name = "buttonUp";
-			this.buttonUp.UseStock = true;
-			this.buttonUp.UseUnderline = true;
-			this.buttonUp.Label = "gtk-go-up";
-			this.vbox4.Add (this.buttonUp);
-			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.buttonUp]));
-			w14.Position = 0;
-			w14.Expand = false;
-			w14.Fill = false;
-			// Container child vbox4.Gtk.Box+BoxChild
-			this.buttonDown = new global::Gtk.Button ();
-			this.buttonDown.CanFocus = true;
-			this.buttonDown.Name = "buttonDown";
-			this.buttonDown.UseStock = true;
-			this.buttonDown.UseUnderline = true;
-			this.buttonDown.Label = "gtk-go-down";
-			this.vbox4.Add (this.buttonDown);
-			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.buttonDown]));
-			w15.Position = 1;
-			w15.Expand = false;
-			w15.Fill = false;
-			this.hbox1.Add (this.vbox4);
-			global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.vbox4]));
-			w16.Position = 1;
-			w16.Expand = false;
-			w16.Fill = false;
-			this.vbox2.Add (this.hbox1);
-			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.hbox1]));
-			w17.Position = 1;
+			this.prioritylist = new global::MonoDevelop.Ide.Gui.Components.PriorityList ();
+			this.prioritylist.Name = "prioritylist";
+			this.vbox2.Add (this.prioritylist);
+			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.prioritylist]));
+			w12.Position = 1;
 			this.notebook1.Add (this.vbox2);
-			global::Gtk.Notebook.NotebookChild w18 = ((global::Gtk.Notebook.NotebookChild)(this.notebook1 [this.vbox2]));
-			w18.Position = 1;
+			global::Gtk.Notebook.NotebookChild w13 = ((global::Gtk.Notebook.NotebookChild)(this.notebook1[this.vbox2]));
+			w13.Position = 1;
 			// Notebook tab
 			this.label1 = new global::Gtk.Label ();
 			this.label1.Name = "label1";
@@ -240,8 +203,6 @@ namespace MonoDevelop.Debugger
 			}
 			this.Hide ();
 			this.checkAllowEval.Toggled += new global::System.EventHandler (this.OnCheckAllowEvalToggled);
-			this.buttonUp.Clicked += new global::System.EventHandler (this.OnButtonUpClicked);
-			this.buttonDown.Clicked += new global::System.EventHandler (this.OnButtonDownClicked);
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.Debugger/gtk-gui/generated.cs b/main/src/addins/MonoDevelop.Debugger/gtk-gui/generated.cs
index 36abc51341..91cadc87fd 100644
--- a/main/src/addins/MonoDevelop.Debugger/gtk-gui/generated.cs
+++ b/main/src/addins/MonoDevelop.Debugger/gtk-gui/generated.cs
@@ -6,7 +6,7 @@ namespace Stetic
 	{
 		private static bool initialized;
 
-		internal static void Initialize (Gtk.Widget iconRenderer)
+		static internal void Initialize (Gtk.Widget iconRenderer)
 		{
 			if ((Stetic.Gui.initialized == false)) {
 				Stetic.Gui.initialized = true;
@@ -24,7 +24,7 @@ namespace Stetic
 			} else {
 				int sz;
 				int sy;
-				global::Gtk.Icon.SizeLookup (size, out  sz, out  sy);
+				global::Gtk.Icon.SizeLookup (size, out sz, out sy);
 				try {
 					return Gtk.IconTheme.Default.LoadIcon (name, sz, 0);
 				} catch (System.Exception) {
@@ -51,6 +51,7 @@ namespace Stetic
 	internal class BinContainer
 	{
 		private Gtk.Widget child;
+
 		private Gtk.UIManager uimanager;
 
 		public static BinContainer Attach (Gtk.Bin bin)
diff --git a/main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic
index ce089c16ed..5be1f00b35 100644
--- a/main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic
+++ b/main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic
@@ -1230,14 +1230,14 @@
       </widget>
     </child>
   </widget>
-  <widget class="Gtk.Bin" id="MonoDevelop.Debugger.DebuggerOptionsPanelWidget" design-size="523 242">
+  <widget class="Gtk.Bin" id="MonoDevelop.Debugger.DebuggerOptionsPanelWidget" design-size="523 250">
     <property name="MemberName" />
     <property name="Visible">False</property>
     <child>
       <widget class="Gtk.Notebook" id="notebook1">
         <property name="MemberName" />
         <property name="CanFocus">True</property>
-        <property name="CurrentPage">0</property>
+        <property name="CurrentPage">1</property>
         <child>
           <widget class="Gtk.VBox" id="vbox3">
             <property name="MemberName" />
@@ -1433,73 +1433,8 @@
               </packing>
             </child>
             <child>
-              <widget class="Gtk.HBox" id="hbox1">
+              <widget class="MonoDevelop.Ide.Gui.Components.PriorityList" id="prioritylist">
                 <property name="MemberName" />
-                <property name="Spacing">6</property>
-                <child>
-                  <widget class="Gtk.ScrolledWindow" id="GtkScrolledWindow">
-                    <property name="MemberName" />
-                    <property name="ShadowType">In</property>
-                    <child>
-                      <widget class="Gtk.TreeView" id="engineList">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <property name="ShowScrollbars">True</property>
-                        <property name="HeadersVisible">False</property>
-                      </widget>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="Position">0</property>
-                    <property name="AutoSize">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="Gtk.VBox" id="vbox4">
-                    <property name="MemberName" />
-                    <property name="Spacing">6</property>
-                    <child>
-                      <widget class="Gtk.Button" id="buttonUp">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <property name="UseStock">True</property>
-                        <property name="Type">StockItem</property>
-                        <property name="StockId">gtk-go-up</property>
-                        <signal name="Clicked" handler="OnButtonUpClicked" />
-                        <property name="label">gtk-go-up</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">0</property>
-                        <property name="AutoSize">True</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="Gtk.Button" id="buttonDown">
-                        <property name="MemberName" />
-                        <property name="CanFocus">True</property>
-                        <property name="UseStock">True</property>
-                        <property name="Type">StockItem</property>
-                        <property name="StockId">gtk-go-down</property>
-                        <signal name="Clicked" handler="OnButtonDownClicked" />
-                        <property name="label">gtk-go-down</property>
-                      </widget>
-                      <packing>
-                        <property name="Position">1</property>
-                        <property name="AutoSize">True</property>
-                        <property name="Expand">False</property>
-                        <property name="Fill">False</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="Position">1</property>
-                    <property name="AutoSize">True</property>
-                    <property name="Expand">False</property>
-                    <property name="Fill">False</property>
-                  </packing>
-                </child>
               </widget>
               <packing>
                 <property name="Position">1</property>