[Debugger] In the breakpoint properties dialog, change 'Line' entry into a spin button

Also, make editable line # value actually save.

2 files changed, 29 insertions, 24 deletions

diff --git a/main/src/addins/MonoDevelop.Debugger/gtk-gui/MonoDevelop.Debugger.BreakpointPropertiesDialog.cs b/main/src/addins/MonoDevelop.Debugger/gtk-gui/MonoDevelop.Debugger.BreakpointPropertiesDialog.cs
index 75217ff3dc..913e79a388 100644
--- a/main/src/addins/MonoDevelop.Debugger/gtk-gui/MonoDevelop.Debugger.BreakpointPropertiesDialog.cs
+++ b/main/src/addins/MonoDevelop.Debugger/gtk-gui/MonoDevelop.Debugger.BreakpointPropertiesDialog.cs
@@ -9,7 +9,7 @@ namespace MonoDevelop.Debugger
 		private global::Gtk.Table table1;
 		private global::Gtk.Entry entryFile;
 		private global::Gtk.HBox hbox1;
-		private global::Gtk.Entry entryLine;
+		private global::Gtk.SpinButton spinLine;
 		private global::Gtk.Label label4;
 		private global::Gtk.Label label5;
 		private global::Gtk.Label label6;
@@ -91,21 +91,25 @@ namespace MonoDevelop.Debugger
 			this.hbox1.Name = "hbox1";
 			this.hbox1.Spacing = 6;
 			// Container child hbox1.Gtk.Box+BoxChild
-			this.entryLine = new global::Gtk.Entry ();
-			this.entryLine.CanFocus = true;
-			this.entryLine.Name = "entryLine";
-			this.entryLine.IsEditable = true;
-			this.entryLine.WidthChars = 10;
-			this.entryLine.InvisibleChar = '●';
-			this.hbox1.Add (this.entryLine);
-			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.entryLine]));
+			this.spinLine = new global::Gtk.SpinButton (1, 100, 1);
+			this.spinLine.CanFocus = true;
+			this.spinLine.Name = "spinLine";
+			this.spinLine.Adjustment.PageIncrement = 10;
+			this.spinLine.ClimbRate = 1;
+			this.spinLine.Numeric = true;
+			this.spinLine.Value = 1;
+			this.hbox1.Add (this.spinLine);
+			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.spinLine]));
 			w4.Position = 0;
+			w4.Expand = false;
+			w4.Fill = false;
 			this.table1.Add (this.hbox1);
 			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1 [this.hbox1]));
 			w5.TopAttach = ((uint)(1));
 			w5.BottomAttach = ((uint)(2));
 			w5.LeftAttach = ((uint)(2));
 			w5.RightAttach = ((uint)(3));
+			w5.XOptions = ((global::Gtk.AttachOptions)(4));
 			w5.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table1.Gtk.Table+TableChild
 			this.label4 = new global::Gtk.Label ();
@@ -141,8 +145,6 @@ namespace MonoDevelop.Debugger
 			this.vbox2.Add (this.table1);
 			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.table1]));
 			w9.Position = 1;
-			w9.Expand = false;
-			w9.Fill = false;
 			// Container child vbox2.Gtk.Box+BoxChild
 			this.label2 = new global::Gtk.Label ();
 			this.label2.Name = "label2";
@@ -175,7 +177,6 @@ namespace MonoDevelop.Debugger
 			this.radioBreakAlways = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("Always break"));
 			this.radioBreakAlways.CanFocus = true;
 			this.radioBreakAlways.Name = "radioBreakAlways";
-			this.radioBreakAlways.Active = true;
 			this.radioBreakAlways.DrawIndicator = true;
 			this.radioBreakAlways.UseUnderline = true;
 			this.radioBreakAlways.Group = new global::GLib.SList (global::System.IntPtr.Zero);
@@ -333,7 +334,6 @@ namespace MonoDevelop.Debugger
 			this.radioActionBreak = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("Break"));
 			this.radioActionBreak.CanFocus = true;
 			this.radioActionBreak.Name = "radioActionBreak";
