Qt6 support

- QRegExp fixes for Qt6
- Convert CodeHighlighter from QRegExp to python regex

Author: MHendricks

preditor/about_module.py

@@ -116,10 +116,14 @@ def text(self):
             pass
 
         # Add info for all Qt5 bindings that have been imported
-        if 'PyQt5.QtCore' in sys.modules:
-            ret.append('PyQt5: {}'.format(sys.modules['PyQt5.QtCore'].PYQT_VERSION_STR))
+        if 'PySide6.QtCore' in sys.modules:
+            ret.append('PySide6: {}'.format(sys.modules['PySide6.QtCore'].qVersion()))
+        if 'PyQt6.QtCore' in sys.modules:
+            ret.append('PyQt6: {}'.format(sys.modules['PyQt6.QtCore'].PYQT_VERSION_STR))
         if 'PySide2.QtCore' in sys.modules:
             ret.append('PySide2: {}'.format(sys.modules['PySide2.QtCore'].qVersion()))
+        if 'PyQt5.QtCore' in sys.modules:
+            ret.append('PyQt5: {}'.format(sys.modules['PyQt5.QtCore'].PYQT_VERSION_STR))
 
         # Add qt library paths for plugin debugging
         for i, path in enumerate(QtCore.QCoreApplication.libraryPaths()):

preditor/gui/app.py

@@ -93,7 +93,7 @@ def dpi_awareness_args(cls):
         Returns:
             args: Extend the arguments used to intialize the QApplication.
         """
-        if settings.OS_TYPE == "Windows" and Qt.IsPyQt5:
+        if settings.OS_TYPE == "Windows" and (Qt.IsPyQt6 or Qt.IsPyQt5):
             # Make Qt automatically scale based on the monitor the window is
             # currently located.
             return ["--platform", "windows:dpiawareness=0"]
@@ -156,4 +156,4 @@ def start(self):
         """Exec's the QApplication if it hasn't already been started."""
         if self.app_created and self.app and not self.app_has_exec:
             self.app_has_exec = True
-            self.app.exec_()
+            Qt.QtCompat.QApplication.exec_()

preditor/gui/codehighlighter.py

@@ -4,7 +4,6 @@
 import os
 import re
 
-from Qt.QtCore import QRegExp
 from Qt.QtGui import QColor, QSyntaxHighlighter, QTextCharFormat
 
 from .. import resourcePath
@@ -68,59 +67,46 @@ def highlightBlock(self, text):
             if parent and hasattr(parent, 'outputPrompt'):
                 self.highlightText(
                     text,
-                    QRegExp('%s[^\\n]*' % re.escape(parent.outputPrompt())),
+                    re.compile('%s[^\\n]*' % re.escape(parent.outputPrompt())),
                     format,
                 )
 
             # format the keywords
             format = self.keywordFormat()
             for kwd in self._keywords:
-                self.highlightText(text, QRegExp(r'\b%s\b' % kwd), format)
+                self.highlightText(text, re.compile(r'\b%s\b' % kwd), format)
 
             # format the strings
             format = self.stringFormat()
+
             for string in self._strings:
                 self.highlightText(
                     text,
-                    QRegExp('%s[^%s]*' % (string, string)),
+                    re.compile('{s}[^{s}]*{s}'.format(s=string)),
                     format,
-                    includeLast=True,
                 )
 
             # format the comments
             format = self.commentFormat()
             for comment in self._comments:
-                self.highlightText(text, QRegExp(comment), format)
+                self.highlightText(text, re.compile(comment), format)
 
     def highlightText(self, text, expr, format, offset=0, includeLast=False):
         """Highlights a text group with an expression and format
 
         Args:
             text (str): text to highlight
-            expr (QRegExp): search parameter
+            expr (QRegularExpression): search parameter
             format (QTextCharFormat): formatting rule
