[CSharpBinding] Added support for underscore handling in naming

conventions.

4 files changed, 181 insertions, 92 deletions

diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionEditRuleDialog.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionEditRuleDialog.cs
index dbb5e64470..cbd77ab649 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionEditRuleDialog.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionEditRuleDialog.cs
@@ -148,6 +148,12 @@ namespace MonoDevelop.CSharp.Refactoring.CodeIssues
 
 			checkbuttonStatic.Active = rule.IncludeStaticEntities;
 			checkbuttonInstanceMembers.Active = rule.IncludeInstanceMembers;
+
+			comboboxentryUnderscoreAllowance.AppendText (GettextCatalog.GetString ("Forbid"));
+			comboboxentryUnderscoreAllowance.AppendText (GettextCatalog.GetString ("Allow"));
+			comboboxentryUnderscoreAllowance.AppendText (GettextCatalog.GetString ("Allow with lower following letter"));
+			comboboxentryUnderscoreAllowance.AppendText (GettextCatalog.GetString ("Allow with upper following letter"));
+			comboboxentryUnderscoreAllowance.Active = (int)rule.UnderscoreHandling;
 		}
 
 		public void Apply ()
@@ -210,6 +216,7 @@ namespace MonoDevelop.CSharp.Refactoring.CodeIssues
 			rule.VisibilityMask = mod;
 			rule.IncludeStaticEntities = checkbuttonStatic.Active;
 			rule.IncludeInstanceMembers = checkbuttonInstanceMembers.Active;
+			rule.UnderscoreHandling = (UnderscoreHandling)comboboxentryUnderscoreAllowance.Active;
 		}
 	}
 }
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionRule.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionRule.cs
index 5093f848a5..6f17bab0b4 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionRule.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeIssues/NamingInspection/NameConventionRule.cs
@@ -101,7 +101,13 @@ namespace MonoDevelop.CSharp.Refactoring.CodeIssues
 			set { wrappedRule.IncludeStaticEntities = value;} 
 		}
 
-		
+		[ItemProperty]
+		public ICSharpCode.NRefactory.CSharp.UnderscoreHandling UnderscoreHandling {
+			get { return wrappedRule.UnderscoreHandling; } 
+			set { wrappedRule.UnderscoreHandling = value;} 
+		}
+
+
 		internal NameConventionRule (ICSharpCode.NRefactory.CSharp.Refactoring.NamingRule wrappedRule)
 		{
 			this.wrappedRule = wrappedRule;
diff --git a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionEditRuleDialog.cs b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionEditRuleDialog.cs
index 43447c287a..f7e1c3e2b2 100644
--- a/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionEditRuleDialog.cs
+++ b/main/src/addins/CSharpBinding/gtk-gui/MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionEditRuleDialog.cs
@@ -21,12 +21,14 @@ namespace MonoDevelop.CSharp.Refactoring.CodeIssues
 		private global::Gtk.CheckButton checkbuttonStatic;
 		private global::Gtk.CheckButton checkbuttonInstanceMembers;
 		private global::Gtk.Table table2;
+		private global::Gtk.ComboBoxEntry comboboxentryUnderscoreAllowance;
 		private global::Gtk.Entry entryPrefix;
 		private global::Gtk.Entry entryPrefixAllowed;
 		private global::Gtk.Entry entrySuffix;
 		private global::Gtk.Label label1;
 		private global::Gtk.Label label3;
 		private global::Gtk.Label label8;
+		private global::Gtk.Label label9;
 		private global::Gtk.VBox vbox2;
 		private global::Gtk.Label label2;
 		private global::Gtk.VBox vbox4;
@@ -206,21 +208,33 @@ namespace MonoDevelop.CSharp.Refactoring.CodeIssues
 			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.table1]));
 			w15.Position = 0;
 			// Container child hbox1.Gtk.Box+BoxChild
-			this.table2 = new global::Gtk.Table (((uint)(4)), ((uint)(2)), false);
+			this.table2 = new global::Gtk.Table (((uint)(5)), ((uint)(2)), false);
 			this.table2.Name = "table2";
 			this.table2.RowSpacing = ((uint)(6));
 			this.table2.ColumnSpacing = ((uint)(6));
 			// Container child table2.Gtk.Table+TableChild
