Merge remote-tracking branch 'origin/master' into key-bindings-redesign

3 files changed, 266 insertions, 62 deletions

diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.IDEStyleOptionsPanelWidget.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.IDEStyleOptionsPanelWidget.cs
index f12e3d37b7..2c02f0bd2a 100644
--- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.IDEStyleOptionsPanelWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.IDEStyleOptionsPanelWidget.cs
@@ -2,15 +2,30 @@
 // This file has been generated by the GUI designer. Do not modify.
 namespace MonoDevelop.Ide.Gui.OptionPanels
 {
-	partial class IDEStyleOptionsPanelWidget
+	public partial class IDEStyleOptionsPanelWidget
 	{
 		private global::Gtk.VBox vbox13;
+
 		private global::Gtk.Table table1;
+
 		private global::Gtk.ComboBox comboLanguage;
+
 		private global::Gtk.ComboBox comboTheme;
+
 		private global::Gtk.Label label2;
+
 		private global::Gtk.Label labelTheme;
 
+		private global::Gtk.HSeparator separatorRestart;
+
+		private global::Gtk.Table tableRestart;
+
+		private global::Gtk.Button btnRestart;
+
+		private global::MonoDevelop.Components.ImageView imageRestart;
+
+		private global::Gtk.Label labelRestart;
+
 		protected virtual void Build ()
 		{
 			global::Stetic.Gui.Initialize (this);
@@ -71,11 +86,63 @@ namespace MonoDevelop.Ide.Gui.OptionPanels
 			w5.Position = 0;
 			w5.Expand = false;
 			w5.Fill = false;
+			// Container child vbox13.Gtk.Box+BoxChild
+			this.separatorRestart = new global::Gtk.HSeparator ();
+			this.separatorRestart.Name = "separatorRestart";
+			this.vbox13.Add (this.separatorRestart);
+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.vbox13 [this.separatorRestart]));
+			w6.Position = 1;
+			w6.Expand = false;
+			w6.Fill = false;
+			// Container child vbox13.Gtk.Box+BoxChild
+			this.tableRestart = new global::Gtk.Table (((uint)(2)), ((uint)(3)), false);
+			this.tableRestart.Name = "tableRestart";
+			this.tableRestart.RowSpacing = ((uint)(6));
+			this.tableRestart.ColumnSpacing = ((uint)(6));
+			// Container child tableRestart.Gtk.Table+TableChild
+			this.btnRestart = new global::Gtk.Button ();
+			this.btnRestart.CanFocus = true;
+			this.btnRestart.Name = "btnRestart";
+			this.btnRestart.UseUnderline = true;
+			this.btnRestart.Label = "Restart {0}";
+			this.tableRestart.Add (this.btnRestart);
+			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.tableRestart [this.btnRestart]));
+			w7.TopAttach = ((uint)(1));
+			w7.BottomAttach = ((uint)(2));
+			w7.LeftAttach = ((uint)(1));
+			w7.RightAttach = ((uint)(2));
+			w7.XOptions = ((global::Gtk.AttachOptions)(4));
+			w7.YOptions = ((global::Gtk.AttachOptions)(4));
+			// Container child tableRestart.Gtk.Table+TableChild
+			this.imageRestart = new global::MonoDevelop.Components.ImageView ();
+			this.imageRestart.Name = "imageRestart";
+			this.imageRestart.IconId = "md-information";
+			this.imageRestart.IconSize = ((global::Gtk.IconSize)(1));
+			this.tableRestart.Add (this.imageRestart);
+			global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.tableRestart [this.imageRestart]));
+			w8.XOptions = ((global::Gtk.AttachOptions)(4));
+			w8.YOptions = ((global::Gtk.AttachOptions)(4));
+			// Container child tableRestart.Gtk.Table+TableChild
+			this.labelRestart = new global::Gtk.Label ();
+			this.labelRestart.Name = "labelRestart";
+			this.labelRestart.LabelProp = "These preferences will take effect next time you start {0}";
+			this.tableRestart.Add (this.labelRestart);
+			global::Gtk.Table.TableChild w9 = ((global::Gtk.Table.TableChild)(this.tableRestart [this.labelRestart]));
+			w9.LeftAttach = ((uint)(1));
+			w9.RightAttach = ((uint)(3));
+			w9.XOptions = ((global::Gtk.AttachOptions)(4));
+			w9.YOptions = ((global::Gtk.AttachOptions)(4));
+			this.vbox13.Add (this.tableRestart);
+			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox13 [this.tableRestart]));
+			w10.Position = 2;
+			w10.Expand = false;
+			w10.Fill = false;
 			this.Add (this.vbox13);
 			if ((this.Child != null)) {
 				this.Child.ShowAll ();
 			}
 			this.Show ();
+			this.btnRestart.Clicked += new global::System.EventHandler (this.RestartClicked);
 		}
 	}
 }
diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.MonoRuntimePanelWidget.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.MonoRuntimePanelWidget.cs
index 5d58db68d4..035cd9e3e6 100644
--- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.MonoRuntimePanelWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.MonoRuntimePanelWidget.cs
@@ -2,17 +2,26 @@
 // This file has been generated by the GUI designer. Do not modify.
 namespace MonoDevelop.Ide.Gui.OptionPanels
 {
-	internal partial class MonoRuntimePanelWidget
+	partial class MonoRuntimePanelWidget
 	{
 		private global::Gtk.VBox vbox1;
-		private global::Gtk.Label label1;
-		private global::Gtk.HBox hbox2;
+
+		private global::Gtk.Table table1;
+
 		private global::Gtk.ScrolledWindow GtkScrolledWindow;
+
 		private global::Gtk.TreeView tree;
+
+		private global::Gtk.TextView textview1;
+
 		private global::Gtk.VBox vbox2;
+
 		private global::Gtk.Button buttonDefault;
+
 		private global::Gtk.Button buttonAdd;
+
 		private global::Gtk.Button buttonRemove;
+
 		private global::Gtk.Label labelRunning;
 
 		protected virtual void Build ()
@@ -26,23 +35,11 @@ namespace MonoDevelop.Ide.Gui.OptionPanels
 			this.vbox1.Name = "vbox1";
 			this.vbox1.Spacing = 6;
 			// Container child vbox1.Gtk.Box+BoxChild
-			this.label1 = new global::Gtk.Label ();
-			this.label1.WidthRequest = 500;
-			this.label1.Name = "label1";
-			this.label1.Xalign = 0F;
-			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("If you have a parallel installation of Mono you can register it here, so you can use it for building and running projects. The <b>default runtime</b> is the .NET runtime to be used for building and running applications when none is specifically selected.");
-			this.label1.UseMarkup = true;
-			this.label1.Wrap = true;
-			this.vbox1.Add (this.label1);
-			global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.label1]));
-			w1.Position = 0;
-			w1.Expand = false;
-			w1.Fill = false;
-			// Container child vbox1.Gtk.Box+BoxChild
-			this.hbox2 = new global::Gtk.HBox ();
-			this.hbox2.Name = "hbox2";
-			this.hbox2.Spacing = 6;
-			// Container child hbox2.Gtk.Box+BoxChild
+			this.table1 = new global::Gtk.Table (((uint)(2)), ((uint)(2)), false);
+			this.table1.Name = "table1";
+			this.table1.RowSpacing = ((uint)(6));
+			this.table1.ColumnSpacing = ((uint)(6));
+			// Container child table1.Gtk.Table+TableChild
 			this.GtkScrolledWindow = new global::Gtk.ScrolledWindow ();
 			this.GtkScrolledWindow.Name = "GtkScrolledWindow";
 			this.GtkScrolledWindow.ShadowType = ((global::Gtk.ShadowType)(1));
@@ -51,10 +48,26 @@ namespace MonoDevelop.Ide.Gui.OptionPanels
 			this.tree.CanFocus = true;
 			this.tree.Name = "tree";
 			this.GtkScrolledWindow.Add (this.tree);
-			this.hbox2.Add (this.GtkScrolledWindow);
-			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.GtkScrolledWindow]));
-			w3.Position = 0;
-			// Container child hbox2.Gtk.Box+BoxChild
+			this.table1.Add (this.GtkScrolledWindow);
+			global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table1 [this.GtkScrolledWindow]));
+			w2.TopAttach = ((uint)(1));
+			w2.BottomAttach = ((uint)(2));
+			// Container child table1.Gtk.Table+TableChild
+			this.textview1 = new global::Gtk.TextView ();
+			this.textview1.Buffer.Text = "If you have a parallel installation of Mono you can register it here, so you can use it for building and running projects. The <b>default runtime</b> is the .NET runtime to be used for building and running applications when none is specifically selected.";
+			this.textview1.Sensitive = false;
+			this.textview1.Name = "textview1";
+			this.textview1.Editable = false;
+			this.textview1.CursorVisible = false;
+			this.textview1.AcceptsTab = false;
+			this.textview1.WrapMode = ((global::Gtk.WrapMode)(2));
+			this.textview1.PixelsBelowLines = 6;
+			this.textview1.PixelsInsideWrap = 3;
+			this.table1.Add (this.textview1);
+			global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1 [this.textview1]));
+			w3.XOptions = ((global::Gtk.AttachOptions)(6));
+			w3.YOptions = ((global::Gtk.AttachOptions)(4));
+			// Container child table1.Gtk.Table+TableChild
 			this.vbox2 = new global::Gtk.VBox ();
 			this.vbox2.Name = "vbox2";
 			this.vbox2.Spacing = 6;