-            offset (int): number of characters to offset by when highlighting
             includeLast (bool): whether or not the last character should be highlighted
         """
-        pos = expr.indexIn(text, 0)
-
         # highlight all the given matches to the expression in the text
-        while pos != -1:
-            pos = expr.pos(offset)
-            length = len(expr.cap(offset))
-
-            # use the last character if desired
+        for match in expr.finditer(text):
+            start, end = match.span()
+            length = end - start
             if includeLast:
                 length += 1
-
-            # set the formatting
-            self.setFormat(pos, length, format)
-
-            matched = expr.matchedLength()
-            if includeLast:
-                matched += 1
-
-            pos = expr.indexIn(text, pos + matched)
+            self.setFormat(start, length, format)
 
     def keywordColor(self):
         # pull the color from the parent if possible because this doesn't support

preditor/gui/completer.py

@@ -5,6 +5,7 @@
 import sys
 from enum import Enum
 
+import Qt as Qt_py
 from Qt.QtCore import QRegExp, QSortFilterProxyModel, QStringListModel, Qt
 from Qt.QtGui import QCursor, QTextCursor
 from Qt.QtWidgets import QCompleter, QToolTip
@@ -155,8 +156,14 @@ def refreshList(self, scope=None):
         if self._completerMode == CompleterMode.FULL_FUZZY:
             regExStr = ".*".join(prefix)
 
-        regexp = QRegExp(regExStr, self._sensitivity)
-        self.filterModel.setFilterRegExp(regexp)
+        if Qt_py.IsPyQt6 or Qt_py.IsPySide6:
+            regexp = QRegExp(regExStr)
+            if self._sensitivity:
+                regexp.setPatternOptions(QRegExp.PatternOption.CaseInsensitiveOption)
+            self.filterModel.setFilterRegularExpression(regexp)
+        else:
+            regexp = QRegExp(regExStr, self._sensitivity)
+            self.filterModel.setFilterRegExp(regexp)
 
     def clear(self):
         self.popup().hide()

preditor/gui/console.py

@@ -15,7 +15,14 @@
 import __main__
 from Qt import QtCompat
 from Qt.QtCore import QPoint, Qt, QTimer
-from Qt.QtGui import QColor, QFontMetrics, QTextCharFormat, QTextCursor, QTextDocument
+from Qt.QtGui import (
+    QColor,
+    QFontMetrics,
+    QKeySequence,
+    QTextCharFormat,
+    QTextCursor,
+    QTextDocument,
+)
 from Qt.QtWidgets import QAbstractItemView, QAction, QApplication, QTextEdit
 
 from .. import debug, settings, stream
@@ -99,7 +106,9 @@ def __init__(self, parent):
 
         self.uiClearToLastPromptACT = QAction('Clear to Last', self)
         self.uiClearToLastPromptACT.triggered.connect(self.clearToLastPrompt)
-        self.uiClearToLastPromptACT.setShortcut(Qt.CTRL | Qt.SHIFT | Qt.Key_Backspace)
+        self.uiClearToLastPromptACT.setShortcut(
+            QKeySequence(Qt.Modifier.CTRL | Qt.Modifier.SHIFT | Qt.Key.Key_Backspace)
+        )
         self.addAction(self.uiClearToLastPromptACT)
 
         self.x = 0
@@ -155,8 +164,8 @@ def setConsoleFont(self, font):
             workbox = self.window().current_workbox()
             if workbox:
                 tab_width = workbox.__tab_width__()
-        fontPixelWidth = QFontMetrics(font).width(" ")
-        self.setTabStopWidth(fontPixelWidth * tab_width)
+        fontPixelWidth = QFontMetrics(font).horizontalAdvance(" ")
+        self.setTabStopDistance(fontPixelWidth * tab_width)
 
         # Scroll to same relative position where we started
         if origPercent is not None:

preditor/gui/loggerwindow.py

@@ -11,16 +11,18 @@
 from functools import partial
 
 import __main__
+import Qt as Qt_py
 import six
 from Qt import QtCompat, QtCore, QtWidgets
 from Qt.QtCore import QByteArray, Qt, QTimer, Signal, Slot
-from Qt.QtGui import QCursor, QFont, QIcon, QTextCursor
+from Qt.QtGui import QCursor, QFont, QIcon, QKeySequence, QTextCursor
 from Qt.QtWidgets import (
     QApplication,
     QFontDialog,
     QInputDialog,
     QMessageBox,
     QTextBrowser,
+    QTextEdit,
     QToolTip,
     QVBoxLayout,
 )
@@ -172,7 +174,7 @@ def __init__(self, parent, name=None, run_workbox=False, standalone=False):
         self.uiCompleterModeMENU.addSeparator()
         action = self.uiCompleterModeMENU.addAction('Cycle mode')
         action.setObjectName('uiCycleModeACT')
-        action.setShortcut(Qt.CTRL | Qt.Key_M)
+        action.setShortcut(QKeySequence(Qt.Modifier.CTRL | Qt.Key.Key_M))
         action.triggered.connect(self.cycleCompleterMode)
         self.uiCompleterModeMENU.hovered.connect(self.handleMenuHovered)
 
@@ -542,7 +544,10 @@ def handleMenuHovered(self, action):
         else:
             text = action.toolTip()
 
-        menu = action.parentWidget()
+        if Qt_py.IsPyQt4:
+            menu = action.parentWidget()
+        else:
+            menu = action.parent()
         QToolTip.showText(QCursor.pos(), text, menu)
 
     def selectFont(self, monospace=False, proportional=False):
@@ -722,7 +727,7 @@ def recordPrefs(self, manual=False):
         pref.update(
             {
                 'loggergeom': [geo.x(), geo.y(), geo.width(), geo.height()],
-                'windowState': int(self.windowState()),
+                'windowState': QtCompat.enumValue(self.windowState()),
                 'SplitterVertical': self.uiEditorVerticalACT.isChecked(),
                 'SplitterSize': self.uiSplitterSPLIT.sizes(),
                 'tabIndent': self.uiIndentationsTabsACT.isChecked(),
@@ -846,7 +851,7 @@ def restorePrefs(self):
         sizes = pref.get('SplitterSize')
         if sizes:
             self.uiSplitterSPLIT.setSizes(sizes)
-        self.setWindowState(Qt.WindowStates(pref.get('windowState', 0)))
+        self.setWindowState(Qt.WindowState(pref.get('windowState', 0)))
         self.uiIndentationsTabsACT.setChecked(pref.get('tabIndent', True))
         self.uiCopyTabsToSpacesACT.setChecked(pref.get('copyIndentsAsSpaces', False))
 
@@ -919,7 +924,7 @@ def restorePrefs(self):
         _font = pref.get('consoleFont', None)
         if _font:
             font = QFont()
-            if font.fromString(_font):
+            if QtCompat.QFont.fromString(font, _font):
                 self.console().setConsoleFont(font)
 
         self.dont_ask_again = pref.get('dont_ask_again', [])
@@ -1098,9 +1103,9 @@ def setFlashWindowInterval(self):
 
     def setWordWrap(self, state):
         if state:
-            self.uiConsoleTXT.setLineWrapMode(self.uiConsoleTXT.WidgetWidth)
+            self.uiConsoleTXT.setLineWrapMode(QTextEdit.WidgetWidth)
         else:
-            self.uiConsoleTXT.setLineWrapMode(self.uiConsoleTXT.NoWrap)
+            self.uiConsoleTXT.setLineWrapMode(QTextEdit.NoWrap)
 
     def show_about(self):
         """Shows `preditor.about_preditor()`'s output in a message box."""