+			this.comboboxentryUnderscoreAllowance = global::Gtk.ComboBoxEntry.NewText ();
+			this.comboboxentryUnderscoreAllowance.Name = "comboboxentryUnderscoreAllowance";
+			this.table2.Add (this.comboboxentryUnderscoreAllowance);
+			global::Gtk.Table.TableChild w16 = ((global::Gtk.Table.TableChild)(this.table2 [this.comboboxentryUnderscoreAllowance]));
+			w16.TopAttach = ((uint)(4));
+			w16.BottomAttach = ((uint)(5));
+			w16.LeftAttach = ((uint)(1));
+			w16.RightAttach = ((uint)(2));
+			w16.XOptions = ((global::Gtk.AttachOptions)(4));
+			w16.YOptions = ((global::Gtk.AttachOptions)(4));
+			// Container child table2.Gtk.Table+TableChild
 			this.entryPrefix = new global::Gtk.Entry ();
 			this.entryPrefix.CanFocus = true;
 			this.entryPrefix.Name = "entryPrefix";
 			this.entryPrefix.IsEditable = true;
 			this.entryPrefix.InvisibleChar = '●';
 			this.table2.Add (this.entryPrefix);
-			global::Gtk.Table.TableChild w16 = ((global::Gtk.Table.TableChild)(this.table2 [this.entryPrefix]));
-			w16.LeftAttach = ((uint)(1));
-			w16.RightAttach = ((uint)(2));
-			w16.YOptions = ((global::Gtk.AttachOptions)(4));
+			global::Gtk.Table.TableChild w17 = ((global::Gtk.Table.TableChild)(this.table2 [this.entryPrefix]));
+			w17.LeftAttach = ((uint)(1));
+			w17.RightAttach = ((uint)(2));
+			w17.XOptions = ((global::Gtk.AttachOptions)(4));
+			w17.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table2.Gtk.Table+TableChild
 			this.entryPrefixAllowed = new global::Gtk.Entry ();
 			this.entryPrefixAllowed.CanFocus = true;
@@ -228,12 +242,13 @@ namespace MonoDevelop.CSharp.Refactoring.CodeIssues
 			this.entryPrefixAllowed.IsEditable = true;
 			this.entryPrefixAllowed.InvisibleChar = '●';
 			this.table2.Add (this.entryPrefixAllowed);
-			global::Gtk.Table.TableChild w17 = ((global::Gtk.Table.TableChild)(this.table2 [this.entryPrefixAllowed]));
-			w17.TopAttach = ((uint)(1));
-			w17.BottomAttach = ((uint)(2));
-			w17.LeftAttach = ((uint)(1));
-			w17.RightAttach = ((uint)(2));
-			w17.YOptions = ((global::Gtk.AttachOptions)(4));
+			global::Gtk.Table.TableChild w18 = ((global::Gtk.Table.TableChild)(this.table2 [this.entryPrefixAllowed]));
+			w18.TopAttach = ((uint)(1));
+			w18.BottomAttach = ((uint)(2));
+			w18.LeftAttach = ((uint)(1));
+			w18.RightAttach = ((uint)(2));
+			w18.XOptions = ((global::Gtk.AttachOptions)(4));
+			w18.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table2.Gtk.Table+TableChild
 			this.entrySuffix = new global::Gtk.Entry ();
 			this.entrySuffix.CanFocus = true;
@@ -241,43 +256,55 @@ namespace MonoDevelop.CSharp.Refactoring.CodeIssues
 			this.entrySuffix.IsEditable = true;
 			this.entrySuffix.InvisibleChar = '●';
 			this.table2.Add (this.entrySuffix);
-			global::Gtk.Table.TableChild w18 = ((global::Gtk.Table.TableChild)(this.table2 [this.entrySuffix]));
-			w18.TopAttach = ((uint)(3));
-			w18.BottomAttach = ((uint)(4));
-			w18.LeftAttach = ((uint)(1));
-			w18.RightAttach = ((uint)(2));
-			w18.YOptions = ((global::Gtk.AttachOptions)(4));
+			global::Gtk.Table.TableChild w19 = ((global::Gtk.Table.TableChild)(this.table2 [this.entrySuffix]));
+			w19.TopAttach = ((uint)(3));
+			w19.BottomAttach = ((uint)(4));
+			w19.LeftAttach = ((uint)(1));
+			w19.RightAttach = ((uint)(2));
+			w19.XOptions = ((global::Gtk.AttachOptions)(4));
+			w19.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table2.Gtk.Table+TableChild
 			this.label1 = new global::Gtk.Label ();
 			this.label1.Name = "label1";
 			this.label1.Xalign = 1F;
 			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("Prefix:");
 			this.table2.Add (this.label1);
