* gtk-gui/gui.stetic:

* MonoDevelop.Ide.Gui.Dialogs/NewLayoutDialog.cs:
* gtk-gui/MonoDevelop.Ide.Gui.Dialogs.NewLayoutDialog.cs:
* gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.KeyBindingsPanel.cs: Show
  validation messages for new layout names.

* MonoDevelop.Ide.Gui/DefaultWorkbench.cs: Remove unused variable.

* gtk-gui/objects.xml: Flush.

svn path=/trunk/monodevelop/; revision=156658

4 files changed, 135 insertions, 50 deletions

diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.NewLayoutDialog.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.NewLayoutDialog.cs
index ce203a23b9..05d0f88d40 100644
--- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.NewLayoutDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.NewLayoutDialog.cs
@@ -4,12 +4,18 @@ namespace MonoDevelop.Ide.Gui.Dialogs
 {
 	internal partial class NewLayoutDialog
 	{
+		private global::Gtk.Alignment alignment1;
+
+		private global::Gtk.VBox vbox2;
+
 		private global::Gtk.HBox hbox45;
 
 		private global::Gtk.Label label72;
 
 		private global::Gtk.Entry layoutName;
 
+		private global::Gtk.Label validationMessage;
+
 		private global::Gtk.Button button309;
 
 		private global::Gtk.Button newButton;
@@ -30,10 +36,17 @@ namespace MonoDevelop.Ide.Gui.Dialogs
 			w1.Spacing = 6;
 			w1.BorderWidth = ((uint)(2));
 			// Container child dialog-vbox4.Gtk.Box+BoxChild
+			this.alignment1 = new global::Gtk.Alignment (0.5f, 0.5f, 1f, 1f);
+			this.alignment1.Name = "alignment1";
+			// Container child alignment1.Gtk.Container+ContainerChild
+			this.vbox2 = new global::Gtk.VBox ();
+			this.vbox2.Name = "vbox2";
+			this.vbox2.Spacing = 6;
+			this.vbox2.BorderWidth = ((uint)(6));
+			// Container child vbox2.Gtk.Box+BoxChild
 			this.hbox45 = new global::Gtk.HBox ();
 			this.hbox45.Name = "hbox45";
 			this.hbox45.Spacing = 6;
-			this.hbox45.BorderWidth = ((uint)(6));
 			// Container child hbox45.Gtk.Box+BoxChild
 			this.label72 = new global::Gtk.Label ();
 			this.label72.Name = "label72";
@@ -46,6 +59,7 @@ namespace MonoDevelop.Ide.Gui.Dialogs
 			w2.Fill = false;
 			// Container child hbox45.Gtk.Box+BoxChild
 			this.layoutName = new global::Gtk.Entry ();
+			this.layoutName.WidthRequest = 320;
 			this.layoutName.Name = "layoutName";
 			this.layoutName.IsEditable = true;
 			this.layoutName.ActivatesDefault = true;
@@ -53,15 +67,32 @@ namespace MonoDevelop.Ide.Gui.Dialogs
 			this.hbox45.Add (this.layoutName);
 			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox45[this.layoutName]));
 			w3.Position = 1;
-			w1.Add (this.hbox45);
-			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(w1[this.hbox45]));
+			this.vbox2.Add (this.hbox45);
+			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.hbox45]));
 			w4.Position = 0;
+			w4.Expand = false;
+			w4.Fill = false;
+			// Container child vbox2.Gtk.Box+BoxChild
+			this.validationMessage = new global::Gtk.Label ();
+			this.validationMessage.Name = "validationMessage";
+			this.validationMessage.Xalign = 0f;
+			this.vbox2.Add (this.validationMessage);
+			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.validationMessage]));
+			w5.Position = 1;
+			w5.Expand = false;
+			w5.Fill = false;
+			this.alignment1.Add (this.vbox2);
+			w1.Add (this.alignment1);
+			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(w1[this.alignment1]));
+			w7.Position = 0;
+			w7.Expand = false;
+			w7.Fill = false;
 			// Internal child MonoDevelop.Ide.Gui.Dialogs.NewLayoutDialog.ActionArea
-			global::Gtk.HButtonBox w5 = this.ActionArea;
-			w5.Name = "GtkDialog_ActionArea";
-			w5.Spacing = 6;
-			w5.BorderWidth = ((uint)(5));
-			w5.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
+			global::Gtk.HButtonBox w8 = this.ActionArea;
+			w8.Name = "GtkDialog_ActionArea";
+			w8.Spacing = 6;
+			w8.BorderWidth = ((uint)(5));
+			w8.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
 			// Container child GtkDialog_ActionArea.Gtk.ButtonBox+ButtonBoxChild
 			this.button309 = new global::Gtk.Button ();
 			this.button309.CanFocus = true;