preditor/gui/workbox_text_edit.py

@@ -64,7 +64,7 @@ def __font__(self):
 
     def __set_font__(self, font):
         metrics = QFontMetrics(font)
-        self.setTabStopDistance(metrics.width(" ") * 4)
+        self.setTabStopDistance(metrics.horizontalAdvance(" ") * 4)
         super(WorkboxTextEdit, self).setFont(font)
 
     def __goto_line__(self, line):

preditor/gui/workboxwidget.py

@@ -216,13 +216,13 @@ def keyPressEvent(self, event):
         when Return is pressed), so this combination is not detectable.
         """
         if self._software == 'softimage':
-            DocumentEditor.keyPressEvent(self, event)
+            super(WorkboxWidget, self).keyPressEvent(event)
         else:
             if self.process_shortcut(event):
                 return
             else:
                 # Send regular keystroke
-                DocumentEditor.keyPressEvent(self, event)
+                super(WorkboxWidget, self).keyPressEvent(event)
 
     def initShortcuts(self):
         """Use this to set up shortcuts when the DocumentEditor"""

preditor/scintilla/delayables/smart_highlight.py

@@ -1,5 +1,6 @@
 from __future__ import absolute_import, print_function
 
+import Qt
 from PyQt5.Qsci import QsciScintilla
 from Qt.QtCore import QSignalMapper
 from Qt.QtWidgets import QWidget
@@ -36,7 +37,10 @@ def add_document(self, document):
         )
 
         self.signal_mapper.setMapping(document, document)
-        self.signal_mapper.mapped[QWidget].connect(self.update_highlighter)
+        if Qt.IsPyQt4:
+            self.signal_mapper.mapped[QWidget].connect(self.update_highlighter)
+        else:
+            self.signal_mapper.mappedObject.connect(self.update_highlighter)
         document.selectionChanged.connect(self.signal_mapper.map)
 
     def clear_markings(self, document):

preditor/scintilla/documenteditor.py

@@ -1101,7 +1101,7 @@ def saveAs(self, filename='', setFilename=True):
                     self.window(),
                     'Error saving file...',
                     'There was a error saving the file. Error Code: %i' % f.error(),
-                    QMessageBox.Ok,
+                    QMessageBox.StandardButton.Ok,
                 )
                 f.close()
                 return False