-			global::Gtk.Table.TableChild w19 = ((global::Gtk.Table.TableChild)(this.table2 [this.label1]));
-			w19.XOptions = ((global::Gtk.AttachOptions)(4));
-			w19.YOptions = ((global::Gtk.AttachOptions)(4));
+			global::Gtk.Table.TableChild w20 = ((global::Gtk.Table.TableChild)(this.table2 [this.label1]));
+			w20.XOptions = ((global::Gtk.AttachOptions)(4));
+			w20.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table2.Gtk.Table+TableChild
 			this.label3 = new global::Gtk.Label ();
 			this.label3.Name = "label3";
 			this.label3.Xalign = 1F;
 			this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("Suffix:");
 			this.table2.Add (this.label3);
-			global::Gtk.Table.TableChild w20 = ((global::Gtk.Table.TableChild)(this.table2 [this.label3]));
-			w20.TopAttach = ((uint)(3));
-			w20.BottomAttach = ((uint)(4));
-			w20.XOptions = ((global::Gtk.AttachOptions)(4));
-			w20.YOptions = ((global::Gtk.AttachOptions)(4));
+			global::Gtk.Table.TableChild w21 = ((global::Gtk.Table.TableChild)(this.table2 [this.label3]));
+			w21.TopAttach = ((uint)(3));
+			w21.BottomAttach = ((uint)(4));
+			w21.XOptions = ((global::Gtk.AttachOptions)(4));
+			w21.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table2.Gtk.Table+TableChild
 			this.label8 = new global::Gtk.Label ();
 			this.label8.Name = "label8";
 			this.label8.Xalign = 1F;
 			this.label8.LabelProp = global::Mono.Unix.Catalog.GetString ("Optional Prefixes:");
 			this.table2.Add (this.label8);
-			global::Gtk.Table.TableChild w21 = ((global::Gtk.Table.TableChild)(this.table2 [this.label8]));
-			w21.TopAttach = ((uint)(1));
-			w21.BottomAttach = ((uint)(2));
-			w21.XOptions = ((global::Gtk.AttachOptions)(4));
-			w21.YOptions = ((global::Gtk.AttachOptions)(4));
+			global::Gtk.Table.TableChild w22 = ((global::Gtk.Table.TableChild)(this.table2 [this.label8]));
+			w22.TopAttach = ((uint)(1));
+			w22.BottomAttach = ((uint)(2));
+			w22.XOptions = ((global::Gtk.AttachOptions)(4));
+			w22.YOptions = ((global::Gtk.AttachOptions)(4));
+			// Container child table2.Gtk.Table+TableChild
+			this.label9 = new global::Gtk.Label ();
+			this.label9.Name = "label9";
+			this.label9.Xalign = 1F;
+			this.label9.LabelProp = global::Mono.Unix.Catalog.GetString ("'_' inside name:");
+			this.table2.Add (this.label9);
+			global::Gtk.Table.TableChild w23 = ((global::Gtk.Table.TableChild)(this.table2 [this.label9]));
+			w23.TopAttach = ((uint)(4));
+			w23.BottomAttach = ((uint)(5));
+			w23.XOptions = ((global::Gtk.AttachOptions)(4));
+			w23.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table2.Gtk.Table+TableChild
 			this.vbox2 = new global::Gtk.VBox ();
 			this.vbox2.Name = "vbox2";
@@ -288,16 +315,16 @@ namespace MonoDevelop.CSharp.Refactoring.CodeIssues
 			this.label2.Xalign = 1F;
 			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("Style:");
 			this.vbox2.Add (this.label2);
-			global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.label2]));
-			w22.Position = 0;
-			w22.Expand = false;
-			w22.Fill = false;
+			global::Gtk.Box.BoxChild w24 = ((global::Gtk.Box.BoxChild)(this.vbox2 [this.label2]));
+			w24.Position = 0;
+			w24.Expand = false;
+			w24.Fill = false;
 			this.table2.Add (this.vbox2);