@@ -70,26 +101,42 @@ namespace MonoDevelop.Ide.Gui.Dialogs
 			this.button309.UseUnderline = true;
 			this.button309.Label = "gtk-cancel";
 			this.AddActionWidget (this.button309, -6);
-			global::Gtk.ButtonBox.ButtonBoxChild w6 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w5[this.button309]));
-			w6.Expand = false;
-			w6.Fill = false;
+			global::Gtk.ButtonBox.ButtonBoxChild w9 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w8[this.button309]));
+			w9.Expand = false;
+			w9.Fill = false;
 			// Container child GtkDialog_ActionArea.Gtk.ButtonBox+ButtonBoxChild
 			this.newButton = new global::Gtk.Button ();
+			this.newButton.CanDefault = true;
 			this.newButton.CanFocus = true;
 			this.newButton.Name = "newButton";
-			this.newButton.UseStock = true;
 			this.newButton.UseUnderline = true;
-			this.newButton.Label = "gtk-new";
+			// Container child newButton.Gtk.Container+ContainerChild
+			global::Gtk.Alignment w10 = new global::Gtk.Alignment (0.5f, 0.5f, 0f, 0f);
+			// Container child GtkAlignment.Gtk.Container+ContainerChild
+			global::Gtk.HBox w11 = new global::Gtk.HBox ();
+			w11.Spacing = 2;
+			// Container child GtkHBox.Gtk.Container+ContainerChild
+			global::Gtk.Image w12 = new global::Gtk.Image ();
+			w12.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-new", global::Gtk.IconSize.Menu);
+			w11.Add (w12);
+			// Container child GtkHBox.Gtk.Container+ContainerChild
+			global::Gtk.Label w14 = new global::Gtk.Label ();
+			w14.LabelProp = global::MonoDevelop.Core.GettextCatalog.GetString ("Create _Layout");
+			w14.UseUnderline = true;
+			w11.Add (w14);
+			w10.Add (w11);
+			this.newButton.Add (w10);
 			this.AddActionWidget (this.newButton, -5);
-			global::Gtk.ButtonBox.ButtonBoxChild w7 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w5[this.newButton]));
-			w7.Position = 1;
-			w7.Expand = false;
-			w7.Fill = false;
+			global::Gtk.ButtonBox.ButtonBoxChild w18 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w8[this.newButton]));
+			w18.Position = 1;
+			w18.Expand = false;
+			w18.Fill = false;
 			if ((this.Child != null)) {
 				this.Child.ShowAll ();
 			}
-			this.DefaultWidth = 363;
-			this.DefaultHeight = 131;
+			this.DefaultWidth = 459;
+			this.DefaultHeight = 162;
+			this.newButton.HasDefault = true;
 			this.Show ();
 		}
 	}
diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.KeyBindingsPanel.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.KeyBindingsPanel.cs
index a08b2e0c98..0ef58638fe 100644
--- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.KeyBindingsPanel.cs
+++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.KeyBindingsPanel.cs
@@ -177,7 +177,7 @@ namespace MonoDevelop.Ide.Gui.OptionPanels
 			this.conflicButton.CanFocus = true;
 			this.conflicButton.Name = "conflicButton";
 			this.conflicButton.UseMarkup = false;
-			this.conflicButton.Label = "View Conflicts";
+			this.conflicButton.Label = null;
 			this.warningBox.Add (this.conflicButton);
 			global::Gtk.Box.BoxChild w12 = ((global::Gtk.Box.BoxChild)(this.warningBox[this.conflicButton]));
 			w12.Position = 2;
diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic b/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic
index 6ca300edba..fb1b5190f5 100644
--- a/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic
+++ b/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic
@@ -5,6 +5,7 @@
     <target-gtk-version>2.12</target-gtk-version>
   </configuration>
   <import>
+    <widget-library name="Mono.Addins.Gui, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
     <widget-library name="../../../../build/bin/Mono.TextEditor.dll" />
     <widget-library name="../../../../build/bin/MonoDevelop.Ide.dll" internal="true" />
   </import>
@@ -2095,7 +2096,7 @@
       </widget>
     </child>
   </widget>
-  <widget class="Gtk.Dialog" id="MonoDevelop.Ide.Gui.Dialogs.NewLayoutDialog" design-size="363 131">
+  <widget class="Gtk.Dialog" id="MonoDevelop.Ide.Gui.Dialogs.NewLayoutDialog" design-size="459 162">
     <property name="MemberName" />
     <property name="GeneratePublic">False</property>
     <property name="Title" translatable="yes">New Layout</property>
