Mercurial Repositories > eric / file diff

--- a/eric7/QScintilla/Editor.py	Sun May 16 20:07:24 2021 +0200
+++ b/eric7/QScintilla/Editor.py	Mon May 17 19:58:15 2021 +0200
@@ -535,7 +535,8 @@
             self.__changeBreakPoints)
         self.breakpointModel.rowsInserted.connect(
             self.__addBreakPoints)
-        self.SCN_MODIFIED.connect(self.__modified)
+        # FIXME: C++ type 'const char*' is not supported as a signal argument type
+##        self.SCN_MODIFIED.connect(self.__modified)
         
         # establish connection to some ViewManager action groups
         self.addActions(self.vm.editorActGrp.actions())
@@ -4721,12 +4722,12 @@
         self.setAutoCompletionReplaceWord(
             Preferences.getEditor("AutoCompletionReplaceWord"))
         self.setAutoCompletionThreshold(0)
-        try:
+        if Preferences.getEditor("AutoCompletionShowSingle"):
             self.setAutoCompletionUseSingle(
-                Preferences.getEditor("AutoCompletionShowSingle"))
-        except AttributeError:
-            self.setAutoCompletionShowSingle(
-                Preferences.getEditor("AutoCompletionShowSingle"))
+                QsciScintilla.AutoCompletionUseSingle.AcusAlways)
+        else:
+            self.setAutoCompletionUseSingle(
+                QsciScintilla.AutoCompletionUseSingle.AcusNever)
         autoCompletionSource = Preferences.getEditor("AutoCompletionSource")
         if (
             autoCompletionSource ==
@@ -5461,9 +5462,9 @@
             elif self.__marginNumber(evt.x()) == self.__bpMargin:
                 self.bpMarginMenu.popup(evt.globalPos())
             elif self.__marginNumber(evt.x()) == self.__indicMargin:
-                self.indicMarginMenu.popup(evt.globalPos())
+                self.indicMarginMenu.popup(evt.globalPos)
             elif self.__marginNumber(evt.x()) == self.__foldMargin:
-                self.foldMarginMenu.popup(evt.globalPos())
+                self.foldMarginMenu.popup(evt.globalPos)
         
     def __showContextMenu(self):
         """
@@ -8414,7 +8415,7 @@
         """
         modifiers = evt.modifiers()
         button = evt.button()
-        key = (int(modifiers), int(button))
+        key = (modifiers.value, button.value)
         
         self.vm.eventFilter(self, evt)
         super().mouseReleaseEvent(evt)