Fix: Remove "use legacy editor" pref, move others up to "coding" section

2 files changed, 2 insertions, 51 deletions

diff --git a/main/src/addins/MonoDevelop.SourceEditor2/Gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/Gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs
index e078727d79..8eb2ae3fb8 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/Gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/Gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs
@@ -26,9 +26,6 @@ vbox1
       vbox6
           wordWrapCheckbutton
           antiAliasingCheckbutton
-  GtkLabel16 "Experimental"
-  alignment5
-      experimentalSection
 
 		*/
 		private global::Gtk.VBox vbox1;
@@ -69,12 +66,6 @@ vbox1
 
 		private global::Gtk.CheckButton antiAliasingCheckbutton;
 
-		private global::Gtk.Label GtkLabel16;
-
-		private global::Gtk.Alignment alignment5;
-
-		private global::Gtk.VBox experimentalSection;
-
 		protected virtual void Build()
 		{
 			MonoDevelop.Components.Gui.Initialize(this);
@@ -254,35 +245,6 @@ vbox1
 			w19.Expand = false;
 			w19.Fill = false;
 
-			// Container child vbox1.Gtk.Box+BoxChild
-			this.GtkLabel16 = new global::Gtk.Label ();
-			this.GtkLabel16.Name = "GtkLabel16";
-			this.GtkLabel16.Xalign = 0F;
-			this.GtkLabel16.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>Modern Editor</b>");
-			this.GtkLabel16.UseMarkup = true;
-			this.vbox1.Add (this.GtkLabel16);
-			global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.GtkLabel16]));
-			w20.Position = 6;
-			w20.Expand = false;
-			w20.Fill = false;
-
-			// Container child vbox1.Gtk.Box+BoxChild
-			this.alignment5 = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
-			this.alignment5.Name = "alignment5";
-			this.alignment5.LeftPadding = ((uint)(12));
-
-			// Container child alignment3.Gtk.Container+ContainerChild
-			this.experimentalSection = new global::Gtk.VBox ();
-			this.experimentalSection.Name = "experimentalSection";
-			this.experimentalSection.Spacing = 6;
-
-			this.alignment5.Add (this.experimentalSection);
-			this.vbox1.Add (this.alignment5);
-			global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.alignment5]));
-			w22.Position = 7;
-			w22.Expand = false;
-			w22.Fill = false;
-
 			this.Add(this.vbox1);
 			if ((this.Child != null))
 			{
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/GeneralOptionsPanel.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/GeneralOptionsPanel.cs
index e847ad4a65..f3ebab4579 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/GeneralOptionsPanel.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/GeneralOptionsPanel.cs
@@ -39,7 +39,6 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 {
 	partial class GeneralOptionsPanel : Gtk.Bin, IOptionsPanel
 	{
-		readonly Xwt.CheckBox legacyEditorCheckBox;
 		readonly Xwt.CheckBox wordWrapCheckBox;
 		readonly Xwt.CheckBox wordWrapVisualGlyphsCheckBox;
 
@@ -65,13 +64,8 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			wordWrapVisualGlyphsCheckBox.Toggled += HandleNewEditorOptionToggled;
 			newEditorOptionsBox.PackStart (wordWrapVisualGlyphsCheckBox);
 
-			legacyEditorCheckBox = new Xwt.CheckBox (GettextCatalog.GetString ("Use the legacy text editor where available (not recommended)"));
-			legacyEditorCheckBox.Active = !DefaultSourceEditorOptions.Instance.EnableNewEditor;
-			legacyEditorCheckBox.Toggled += HandleNewEditorOptionToggled;
-			newEditorOptionsBox.PackStart (legacyEditorCheckBox);
-
 			if (Xwt.Toolkit.CurrentEngine.Type == Xwt.ToolkitType.Gtk)
-				experimentalSection.PackStart ((Gtk.Widget)Xwt.Toolkit.CurrentEngine.GetNativeWidget (newEditorOptionsBox), false, false, 0);
+				vbox4.PackStart ((Gtk.Widget)Xwt.Toolkit.CurrentEngine.GetNativeWidget (newEditorOptionsBox), false, false, 0);
 			else
 				LoggingService.LogError ("GeneralOptionsPanel: Xwt.Toolkit.CurrentEngine.Type != Xwt.ToolkitType.Gtk - currently unsupported");
 
@@ -90,8 +84,6 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 			                                                         GettextCatalog.GetString ("Check to fold regions by default"));
 			foldCommentsCheckbutton.SetCommonAccessibilityAttributes ("SourceEditorGeneral.commens", "",
 			                                                          GettextCatalog.GetString ("Check to fold comments by default"));
-			legacyEditorCheckBox.SetCommonAccessibilityAttributes ("SourceEditorGeneral.legacyEditor", "",
-			                                                    GettextCatalog.GetString ("Check to enable legacy text editor"));
 			wordWrapCheckBox.SetCommonAccessibilityAttributes ("SourceEditorGeneral.newEditor.wordWrap", "",
 			                                                   GettextCatalog.GetString ("Check to enable word wrap in the modern editor"));
 			wordWrapVisualGlyphsCheckBox.SetCommonAccessibilityAttributes ("SourceEditorGeneral.newEditor.wordWrap.enableVisualGlyphs", "",
@@ -120,14 +112,11 @@ namespace MonoDevelop.SourceEditor.OptionPanels
 				DefaultSourceEditorOptions.Instance.ShowFoldMargin = this.foldingCheckbutton.Active;
 				HighlightingPanel.UpdateActiveDocument ();
 			}
-
-			DefaultSourceEditorOptions.Instance.EnableNewEditor = !this.legacyEditorCheckBox.Active;
 		}
 
 		void HandleNewEditorOptionToggled (object sender, EventArgs e)
 		{
-			wordWrapCheckBox.Sensitive = !legacyEditorCheckBox.Active;
-			wordWrapVisualGlyphsCheckBox.Sensitive = !legacyEditorCheckBox.Active && wordWrapCheckBox.Active;
+			wordWrapVisualGlyphsCheckBox.Sensitive = wordWrapCheckBox.Active;
 
 			var wrap = DefaultSourceEditorOptions.Instance.WordWrapStyle;