style: clean unused code, add explicit return

Author: beatreichenbach

qt_parameters/box.py

@@ -142,7 +142,7 @@ def setLayout(self, layout: QtWidgets.QLayout) -> None:
 
     def paintEvent(self, event: QtGui.QPaintEvent) -> None:
         if not self._style == CollapsibleBox.Style.BUTTON:
-            return super().paintEvent(event)
+            super().paintEvent(event)
 
         option = QtWidgets.QStyleOptionButton()
         option.initFrom(self)

qt_parameters/editor.py

@@ -487,6 +487,7 @@ def checkbox(parameter: ParameterWidget) -> BoolParameter | None:
                         if widget := item.widget():
                             if isinstance(widget, BoolParameter):
                                 return widget
+        return None
 
     @staticmethod
     def label(parameter: ParameterWidget) -> ParameterLabel | None:
@@ -502,6 +503,7 @@ def label(parameter: ParameterWidget) -> ParameterLabel | None:
                         if widget := item.widget():
                             if isinstance(widget, ParameterLabel):
                                 return widget
+        return None
 
     def _collapsed_boxes(self) -> tuple[str, ...]:
         """Return a tuple of all collapsed boxes."""

qt_parameters/inputs.py

@@ -90,7 +90,7 @@ def keyPressEvent(self, event: QtGui.QKeyEvent) -> None:
             self._step(add=False)
             event.accept()
         else:
-            return super().keyPressEvent(event)
+            super().keyPressEvent(event)
 
     def minimumSizeHint(self) -> QtCore.QSize:
         size = super().minimumSizeHint()
@@ -573,3 +573,4 @@ def _color(name: str) -> QtGui.QColor | None:
 
         if theme := qt_themes.get_theme():
             return getattr(theme, name, None)
+        return None

qt_parameters/widgets.py

@@ -1,32 +1,31 @@
 from __future__ import annotations
 
-import logging
-import math
-from collections.abc import Sequence, Mapping, Collection
-from enum import Enum, auto, EnumMeta
+from abc import abstractmethod
+from collections.abc import Collection, Mapping, Sequence
+from enum import Enum, EnumMeta, auto
+from functools import partial
 from typing import Any, Callable
 
 from qt_material_icons import MaterialIcon
 from qtpy import QtCore, QtGui, QtWidgets
 
 from . import utils
-from .resizegrip import ResizeGrip
 from .inputs import (
     FloatLineEdit,
     FloatSlider,
     IntLineEdit,
     IntSlider,
-    NumberSlider,
     RatioButton,
     TextEdit,
 )
+from .resizegrip import ResizeGrip
 
 MIN_SLIDER_WIDTH = 200
 
 
 class ParameterWidget(QtWidgets.QWidget):
-    enabled_changed: QtCore.Signal = QtCore.Signal(bool)
-    value_changed: QtCore.Signal = QtCore.Signal(object)
+    enabled_changed = QtCore.Signal(bool)
+    value_changed = QtCore.Signal(object)
 
     _value: Any = None
     _default: Any = None
@@ -45,21 +44,29 @@ def __init__(self, name: str = '', parent: QtWidgets.QWidget | None = None) -> N
             self.set_label(utils.title(name))
 
     def __repr__(self) -> str:
-        return f'{self.__class__.__name__}({repr(self.name())})'
+        return f'{self.__class__.__name__}({self._name!r})'
 
     def _init_layout(self) -> None:
         self._layout = QtWidgets.QHBoxLayout()
-        self._layout.setContentsMargins(0, 0, 0, 0)
+        self._layout.setContentsMargins(QtCore.QMargins())
         self.setLayout(self._layout)
 
-    def _init_ui(self) -> None:
-        pass
+    @abstractmethod
+    def _init_ui(self) -> None: ...
 
     def changeEvent(self, event: QtCore.QEvent) -> None:
         if event.type() == QtCore.QEvent.Type.EnabledChange:
             self.enabled_changed.emit(self.isEnabled())
         super().changeEvent(event)
 
+    def value(self) -> Any:
+        return self._value
+
+    def set_value(self, value: Any) -> None:
+        if value != self._value:
+            self._value = value
+            self.value_changed.emit(value)
+
     def default(self) -> Any:
         return self._default
 
@@ -85,20 +92,12 @@ def tooltip(self) -> str:
     def set_tooltip(self, tooltip: str) -> None:
         self._tooltip = tooltip
 