-			global::Gtk.Table.TableChild w23 = ((global::Gtk.Table.TableChild)(this.table2 [this.vbox2]));
-			w23.TopAttach = ((uint)(2));
-			w23.BottomAttach = ((uint)(3));
-			w23.XOptions = ((global::Gtk.AttachOptions)(4));
-			w23.YOptions = ((global::Gtk.AttachOptions)(4));
+			global::Gtk.Table.TableChild w25 = ((global::Gtk.Table.TableChild)(this.table2 [this.vbox2]));
+			w25.TopAttach = ((uint)(2));
+			w25.BottomAttach = ((uint)(3));
+			w25.XOptions = ((global::Gtk.AttachOptions)(4));
+			w25.YOptions = ((global::Gtk.AttachOptions)(4));
 			// Container child table2.Gtk.Table+TableChild
 			this.vbox4 = new global::Gtk.VBox ();
 			this.vbox4.Name = "vbox4";
@@ -306,15 +333,14 @@ namespace MonoDevelop.CSharp.Refactoring.CodeIssues
 			this.radiobuttonPascalCase = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("_PascalCase"));
 			this.radiobuttonPascalCase.CanFocus = true;
 			this.radiobuttonPascalCase.Name = "radiobuttonPascalCase";
-			this.radiobuttonPascalCase.Active = true;
 			this.radiobuttonPascalCase.DrawIndicator = true;
 			this.radiobuttonPascalCase.UseUnderline = true;
 			this.radiobuttonPascalCase.Group = new global::GLib.SList (global::System.IntPtr.Zero);
 			this.vbox4.Add (this.radiobuttonPascalCase);
-			global::Gtk.Box.BoxChild w24 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.radiobuttonPascalCase]));
-			w24.Position = 0;
-			w24.Expand = false;
-			w24.Fill = false;
+			global::Gtk.Box.BoxChild w26 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.radiobuttonPascalCase]));
+			w26.Position = 0;
+			w26.Expand = false;
+			w26.Fill = false;
 			// Container child vbox4.Gtk.Box+BoxChild
 			this.radiobuttonCamelCase = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("_camelCase"));
 			this.radiobuttonCamelCase.CanFocus = true;
@@ -323,10 +349,10 @@ namespace MonoDevelop.CSharp.Refactoring.CodeIssues
 			this.radiobuttonCamelCase.UseUnderline = true;
 			this.radiobuttonCamelCase.Group = this.radiobuttonPascalCase.Group;
 			this.vbox4.Add (this.radiobuttonCamelCase);
-			global::Gtk.Box.BoxChild w25 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.radiobuttonCamelCase]));
-			w25.Position = 1;
-			w25.Expand = false;
-			w25.Fill = false;
+			global::Gtk.Box.BoxChild w27 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.radiobuttonCamelCase]));
+			w27.Position = 1;
+			w27.Expand = false;
+			w27.Fill = false;
 			// Container child vbox4.Gtk.Box+BoxChild
 			this.radiobuttonAllUpper = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("_ALL__Upper"));
 			this.radiobuttonAllUpper.CanFocus = true;
@@ -335,10 +361,10 @@ namespace MonoDevelop.CSharp.Refactoring.CodeIssues
 			this.radiobuttonAllUpper.UseUnderline = true;
 			this.radiobuttonAllUpper.Group = this.radiobuttonPascalCase.Group;
 			this.vbox4.Add (this.radiobuttonAllUpper);
-			global::Gtk.Box.BoxChild w26 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.radiobuttonAllUpper]));
-			w26.Position = 2;
-			w26.Expand = false;
-			w26.Fill = false;
+			global::Gtk.Box.BoxChild w28 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.radiobuttonAllUpper]));
+			w28.Position = 2;
+			w28.Expand = false;
+			w28.Fill = false;
 			// Container child vbox4.Gtk.Box+BoxChild
 			this.radiobuttonAllLower = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("all__l_ower"));
 			this.radiobuttonAllLower.CanFocus = true;
@@ -347,10 +373,10 @@ namespace MonoDevelop.CSharp.Refactoring.CodeIssues
 			this.radiobuttonAllLower.UseUnderline = true;
 			this.radiobuttonAllLower.Group = this.radiobuttonPascalCase.Group;
 			this.vbox4.Add (this.radiobuttonAllLower);
