Mercurial Repositories > eric / file diff

--- a/eric6/Preferences/ConfigurationPages/EditorCalltipsPage.py	Mon Sep 02 18:50:38 2019 +0200
+++ b/eric6/Preferences/ConfigurationPages/EditorCalltipsPage.py	Mon Sep 02 18:51:38 2019 +0200
@@ -11,8 +11,6 @@
 
 from PyQt5.Qsci import QsciScintilla
 
-from QScintilla.QsciScintillaCompat import QSCINTILLA_VERSION
-
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorCalltipsPage import Ui_EditorCalltipsPage
 
@@ -31,15 +29,12 @@
         self.setupUi(self)
         self.setObjectName("EditorCalltipsPage")
         
-        if QSCINTILLA_VERSION() >= 0x020700:
-            self.positionComboBox.addItem(
-                self.tr("Below Text"),
-                QsciScintilla.CallTipsBelowText)
-            self.positionComboBox.addItem(
-                self.tr("Above Text"),
-                QsciScintilla.CallTipsAboveText)
-        else:
-            self.calltipsPositionBox.hide()
+        self.positionComboBox.addItem(
+            self.tr("Below Text"),
+            QsciScintilla.CallTipsBelowText)
+        self.positionComboBox.addItem(
+            self.tr("Above Text"),
+            QsciScintilla.CallTipsAboveText)
         
         # set initial values
         self.ctEnabledCheckBox.setChecked(
@@ -53,10 +48,9 @@
         self.ctScintillaCheckBox.setChecked(
             Preferences.getEditor("CallTipsScintillaOnFail"))
         
-        if QSCINTILLA_VERSION() >= 0x020700:
-            self.positionComboBox.setCurrentIndex(
-                self.positionComboBox.findData(
-                    Preferences.getEditor("CallTipsPosition")))
+        self.positionComboBox.setCurrentIndex(
+            self.positionComboBox.findData(
+                Preferences.getEditor("CallTipsPosition")))
         
     def save(self):
         """
@@ -75,11 +69,10 @@
             "CallTipsScintillaOnFail",
             self.ctScintillaCheckBox.isChecked())
         
-        if QSCINTILLA_VERSION() >= 0x020700:
-            Preferences.setEditor(
-                "CallTipsPosition",
-                self.positionComboBox.itemData(
-                    self.positionComboBox.currentIndex()))
+        Preferences.setEditor(
+            "CallTipsPosition",
+            self.positionComboBox.itemData(
+                self.positionComboBox.currentIndex()))
 
 
 def create(dlg):