diff -r 27f636beebad -r 2c730d5fd177 eric6/WebBrowser/WebBrowserJavaScriptConsole.py
--- a/eric6/WebBrowser/WebBrowserJavaScriptConsole.py Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/WebBrowser/WebBrowserJavaScriptConsole.py Tue Mar 02 17:17:09 2021 +0100
@@ -25,7 +25,7 @@
"""
super(WebBrowserJavaScriptConsole, self).__init__(parent)
self.setAcceptRichText(False)
- self.setLineWrapMode(QTextEdit.NoWrap)
+ self.setLineWrapMode(QTextEdit.LineWrapMode.NoWrap)
self.setReadOnly(True)
# create the context menu
@@ -35,13 +35,16 @@
self.__menu.addSeparator()
self.__menu.addAction(self.tr('Select All'), self.selectAll)
- self.setContextMenuPolicy(Qt.CustomContextMenu)
+ self.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
self.customContextMenuRequested.connect(self.__handleShowContextMenu)
self.__levelStrings = {
- QWebEnginePage.InfoMessageLevel: self.tr("Info"),
- QWebEnginePage.WarningMessageLevel: self.tr("Warning"),
- QWebEnginePage.ErrorMessageLevel: self.tr("Error"),
+ QWebEnginePage.JavaScriptConsoleMessageLevel.InfoMessageLevel:
+ self.tr("Info"),
+ QWebEnginePage.JavaScriptConsoleMessageLevel.WarningMessageLevel:
+ self.tr("Warning"),
+ QWebEnginePage.JavaScriptConsoleMessageLevel.ErrorMessageLevel:
+ self.tr("Error"),
}
def __handleShowContextMenu(self, coord):
@@ -60,7 +63,7 @@
@param txt text to insert (string)
"""
tc = self.textCursor()
- tc.movePosition(QTextCursor.End)
+ tc.movePosition(QTextCursor.MoveOperation.End)
self.setTextCursor(tc)
self.insertPlainText(txt)
self.ensureCursorVisible()
@@ -71,12 +74,12 @@
@param evt key press event (QKeyEvent)
"""
- if evt.modifiers() == Qt.ControlModifier:
- if evt.key() == Qt.Key_C:
+ if evt.modifiers() == Qt.KeyboardModifier.ControlModifier:
+ if evt.key() == Qt.Key.Key_C:
self.copy()
evt.accept()
return
- elif evt.key() == Qt.Key_A:
+ elif evt.key() == Qt.Key.Key_A:
self.selectAll()
evt.accept()
return
