diff -r c83dcb7c6147 -r 5e1afd1577b9 Preferences/ConfigurationPages/EditorStylesPage.py
--- a/Preferences/ConfigurationPages/EditorStylesPage.py Tue Mar 05 19:50:32 2019 +0100
+++ b/Preferences/ConfigurationPages/EditorStylesPage.py Wed Mar 06 18:44:29 2019 +0100
@@ -73,19 +73,21 @@
QsciScintilla.WrapFlagInMargin)
self.wrapIndentComboBox.addItem(
- self.tr("Fixed Amount"), QsciScintilla.WrapIndentFixed)
+ self.tr("Fixed"), QsciScintilla.WrapIndentFixed)
self.wrapIndentComboBox.addItem(
- self.tr("Aligned to First Line"), QsciScintilla.WrapIndentSame)
+ self.tr("Aligned"), QsciScintilla.WrapIndentSame)
self.wrapIndentComboBox.addItem(
- self.tr("Aligned to First Line plus One"),
+ self.tr("Aligned plus One"),
QsciScintilla.WrapIndentIndented)
if QSCINTILLA_VERSION() >= 0x020B00:
self.wrapIndentComboBox.addItem(
- self.tr("Aligned to First Line plus Two"),
+ self.tr("Aligned plus Two"),
QsciScintilla.WrapIndentDeeplyIndented)
- if QSCINTILLA_VERSION() < 0x020800:
- self.caretlineAlwaysVisibleCheckBox.hide()
+ self.caretlineAlwaysVisibleCheckBox.setEnabled(
+ QSCINTILLA_VERSION() >= 0x020800)
+ self.caretlineFrameWidthSpinBox.setEnabled(
+ QSCINTILLA_VERSION() >= 0x020B00)
# set initial values
try:
@@ -112,6 +114,8 @@
Preferences.getEditor("CaretLineAlwaysVisible"))
self.caretWidthSpinBox.setValue(
Preferences.getEditor("CaretWidth"))
+ self.caretlineFrameWidthSpinBox.setValue(
+ Preferences.getEditor("CaretLineFrameWidth"))
self.colourizeSelTextCheckBox.setChecked(
Preferences.getEditor("ColourizeSelText"))
self.customSelColourCheckBox.setChecked(
@@ -170,6 +174,8 @@
self.wrapIndentComboBox.setCurrentIndex(
self.wrapIndentComboBox.findData(
Preferences.getEditor("WrapIndentMode")))
+ self.wrapStartIndentSpinBox.setValue(
+ Preferences.getEditor("WrapStartIndent"))
self.edgeModeCombo.setCurrentIndex(
self.edgeModes.index(Preferences.getEditor("EdgeMode")))
@@ -326,6 +332,8 @@
Preferences.setEditor(
"CaretWidth", self.caretWidthSpinBox.value())
+ Preferences.setEditor(
+ "CaretLineFrameWidth", self.caretlineFrameWidthSpinBox.value())
Preferences.setEditor(
"ShowEOL", self.eolCheckBox.isChecked())
@@ -339,6 +347,8 @@
"WrapIndentMode", self.wrapIndentComboBox.itemData(
self.wrapIndentComboBox.currentIndex()))
Preferences.setEditor(
+ "WrapStartIndent", self.wrapStartIndentSpinBox.value())
+ Preferences.setEditor(
"EdgeMode", self.edgeModes[self.edgeModeCombo.currentIndex()])
Preferences.setEditor(
"EdgeColumn", self.edgeLineColumnSlider.value())
