Browse Source

Rename UseOverstrikeMode to AllowOverstrikeMode

pull/289/head
Patryk Mikos 12 years ago
parent
commit
df53c3199c
  1. 4
      data/resources/StringResources.resx
  2. 4
      src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/GeneralEditorOptions.xaml
  3. 4
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/Caret.cs
  4. 2
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/CaretLayer.cs
  5. 2
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/TextArea.cs
  6. 12
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/TextEditorOptions.cs

4
data/resources/StringResources.resx

@ -2400,8 +2400,8 @@ system. I don't think that it needs translation.</comment>
<data name="Dialog.Options.IDEOptions.TextEditor.General.HideCursorWhileTypingCheckBoxCheckBox" xml:space="preserve"> <data name="Dialog.Options.IDEOptions.TextEditor.General.HideCursorWhileTypingCheckBoxCheckBox" xml:space="preserve">
<value>Hide cursor while typing</value> <value>Hide cursor while typing</value>
</data> </data>
<data name="Dialog.Options.IDEOptions.TextEditor.General.UseOverstrikeModeCheckBox" xml:space="preserve"> <data name="Dialog.Options.IDEOptions.TextEditor.General.AllowOverstrikeModeCheckBox" xml:space="preserve">
<value>Use overstrike mode</value> <value>Allow overstrike mode</value>
</data> </data>
<data name="Dialog.Options.IDEOptions.TextEditor.General.ShowQuickClassBrowserCheckBox" xml:space="preserve"> <data name="Dialog.Options.IDEOptions.TextEditor.General.ShowQuickClassBrowserCheckBox" xml:space="preserve">
<value>Show &amp;Quick ClassBrowser Panel</value> <value>Show &amp;Quick ClassBrowser Panel</value>

4
src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/GeneralEditorOptions.xaml

@ -28,8 +28,8 @@
IsChecked="{core:OptionBinding local:CodeEditorOptions.ShowHiddenDefinitions}" IsChecked="{core:OptionBinding local:CodeEditorOptions.ShowHiddenDefinitions}"
Content="{core:Localize Dialog.Options.IDEOptions.TextEditor.Markers.ShowHiddenDefinitionsCheckBox}" /> Content="{core:Localize Dialog.Options.IDEOptions.TextEditor.Markers.ShowHiddenDefinitionsCheckBox}" />
<CheckBox <CheckBox
IsChecked="{core:OptionBinding local:CodeEditorOptions.UseOverstrikeMode}" IsChecked="{core:OptionBinding local:CodeEditorOptions.AllowOverstrikeMode}"
Content="{core:Localize Dialog.Options.IDEOptions.TextEditor.General.UseOverstrikeModeCheckBox}" /> Content="{core:Localize Dialog.Options.IDEOptions.TextEditor.General.AllowOverstrikeModeCheckBox}" />
</widgets:StackPanelWithSpacing> </widgets:StackPanelWithSpacing>
</GroupBox> </GroupBox>
</StackPanel> </StackPanel>

4
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/Caret.cs

@ -394,7 +394,7 @@ namespace ICSharpCode.AvalonEdit.Editing
{ {
if (textView != null && textView.Document != null) { if (textView != null && textView.Document != null) {
VisualLine visualLine = textView.GetOrConstructVisualLine(textView.Document.GetLineByNumber(position.Line)); 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); ? CalcCaretOverstrikeRectangle(visualLine) : CalcCaretRectangle(visualLine);
} else { } else {
return Rect.Empty; return Rect.Empty;
@ -451,7 +451,7 @@ namespace ICSharpCode.AvalonEdit.Editing
VisualLine visualLine = textView.GetVisualLine(position.Line); VisualLine visualLine = textView.GetVisualLine(position.Line);
if (visualLine != null) { if (visualLine != null) {
Rect caretRect; Rect caretRect;
if (this.textView.Options.UseOverstrikeMode && this.textArea.OverstrikeMode) { if (this.textView.Options.AllowOverstrikeMode && this.textArea.OverstrikeMode) {
caretRect = CalcCaretOverstrikeRectangle(visualLine); caretRect = CalcCaretOverstrikeRectangle(visualLine);
} else { } else {
caretRect = CalcCaretRectangle(visualLine); caretRect = CalcCaretRectangle(visualLine);

2
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/CaretLayer.cs

@ -79,7 +79,7 @@ namespace ICSharpCode.AvalonEdit.Editing
if (caretBrush == null) if (caretBrush == null)
caretBrush = (Brush)textView.GetValue(TextBlock.ForegroundProperty); 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; SolidColorBrush scBrush = caretBrush as SolidColorBrush;
if (scBrush != null) { if (scBrush != null) {
Color brushColor = scBrush.Color; Color brushColor = scBrush.Color;

2
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Editing/TextArea.cs

@ -956,7 +956,7 @@ namespace ICSharpCode.AvalonEdit.Editing
{ {
base.OnPreviewKeyDown(e); base.OnPreviewKeyDown(e);
if (!this.Options.UseOverstrikeMode) { if (!this.Options.AllowOverstrikeMode) {
this.overstrikeMode = false; this.overstrikeMode = false;
} else if (!e.Handled && e.Key == Key.Insert) { } else if (!e.Handled && e.Key == Key.Insert) {
this.overstrikeMode = !this.overstrikeMode; this.overstrikeMode = !this.overstrikeMode;

12
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/TextEditorOptions.cs

@ -463,18 +463,18 @@ namespace ICSharpCode.AvalonEdit
} }
} }
bool useOverstrikeMode = false; bool allowOverstrikeMode = false;
[DefaultValue(false)] [DefaultValue(false)]
/// <summary> /// <summary>
/// Gets/Sets if overstrike mode is enabled to use /// Gets/Sets if overstrike mode is enabled to use
/// </summary> /// </summary>
public bool UseOverstrikeMode { public bool AllowOverstrikeMode {
get { return useOverstrikeMode; } get { return allowOverstrikeMode; }
set { set {
if (useOverstrikeMode != value) { if (allowOverstrikeMode != value) {
useOverstrikeMode = value; allowOverstrikeMode = value;
OnPropertyChanged("UseOverstrikeMode"); OnPropertyChanged("AllowOverstrikeMode");
} }
} }
} }

Loading…
Cancel
Save