Merge pull request saschaludwig#57 from saschaludwig/refactor/extract-timer-manager

Add tests, PyQt5 → PyQt6, extract modules from start.py and improve general code quality

Author: saschaludwig

.gitignore

@@ -11,4 +11,5 @@ build/
 .idea/
 distribution.py
 *.build
-*.dist
+*.dist
+.vscode/

LICENSE

@@ -1,7 +1,7 @@
 #############################################################################
 #
 # OnAirScreen
-# Copyright (c) 2012-2024 Sascha Ludwig, astrastudio.de
+# Copyright (c) 2012-2025 Sascha Ludwig, astrastudio.de
 # All rights reserved.
 #
 # You may use this file under the terms of the BSD license as follows:

Makefile

@@ -1,13 +1,24 @@
 all : mainscreen.py settings.py resources_rc.py
 
 mainscreen.py : mainscreen.ui
-	pyuic5 mainscreen.ui -o mainscreen.py
+	pyuic6 mainscreen.ui -o mainscreen.py
+	@echo "import resources_rc  # noqa: F401" | cat - mainscreen.py > temp && mv temp mainscreen.py || true
 
 settings.py : settings.ui
-	pyuic5 settings.ui -o settings.py
+	pyuic6 settings.ui -o settings.py
+	@echo "import resources_rc  # noqa: F401" | cat - settings.py > temp && mv temp settings.py || true
 
 resources_rc.py : resources.qrc
-	pyrcc5 resources.qrc -o resources_rc.py
+	@if command -v rcc >/dev/null 2>&1; then \
+		rcc -g python -o resources_rc.py resources.qrc && \
+		sed -i '' 's/from PySide6/from PyQt6/g' resources_rc.py; \
+	elif [ -f /usr/local/Cellar/qt/*/share/qt/libexec/rcc ]; then \
+		rcc_path=$$(find /usr/local/Cellar/qt -name rcc -type f | head -1); \
+		$$rcc_path -g python -o resources_rc.py resources.qrc && \
+		sed -i '' 's/from PySide6/from PyQt6/g' resources_rc.py; \
+	else \
+		echo "Warning: rcc tool not found. Using existing resources_rc.py if available."; \
+	fi
 
 clean cleandir:
 	rm -rf $(CLEANFILES)

clockplugin.py

@@ -3,11 +3,11 @@
 #############################################################################
 #
 # OnAirScreen Analog Clock QtDesigner Plugin
-# Copyright (c) 2012-2024 Sascha Ludwig, astrastudio.de
+# Copyright (c) 2012-2025 Sascha Ludwig, astrastudio.de
 # All rights reserved.
 #
 
-from PyQt5 import QtGui, QtDesigner
+from PyQt6 import QtGui, QtDesigner
 
 from clockwidget import ClockWidget
 

clockwidget.py

@@ -3,7 +3,7 @@
 #############################################################################
 #
 # OnAirScreen Analog / Digital Clock implementation
-# Copyright (c) 2012-2024 Sascha Ludwig, astrastudio.de
+# Copyright (c) 2012-2025 Sascha Ludwig, astrastudio.de
 # All rights reserved.
 #
 # start.py
@@ -79,9 +79,9 @@
 
 import time as pytime
 
-from PyQt5 import QtCore, QtGui, QtWidgets
-from PyQt5.QtCore import QRectF
-from PyQt5.QtGui import QColor
+from PyQt6 import QtCore, QtGui, QtWidgets
+from PyQt6.QtCore import QRectF
+from PyQt6.QtGui import QColor
 
 
 class ClockWidget(QtWidgets.QWidget):
@@ -259,7 +259,7 @@ def paintEvent(self, event):
         self.time = QtCore.QTime.currentTime()
 
         painter = QtGui.QPainter(self)
-        painter.setRenderHints(QtGui.QPainter.Antialiasing | QtGui.QPainter.SmoothPixmapTransform)
+        painter.setRenderHints(QtGui.QPainter.RenderHint.Antialiasing | QtGui.QPainter.RenderHint.SmoothPixmapTransform)
         painter.translate(self.width() / 2, self.height() / 2)
         painter.scale(side / 200.0, side / 200.0)
 
@@ -301,7 +301,7 @@ def paint_analog(self, painter):
             painter.drawImage(QtCore.QRectF(paint_x - (paint_w / 2), paint_y - (paint_h / 2), paint_w, paint_h), image)
             painter.restore()
 
-        painter.setPen(QtCore.Qt.NoPen)
+        painter.setPen(QtCore.Qt.PenStyle.NoPen)
         painter.setBrush(self.hourColor)
         # set hour hand length and minute hand length
         hhl = -70  # -50
@@ -321,7 +321,7 @@ def paint_analog(self, painter):
             painter.drawRoundedRect(88, -1, 8, 2, 1.0, 1.0)
             painter.rotate(30.0)
 
-        painter.setPen(QtCore.Qt.NoPen)
+        painter.setPen(QtCore.Qt.PenStyle.NoPen)
         painter.setBrush(self.minuteColor)
 
         # draw minute hand
@@ -383,7 +383,7 @@ def paint_digital(self, painter):
         time = self.time
 
         # draw digits and colon
-        painter.setPen(QtCore.Qt.NoPen)
+        painter.setPen(QtCore.Qt.PenStyle.NoPen)
         painter.setBrush(self.digiDigitColor)
         painter.setPen(self.digiDigitColor)
 
@@ -439,7 +439,7 @@ def paint_digital(self, painter):
         dot_size = 1.6
         # set painter to 12 o'clock position
         painter.rotate(-90.0)
-        painter.setPen(QtCore.Qt.NoPen)
+        painter.setPen(QtCore.Qt.PenStyle.NoPen)
         painter.setBrush(self.digiHourColor)
         painter.setPen(self.digiHourColor)
 
@@ -450,7 +450,7 @@ def paint_digital(self, painter):
             painter.rotate(30.0)
         painter.restore()
 
-        painter.setPen(QtCore.Qt.NoPen)
+        painter.setPen(QtCore.Qt.PenStyle.NoPen)
         painter.setBrush(self.digiSecondColor)
         painter.setPen(self.digiSecondColor)