PrEditor 1.1.0__py3-none-any.whl → 1.3.0__py3-none-any.whl

preditor/gui/console.py

@@ -15,7 +15,14 @@ from functools import partial
 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 settings, stream
@@ -32,7 +39,7 @@ class ConsolePrEdit(QTextEdit):
 
     # These Qt Properties can be customized using style sheets.
     commentColor = QtPropertyInit('_commentColor', QColor(0, 206, 52))
-    errorMessageColor = QtPropertyInit('_errorMessageColor', QColor(Qt.red))
+    errorMessageColor = QtPropertyInit('_errorMessageColor', QColor(Qt.GlobalColor.red))
     keywordColor = QtPropertyInit('_keywordColor', QColor(17, 154, 255))
     resultColor = QtPropertyInit('_resultColor', QColor(128, 128, 128))
     stdoutColor = QtPropertyInit('_stdoutColor', QColor(17, 154, 255))
@@ -56,6 +63,8 @@ class ConsolePrEdit(QTextEdit):
 
         self._firstShow = True
 
+        self.addSepNewline = False
+
         # When executing code, that takes longer than this seconds, flash the window
         self.flash_time = 1.0
         self.flash_window = None
@@ -99,7 +108,9 @@ class ConsolePrEdit(QTextEdit):
 
         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 +166,8 @@ class ConsolePrEdit(QTextEdit):
             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:
@@ -170,7 +181,7 @@ class ConsolePrEdit(QTextEdit):
         self.clickPos = event.pos()
         self.anchor = self.anchorAt(event.pos())
         if self.anchor:
-            QApplication.setOverrideCursor(Qt.PointingHandCursor)
+            QApplication.setOverrideCursor(Qt.CursorShape.PointingHandCursor)
         return super(ConsolePrEdit, self).mousePressEvent(event)
 
     def mouseReleaseEvent(self, event):
