novelWriter 2.4.2__py3-none-any.whl → 2.5b1__py3-none-any.whl

novelwriter/dialogs/wordlist.py

@@ -25,14 +25,13 @@ from __future__ import annotations
 
 import logging
 
-from typing import TYPE_CHECKING
 from pathlib import Path
 
 from PyQt5.QtCore import Qt, pyqtSignal, pyqtSlot
 from PyQt5.QtGui import QCloseEvent
 from PyQt5.QtWidgets import (
     QAbstractItemView, QApplication, QDialog, QDialogButtonBox, QFileDialog,
-    QHBoxLayout, QLineEdit, QListWidget, QVBoxLayout
+    QHBoxLayout, QLineEdit, QListWidget, QVBoxLayout, QWidget
 )
 
 from novelwriter import CONFIG, SHARED
@@ -42,9 +41,6 @@ from novelwriter.extensions.configlayout import NColourLabel
 from novelwriter.extensions.modified import NIconToolButton
 from novelwriter.types import QtDialogClose, QtDialogSave
 
-if TYPE_CHECKING:  # pragma: no cover
-    from novelwriter.guimain import GuiMain
-
 logger = logging.getLogger(__name__)
 
 
@@ -52,8 +48,8 @@ class GuiWordList(QDialog):
 
     newWordListReady = pyqtSignal()
 
-    def __init__(self, mainGui: GuiMain) -> None:
-        super().__init__(parent=mainGui)
+    def __init__(self, parent: QWidget) -> None:
+        super().__init__(parent=parent)
 
         logger.debug("Create: GuiWordList")
         self.setObjectName("GuiWordList")
@@ -257,5 +253,3 @@ class GuiWordList(QDialog):
             if (item := self.listBox.item(i)) and (word := item.text().strip()):
                 result.append(word)
         return result
-
-# END Class GuiWordList

novelwriter/enum.py

@@ -32,8 +32,6 @@ class nwItemType(Enum):
     FOLDER  = 2
     FILE    = 3
 
-# END Enum nwItemType
-
 
 class nwItemClass(Enum):
 
@@ -50,8 +48,6 @@ class nwItemClass(Enum):
     TEMPLATE  = 10
     TRASH     = 11
 
-# END Enum nwItemClass
-
 
 class nwItemLayout(Enum):
 
@@ -59,16 +55,17 @@ class nwItemLayout(Enum):
     DOCUMENT  = 1
     NOTE      = 2
 
-# END Enum nwItemLayout
-
 
 class nwComment(Enum):
 
     PLAIN    = 0
-    SYNOPSIS = 1
-    SHORT    = 2
-
-# END Enum nwComment
+    IGNORE   = 1
+    SYNOPSIS = 2
+    SHORT    = 3
+    NOTE     = 4
+    FOOTNOTE = 5
+    COMMENT  = 6
+    STORY    = 7
 
 
 class nwTrinary(Enum):
@@ -77,16 +74,12 @@ class nwTrinary(Enum):
     NEUTRAL  = 0
     POSITIVE = 1
 
-# END Enum nwTrinary
-
 
 class nwDocMode(Enum):
 
     VIEW = 0
     EDIT = 1
 
-# END Enum nwDocMode
-
 
 class nwDocAction(Enum):
 
@@ -129,8 +122,6 @@ class nwDocAction(Enum):
     SC_SUP    = 36
     SC_SUB    = 37
 
-# END Enum nwDocAction
-
 
 class nwDocInsert(Enum):
 
@@ -145,8 +136,7 @@ class nwDocInsert(Enum):
     VSPACE_S  = 8
     VSPACE_M  = 9
     LIPSUM    = 10
-
-# END Enum nwDocInsert
+    FOOTNOTE  = 11
 
 
 class nwView(Enum):
@@ -157,8 +147,6 @@ class nwView(Enum):
     OUTLINE = 3
     SEARCH  = 4
 
-# END Enum nwView
-
 
 class nwWidget(Enum):
 
@@ -167,8 +155,6 @@ class nwWidget(Enum):
     VIEWER  = 3
     OUTLINE = 4
 
-# END Enum nwWidget
-
 
 class nwOutline(Enum):
 