@@ -2111,39 +2112,71 @@
         <property name="Spacing">6</property>
         <property name="BorderWidth">2</property>
         <child>
-          <widget class="Gtk.HBox" id="hbox45">
+          <widget class="Gtk.Alignment" id="alignment1">
             <property name="MemberName" />
-            <property name="Spacing">6</property>
-            <property name="BorderWidth">6</property>
-            <child>
-              <widget class="Gtk.Label" id="label72">
-                <property name="MemberName" />
-                <property name="Xalign">0</property>
-                <property name="LabelProp" translatable="yes">Layout name:</property>
-              </widget>
-              <packing>
-                <property name="Position">0</property>
-                <property name="AutoSize">False</property>
-                <property name="Expand">False</property>
-                <property name="Fill">False</property>
-              </packing>
-            </child>
             <child>
-              <widget class="Gtk.Entry" id="layoutName">
+              <widget class="Gtk.VBox" id="vbox2">
                 <property name="MemberName" />
-                <property name="IsEditable">True</property>
-                <property name="ActivatesDefault">True</property>
-                <property name="InvisibleChar">●</property>
+                <property name="Spacing">6</property>
+                <property name="BorderWidth">6</property>
+                <child>
+                  <widget class="Gtk.HBox" id="hbox45">
+                    <property name="MemberName" />
+                    <property name="Spacing">6</property>
+                    <child>
+                      <widget class="Gtk.Label" id="label72">
+                        <property name="MemberName" />
+                        <property name="Xalign">0</property>
+                        <property name="LabelProp" translatable="yes">Layout name:</property>
+                      </widget>
+                      <packing>
+                        <property name="Position">0</property>
+                        <property name="AutoSize">False</property>
+                        <property name="Expand">False</property>
+                        <property name="Fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="Gtk.Entry" id="layoutName">
+                        <property name="MemberName" />
+                        <property name="WidthRequest">320</property>
+                        <property name="IsEditable">True</property>
+                        <property name="ActivatesDefault">True</property>
+                        <property name="InvisibleChar">●</property>
+                      </widget>
+                      <packing>
+                        <property name="Position">1</property>
+                        <property name="AutoSize">False</property>
+                      </packing>
+                    </child>
+                  </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.Label" id="validationMessage">
+                    <property name="MemberName" />
+                    <property name="Xalign">0</property>
+                  </widget>
+                  <packing>
+                    <property name="Position">1</property>
+                    <property name="AutoSize">False</property>
+                    <property name="Expand">False</property>
+                    <property name="Fill">False</property>
+                  </packing>
+                </child>
               </widget>
-              <packing>
-                <property name="Position">1</property>
-                <property name="AutoSize">False</property>
-              </packing>
             </child>
           </widget>
           <packing>
             <property name="Position">0</property>
-            <property name="AutoSize">False</property>
+            <property name="AutoSize">True</property>
+            <property name="Expand">False</property>
+            <property name="Fill">False</property>
           </packing>
         </child>
       </widget>
@@ -2173,12 +2206,14 @@
         <child>
           <widget class="Gtk.Button" id="newButton">
             <property name="MemberName" />
+            <property name="CanDefault">True</property>
+            <property name="HasDefault">True</property>
             <property name="CanFocus">True</property>
-            <property name="UseStock">True</property>
-            <property name="Type">StockItem</property>
-            <property name="StockId">gtk-new</property>
+            <property name="Type">TextAndIcon</property>
+            <property name="Icon">stock:gtk-new Menu</property>
+            <property name="Label" translatable="yes">Create _Layout</property>
+            <property name="UseUnderline">True</property>
             <property name="ResponseId">-5</property>
-            <property name="label">gtk-new</property>
           </widget>
           <packing>
             <property name="Position">1</property>
@@ -3239,6 +3274,9 @@ Months</property>
                           <placeholder />
                         </child>
                       </widget>
+                      <packing>
+                        <property name="Resize">False</property>
+                      </packing>
                     </child>
                     <child>
                       <widget class="Gtk.ScrolledWindow" id="scrolledInfo">
diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/objects.xml b/main/src/core/MonoDevelop.Ide/gtk-gui/objects.xml
index 3cf66886a8..b1465c12f6 100644
--- a/main/src/core/MonoDevelop.Ide/gtk-gui/objects.xml
+++ b/main/src/core/MonoDevelop.Ide/gtk-gui/objects.xml