@@ -178,7 +189,7 @@ class ConsolePrEdit(QTextEdit):
         click position is the same as release position, if so, call errorHyperlink.
         """
         samePos = event.pos() == self.clickPos
-        left = event.button() == Qt.LeftButton
+        left = event.button() == Qt.MouseButton.LeftButton
         if samePos and left and self.anchor:
             self.errorHyperlink()
 
@@ -192,7 +203,7 @@ class ConsolePrEdit(QTextEdit):
         # scrolling. If used in LoggerWindow, use that wheel event
         # May not want to import LoggerWindow, so perhaps
         # check by str(type())
-        ctrlPressed = event.modifiers() == Qt.ControlModifier
+        ctrlPressed = event.modifiers() == Qt.KeyboardModifier.ControlModifier
         if ctrlPressed and "LoggerWindow" in str(type(self.window())):
             self.window().wheelEvent(event)
         else:
@@ -202,7 +213,7 @@ class ConsolePrEdit(QTextEdit):
         """Override of keyReleaseEvent to determine when to end navigation of
         previous commands
         """
-        if event.key() == Qt.Key_Alt:
+        if event.key() == Qt.Key.Key_Alt:
             self._prevCommandIndex = 0
         else:
             event.ignore()
@@ -319,7 +330,7 @@ class ConsolePrEdit(QTextEdit):
             prevCommand = self._prevCommands[self._prevCommandIndex]
 
         cursor = self.textCursor()
-        cursor.select(QTextCursor.LineUnderCursor)
+        cursor.select(QTextCursor.SelectionType.LineUnderCursor)
         if cursor.selectedText().startswith(self._consolePrompt):
             prevCommand = "{}{}".format(self._consolePrompt, prevCommand)
         cursor.insertText(prevCommand)
@@ -335,7 +346,7 @@ class ConsolePrEdit(QTextEdit):
         currentCursor = self.textCursor()
         # move to the end of the document so we can search backwards
         cursor = self.textCursor()
-        cursor.movePosition(cursor.End)
+        cursor.movePosition(QTextCursor.MoveOperation.End)
         self.setTextCursor(cursor)
         # Check if the last line is a empty prompt. If so, then preform two finds so we
         # find the prompt we are looking for instead of this empty prompt
@@ -343,12 +354,14 @@ class ConsolePrEdit(QTextEdit):
             2 if self.toPlainText()[-len(self.prompt()) :] == self.prompt() else 1
         )
         for _ in range(findCount):
-            self.find(self.prompt(), QTextDocument.FindBackward)
+            self.find(self.prompt(), QTextDocument.FindFlag.FindBackward)
         # move to the end of the found line, select the rest of the text and remove it
         # preserving history if there is anything to remove.
         cursor = self.textCursor()
-        cursor.movePosition(cursor.EndOfLine)
-        cursor.movePosition(cursor.End, cursor.KeepAnchor)
+        cursor.movePosition(QTextCursor.MoveOperation.EndOfLine)
+        cursor.movePosition(
+            QTextCursor.MoveOperation.End, QTextCursor.MoveMode.KeepAnchor
+        )
         txt = cursor.selectedText()
         if txt:
             self.setTextCursor(cursor)
@@ -364,7 +377,7 @@ class ConsolePrEdit(QTextEdit):
         if self.clearExecutionTime is not None:
             self.clearExecutionTime()
         cursor = self.textCursor()
-        cursor.select(QTextCursor.BlockUnderCursor)
+        cursor.select(QTextCursor.SelectionType.BlockUnderCursor)
         line = cursor.selectedText()
         if line and line[0] not in string.printable:
             line = line[1:]
@@ -472,7 +485,7 @@ class ConsolePrEdit(QTextEdit):
         """inserts the completion text into the editor"""
         if self.completer().widget() == self:
             cursor = self.textCursor()
-            cursor.select(QTextCursor.WordUnderCursor)
+            cursor.select(QTextCursor.SelectionType.WordUnderCursor)
             cursor.insertText(completion)
             self.setTextCursor(cursor)
 
@@ -535,21 +548,21 @@ class ConsolePrEdit(QTextEdit):
         # character, or remove it if backspace or delete has just been pressed.
         key = event.text()
         _, prefix = completer.currentObject(scope=__main__.__dict__)
-        isBackspaceOrDel = event.key() in (Qt.Key_Backspace, Qt.Key_Delete)
+        isBackspaceOrDel = event.key() in (Qt.Key.Key_Backspace, Qt.Key.Key_Delete)
         if key.isalnum() or key in ("-", "_"):
             prefix += str(key)
         elif isBackspaceOrDel and prefix:
             prefix = prefix[:-1]
 
         if completer and event.key() in (
-            Qt.Key_Backspace,
-            Qt.Key_Delete,
-            Qt.Key_Escape,
+            Qt.Key.Key_Backspace,
+            Qt.Key.Key_Delete,
+            Qt.Key.Key_Escape,
         ):
             completer.hideDocumentation()
 
         # enter || return keys will execute the command
-        if event.key() in (Qt.Key_Return, Qt.Key_Enter):
+        if event.key() in (Qt.Key.Key_Return, Qt.Key.Key_Enter):
             if completer.popup().isVisible():
                 completer.clear()
                 event.ignore()
@@ -557,11 +570,11 @@ class ConsolePrEdit(QTextEdit):
                 self.executeCommand()
 
         # home key will move the cursor to home
-        elif event.key() == Qt.Key_Home:
+        elif event.key() == Qt.Key.Key_Home:
             self.moveToHome()
 
         # otherwise, ignore the event for completion events
-        elif event.key() in (Qt.Key_Tab, Qt.Key_Backtab):
+        elif event.key() in (Qt.Key.Key_Tab, Qt.Key.Key_Backtab):
             if not completer.popup().isVisible():
                 # The completer does not get updated if its not visible while typing.
                 # We are about to complete the text using it so ensure its updated.
@@ -571,19 +584,28 @@ class ConsolePrEdit(QTextEdit):
                 )
             # Insert the correct text and clear the completion model
             index = completer.popup().currentIndex()
-            self.insertCompletion(index.data(Qt.DisplayRole))
+            self.insertCompletion(index.data(Qt.ItemDataRole.DisplayRole))
             completer.clear()
 
-        elif event.key() == Qt.Key_Escape and completer.popup().isVisible():
+        elif event.key() == Qt.Key.Key_Escape and completer.popup().isVisible():
             completer.clear()
 
         # other wise handle the keypress
         else:
             # define special key sequences
             modifiers = QApplication.instance().keyboardModifiers()
-            ctrlSpace = event.key() == Qt.Key_Space and modifiers == Qt.ControlModifier
-            ctrlM = event.key() == Qt.Key_M and modifiers == Qt.ControlModifier
-            ctrlI = event.key() == Qt.Key_I and modifiers == Qt.ControlModifier
+            ctrlSpace = (
+                event.key() == Qt.Key.Key_Space
+                and modifiers == Qt.KeyboardModifier.ControlModifier
+            )
+            ctrlM = (
+                event.key() == Qt.Key.Key_M
+                and modifiers == Qt.KeyboardModifier.ControlModifier
+            )
+            ctrlI = (
+                event.key() == Qt.Key.Key_I
+                and modifiers == Qt.KeyboardModifier.ControlModifier
+            )
 
             # Process all events we do not want to override
             if not (ctrlSpace or ctrlM or ctrlI):
@@ -602,20 +624,20 @@ class ConsolePrEdit(QTextEdit):
             # check for particular events for the completion
             if completer:
                 # look for documentation popups
-                if event.key() == Qt.Key_ParenLeft:
+                if event.key() == Qt.Key.Key_ParenLeft:
                     rect = self.cursorRect()
                     point = self.mapToGlobal(QPoint(rect.x(), rect.y()))
                     completer.showDocumentation(pos=point, scope=__main__.__dict__)
 
                 # hide documentation popups
-                elif event.key() == Qt.Key_ParenRight:
+                elif event.key() == Qt.Key.Key_ParenRight:
                     completer.hideDocumentation()
 
                 # determine if we need to show the popup or if it already is visible, we
                 # need to update it
                 elif (
-                    event.key() == Qt.Key_Period
-                    or event.key() == Qt.Key_Escape
+                    event.key() == Qt.Key.Key_Period
+                    or event.key() == Qt.Key.Key_Escape
                     or completer.popup().isVisible()
                     or ctrlSpace
                     or ctrlI
@@ -646,7 +668,9 @@ class ConsolePrEdit(QTextEdit):
                     completer.setCurrentRow(index.row())
 
                     # Make sure that current selection is visible, ie scroll to it
-                    completer.popup().scrollTo(index, QAbstractItemView.EnsureVisible)
+                    completer.popup().scrollTo(
+                        index, QAbstractItemView.ScrollHint.EnsureVisible
+                    )
 
                     # show the completer for the rect
                     rect = self.cursorRect()
@@ -663,7 +687,7 @@ class ConsolePrEdit(QTextEdit):
                 if completer.wasCompleting and not completer.popup().isVisible():
                     wasCompletingCounterMax = completer.wasCompletingCounterMax
                     if completer.wasCompletingCounter <= wasCompletingCounterMax:
-                        if event.key() not in (Qt.Key_Backspace, Qt.Key_Left):
+                        if event.key() not in (Qt.Key.Key_Backspace, Qt.Key.Key_Left):
                             completer.wasCompletingCounter += 1
                     else:
                         completer.wasCompletingCounter = 0
@@ -671,20 +695,26 @@ class ConsolePrEdit(QTextEdit):
 
     def moveToHome(self):
         """moves the cursor to the home location"""
-        mode = QTextCursor.MoveAnchor
+        mode = QTextCursor.MoveMode.MoveAnchor
         # select the home
-        if QApplication.instance().keyboardModifiers() == Qt.ShiftModifier:
-            mode = QTextCursor.KeepAnchor
+        if (
+            QApplication.instance().keyboardModifiers()
+            == Qt.KeyboardModifier.ShiftModifier
+        ):
+            mode = QTextCursor.MoveMode.KeepAnchor
         # grab the cursor
         cursor = self.textCursor()
-        if QApplication.instance().keyboardModifiers() == Qt.ControlModifier:
+        if (
+            QApplication.instance().keyboardModifiers()
+            == Qt.KeyboardModifier.ControlModifier
+        ):
             # move to the top of the document if control is pressed
-            cursor.movePosition(QTextCursor.Start)
+            cursor.movePosition(QTextCursor.MoveOperation.Start)
         else:
             # Otherwise just move it to the start of the line
-            cursor.movePosition(QTextCursor.StartOfBlock, mode)
+            cursor.movePosition(QTextCursor.MoveOperation.StartOfBlock, mode)
         # move the cursor to the end of the prompt.
-        cursor.movePosition(QTextCursor.Right, mode, len(self.prompt()))
+        cursor.movePosition(QTextCursor.MoveOperation.Right, mode, len(self.prompt()))
         self.setTextCursor(cursor)
 
     def outputPrompt(self):
@@ -721,7 +751,7 @@ class ConsolePrEdit(QTextEdit):
             prompt(str): The prompt to start the line with. If this prompt
                 is already the only text on the last line this function does nothing.
         """
