diff options
6 files changed, 20 insertions, 29 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 4934ac1188..e078727d79 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 @@ -258,7 +258,7 @@ vbox1 this.GtkLabel16 = new global::Gtk.Label (); this.GtkLabel16.Name = "GtkLabel16"; this.GtkLabel16.Xalign = 0F; - this.GtkLabel16.LabelProp = global::Mono.Unix.Catalog.GetString ("<b>New Editor</b>"); + 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])); 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 00ffe30273..e847ad4a65 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,7 @@ namespace MonoDevelop.SourceEditor.OptionPanels { partial class GeneralOptionsPanel : Gtk.Bin, IOptionsPanel { - readonly Xwt.CheckBox newEditorCheckBox; + readonly Xwt.CheckBox legacyEditorCheckBox; readonly Xwt.CheckBox wordWrapCheckBox; readonly Xwt.CheckBox wordWrapVisualGlyphsCheckBox; @@ -54,31 +54,22 @@ namespace MonoDevelop.SourceEditor.OptionPanels var newEditorOptionsBox = new Xwt.VBox (); - var newEditorLearnMoreLink = new Xwt.LinkLabel { - MarginBottom = 6, - MarginTop = 6, - Text = GettextCatalog.GetString ("Learn more about the New Editor"), - Uri = new Uri ("https://aka.ms/vs/mac/editor/learn-more") - }; - newEditorOptionsBox.PackStart (newEditorLearnMoreLink); - - newEditorCheckBox = new Xwt.CheckBox (GettextCatalog.GetString ("Open C# files in the New Editor")); - newEditorCheckBox.Active = DefaultSourceEditorOptions.Instance.EnableNewEditor; - newEditorCheckBox.Toggled += HandleNewEditorOptionToggled; - newEditorOptionsBox.PackStart (newEditorCheckBox); - wordWrapCheckBox = new Xwt.CheckBox (GettextCatalog.GetString ("_Word wrap")); - wordWrapCheckBox.MarginLeft = 18; wordWrapCheckBox.Active = DefaultSourceEditorOptions.Instance.WordWrapStyle.HasFlag (WordWrapStyles.WordWrap); wordWrapCheckBox.Toggled += HandleNewEditorOptionToggled; newEditorOptionsBox.PackStart (wordWrapCheckBox); wordWrapVisualGlyphsCheckBox = new Xwt.CheckBox (GettextCatalog.GetString ("Show visible glyphs for word wrap")); - wordWrapVisualGlyphsCheckBox.MarginLeft = 36; + wordWrapVisualGlyphsCheckBox.MarginLeft = 18; wordWrapVisualGlyphsCheckBox.Active = DefaultSourceEditorOptions.Instance.WordWrapStyle.HasFlag (WordWrapStyles.VisibleGlyphs); 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); else @@ -99,12 +90,12 @@ namespace MonoDevelop.SourceEditor.OptionPanels GettextCatalog.GetString ("Check to fold regions by default")); foldCommentsCheckbutton.SetCommonAccessibilityAttributes ("SourceEditorGeneral.commens", "", GettextCatalog.GetString ("Check to fold comments by default")); - newEditorCheckBox.SetCommonAccessibilityAttributes ("SourceEditorGeneral.newEditor", "", - GettextCatalog.GetString ("Check to enable experimental new editor")); + 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 experimental new editor")); + GettextCatalog.GetString ("Check to enable word wrap in the modern editor")); wordWrapVisualGlyphsCheckBox.SetCommonAccessibilityAttributes ("SourceEditorGeneral.newEditor.wordWrap.enableVisualGlyphs", "", - GettextCatalog.GetString ("Check to enable visual word wrap glyphs in the experimental new editor")); + GettextCatalog.GetString ("Check to enable visual word wrap glyphs in the modern editor")); } public virtual Control CreatePanelWidget () @@ -130,13 +121,13 @@ namespace MonoDevelop.SourceEditor.OptionPanels HighlightingPanel.UpdateActiveDocument (); } - DefaultSourceEditorOptions.Instance.EnableNewEditor = this.newEditorCheckBox.Active; + DefaultSourceEditorOptions.Instance.EnableNewEditor = !this.legacyEditorCheckBox.Active; } void HandleNewEditorOptionToggled (object sender, EventArgs e) { - wordWrapCheckBox.Sensitive = newEditorCheckBox.Active; - wordWrapVisualGlyphsCheckBox.Sensitive = newEditorCheckBox.Active && wordWrapCheckBox.Active; + wordWrapCheckBox.Sensitive = !legacyEditorCheckBox.Active; + wordWrapVisualGlyphsCheckBox.Sensitive = !legacyEditorCheckBox.Active && wordWrapCheckBox.Active; var wrap = DefaultSourceEditorOptions.Instance.WordWrapStyle; diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/SupportedFileTypeExtensionNode.cs b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/SupportedFileTypeExtensionNode.cs index d24dde35d0..3369461003 100644 --- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/SupportedFileTypeExtensionNode.cs +++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/SupportedFileTypeExtensionNode.cs @@ -34,7 +34,7 @@ namespace MonoDevelop.TextEditor [NodeAttribute ("buildAction", Description = "If specified, the file must have this build action")]
public string BuildAction { get; private set; }
- [NodeAttribute ("featureFlag", Description = "ID of a feature flag that can be used to enable/disable editing of this file type in the new editor")]
+ [NodeAttribute ("featureFlag", Description = "ID of a feature flag that can be used to enable/disable editing of this file type in the modern editor")]
public string FeatureFlag { get; private set; }
[NodeAttribute ("featureFlagDefault", Description = "Default value of the feature flag")]
diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewDisplayBinding.cs b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewDisplayBinding.cs index 1637ad2bd4..30770c391b 100644 --- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewDisplayBinding.cs +++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewDisplayBinding.cs @@ -55,7 +55,7 @@ namespace MonoDevelop.TextEditor ); if (supported) { - yield return new DocumentControllerDescription (GettextCatalog.GetString ("New Source Code Editor"), true, DocumentControllerRole.Source); + yield return new DocumentControllerDescription (GettextCatalog.GetString ("Modern Source Code Editor"), true, DocumentControllerRole.Source); } bool ExtensionMatch (SupportedFileTypeExtensionNode node) => diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DefaultSourceEditorOptions.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DefaultSourceEditorOptions.cs index 9a47f7e362..423df40252 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DefaultSourceEditorOptions.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DefaultSourceEditorOptions.cs @@ -419,12 +419,12 @@ namespace MonoDevelop.Ide.Editor if (!value) { messageText = GettextCatalog.GetString ( - "The New Editor Preview has been enabled, but already opened files " + + "The modern editor has been enabled, but already opened files " + "will need to be closed and re-opened for the change to take effect."); Counters.NewEditorEnabled.Inc (); } else { messageText = GettextCatalog.GetString ( - "The New Editor Preview has been disabled, but already opened files " + + "The legacy editor has been enabled, but already opened files " + "will need to be closed and re-opened for the change to take effect."); Counters.NewEditorDisabled.Inc (); } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditorDisplayBinding.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditorDisplayBinding.cs index 105b17f991..cf6ecf627e 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditorDisplayBinding.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditorDisplayBinding.cs @@ -56,7 +56,7 @@ namespace MonoDevelop.Ide.Editor } return list.Add (new DocumentControllerDescription { - Name = GettextCatalog.GetString ("Source Code Editor"), + Name = GettextCatalog.GetString ("Legacy Source Code Editor"), Role = DocumentControllerRole.Source, CanUseAsDefault = true }); |