@@ -190,8 +176,6 @@ class nwOutline(Enum):
     CUSTOM = 15
     SYNOP  = 16
 
-# END Enum nwOutline
-
 
 class nwBuildFmt(Enum):
 
@@ -204,4 +188,26 @@ class nwBuildFmt(Enum):
     J_HTML = 6
     J_NWD  = 7
 
-# END Enum nwBuildFormat
+
+class nwStatusShape(Enum):
+
+    SQUARE   = 0
+    TRIANGLE = 1
+    NABLA    = 2
+    DIAMOND  = 3
+    PENTAGON = 4
+    HEXAGON  = 5
+    STAR     = 6
+    PACMAN   = 7
+    CIRCLE_Q = 8
+    CIRCLE_H = 9
+    CIRCLE_T = 10
+    CIRCLE   = 11
+    BARS_1   = 12
+    BARS_2   = 13
+    BARS_3   = 14
+    BARS_4   = 15
+    BLOCK_1  = 16
+    BLOCK_2  = 17
+    BLOCK_3  = 18
+    BLOCK_4  = 19

novelwriter/error.py

@@ -23,17 +23,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 from __future__ import annotations
 
-import sys
-import random
 import logging
+import random
+import sys
 
 from typing import TYPE_CHECKING
 
 from PyQt5.QtCore import Qt, pyqtSlot
 from PyQt5.QtGui import QFont, QFontDatabase
 from PyQt5.QtWidgets import (
-    QApplication, QWidget, QDialog, QGridLayout, QStyle, QPlainTextEdit,
-    QLabel, QDialogButtonBox
+    QApplication, QDialog, QDialogButtonBox, QGridLayout, QLabel,
+    QPlainTextEdit, QStyle, QWidget
 )
 
 if TYPE_CHECKING:  # pragma: no cover
@@ -42,10 +42,6 @@ if TYPE_CHECKING:  # pragma: no cover
 logger = logging.getLogger(__name__)
 
 
-# =============================================================================================== #
-#  Utility Functions
-# =============================================================================================== #
-
 def logException() -> None:
     """Log the content of an exception message."""
     exType, exValue, _ = sys.exc_info()
@@ -61,10 +57,6 @@ def formatException(exc: BaseException) -> str:
     return f"{type(exc).__name__}: {str(exc)}"
 
 
-# =============================================================================================== #
-#  Error Handler
-# =============================================================================================== #
-
 class NWErrorMessage(QDialog):
 
     def __init__(self, parent: QWidget) -> None:
@@ -125,9 +117,11 @@ class NWErrorMessage(QDialog):
         error traceback.
         """
         from traceback import format_tb
+
+        from PyQt5.QtCore import PYQT_VERSION_STR, QT_VERSION_STR, QSysInfo
+
         from novelwriter import __version__
         from novelwriter.constants import nwConst
-        from PyQt5.QtCore import QT_VERSION_STR, PYQT_VERSION_STR, QSysInfo
 
         self.msgHead.setText(
             "<p>An unhandled error has been encountered.</p>"
@@ -175,12 +169,11 @@ class NWErrorMessage(QDialog):
         self.close()
         return
 
-# END Class NWErrorMessage
-
 
 def exceptionHandler(exType: type, exValue: BaseException, exTrace: TracebackType) -> None:
     """Function to catch unhandled global exceptions."""
     from traceback import print_tb
+
     from PyQt5.QtWidgets import QApplication
 
     logger.critical("%s: %s", exType.__name__, str(exValue))

novelwriter/extensions/circularprogress.py

@@ -26,11 +26,12 @@ from __future__ import annotations
 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.QtGui import QBrush, QColor, QPainter, QPaintEvent, QPen
+from PyQt5.QtWidgets import QProgressBar, QWidget
 
 from novelwriter.types import (
-    QtPaintAnitAlias, QtAlignCenter, QtRoundCap, QtSolidLine, QtTransparent
+    QtAlignCenter, QtPaintAnitAlias, 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
@@ -100,5 +101,3 @@ class NProgressCircle(QProgressBar):
         painter.setPen(self._tColor)
         painter.drawText(self._cRect, QtAlignCenter, self._text or f"{progress:.1f} %")
         return
-
-# END Class NProgressCircle

novelwriter/extensions/configlayout.py

@@ -27,8 +27,8 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 from __future__ import annotations
 
-from PyQt5.QtGui import QColor, QFont, QPalette
 from PyQt5.QtCore import Qt
+from PyQt5.QtGui import QColor, QFont, QPalette
 from PyQt5.QtWidgets import (
     QAbstractButton, QFrame, QHBoxLayout, QLabel, QLayout, QScrollArea,
     QVBoxLayout, QWidget
@@ -64,8 +64,6 @@ class NFixedPage(QFrame):
         self.setLayout(layout)
         return
 
-# END Class NFixedPage
-
 
 class NScrollablePage(QScrollArea):
     """Extension: Scrollable Page Widget