-        self.moveCursor(QTextCursor.End)
+        self.moveCursor(QTextCursor.MoveOperation.End)
 
         # if this is not already a new line
         if self.textCursor().block().text() != prompt:
@@ -744,9 +774,11 @@ class ConsolePrEdit(QTextEdit):
         self.startPrompt(self._outputPrompt)
 
     def removeCurrentLine(self):
-        self.moveCursor(QTextCursor.End, QTextCursor.MoveAnchor)
-        self.moveCursor(QTextCursor.StartOfLine, QTextCursor.MoveAnchor)
-        self.moveCursor(QTextCursor.End, QTextCursor.KeepAnchor)
+        self.moveCursor(QTextCursor.MoveOperation.End, QTextCursor.MoveMode.MoveAnchor)
+        self.moveCursor(
+            QTextCursor.MoveOperation.StartOfLine, QTextCursor.MoveMode.MoveAnchor
+        )
+        self.moveCursor(QTextCursor.MoveOperation.End, QTextCursor.MoveMode.KeepAnchor)
         self.textCursor().removeSelectedText()
         self.textCursor().deletePreviousChar()
         self.insertPlainText("\n")
@@ -787,7 +819,11 @@ class ConsolePrEdit(QTextEdit):
                 hasattr(window, 'uiErrorHyperlinksACT')
                 and window.uiErrorHyperlinksACT.isChecked()
             )