-			global::Gtk.Box.BoxChild w27 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.radiobuttonAllLower]));
-			w27.Position = 3;
-			w27.Expand = false;
-			w27.Fill = false;
+			global::Gtk.Box.BoxChild w29 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.radiobuttonAllLower]));
+			w29.Position = 3;
+			w29.Expand = false;
+			w29.Fill = false;
 			// Container child vbox4.Gtk.Box+BoxChild
 			this.radiobuttonFirstUpper = new global::Gtk.RadioButton (global::Mono.Unix.Catalog.GetString ("_First__upper"));
 			this.radiobuttonFirstUpper.CanFocus = true;
@@ -359,33 +385,36 @@ namespace MonoDevelop.CSharp.Refactoring.CodeIssues
 			this.radiobuttonFirstUpper.UseUnderline = true;
 			this.radiobuttonFirstUpper.Group = this.radiobuttonPascalCase.Group;
 			this.vbox4.Add (this.radiobuttonFirstUpper);
-			global::Gtk.Box.BoxChild w28 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.radiobuttonFirstUpper]));
-			w28.Position = 4;
-			w28.Expand = false;
-			w28.Fill = false;
+			global::Gtk.Box.BoxChild w30 = ((global::Gtk.Box.BoxChild)(this.vbox4 [this.radiobuttonFirstUpper]));
+			w30.Position = 4;
+			w30.Expand = false;
+			w30.Fill = false;
 			this.table2.Add (this.vbox4);
-			global::Gtk.Table.TableChild w29 = ((global::Gtk.Table.TableChild)(this.table2 [this.vbox4]));
-			w29.TopAttach = ((uint)(2));
-			w29.BottomAttach = ((uint)(3));
-			w29.LeftAttach = ((uint)(1));
-			w29.RightAttach = ((uint)(2));
-			w29.YOptions = ((global::Gtk.AttachOptions)(4));
+			global::Gtk.Table.TableChild w31 = ((global::Gtk.Table.TableChild)(this.table2 [this.vbox4]));
+			w31.TopAttach = ((uint)(2));
+			w31.BottomAttach = ((uint)(3));
+			w31.LeftAttach = ((uint)(1));
+			w31.RightAttach = ((uint)(2));
+			w31.XOptions = ((global::Gtk.AttachOptions)(4));
+			w31.YOptions = ((global::Gtk.AttachOptions)(4));
 			this.hbox1.Add (this.table2);
-			global::Gtk.Box.BoxChild w30 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.table2]));
-			w30.Position = 1;
+			global::Gtk.Box.BoxChild w32 = ((global::Gtk.Box.BoxChild)(this.hbox1 [this.table2]));
+			w32.Position = 1;
+			w32.Expand = false;
+			w32.Fill = false;
 			this.vbox3.Add (this.hbox1);
-			global::Gtk.Box.BoxChild w31 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.hbox1]));
-			w31.Position = 1;
+			global::Gtk.Box.BoxChild w33 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.hbox1]));
+			w33.Position = 1;
 			w1.Add (this.vbox3);
-			global::Gtk.Box.BoxChild w32 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox3]));
-			w32.Position = 0;
-			w32.Padding = ((uint)(6));
+			global::Gtk.Box.BoxChild w34 = ((global::Gtk.Box.BoxChild)(w1 [this.vbox3]));
+			w34.Position = 0;
+			w34.Padding = ((uint)(6));
 			// Internal child MonoDevelop.CSharp.Refactoring.CodeIssues.NameConventionEditRuleDialog.ActionArea
-			global::Gtk.HButtonBox w33 = this.ActionArea;
-			w33.Name = "dialog1_ActionArea";
-			w33.Spacing = 10;
-			w33.BorderWidth = ((uint)(5));
-			w33.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
+			global::Gtk.HButtonBox w35 = this.ActionArea;
+			w35.Name = "dialog1_ActionArea";
+			w35.Spacing = 10;
+			w35.BorderWidth = ((uint)(5));
+			w35.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
 			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
 			this.buttonCancel = new global::Gtk.Button ();
 			this.buttonCancel.CanDefault = true;
@@ -395,9 +424,9 @@ namespace MonoDevelop.CSharp.Refactoring.CodeIssues
 			this.buttonCancel.UseUnderline = true;
 			this.buttonCancel.Label = "gtk-cancel";
 			this.AddActionWidget (this.buttonCancel, -6);
-			global::Gtk.ButtonBox.ButtonBoxChild w34 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w33 [this.buttonCancel]));
-			w34.Expand = false;
-			w34.Fill = false;
+			global::Gtk.ButtonBox.ButtonBoxChild w36 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w35 [this.buttonCancel]));
+			w36.Expand = false;
+			w36.Fill = false;
 			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
 			this.buttonOk = new global::Gtk.Button ();
 			this.buttonOk.CanDefault = true;