@@ -93,14 +106,17 @@ namespace MonoDevelop.Ide.Gui.OptionPanels
 			w6.Position = 2;
 			w6.Expand = false;
 			w6.Fill = false;
-			this.hbox2.Add (this.vbox2);
-			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.vbox2]));
-			w7.Position = 1;
-			w7.Expand = false;
-			w7.Fill = false;
-			this.vbox1.Add (this.hbox2);
-			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox2]));
-			w8.Position = 1;
+			this.table1.Add (this.vbox2);
+			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1 [this.vbox2]));
+			w7.TopAttach = ((uint)(1));
+			w7.BottomAttach = ((uint)(2));
+			w7.LeftAttach = ((uint)(1));
+			w7.RightAttach = ((uint)(2));
+			w7.XOptions = ((global::Gtk.AttachOptions)(4));
+			w7.YOptions = ((global::Gtk.AttachOptions)(4));
+			this.vbox1.Add (this.table1);
+			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.table1]));
+			w8.Position = 0;
 			// Container child vbox1.Gtk.Box+BoxChild
 			this.labelRunning = new global::Gtk.Label ();
 			this.labelRunning.Name = "labelRunning";
@@ -108,7 +124,7 @@ namespace MonoDevelop.Ide.Gui.OptionPanels
 			this.labelRunning.LabelProp = global::Mono.Unix.Catalog.GetString ("label1");
 			this.vbox1.Add (this.labelRunning);
 			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.labelRunning]));
-			w9.Position = 2;
+			w9.Position = 1;
 			w9.Expand = false;
 			w9.Fill = false;
 			this.Add (this.vbox1);
diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic b/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic
index 431f5b3802..e5b53d1fac 100644
--- a/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic
+++ b/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic
@@ -3216,7 +3216,98 @@ Diagnostic</property>
           </packing>
         </child>
         <child>
-          <placeholder />
+          <widget class="Gtk.HSeparator" id="separatorRestart">
+            <property name="MemberName" />
+          </widget>
+          <packing>
+            <property name="Position">1</property>
+            <property name="AutoSize">True</property>
+            <property name="Expand">False</property>
+            <property name="Fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="Gtk.Table" id="tableRestart">
+            <property name="MemberName" />
+            <property name="NRows">2</property>
+            <property name="NColumns">3</property>
+            <property name="RowSpacing">6</property>
+            <property name="ColumnSpacing">6</property>
+            <child>
+              <placeholder />
+            </child>
+            <child>
+              <placeholder />
+            </child>
+            <child>
+              <widget class="Gtk.Button" id="btnRestart">
+                <property name="MemberName" />
+                <property name="CanFocus">True</property>
+                <property name="Type">TextOnly</property>
+                <property name="Label">Restart {0}</property>
+                <property name="UseUnderline">True</property>
+                <signal name="Clicked" handler="RestartClicked" />
+              </widget>
+              <packing>
+                <property name="TopAttach">1</property>
+                <property name="BottomAttach">2</property>
+                <property name="LeftAttach">1</property>
+                <property name="RightAttach">2</property>
+                <property name="AutoSize">True</property>
+                <property name="XOptions">Fill</property>
+                <property name="YOptions">Fill</property>
+                <property name="XExpand">False</property>
+                <property name="XFill">True</property>
+                <property name="XShrink">False</property>
+                <property name="YExpand">False</property>
+                <property name="YFill">True</property>
+                <property name="YShrink">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="MonoDevelop.Components.ImageView" id="imageRestart">
+                <property name="MemberName" />
+                <property name="IconId">md-information</property>
+                <property name="IconSize">Menu</property>
+              </widget>
+              <packing>
+                <property name="AutoSize">True</property>
+                <property name="XOptions">Fill</property>
+                <property name="YOptions">Fill</property>
+                <property name="XExpand">False</property>
+                <property name="XFill">True</property>
+                <property name="XShrink">False</property>
+                <property name="YExpand">False</property>
+                <property name="YFill">True</property>
+                <property name="YShrink">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="Gtk.Label" id="labelRestart">
+                <property name="MemberName" />
+                <property name="LabelProp">These preferences will take effect next time you start {0}</property>
+              </widget>
+              <packing>
+                <property name="LeftAttach">1</property>
+                <property name="RightAttach">3</property>
+                <property name="AutoSize">True</property>
+                <property name="XOptions">Fill</property>
+                <property name="YOptions">Fill</property>
+                <property name="XExpand">False</property>
+                <property name="XFill">True</property>
+                <property name="XShrink">False</property>
+                <property name="YExpand">False</property>
+                <property name="YFill">True</property>
+                <property name="YShrink">False</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="Position">2</property>
+            <property name="AutoSize">True</property>
+            <property name="Expand">False</property>
+            <property name="Fill">False</property>
+          </packing>
         </child>
       </widget>
     </child>