-            self.moveCursor(QTextCursor.End)
+            sepPreditorTrace = (
+                hasattr(window, 'uiSeparateTracebackACT')
+                and window.uiSeparateTracebackACT.isChecked()
+            )
+            self.moveCursor(QTextCursor.MoveOperation.End)
 
             charFormat = QTextCharFormat()
             if not error:
@@ -806,7 +842,7 @@ class ConsolePrEdit(QTextEdit):
             info = None
 
             if doHyperlink and msg == '\n':
-                cursor.select(QTextCursor.BlockUnderCursor)
+                cursor.select(QTextCursor.SelectionType.BlockUnderCursor)
                 line = cursor.selectedText()
 
                 # Remove possible leading unicode paragraph separator, which really
@@ -825,6 +861,17 @@ class ConsolePrEdit(QTextEdit):
             filename = info.get("filename", "") if info else ""
             isConsolePrEdit = '<ConsolePrEdit>' in filename
 
+            # To make it easier to see relevant lines of a traceback, optionally insert
+            # a newline separating internal PrEditor code from the code run by user.
+            if self.addSepNewline:
+                if sepPreditorTrace:
+                    msg += "\n"
+                self.addSepNewline = False
+
+            preditorCalls = ("cmdresult = e", "exec(compiled,")
+            if msg.strip().startswith(preditorCalls):
+                self.addSepNewline = True
+
             if info and doHyperlink and not isConsolePrEdit:
                 fileStart = info.get("fileStart")
                 fileEnd = info.get("fileEnd")

preditor/gui/dialog.py

@@ -24,11 +24,14 @@ class Dialog(QDialog):
         if not cls._instance:
             cls._instance = cls(parent=parent)
             # protect the memory
-            cls._instance.setAttribute(Qt.WA_DeleteOnClose, False)
+            cls._instance.setAttribute(Qt.WidgetAttribute.WA_DeleteOnClose, False)
         return cls._instance
 
     def __init__(
-        self, parent=None, flags=Qt.WindowMinMaxButtonsHint | Qt.WindowCloseButtonHint
+        self,
+        parent=None,
+        flags=Qt.WindowType.WindowMinMaxButtonsHint
+        | Qt.WindowType.WindowCloseButtonHint,
     ):
         # if there is no root, create
         if not parent:
@@ -68,7 +71,7 @@ class Dialog(QDialog):
         # dead dialogs
 
         # set the delete attribute to clean up the window once it is closed
-        self.setAttribute(Qt.WA_DeleteOnClose, True)
+        self.setAttribute(Qt.WidgetAttribute.WA_DeleteOnClose, True)
 
         # set this property to true to properly handle tracking events to control
         # keyboard overrides
@@ -109,7 +112,7 @@ class Dialog(QDialog):
     def closeEvent(self, event):
         # ensure this object gets deleted
         wwidget = None