-			this.radioActionBreak.Active = true;
 			this.radioActionBreak.DrawIndicator = true;
 			this.radioActionBreak.UseUnderline = true;
 			this.radioActionBreak.Group = new global::GLib.SList (global::System.IntPtr.Zero);
diff --git a/main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic
index e426feabba..f60ce2f186 100644
--- a/main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic
+++ b/main/src/addins/MonoDevelop.Debugger/gtk-gui/gui.stetic
@@ -495,6 +495,7 @@
                     <property name="AllowAdding">False</property>
                     <property name="AllowEditing">False</property>
                     <property name="AllowPinning">False</property>
+                    <property name="RootPinAlwaysVisible">False</property>
                     <property name="AllowExpanding">False</property>
                     <property name="PinnedWatchLine">0</property>
                     <property name="CompactView">False</property>
@@ -591,7 +592,7 @@
                   <packing>
                     <property name="LeftAttach">2</property>
                     <property name="RightAttach">3</property>
-                    <property name="AutoSize">True</property>
+                    <property name="AutoSize">False</property>
                     <property name="YOptions">Fill</property>
                     <property name="XExpand">True</property>
                     <property name="XFill">True</property>
@@ -606,16 +607,22 @@
                     <property name="MemberName" />
                     <property name="Spacing">6</property>
                     <child>
-                      <widget class="Gtk.Entry" id="entryLine">
+                      <widget class="Gtk.SpinButton" id="spinLine">
                         <property name="MemberName" />
                         <property name="CanFocus">True</property>
-                        <property name="IsEditable">True</property>
-                        <property name="WidthChars">10</property>
-                        <property name="InvisibleChar">●</property>
+                        <property name="Lower">1</property>
+                        <property name="Upper">100</property>
+                        <property name="PageIncrement">10</property>
+                        <property name="StepIncrement">1</property>
+                        <property name="ClimbRate">1</property>
+                        <property name="Numeric">True</property>
+                        <property name="Value">1</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>
@@ -631,8 +638,9 @@
                     <property name="LeftAttach">2</property>
                     <property name="RightAttach">3</property>
                     <property name="AutoSize">True</property>
+                    <property name="XOptions">Fill</property>
                     <property name="YOptions">Fill</property>
-                    <property name="XExpand">True</property>
+                    <property name="XExpand">False</property>
                     <property name="XFill">True</property>
                     <property name="XShrink">False</property>
                     <property name="YExpand">False</property>
@@ -701,9 +709,7 @@
               </widget>
               <packing>
                 <property name="Position">1</property>
-                <property name="AutoSize">True</property>
-                <property name="Expand">False</property>
-                <property name="Fill">False</property>
+                <property name="AutoSize">False</property>
               </packing>
             </child>
             <child>
@@ -745,7 +751,6 @@
                         <property name="MemberName" />
                         <property name="CanFocus">True</property>
                         <property name="Label" translatable="yes">Always break</property>
-                        <property name="Active">True</property>
                         <property name="DrawIndicator">True</property>
                         <property name="HasLabel">True</property>
                         <property name="UseUnderline">True</property>
@@ -962,7 +967,6 @@
                         <property name="MemberName" />
                         <property name="CanFocus">True</property>
                         <property name="Label" translatable="yes">Break</property>
-                        <property name="Active">True</property>
                         <property name="DrawIndicator">True</property>
                         <property name="HasLabel">True</property>
                         <property name="UseUnderline">True</property>
@@ -1785,6 +1789,7 @@
                         <property name="AllowAdding">False</property>
                         <property name="AllowEditing">True</property>
                         <property name="AllowPinning">False</property>
+                        <property name="RootPinAlwaysVisible">False</property>
                         <property name="AllowExpanding">False</property>
                         <property name="PinnedWatchLine">0</property>
                         <property name="CompactView">False</property>