@@ -89,8 +87,6 @@ class NScrollablePage(QScrollArea):
         self._widget.setLayout(layout)
         return
 
-# END Class NScrollablePage
-
 
 class NScrollableForm(QScrollArea):
     """Extension: Scrollable Form Widget
@@ -184,16 +180,26 @@ class NScrollableForm(QScrollArea):
             self._sections[identifier] = qLabel
         return
 
-    def addRow(self, label: str, widget: QWidget, helpText: str = "", unit: str | None = None,
-               button: QWidget | None = None, editable: str | None = None,
+    def addRow(self, label: str, widget: QWidget | list[QWidget], helpText: str = "",
+               unit: str | None = None, button: QWidget | None = None, editable: str | None = None,
                stretch: tuple[int, int] = (1, 0)) -> None:
         """Add a label and a widget as a new row of the form."""
         row = QHBoxLayout()
         row.setSpacing(CONFIG.pxInt(12))
 
+        if isinstance(widget, list):
+            wBox = QHBoxLayout()
+            wBox.setContentsMargins(0, 0, 0, 0)
+            for item in widget:
+                wBox.addWidget(item)
+            qWidget = QWidget(self)
+            qWidget.setLayout(wBox)
+        else:
+            qWidget = widget
+
         qLabel = QLabel(label, self)
         qLabel.setIndent(self._indent)
-        qLabel.setBuddy(widget)
+        qLabel.setBuddy(qWidget)
 
         if helpText:
             qHelp = NColourLabel(
@@ -212,19 +218,19 @@ class NScrollableForm(QScrollArea):
 
         if isinstance(unit, str):
             box = QHBoxLayout()
-            box.addWidget(widget, 1)
+            box.addWidget(qWidget, 1)
             box.addWidget(QLabel(unit, self), 0)
             row.addLayout(box, stretch[1])
         elif isinstance(button, QAbstractButton):
             box = QHBoxLayout()
-            box.addWidget(widget, 1)
+            box.addWidget(qWidget, 1)
             box.addWidget(button, 0)
             row.addLayout(box, stretch[1])
         else:
-            row.addWidget(widget, stretch[1])
+            row.addWidget(qWidget, stretch[1])
 
         self._layout.addLayout(row)
-        self._index[label.strip()] = widget
+        self._index[label.strip()] = qWidget
         self._first = False
 
         return
@@ -235,8 +241,6 @@ class NScrollableForm(QScrollArea):
         self._layout.addStretch(1)
         return
 
-# END Class NScrollableForm
-
 
 class NColourLabel(QLabel):
     """Extension: A Coloured Label
@@ -267,8 +271,6 @@ class NColourLabel(QLabel):
 
         return
 