-        if self.testAttribute(Qt.WA_DeleteOnClose):
+        if self.testAttribute(Qt.WidgetAttribute.WA_DeleteOnClose):
             # collect the win widget to uncache it
             if self.parent() and self.parent().inherits('QWinWidget'):
                 wwidget = self.parent()
@@ -128,10 +131,10 @@ class Dialog(QDialog):
         # This function properly transfers ownership of the dialog instance back to
         # Python anyway
 
-        self.setAttribute(Qt.WA_DeleteOnClose, False)
+        self.setAttribute(Qt.WidgetAttribute.WA_DeleteOnClose, False)
 
         # execute the dialog
-        return QDialog.exec_(self)
+        return super().exec()
 
     def setGeometry(self, *args):
         """
@@ -158,7 +161,7 @@ class Dialog(QDialog):
         # allow the global instance to be cleared
         if this == cls._instance:
             cls._instance = None
-            this.setAttribute(Qt.WA_DeleteOnClose, True)
+            this.setAttribute(Qt.WidgetAttribute.WA_DeleteOnClose, True)
         try:
             this.close()
         except RuntimeError:

preditor/gui/drag_tab_bar.py

@@ -52,12 +52,12 @@ class DragTabBar(QTabBar):
         drag.setMimeData(self._mime_data)
         drag.setPixmap(self._mime_data.imageData())
         drag.setHotSpot(event_pos - pos_in_tab)
-        cursor = QCursor(Qt.OpenHandCursor)
-        drag.setDragCursor(cursor.pixmap(), Qt.MoveAction)
-        action = drag.exec_(Qt.MoveAction)
+        cursor = QCursor(Qt.CursorShape.OpenHandCursor)
+        drag.setDragCursor(cursor.pixmap(), Qt.DropAction.MoveAction)
+        action = drag.exec(Qt.DropAction.MoveAction)
         # If the user didn't successfully add this to a new tab widget, restore
         # the tab to the original location.
-        if action == Qt.IgnoreAction:
+        if action == Qt.DropAction.IgnoreAction:
             original_tab_index = self._mime_data.property('original_tab_index')
             self.parentWidget().insertTab(
                 original_tab_index, widget, self._mime_data.text()
@@ -66,7 +66,7 @@ class DragTabBar(QTabBar):
         self._mime_data = None
 
     def mousePressEvent(self, event):  # noqa: N802
-        if event.button() == Qt.LeftButton and not self._mime_data:
+        if event.button() == Qt.MouseButton.LeftButton and not self._mime_data:
             tab_index = self.tabAt(event.pos())
 
             # While we don't remove the tab on mouse press, capture its tab image
@@ -123,7 +123,7 @@ class DragTabBar(QTabBar):
         if event.source().parentWidget() == self:
             return
 
-        event.setDropAction(Qt.MoveAction)
+        event.setDropAction(Qt.DropAction.MoveAction)
         event.accept()
         counter = self.count()
 
@@ -184,7 +184,7 @@ class DragTabBar(QTabBar):
         tab_widget.setDocumentMode(True)
 
         if menu:
-            bar.setContextMenuPolicy(Qt.CustomContextMenu)
+            bar.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
             bar.customContextMenuRequested.connect(bar.tab_menu)
 
         return bar

preditor/gui/errordialog.py

@@ -21,7 +21,7 @@ class ErrorDialog(Dialog):
 
         self.parent_ = parent
         self.setWindowTitle('Error Occurred')
-        self.uiErrorLBL.setTextFormat(Qt.RichText)
+        self.uiErrorLBL.setTextFormat(Qt.TextFormat.RichText)
         self.uiIconLBL.setPixmap(
             QPixmap(
                 os.path.join(
@@ -30,7 +30,7 @@ class ErrorDialog(Dialog):
                     'img',
                     'warning-big.png',
                 )
-            ).scaledToHeight(64, Qt.SmoothTransformation)
+            ).scaledToHeight(64, Qt.TransformationMode.SmoothTransformation)
         )
 
         self.uiLoggerBTN.clicked.connect(self.show_logger)

preditor/gui/find_files.py

@@ -30,22 +30,24 @@ class FindFiles(QWidget):
 
         # Create shortcuts
         self.uiCloseSCT = QShortcut(
-            QKeySequence(Qt.Key_Escape), self, context=Qt.WidgetWithChildrenShortcut
+            QKeySequence(Qt.Key.Key_Escape),
+            self,
+            context=Qt.ShortcutContext.WidgetWithChildrenShortcut,
         )
 
         self.uiCloseSCT.activated.connect(self.hide)
 
         self.uiCaseSensitiveSCT = QShortcut(
-            QKeySequence(Qt.AltModifier | Qt.Key_C),
+            QKeySequence(Qt.KeyboardModifier.AltModifier | Qt.Key.Key_C),
             self,
-            context=Qt.WidgetWithChildrenShortcut,
+            context=Qt.ShortcutContext.WidgetWithChildrenShortcut,
         )
         self.uiCaseSensitiveSCT.activated.connect(self.uiCaseSensitiveBTN.toggle)
 
         self.uiRegexSCT = QShortcut(
-            QKeySequence(Qt.AltModifier | Qt.Key_R),
+            QKeySequence(Qt.KeyboardModifier.AltModifier | Qt.Key.Key_R),
             self,
-            context=Qt.WidgetWithChildrenShortcut,
+            context=Qt.ShortcutContext.WidgetWithChildrenShortcut,
         )
         self.uiRegexSCT.activated.connect(self.uiRegexBTN.toggle)
 

preditor/gui/fuzzy_search/fuzzy_search.py

@@ -22,14 +22,18 @@ class FuzzySearch(QFrame):
         self.y_offset = 100
         self.setMinimumSize(400, 200)
         self.uiCloseSCT = QShortcut(
-            Qt.Key_Escape, self, context=Qt.WidgetWithChildrenShortcut
+            Qt.Key.Key_Escape,
+            self,
+            context=Qt.ShortcutContext.WidgetWithChildrenShortcut,
         )
         self.uiCloseSCT.activated.connect(self._canceled)
 
-        self.uiUpSCT = QShortcut(Qt.Key_Up, self, context=Qt.WidgetWithChildrenShortcut)
+        self.uiUpSCT = QShortcut(
+            Qt.Key.Key_Up, self, context=Qt.ShortcutContext.WidgetWithChildrenShortcut
+        )
         self.uiUpSCT.activated.connect(partial(self.increment_selection, -1))
         self.uiDownSCT = QShortcut(
-            Qt.Key_Down, self, context=Qt.WidgetWithChildrenShortcut
+            Qt.Key.Key_Down, self, context=Qt.ShortcutContext.WidgetWithChildrenShortcut
         )
         self.uiDownSCT.activated.connect(partial(self.increment_selection, 1))
 
@@ -90,4 +94,4 @@ class FuzzySearch(QFrame):
     def popup(self):
         self.show()
         self.reposition()
-        self.uiLineEDIT.setFocus(Qt.PopupFocusReason)
+        self.uiLineEDIT.setFocus(Qt.FocusReason.PopupFocusReason)

preditor/gui/group_tab_widget/__init__.py

@@ -61,13 +61,13 @@ class GroupTabWidget(OneTabWidget):
         corner.uiMenuBTN = QToolButton(corner)
         corner.uiMenuBTN.setIcon(QIcon(resourcePath('img/chevron-down.png')))
         corner.uiMenuBTN.setObjectName('group_tab_widget_menu_btn')
-        corner.uiMenuBTN.setPopupMode(QToolButton.InstantPopup)
+        corner.uiMenuBTN.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup)
         corner.uiCornerMENU = GroupTabMenu(self, parent=corner.uiMenuBTN)
         corner.uiMenuBTN.setMenu(corner.uiCornerMENU)
         lyt.addWidget(corner.uiMenuBTN)
 
         self.uiCornerBTN = corner
-        self.setCornerWidget(self.uiCornerBTN, Qt.TopRightCorner)
+        self.setCornerWidget(self.uiCornerBTN, Qt.Corner.TopRightCorner)
 
     def add_new_tab(self, group, title="Workbox", group_fmt=None):
         """Adds a new tab to the requested group, creating the group if the group
@@ -148,9 +148,9 @@ class GroupTabWidget(OneTabWidget):
             'Are you sure you want to close all tabs under the "{}" tab?'.format(
                 self.tabText(self.currentIndex())
             ),
-            QMessageBox.Yes | QMessageBox.Cancel,
+            QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.Cancel,
         )
-        if ret == QMessageBox.Yes:
+        if ret == QMessageBox.StandardButton.Yes:
             # Clean up all temp files created by this group's editors if they
             # are not using actual saved files.
             tab_widget = self.widget(self.currentIndex())
@@ -323,3 +323,31 @@ class GroupTabWidget(OneTabWidget):
         tab_widget = self.currentWidget()
         tab_widget.setCurrentIndex(editor)
         return tab_widget.currentWidget()
+
+    def set_current_groups_from_workbox(self, workbox):
+        """Make the specified workbox the current widget. If the workbox is not
+        found, the current widget is not changed.
+
+        Args:
+            workbox (WorkboxMixin): The workbox to make current.
+
+        Returns:
+            success (bool): Whether the workbox was found and made the current
+                widget
+        """
+        workbox_infos = self.all_widgets()
+        found_info = None
+        for workbox_info in workbox_infos:
+            if workbox_info[0] == workbox:
+                found_info = workbox_info
+                break
+        if found_info:
+            workbox = workbox_info[0]
+            group_idx = workbox_info[-2]
+            editor_idx = workbox_info[-1]
+
+            self.setCurrentIndex(group_idx)
+            tab_widget = self.currentWidget()
+            tab_widget.setCurrentIndex(editor_idx)
+
+        return bool(found_info)

preditor/gui/group_tab_widget/grouped_tab_models.py

@@ -7,7 +7,7 @@ from Qt.QtGui import QStandardItem, QStandardItemModel
 
 
 class GroupTabItemModel(QStandardItemModel):
-    GroupIndexRole = Qt.UserRole + 1
+    GroupIndexRole = Qt.ItemDataRole.UserRole + 1
     TabIndexRole = GroupIndexRole + 1
 
     def __init__(self, manager, *args, **kwargs):
@@ -24,7 +24,7 @@ class GroupTabItemModel(QStandardItemModel):
     def pathFromIndex(self, index):
         parts = [""]
         while index.isValid():
-            parts.append(self.data(index, Qt.DisplayRole))
+            parts.append(self.data(index, Qt.ItemDataRole.DisplayRole))
             index = index.parent()
         if len(parts) == 1:
             return ""
@@ -56,7 +56,7 @@ class GroupTabTreeItemModel(GroupTabItemModel):
 
 class GroupTabListItemModel(GroupTabItemModel):
     def flags(self, index):
-        return Qt.ItemIsEnabled | Qt.ItemIsSelectable
+        return Qt.ItemFlag.ItemIsEnabled | Qt.ItemFlag.ItemIsSelectable
 
     def process(self):
         root = self.invisibleRootItem()
@@ -101,7 +101,7 @@ class GroupTabFuzzyFilterProxyModel(QSortFilterProxyModel):
     def pathFromIndex(self, index):
         parts = [""]
         while index.isValid():
-            parts.append(self.data(index, Qt.DisplayRole))
+            parts.append(self.data(index, Qt.ItemDataRole.DisplayRole))
             index = index.parent()
         if len(parts) == 1:
             return ""

preditor/gui/group_tab_widget/grouped_tab_widget.py

@@ -25,7 +25,7 @@ class GroupedTabWidget(OneTabWidget):
         self.uiCornerBTN.setText('+')
         self.uiCornerBTN.setIcon(QIcon(resourcePath('img/file-plus.png')))
         self.uiCornerBTN.released.connect(lambda: self.add_new_editor())
-        self.setCornerWidget(self.uiCornerBTN, Qt.TopRightCorner)
+        self.setCornerWidget(self.uiCornerBTN, Qt.Corner.TopRightCorner)
 
     def add_new_editor(self, title="Workbox"):
         editor, title = self.default_tab(title)
@@ -41,16 +41,18 @@ class GroupedTabWidget(OneTabWidget):
     def close_tab(self, index):
         if self.count() == 1:
             msg = "You have to leave at least one tab open."
-            QMessageBox.critical(self, 'Tab can not be closed.', msg, QMessageBox.Ok)
+            QMessageBox.critical(
+                self, 'Tab can not be closed.', msg, QMessageBox.StandardButton.Ok
+            )
             return
         ret = QMessageBox.question(
             self,
             'Donate to the cause?',
             "Would you like to donate this tabs contents to the /dev/null fund "
             "for wayward code?",
-            QMessageBox.Yes | QMessageBox.Cancel,
+            QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.Cancel,
         )
-        if ret == QMessageBox.Yes:
+        if ret == QMessageBox.StandardButton.Yes:
             # If the tab was saved to a temp file, remove it from disk
             editor = self.widget(index)
             editor.__remove_tempfile__()