-    def value(self) -> Any:
-        return self._value
-
-    def set_value(self, value: Any) -> None:
-        if value != self._value:
-            self._value = value
-            self.value_changed.emit(value)
-
     def reset(self) -> None:
         self.set_value(self.default())
 
 
 class IntParameter(ParameterWidget):
-    value_changed: QtCore.Signal = QtCore.Signal(int)
+    value_changed = QtCore.Signal(int)
 
     _value: int = 0
     _default: int = 0
@@ -205,7 +204,7 @@ def _toggle_slider(self, value: bool) -> None:
 
 
 class FloatParameter(IntParameter):
-    value_changed: QtCore.Signal = QtCore.Signal(float)
+    value_changed = QtCore.Signal(float)
 
     _value: float = 0
     _default: float = 0
@@ -277,7 +276,7 @@ class MenuMode(Enum):
         REPLACE = auto()
         TOGGLE = auto()
 
-    value_changed: QtCore.Signal = QtCore.Signal(str)
+    value_changed = QtCore.Signal(str)
 
     _value: str = ''
     _default: str = ''
@@ -431,7 +430,7 @@ class Method(Enum):
     SAVE_FILE = Method.SAVE_FILE
     EXISTING_DIR = Method.EXISTING_DIR
 
-    value_changed: QtCore.Signal = QtCore.Signal(str)
+    value_changed = QtCore.Signal(str)
 
     _value: str = ''
     _default: str = ''
@@ -666,7 +665,7 @@ def _update_items(self) -> None:
 
 
 class BoolParameter(ParameterWidget):
-    value_changed: QtCore.Signal = QtCore.Signal(bool)
+    value_changed = QtCore.Signal(bool)
 
     _value: bool = False
     _default: bool = False
@@ -689,7 +688,7 @@ def set_value(self, value: bool) -> None:
 
 
 class MultiIntParameter(IntParameter):
-    value_changed: QtCore.Signal = QtCore.Signal(tuple)
+    value_changed = QtCore.Signal(tuple)
 
     _count: int = 2
     _value: tuple[int, ...] = (0, 0)
@@ -891,7 +890,7 @@ def set_value(self, value: tuple[float, ...]) -> None:
 
 
 class PointParameter(MultiIntParameter):
-    value_changed: QtCore.Signal = QtCore.Signal(QtCore.QPoint)
+    value_changed = QtCore.Signal(QtCore.QPoint)
 
     _value: QtCore.QPoint = QtCore.QPoint(0, 0)
     _default: QtCore.QPoint = QtCore.QPoint(0, 0)
@@ -917,7 +916,7 @@ def _cast_to_tuple(self, value: QtCore.QPoint) -> tuple[int, ...]:
 
 
 class PointFParameter(MultiFloatParameter):
-    value_changed: QtCore.Signal = QtCore.Signal(QtCore.QPointF)
+    value_changed = QtCore.Signal(QtCore.QPointF)
 
     _value: QtCore.QPointF = QtCore.QPointF(0, 0)
     _default: QtCore.QPointF = QtCore.QPointF(0, 0)
@@ -943,7 +942,7 @@ def _cast_to_tuple(self, value: QtCore.QPointF) -> tuple[float, ...]:
 
 
 class SizeParameter(MultiIntParameter):
-    value_changed: QtCore.Signal = QtCore.Signal(QtCore.QSize)
+    value_changed = QtCore.Signal(QtCore.QSize)
 
     _value: QtCore.QSize = QtCore.QSize(0, 0)
     _default: QtCore.QSize = QtCore.QSize(0, 0)
@@ -962,7 +961,7 @@ def _cast_to_tuple(self, value: QtCore.QSize) -> tuple[int, ...]:
 
 
 class SizeFParameter(MultiFloatParameter):
-    value_changed: QtCore.Signal = QtCore.Signal(QtCore.QSizeF)
+    value_changed = QtCore.Signal(QtCore.QSizeF)
 
     _value: QtCore.QSizeF = QtCore.QSizeF(0, 0)
     _default: QtCore.QSizeF = QtCore.QSizeF(0, 0)
@@ -981,7 +980,7 @@ def _cast_to_tuple(self, value: QtCore.QSizeF) -> tuple[float, ...]:
 
 
 class ColorParameter(MultiFloatParameter):
-    value_changed: QtCore.Signal = QtCore.Signal(QtGui.QColor)
+    value_changed = QtCore.Signal(QtGui.QColor)
 
     _count: int = 3
     _value: QtGui.QColor = QtGui.QColor(0, 0, 0)