@@ -407,10 +436,10 @@ namespace MonoDevelop.CSharp.Refactoring.CodeIssues
 			this.buttonOk.UseUnderline = true;
 			this.buttonOk.Label = "gtk-ok";
 			this.AddActionWidget (this.buttonOk, -5);
-			global::Gtk.ButtonBox.ButtonBoxChild w35 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w33 [this.buttonOk]));
-			w35.Position = 1;
-			w35.Expand = false;
-			w35.Fill = false;
+			global::Gtk.ButtonBox.ButtonBoxChild w37 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w35 [this.buttonOk]));
+			w37.Position = 1;
+			w37.Expand = false;
+			w37.Fill = false;
 			if ((this.Child != null)) {
 				this.Child.ShowAll ();
 			}
diff --git a/main/src/addins/CSharpBinding/gtk-gui/gui.stetic b/main/src/addins/CSharpBinding/gtk-gui/gui.stetic
index 01f07ee983..0b194c5abd 100644
--- a/main/src/addins/CSharpBinding/gtk-gui/gui.stetic
+++ b/main/src/addins/CSharpBinding/gtk-gui/gui.stetic
@@ -2329,11 +2329,33 @@ None</property>
                 <child>
                   <widget class="Gtk.Table" id="table2">
                     <property name="MemberName" />
-                    <property name="NRows">4</property>
+                    <property name="NRows">5</property>
                     <property name="NColumns">2</property>
                     <property name="RowSpacing">6</property>
                     <property name="ColumnSpacing">6</property>
                     <child>
+                      <widget class="Gtk.ComboBoxEntry" id="comboboxentryUnderscoreAllowance">
+                        <property name="MemberName" />
+                        <property name="IsTextCombo">True</property>
+                        <property name="Items" translatable="yes" />
+                      </widget>
+                      <packing>
+                        <property name="TopAttach">4</property>
+                        <property name="BottomAttach">5</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="Gtk.Entry" id="entryPrefix">
                         <property name="MemberName" />
                         <property name="CanFocus">True</property>
@@ -2344,8 +2366,9 @@ None</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">True</property>
+                        <property name="XExpand">False</property>
                         <property name="XFill">True</property>
                         <property name="XShrink">False</property>
                         <property name="YExpand">False</property>
@@ -2366,8 +2389,9 @@ None</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">True</property>
+                        <property name="XExpand">False</property>
                         <property name="XFill">True</property>
                         <property name="XShrink">False</property>
                         <property name="YExpand">False</property>
@@ -2388,8 +2412,9 @@ None</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">True</property>
+                        <property name="XExpand">False</property>
                         <property name="XFill">True</property>
                         <property name="XShrink">False</property>
                         <property name="YExpand">False</property>
@@ -2456,6 +2481,26 @@ None</property>
                       </packing>
                     </child>
                     <child>
+                      <widget class="Gtk.Label" id="label9">
+                        <property name="MemberName" />
+                        <property name="Xalign">1</property>
+                        <property name="LabelProp" translatable="yes">'_' inside name:</property>
+                      </widget>
+                      <packing>
+                        <property name="TopAttach">4</property>
+                        <property name="BottomAttach">5</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="Gtk.VBox" id="vbox2">
                         <property name="MemberName" />
                         <property name="Spacing">6</property>
@@ -2502,7 +2547,6 @@ None</property>
                             <property name="MemberName" />
                             <property name="CanFocus">True</property>
                             <property name="Label" translatable="yes">_PascalCase</property>
-                            <property name="Active">True</property>
                             <property name="DrawIndicator">True</property>
                             <property name="HasLabel">True</property>
                             <property name="UseUnderline">True</property>
@@ -2590,8 +2634,9 @@ None</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">True</property>
+                        <property name="XExpand">False</property>
                         <property name="XFill">True</property>
                         <property name="XShrink">False</property>
                         <property name="YExpand">False</property>
@@ -2603,6 +2648,8 @@ None</property>
                   <packing>
                     <property name="Position">1</property>
                     <property name="AutoSize">True</property>
+                    <property name="Expand">False</property>
+                    <property name="Fill">False</property>
                   </packing>
                 </child>
               </widget>