@@ -4703,7 +4794,7 @@ Diagnostic</property>
       </widget>
     </child>
   </widget>
-  <widget class="Gtk.Bin" id="MonoDevelop.Ide.Gui.OptionPanels.MonoRuntimePanelWidget" design-size="500 333">
+  <widget class="Gtk.Bin" id="MonoDevelop.Ide.Gui.OptionPanels.MonoRuntimePanelWidget" design-size="540 333">
     <property name="MemberName" />
     <property name="Visible">False</property>
     <property name="GeneratePublic">False</property>
@@ -4712,25 +4803,15 @@ Diagnostic</property>
         <property name="MemberName" />
         <property name="Spacing">6</property>
         <child>
-          <widget class="Gtk.Label" id="label1">
-            <property name="MemberName" />
-            <property name="WidthRequest">500</property>
-            <property name="Xalign">0</property>
-            <property name="LabelProp" translatable="yes">If you have a parallel installation of Mono you can register it here, so you can use it for building and running projects. The &lt;b&gt;default runtime&lt;/b&gt; is the .NET runtime to be used for building and running applications when none is specifically selected.</property>
-            <property name="UseMarkup">True</property>
-            <property name="Wrap">True</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.HBox" id="hbox2">
+          <widget class="Gtk.Table" id="table1">
             <property name="MemberName" />
-            <property name="Spacing">6</property>
+            <property name="NRows">2</property>
+            <property name="NColumns">2</property>
+            <property name="RowSpacing">6</property>
+            <property name="ColumnSpacing">6</property>
+            <child>
+              <placeholder />
+            </child>
             <child>
               <widget class="Gtk.ScrolledWindow" id="GtkScrolledWindow">
                 <property name="MemberName" />
@@ -4744,8 +4825,39 @@ Diagnostic</property>
                 </child>
               </widget>
               <packing>
-                <property name="Position">0</property>
-                <property name="AutoSize">True</property>
+                <property name="TopAttach">1</property>
+                <property name="BottomAttach">2</property>
+                <property name="AutoSize">False</property>
+                <property name="XExpand">True</property>
+                <property name="XFill">True</property>
+                <property name="XShrink">False</property>
+                <property name="YExpand">True</property>
+                <property name="YFill">True</property>
+                <property name="YShrink">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="Gtk.TextView" id="textview1">
+                <property name="MemberName" />
+                <property name="Sensitive">False</property>
+                <property name="Editable">False</property>
+                <property name="CursorVisible">False</property>
+                <property name="AcceptsTab">False</property>
+                <property name="Text" translatable="yes">If you have a parallel installation of Mono you can register it here, so you can use it for building and running projects. The &lt;b&gt;default runtime&lt;/b&gt; is the .NET runtime to be used for building and running applications when none is specifically selected.</property>
+                <property name="WrapMode">Word</property>
+                <property name="PixelsBelowLines">6</property>
+                <property name="PixelsInsideWrap">3</property>
+              </widget>
+              <packing>
+                <property name="AutoSize">False</property>
+                <property name="XOptions">Shrink, Fill</property>
+                <property name="YOptions">Fill</property>
+                <property name="XExpand">False</property>
+                <property name="XFill">True</property>
+                <property name="XShrink">True</property>
+                <property name="YExpand">False</property>
+                <property name="YFill">True</property>
+                <property name="YShrink">False</property>
               </packing>
             </child>
             <child>
@@ -4807,16 +4919,25 @@ Diagnostic</property>
                 </child>
               </widget>
               <packing>
-                <property name="Position">1</property>
+                <property name="TopAttach">1</property>
+                <property name="BottomAttach">2</property>
+                <property name="LeftAttach">1</property>
+                <property name="RightAttach">2</property>
                 <property name="AutoSize">True</property>
-                <property name="Expand">False</property>
-                <property name="Fill">False</property>
+                <property name="XOptions">Fill</property>
+                <property name="YOptions">Fill</property>
+                <property name="XExpand">False</property>
+                <property name="XFill">True</property>
+                <property name="XShrink">False</property>
+                <property name="YExpand">False</property>
+                <property name="YFill">True</property>
+                <property name="YShrink">False</property>
               </packing>
             </child>
           </widget>
           <packing>
-            <property name="Position">1</property>
-            <property name="AutoSize">True</property>
+            <property name="Position">0</property>
+            <property name="AutoSize">False</property>
           </packing>
         </child>
         <child>
@@ -4826,7 +4947,7 @@ Diagnostic</property>
             <property name="LabelProp" translatable="yes">label1</property>
           </widget>
           <packing>
-            <property name="Position">2</property>
+            <property name="Position">1</property>
             <property name="AutoSize">True</property>
             <property name="Expand">False</property>
             <property name="Fill">False</property>