Browse Source

Add Highlight current line option to Tools->Options memu

pull/289/head
Patryk Mikos 12 years ago
parent
commit
e16558b94a
  1. 5
      data/resources/StringResources.resx
  2. 8
      src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditorView.cs
  3. 13
      src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/CodeEditorOptions.cs
  4. 5
      src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/TextViewOptions.xaml

5
data/resources/StringResources.resx

@ -2425,9 +2425,12 @@ system. I don't think that it needs translation.</comment>
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightSymbolCheckBox" xml:space="preserve"> <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightSymbolCheckBox" xml:space="preserve">
<value>Highlight symbols</value> <value>Highlight symbols</value>
</data> </data>
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HiglightBracketCheckBox" xml:space="preserve"> <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightBracketCheckBox" xml:space="preserve">
<value>Highlight &amp;matching bracket</value> <value>Highlight &amp;matching bracket</value>
</data> </data>
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HighlightCurrentLineCheckBox" xml:space="preserve">
<value>Highlight current line</value>
</data>
<data name="Dialog.Options.IDEOptions.TextEditor.Markers.HorizontalRulerCheckBox" xml:space="preserve"> <data name="Dialog.Options.IDEOptions.TextEditor.Markers.HorizontalRulerCheckBox" xml:space="preserve">
<value>Show &amp;horizontal ruler</value> <value>Show &amp;horizontal ruler</value>
</data> </data>

8
src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditorView.cs

@ -158,7 +158,13 @@ namespace ICSharpCode.AvalonEdit.AddIn
/// </summary> /// </summary>
void HighlightCurrentLine(object sender, EventArgs e) void HighlightCurrentLine(object sender, EventArgs e)
{ {
this.currentLineRenderer.SetHighlight(this.TextArea.Caret.Line); if(this.Adapter.Language != null) {
if(CodeEditorOptions.Instance.HighlightCurrentLine) {
this.currentLineRenderer.SetHighlight(this.TextArea.Caret.Line);
} else {
this.currentLineRenderer.SetHighlight(-1);
}
}
} }
#endregion #endregion

13
src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/CodeEditorOptions.cs

@ -153,6 +153,19 @@ namespace ICSharpCode.AvalonEdit.AddIn.Options
} }
} }
bool highlightCurrentLine = true;
[DefaultValueAttribute(true)]
public bool HighlightCurrentLine {
get { return highlightCurrentLine; }
set {
if(highlightCurrentLine != value) {
highlightCurrentLine = value;
OnPropertyChanged("HighlightCurrentLine");
}
}
}
bool highlightSymbol = true; bool highlightSymbol = true;
[DefaultValue(true)] [DefaultValue(true)]

5
src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/TextViewOptions.xaml

@ -20,7 +20,10 @@
Content="{core:Localize Dialog.Options.IDEOptions.TextEditor.Markers.UnderLineErrorsCheckBox}" /> Content="{core:Localize Dialog.Options.IDEOptions.TextEditor.Markers.UnderLineErrorsCheckBox}" />
<CheckBox <CheckBox
IsChecked="{core:OptionBinding local:CodeEditorOptions.HighlightBrackets}" IsChecked="{core:OptionBinding local:CodeEditorOptions.HighlightBrackets}"
Content="{core:Localize Dialog.Options.IDEOptions.TextEditor.Markers.HiglightBracketCheckBox}" /> Content="{core:Localize Dialog.Options.IDEOptions.TextEditor.Markers.HighlightBracketCheckBox}" />
<CheckBox
IsChecked="{core:OptionBinding local:CodeEditorOptions.HighlightCurrentLine}"
Content="{core:Localize Dialog.Options.IDEOptions.TextEditor.Markers.HighlightCurrentLineCheckBox}" />
<CheckBox <CheckBox
IsChecked="{core:OptionBinding local:CodeEditorOptions.HighlightSymbol}" IsChecked="{core:OptionBinding local:CodeEditorOptions.HighlightSymbol}"
Content="{core:Localize Dialog.Options.IDEOptions.TextEditor.Markers.HighlightSymbolCheckBox}" /> Content="{core:Localize Dialog.Options.IDEOptions.TextEditor.Markers.HighlightSymbolCheckBox}" />

Loading…
Cancel
Save