diff -r 6b42677d7043 -r d2f2a1fe0129 eric6/Preferences/ConfigurationPages/EditorStylesPage.py
--- a/eric6/Preferences/ConfigurationPages/EditorStylesPage.py Mon Sep 02 18:50:38 2019 +0200
+++ b/eric6/Preferences/ConfigurationPages/EditorStylesPage.py Mon Sep 02 18:51:38 2019 +0200
@@ -37,8 +37,8 @@
self.setupUi(self)
self.setObjectName("EditorStylesPage")
- from QScintilla.QsciScintillaCompat import QsciScintillaCompat, \
- QSCINTILLA_VERSION
+ from QScintilla.QsciScintillaCompat import QsciScintillaCompat
+
self.foldStyles = [
QsciScintilla.PlainFoldStyle,
QsciScintilla.CircledFoldStyle,
@@ -67,10 +67,9 @@
self.tr("Indicator by Text"), QsciScintilla.WrapFlagByText)
self.wrapVisualComboBox.addItem(
self.tr("Indicator by Margin"), QsciScintilla.WrapFlagByBorder)
- if QSCINTILLA_VERSION() >= 0x020700:
- self.wrapVisualComboBox.addItem(
- self.tr("Indicator in Line Number Margin"),
- QsciScintilla.WrapFlagInMargin)
+ self.wrapVisualComboBox.addItem(
+ self.tr("Indicator in Line Number Margin"),
+ QsciScintilla.WrapFlagInMargin)
self.wrapIndentComboBox.addItem(
self.tr("Fixed"), QsciScintilla.WrapIndentFixed)
@@ -79,15 +78,9 @@
self.wrapIndentComboBox.addItem(
self.tr("Aligned plus One"),
QsciScintilla.WrapIndentIndented)
- if QSCINTILLA_VERSION() >= 0x020B00:
- self.wrapIndentComboBox.addItem(
- self.tr("Aligned plus Two"),
- QsciScintilla.WrapIndentDeeplyIndented)
-
- self.caretlineAlwaysVisibleCheckBox.setEnabled(
- QSCINTILLA_VERSION() >= 0x020800)
- self.caretlineFrameWidthSpinBox.setEnabled(
- QSCINTILLA_VERSION() >= 0x020B00)
+ self.wrapIndentComboBox.addItem(
+ self.tr("Aligned plus Two"),
+ QsciScintilla.WrapIndentDeeplyIndented)
# set initial values
try:
