Support Qt6

setup.cfg

@@ -15,7 +15,7 @@ classifiers =
 package_dir =
     = src
 packages = find:
-python_requires = >=3.6
+python_requires = >=3.8
 install_requires =
     requests
     requests-futures

src/fime/config.py

@@ -1,6 +1,9 @@
 from configparser import ConfigParser
 from pathlib import Path
 
+try:
+    from PySide6 import QtCore
+except ImportError:
     from PySide2 import QtCore
 
 from fime.exceptions import FimeException

src/fime/data.py

@@ -7,6 +7,9 @@ from datetime import datetime, date, timedelta
 from threading import Thread, Event
 from typing import List
 
+try:
+    from PySide6 import QtCore
+except ImportError:
     from PySide2 import QtCore
 
 data_dir_path = os.path.join(QtCore.QStandardPaths.writableLocation(QtCore.QStandardPaths.AppDataLocation),

src/fime/icons/__init__.py

@@ -3,6 +3,9 @@
 # Created by: The Resource Compiler for Qt version 5.15.2
 # WARNING! All changes made in this file will be lost!
 
+try:
+    from PySide6 import QtCore
+except ImportError:
     from PySide2 import QtCore
 
 qt_resource_data = b"\

src/fime/import_task.py

@@ -1,3 +1,6 @@
+try:
+    from PySide6 import QtGui, QtWidgets
+except ImportError:
     from PySide2 import QtGui, QtWidgets
 
 from fime.task_completer import TaskCompleter

src/fime/main.py

@@ -4,8 +4,12 @@ import signal
 import sys
 from functools import partial
 
+try:
+    from PySide6 import QtCore, QtWidgets
+    PYSIDE_6 = True
+except ImportError:
     from PySide2 import QtCore, QtWidgets
-from PySide2.QtWidgets import QMessageBox
+    PYSIDE_6 = False
 
 # noinspection PyUnresolvedReferences
 import fime.icons
@@ -20,6 +24,7 @@ from fime.util import get_screen_height, get_icon
 class App:
     def __init__(self):
         self.app = QtWidgets.QApplication(sys.argv)
+        self.app.setQuitOnLastWindowClosed(False)
 
         data = Data()
         self.tasks = Tasks(data)
@@ -28,7 +33,7 @@ class App:
 
         icon = get_icon("appointment-new")
 
-        self.menu = QtWidgets.QMenu()
+        self.menu = QtWidgets.QMenu(None)
 
         self.import_task = ImportTask(None)
         self.import_task.accepted.connect(self.new_task_imported)
@@ -116,7 +121,8 @@ class App:
         exit_action = self.menu.addAction("Close")
         exit_action.triggered.connect(self.app.quit)
 
-    def sigterm_handler(self, _signo, _frame):
+    def sigterm_handler(self, signo, _frame):
+        print(f'handling signal "{signal.strsignal(signo)}"')
         self.app.quit()
 
     def run(self):
@@ -126,6 +132,9 @@ class App:
         timer.start(500)
         signal.signal(signal.SIGTERM, self.sigterm_handler)
         signal.signal(signal.SIGINT, self.sigterm_handler)
+        if PYSIDE_6:
+            self.app.exec()
+        else:
             self.app.exec_()
 
     @QtCore.Slot()
@@ -149,7 +158,7 @@ def main():
         app = App()
         app.run()
     except FimeException as e:
-        QMessageBox.critical(None, "Error", str(e), QMessageBox.Ok)
+        QtWidgets.QMessageBox.critical(None, "Error", str(e), QtWidgets.QMessageBox.Ok)
 
 
 if __name__ == "__main__":

src/fime/report.py

@@ -1,9 +1,10 @@
+try:
+    from PySide6 import QtCore, QtGui, QtWidgets
+except ImportError:
     from PySide2 import QtCore, QtGui, QtWidgets
 
 from datetime import datetime
 
-from PySide2.QtWidgets import QHeaderView
-
 from fime.data import Tasks
 from fime.util import get_screen_height, get_icon
 
@@ -41,9 +42,9 @@ class Report(QtWidgets.QDialog):
         self.tableWidget.setItemDelegateForColumn(0, Report.TaskItemCompleter(self._tasks, self))
         self.header = QtWidgets.QHeaderView(QtCore.Qt.Orientation.Horizontal)
         self.header.setMinimumSectionSize(1)
-        self.header.setSectionResizeMode(QHeaderView.ResizeToContents)
+        self.header.setSectionResizeMode(QtWidgets.QHeaderView.ResizeToContents)
         self.tableWidget.setHorizontalHeader(self.header)
-        self.header.setSectionResizeMode(self.header.logicalIndex(0), QHeaderView.Stretch)
+        self.header.setSectionResizeMode(self.header.logicalIndex(0), QtWidgets.QHeaderView.Stretch)
 
         self.previous_button = QtWidgets.QPushButton()
         self.previous_button.setText("Previous")

src/fime/task_completer.py

@@ -5,15 +5,16 @@ from functools import reduce
 from queue import Queue, Empty
 from urllib.parse import urlparse, parse_qs
 
-from PySide2 import QtCore
+try:
-from PySide2.QtCore import QTimer
+    from PySide6 import QtCore, QtWidgets
-from PySide2.QtWidgets import QCompleter
+except ImportError:
+    from PySide2 import QtCore, QtWidgets
 from requests_futures.sessions import FuturesSession
 
 from fime.config import Config
 
 
-class TaskCompleter(QCompleter):
+class TaskCompleter(QtWidgets.QCompleter):
     def __init__(self, parent=None, *args, **kwargs):
         super().__init__([], parent, *args, **kwargs)
         self.setFilterMode(QtCore.Qt.MatchFlag.MatchContains)
@@ -26,7 +27,7 @@ class TaskCompleter(QCompleter):
         self.response_text = ""
         self.model_data = set()
         self.escalate = False
-        self.update_timer = QTimer(self)
+        self.update_timer = QtCore.QTimer(self)
         self.update_timer.timeout.connect(self.process_response)
         self.update_timer.setInterval(250)
         self.queue = Queue()

src/fime/task_edit.py

@@ -1,3 +1,6 @@
+try:
+    from PySide6 import QtCore, QtGui, QtWidgets
+except ImportError:
     from PySide2 import QtCore, QtGui, QtWidgets
 
 from fime.util import get_icon

src/fime/util.py

@@ -1,3 +1,6 @@
+try:
+    from PySide6 import QtGui
+except ImportError:
     from PySide2 import QtGui