Mercurial Repositories > eric / file diff

--- a/eric7/QScintilla/Shell.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/QScintilla/Shell.py	Sun May 16 20:07:24 2021 +0200
@@ -12,13 +12,13 @@
 import contextlib
 import enum
 
-from PyQt5.QtCore import pyqtSignal, pyqtSlot, QFileInfo, Qt, QEvent
-from PyQt5.QtGui import QClipboard, QPalette, QFont
-from PyQt5.QtWidgets import (
+from PyQt6.QtCore import pyqtSignal, pyqtSlot, QFileInfo, Qt, QEvent
+from PyQt6.QtGui import QClipboard, QPalette, QFont, QShortcut
+from PyQt6.QtWidgets import (
     QDialog, QInputDialog, QApplication, QMenu, QWidget, QHBoxLayout,
-    QVBoxLayout, QShortcut, QSizePolicy
+    QVBoxLayout, QSizePolicy
 )
-from PyQt5.Qsci import QsciScintilla
+from PyQt6.Qsci import QsciScintilla
 
 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
@@ -436,7 +436,7 @@
         key = 'Scintilla/{0}/style0/font'.format(self.lexer_.language())
         fdesc = Preferences.Prefs.settings.value(key)
         if fdesc is not None:
-            font = QFont(fdesc[0], int(fdesc[1]))
+            font = QFont([fdesc[0]], int(fdesc[1]))
             self.lexer_.setDefaultFont(font)
         self.setLexer(self.lexer_)
         self.lexer_.readSettings(Preferences.Prefs.settings, "Scintilla")
@@ -1248,7 +1248,7 @@
         @param event the mouse press event (QMouseEvent)
         """
         self.setFocus()
-        if event.button() == Qt.MouseButton.MidButton:
+        if event.button() == Qt.MouseButton.MiddleButton:
             lines = QApplication.clipboard().text(QClipboard.Mode.Selection)
             self.paste(lines)
         else: