From df53c3199ce49a31c651bda20beb06b2aa0fb098 Mon Sep 17 00:00:00 2001 From: Patryk Mikos Date: Fri, 24 Jan 2014 18:09:17 +0100 Subject: [PATCH] Rename UseOverstrikeMode to AllowOverstrikeMode --- data/resources/StringResources.resx | 4 ++-- .../Src/Options/GeneralEditorOptions.xaml | 4 ++-- .../ICSharpCode.AvalonEdit/Editing/Caret.cs | 4 ++-- .../ICSharpCode.AvalonEdit/Editing/CaretLayer.cs | 2 +- .../ICSharpCode.AvalonEdit/Editing/TextArea.cs | 2 +- .../ICSharpCode.AvalonEdit/TextEditorOptions.cs | 12 ++++++------ 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/data/resources/StringResources.resx b/data/resources/StringResources.resx index 712347217b..e37e54fb23 100644 --- a/data/resources/StringResources.resx +++ b/data/resources/StringResources.resx @@ -2400,8 +2400,8 @@ system. I don't think that it needs translation. Hide cursor while typing - - Use overstrike mode + + Allow overstrike mode Show &Quick ClassBrowser Panel diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/GeneralEditorOptions.xaml b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/GeneralEditorOptions.xaml index 666efcd3be..6e78d32c41 100644 --- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/GeneralEditorOptions.xaml +++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/GeneralEditorOptions.xaml @@ -28,8 +28,8 @@ IsChecked="{core:OptionBinding local:CodeEditorOptions.ShowHiddenDefinitions}" Content="{core:Localize Dialog.Options.IDEOptions.TextEditor.Markers.ShowHiddenDefinitionsCheckBox}" /> + IsChecked="{core:OptionBinding local:CodeEditorOptions.AllowOverstrikeMode}" + Content="{core:Localize Dialog.Options.IDEOptions.TextEditor.General.AllowOverstrikeModeCheckBox}" /> diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/Caret.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/Caret.cs index 2d70007d15..898b6b84cf 100644 --- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/Caret.cs +++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/Caret.cs @@ -394,7 +394,7 @@ namespace ICSharpCode.AvalonEdit.Editing { if (textView != null && textView.Document != null) { VisualLine visualLine = textView.GetOrConstructVisualLine(textView.Document.GetLineByNumber(position.Line)); - return (this.textView.Options.UseOverstrikeMode && this.textArea.OverstrikeMode) + return (this.textView.Options.AllowOverstrikeMode && this.textArea.OverstrikeMode) ? CalcCaretOverstrikeRectangle(visualLine) : CalcCaretRectangle(visualLine); } else { return Rect.Empty; @@ -451,7 +451,7 @@ namespace ICSharpCode.AvalonEdit.Editing VisualLine visualLine = textView.GetVisualLine(position.Line); if (visualLine != null) { Rect caretRect; - if (this.textView.Options.UseOverstrikeMode && this.textArea.OverstrikeMode) { + if (this.textView.Options.AllowOverstrikeMode && this.textArea.OverstrikeMode) { caretRect = CalcCaretOverstrikeRectangle(visualLine); } else { caretRect = CalcCaretRectangle(visualLine); diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/CaretLayer.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/CaretLayer.cs index 81df5e8a15..6bf68b2a70 100644 --- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/CaretLayer.cs +++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/CaretLayer.cs @@ -79,7 +79,7 @@ namespace ICSharpCode.AvalonEdit.Editing if (caretBrush == null) caretBrush = (Brush)textView.GetValue(TextBlock.ForegroundProperty); - if (this.textArea.Options.UseOverstrikeMode && this.textArea.OverstrikeMode) { + if (this.textArea.Options.AllowOverstrikeMode && this.textArea.OverstrikeMode) { SolidColorBrush scBrush = caretBrush as SolidColorBrush; if (scBrush != null) { Color brushColor = scBrush.Color; diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/TextArea.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/TextArea.cs index 75e244b8af..079bb1ffe2 100644 --- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/TextArea.cs +++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/TextArea.cs @@ -956,7 +956,7 @@ namespace ICSharpCode.AvalonEdit.Editing { base.OnPreviewKeyDown(e); - if (!this.Options.UseOverstrikeMode) { + if (!this.Options.AllowOverstrikeMode) { this.overstrikeMode = false; } else if (!e.Handled && e.Key == Key.Insert) { this.overstrikeMode = !this.overstrikeMode; diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/TextEditorOptions.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/TextEditorOptions.cs index d9fedd28ef..353c958c24 100644 --- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/TextEditorOptions.cs +++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/TextEditorOptions.cs @@ -463,18 +463,18 @@ namespace ICSharpCode.AvalonEdit } } - bool useOverstrikeMode = false; + bool allowOverstrikeMode = false; [DefaultValue(false)] /// /// Gets/Sets if overstrike mode is enabled to use /// - public bool UseOverstrikeMode { - get { return useOverstrikeMode; } + public bool AllowOverstrikeMode { + get { return allowOverstrikeMode; } set { - if (useOverstrikeMode != value) { - useOverstrikeMode = value; - OnPropertyChanged("UseOverstrikeMode"); + if (allowOverstrikeMode != value) { + allowOverstrikeMode = value; + OnPropertyChanged("AllowOverstrikeMode"); } } }