-# END Class NColourLabel
-
 
 class NWrappedWidgetBox(QHBoxLayout):
     """Extension: A Text-Wrapped Widget Box
@@ -287,5 +289,3 @@ class NWrappedWidgetBox(QHBoxLayout):
         if after:
             self.addWidget(QLabel(after.lstrip()))
         return
-
-# END Class NWrappedWidgetBox

novelwriter/extensions/eventfilters.py

@@ -24,8 +24,8 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 from __future__ import annotations
 
-from PyQt5.QtGui import QStatusTipEvent, QWheelEvent
 from PyQt5.QtCore import QEvent, QObject
+from PyQt5.QtGui import QStatusTipEvent, QWheelEvent
 from PyQt5.QtWidgets import QWidget
 
 
@@ -63,13 +63,9 @@ class WheelEventFilter(QObject):
             self._locked = False
         return False
 
-# END Class WheelEventFilter
-
 
 class StatusTipFilter(QObject):
 
     def eventFilter(self, obj: QObject, event: QEvent) -> bool:
         """Filter out status tip events on menus."""
         return True if isinstance(event, QStatusTipEvent) else super().eventFilter(obj, event)
-
-# END Class StatusTipFilter

novelwriter/extensions/modified.py

@@ -6,6 +6,8 @@ File History:
 Created: 2024-02-01 [2.3b1] NComboBox
 Created: 2024-02-01 [2.3b1] NSpinBox
 Created: 2024-02-01 [2.3b1] NDoubleSpinBox
+Created: 2024-05-01 [2.5b1] NToolDialog
+Created: 2024-05-01 [2.5b1] NNonBlockingDialog
 
 This file is a part of novelWriter
 Copyright 2018–2024, Veronica Berglyd Olsen
@@ -25,11 +27,56 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 from __future__ import annotations
 
+from enum import Enum
+from typing import TYPE_CHECKING
+
 from PyQt5.QtCore import QSize, Qt
 from PyQt5.QtGui import QWheelEvent
-from PyQt5.QtWidgets import QComboBox, QDoubleSpinBox, QSpinBox, QToolButton, QWidget
+from PyQt5.QtWidgets import (
+    QApplication, QComboBox, QDialog, QDoubleSpinBox, QSpinBox, QToolButton,
+    QWidget
+)
+
+from novelwriter import CONFIG, SHARED
+
+if TYPE_CHECKING:  # pragma: no cover
+    from novelwriter.guimain import GuiMain
+
+
+class NToolDialog(QDialog):
+
+    def __init__(self, parent: GuiMain) -> None:
+        super().__init__(parent=parent)
+        self.setModal(False)
+        if CONFIG.osDarwin:
+            self.setWindowFlag(Qt.WindowType.Tool)
+        return
+
+    def activateDialog(self) -> None:
+        """Helper function to activate dialog on various systems."""
+        self.show()
+        if CONFIG.osWindows:
+            self.activateWindow()
+        self.raise_()
+        QApplication.processEvents()
+        return
+
 
-from novelwriter import SHARED
+class NNonBlockingDialog(QDialog):
+
+    def __init__(self, parent: QWidget | None = None) -> None:
+        super().__init__(parent=parent)
+        self.setModal(True)
+        return
+
+    def activateDialog(self) -> None:
+        """Helper function to activate dialog on various systems."""
+        self.show()
+        if CONFIG.osWindows:
+            self.activateWindow()
+        self.raise_()
+        QApplication.processEvents()
+        return
 
 
 class NComboBox(QComboBox):
@@ -46,14 +93,12 @@ class NComboBox(QComboBox):
             event.ignore()
         return
 
-    def setCurrentData(self, data: str, default: str) -> None:
+    def setCurrentData(self, data: str | int | Enum, default: str | int | Enum) -> None:
         """Set the current index from data, with a fallback."""
         idx = self.findData(data)
         self.setCurrentIndex(self.findData(default) if idx < 0 else idx)
         return
 
-# END Class NComboBox
-
 
 class NSpinBox(QSpinBox):
 
@@ -69,8 +114,6 @@ class NSpinBox(QSpinBox):
             event.ignore()
         return
 
-# END Class NSpinBox
-
 
 class NDoubleSpinBox(QDoubleSpinBox):
 
@@ -86,8 +129,6 @@ class NDoubleSpinBox(QDoubleSpinBox):
             event.ignore()
         return
 
-# END Class NDoubleSpinBox
-
 
 class NIconToolButton(QToolButton):
 
@@ -105,8 +146,6 @@ class NIconToolButton(QToolButton):
         self.setIcon(SHARED.theme.getIcon(iconKey))
         return
 
-# END Class NIconToolButton
-
 
 class NIconToggleButton(QToolButton):
 
@@ -126,5 +165,3 @@ class NIconToggleButton(QToolButton):
         iconSize = self.iconSize()
         self.setIcon(SHARED.theme.getToggleIcon(iconKey, (iconSize.width(), iconSize.height())))
         return
-
-# END Class NUnfoldButton

novelwriter/extensions/novelselector.py

@@ -29,8 +29,8 @@ from PyQt5.QtCore import pyqtSignal, pyqtSlot
 from PyQt5.QtWidgets import QComboBox, QWidget
 
 from novelwriter import SHARED
-from novelwriter.enum import nwItemClass
 from novelwriter.constants import nwLabels
+from novelwriter.enum import nwItemClass
 
 logger = logging.getLogger(__name__)
 
@@ -126,5 +126,3 @@ class NovelSelector(QComboBox):
         if not self._blockSignal:
             self.novelSelectionChanged.emit(self.currentData())
         return
-
-# END Class NovelSelector

novelwriter/extensions/pagedsidebar.py

@@ -25,14 +25,17 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 from __future__ import annotations
 
-from PyQt5.QtGui import QColor, QPaintEvent, QPainter, QPolygon
 from PyQt5.QtCore import QPoint, QRectF, QSize, Qt, pyqtSignal, pyqtSlot
+from PyQt5.QtGui import QColor, QPainter, QPaintEvent, QPolygon
 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 (
+    QtAlignLeft, QtMouseOver, QtNoBrush, QtNoPen, QtPaintAnitAlias,
+    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
@@ -109,8 +112,6 @@ class NPagedSideBar(QToolBar):
             self.buttonClicked.emit(buttonId)
         return
 
-# END Class NPagedSideBar
-
 
 class _NPagedToolButton(QToolButton):
 
@@ -119,7 +120,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()
@@ -187,8 +188,6 @@ class _NPagedToolButton(QToolButton):
 
         return
 
-# END Class _NPagedToolButton
-
 
 class _NPagedToolLabel(QLabel):
 
@@ -197,7 +196,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)
@@ -228,5 +227,3 @@ class _NPagedToolLabel(QLabel):
         paint.drawText(QRectF(self._lM, self._tM, tW, tH), QtAlignLeft, self.text())
 
         return
-
-# END Class _NPagedToolLabel

novelwriter/extensions/simpleprogress.py

@@ -25,7 +25,7 @@ from __future__ import annotations
 
 from math import ceil
 
-from PyQt5.QtGui import QPaintEvent, QPainter
+from PyQt5.QtGui import QPainter, QPaintEvent
 from PyQt5.QtWidgets import QProgressBar, QWidget
 
 from novelwriter.types import QtPaintAnitAlias
@@ -51,5 +51,3 @@ class NProgressSimple(QProgressBar):
             painter.setBrush(self.palette().highlight())
             painter.drawRect(0, 0, progress, self.height())
         return
-
-# END Class NProgressSimple

novelwriter/extensions/statusled.py

@@ -27,7 +27,7 @@ import logging
 
 from typing import Literal
 
-from PyQt5.QtGui import QColor, QPaintEvent, QPainter
+from PyQt5.QtGui import QColor, QPainter, QPaintEvent
 from PyQt5.QtWidgets import QAbstractButton, QWidget
 
 from novelwriter.types import QtPaintAnitAlias
@@ -75,5 +75,3 @@ class StatusLED(QAbstractButton):
         painter.setOpacity(1.0)
         painter.drawEllipse(1, 1, self.width() - 2, self.height() - 2)
         return
-
-# END Class StatusLED

novelwriter/extensions/switch.py

@@ -23,12 +23,12 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 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.QtGui import QMouseEvent, QPainter, QPaintEvent, QResizeEvent
+from PyQt5.QtWidgets import QAbstractButton, QWidget
 
 from novelwriter import CONFIG, SHARED
-from novelwriter.types import QtPaintAnitAlias, QtMouseLeft, QtNoPen
+from novelwriter.types import QtMouseLeft, QtNoPen, QtPaintAnitAlias, 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
@@ -133,5 +133,3 @@ class NSwitch(QAbstractButton):
         self.setCursor(Qt.CursorShape.PointingHandCursor)
         super().enterEvent(event)
         return
-
-# END Class NSwitch

novelwriter/extensions/switchbox.py

@@ -23,12 +23,15 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 """
 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.QtGui import QIcon
+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)
@@ -124,5 +127,3 @@ class NSwitchBox(QScrollArea):
         self._content.setRowStretch(self._index + 1, 1)
         self._index += 1
         return
-
-# END Class NSwitchBox