Add size policy types

novelwriter/extensions/circularprogress.py

@@ -27,10 +27,11 @@ from math import ceil
 
 from PyQt5.QtCore import QRect
 from PyQt5.QtGui import QBrush, QColor, QPaintEvent, QPainter, QPen
-from PyQt5.QtWidgets import QProgressBar, QSizePolicy, QWidget
+from PyQt5.QtWidgets import QProgressBar, QWidget
 
 from novelwriter.types import (
-    QtPaintAnitAlias, QtAlignCenter, QtRoundCap, QtSolidLine, QtTransparent
+    QtPaintAnitAlias, QtAlignCenter, QtRoundCap, QtSizeFixed, QtSolidLine,
+    QtTransparent
 )
 
 
@@ -59,7 +60,7 @@ class NProgressCircle(QProgressBar):
             bar=self.palette().highlight().color(),
             text=self.palette().text().color()
         )
-        self.setSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Fixed)
+        self.setSizePolicy(QtSizeFixed, QtSizeFixed)
         self.setFixedWidth(size)
         self.setFixedHeight(size)
         return

novelwriter/extensions/pagedsidebar.py

@@ -28,11 +28,14 @@ from __future__ import annotations
 from PyQt5.QtGui import QColor, QPaintEvent, QPainter, QPolygon
 from PyQt5.QtCore import QPoint, QRectF, QSize, Qt, pyqtSignal, pyqtSlot
 from PyQt5.QtWidgets import (
-    QAbstractButton, QAction, QButtonGroup, QLabel, QSizePolicy, QStyle,
+    QAbstractButton, QAction, QButtonGroup, QLabel, QStyle,
     QStyleOptionToolButton, QToolBar, QToolButton, QWidget
 )
 
-from novelwriter.types import QtPaintAnitAlias, QtAlignLeft, QtMouseOver, QtNoBrush, QtNoPen
+from novelwriter.types import (
+    QtPaintAnitAlias, QtAlignLeft, QtMouseOver, QtNoBrush, QtNoPen,
+    QtSizeExpanding, QtSizeFixed
+)
 
 
 class NPagedSideBar(QToolBar):
@@ -59,7 +62,7 @@ class NPagedSideBar(QToolBar):
         self.setOrientation(Qt.Orientation.Vertical)
 
         stretch = QWidget(self)
-        stretch.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
+        stretch.setSizePolicy(QtSizeExpanding, QtSizeExpanding)
         self._stretchAction = self.addWidget(stretch)
 
         return
@@ -119,7 +122,7 @@ class _NPagedToolButton(QToolButton):
     def __init__(self, parent: QWidget) -> None:
         super().__init__(parent=parent)
 
-        self.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
+        self.setSizePolicy(QtSizeExpanding, QtSizeFixed)
         self.setCheckable(True)
 
         fH = self.fontMetrics().height()
@@ -197,7 +200,7 @@ class _NPagedToolLabel(QLabel):
     def __init__(self, parent: QWidget, textColor: QColor | None = None) -> None:
         super().__init__(parent=parent)
 
-        self.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
+        self.setSizePolicy(QtSizeExpanding, QtSizeFixed)
 
         fH = self.fontMetrics().height()
         self._bH = round(fH * 1.7)

novelwriter/extensions/switch.py

@@ -25,10 +25,10 @@ from __future__ import annotations
 
 from PyQt5.QtGui import QMouseEvent, QPainter, QPaintEvent, QResizeEvent
 from PyQt5.QtCore import QEvent, QPropertyAnimation, Qt, pyqtProperty
-from PyQt5.QtWidgets import QAbstractButton, QSizePolicy, QWidget
+from PyQt5.QtWidgets import QAbstractButton, QWidget
 
 from novelwriter import CONFIG, SHARED
-from novelwriter.types import QtPaintAnitAlias, QtMouseLeft, QtNoPen
+from novelwriter.types import QtPaintAnitAlias, QtMouseLeft, QtNoPen, QtSizeFixed
 
 
 class NSwitch(QAbstractButton):
@@ -46,7 +46,7 @@ class NSwitch(QAbstractButton):
         self._rR = self._xR - self._rB
 
         self.setCheckable(True)
-        self.setSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Fixed)
+        self.setSizePolicy(QtSizeFixed, QtSizeFixed)
         self.setFixedWidth(self._xW)
         self.setFixedHeight(self._xH)
         self._offset = self._xR

novelwriter/extensions/switchbox.py

@@ -25,10 +25,13 @@ from __future__ import annotations
 
 from PyQt5.QtGui import QIcon
 from PyQt5.QtCore import pyqtSignal
-from PyQt5.QtWidgets import QGridLayout, QLabel, QScrollArea, QSizePolicy, QWidget
+from PyQt5.QtWidgets import QGridLayout, QLabel, QScrollArea, QWidget
 
 from novelwriter.extensions.switch import NSwitch
-from novelwriter.types import QtAlignLeft, QtAlignRight, QtAlignRightMiddle
+from novelwriter.types import (
+    QtAlignLeft, QtAlignRight, QtAlignRightMiddle, QtSizeMinimum,
+    QtSizeMinimumExpanding
+)
 
 
 class NSwitchBox(QScrollArea):
@@ -59,7 +62,7 @@ class NSwitchBox(QScrollArea):
         self._content.setColumnStretch(1, 1)
 
         self._widget = QWidget(self)
-        self._widget.setSizePolicy(QSizePolicy.Policy.MinimumExpanding, QSizePolicy.Policy.Minimum)
+        self._widget.setSizePolicy(QtSizeMinimumExpanding, QtSizeMinimum)
         self._widget.setLayout(self._content)
 
         self.setWidgetResizable(True)