jbqt 0.1.12__tar.gz → 0.1.13__tar.gz

{jbqt-0.1.12 → jbqt-0.1.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jbqt
-Version: 0.1.12
+Version: 0.1.13
 Summary: 
 Author: Joseph Bochinski
 Author-email: stirgejr@gmail.com
@@ -8,7 +8,8 @@ Requires-Python: >=3.12,<4.0
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: fuzzywuzzy (>=0.18.0,<0.19.0)
-Requires-Dist: jbutils (>=0.1.21,<0.2.0)
+Requires-Dist: jbconsts (>=0.1.1,<0.2.0)
+Requires-Dist: jbutils (>=0.1.23,<0.2.0)
 Requires-Dist: pyqt6 (>=6.9.0,<7.0.0)
 Requires-Dist: python-levenshtein (>=0.27.1,<0.28.0)
 Description-Content-Type: text/markdown

{jbqt-0.1.12 → jbqt-0.1.13}/jbqt/__init__.py

@@ -1,12 +1,9 @@
 """Common exports for jbqt"""
 
-from jbqt.common import consts, qt_utils
-from jbqt.common.consts import GlobalRefs
+from jbqt.common import qt_utils
 from jbqt.common.qt_utils import register_app
 
 __all__ = [
-    "GlobalRefs",
-    "consts",
     "qt_utils",
     "register_app",
 ]

jbqt-0.1.13/jbqt/common/__init__.py

@@ -0,0 +1,9 @@
+"""Const exports"""
+
+from jbqt.common import qt_utils
+from jbqt.common.qt_utils import register_app
+
+__all__ = [
+    "qt_utils",
+    "register_app",
+]

{jbqt-0.1.12 → jbqt-0.1.13}/jbqt/common/qt_utils.py

@@ -14,7 +14,7 @@ from PyQt6.QtWidgets import (
     QDoubleSpinBox,
 )
 
-from jbqt.common import consts
+import jbqt.consts as consts
 from jbqt.models import IChipsWidget
 
 
@@ -24,7 +24,7 @@ def get_item_value(item: QListWidgetItem) -> str:
 
 
 def register_app(app: QApplication, icon_dir: str = "") -> None:
-    consts.GlobalRefs.app = app
+    consts.QtGlobalRefs.app = app
     consts.set_icon_dir(icon_dir)
 
 
@@ -78,4 +78,4 @@ def set_widget_value(widget: QWidget, value: Any) -> None:
 
     elif isinstance(widget, QCalendarWidget):
         if isinstance(value, (date, QDate)):
-            widget.selectedDate(value)
+            widget.setSelectedDate(value)

jbqt-0.1.12/jbqt/common/consts.py → jbqt-0.1.13/jbqt/consts/__init__.py

@@ -1,9 +1,10 @@
+"""Collection of constants and global references for the jbqt package."""
+
 import os
 import re
 
 from typing import Optional
 
-import jbutils
 
 from PyQt6.QtWidgets import QApplication, QMainWindow, QScrollArea, QWidget
 from PyQt6.QtCore import Qt, QSize
@@ -14,11 +15,8 @@ from jbqt.types import IconGetter
 TAG_RE = re.compile(r"^\((.+)\)(\d+\.\d+)$")
 LIST_ITEM_ROLE = Qt.ItemDataRole.UserRole - 1
 
-STYLES = jbutils.STYLES
-COLORS = jbutils.COLORS
-
 
-class GlobalRefs:
+class QtGlobalRefs:
     app: QApplication | None = None
     main_window: QMainWindow | None = None
     scroll_area: QScrollArea | None = None
@@ -79,7 +77,7 @@ def set_icon_dir(path: str) -> None:
     QtPaths.icon_dir = path
 
 
-class SIZES:
+class QtIconSizes:
     ICON_XS = QSize(16, 16)
     ICON_SM = QSize(20, 20)
     ICON_MD = QSize(22, 22)
@@ -109,14 +107,14 @@ def recolor_icon(
         color = QColor(color)
 
     if scale is None:
-        scale = SIZES.ICON_MD
+        scale = QtIconSizes.ICON_MD
     pixmap = QPixmap(image_path)
     icon_key = os.path.splitext(os.path.basename(image_path))[0]
 
     if pixmap.isNull():
         fallback = THEME_ICONS.get(icon_key, STD_ICONS.get(icon_key))
         if fallback:
-            pixmap = fallback.pixmap()
+            pixmap = fallback.pixmap(scale)
 
     recolored_pixmap = QPixmap(pixmap.size())
 
@@ -177,3 +175,9 @@ class ICONS:
             return getattr(cls, name)
         else:
             return default
+
+
+__all__ = [
+    "ICONS",
+    "QtIconSizes",
+]

{jbqt-0.1.12 → jbqt-0.1.13}/jbqt/dialogs/input_form.py

@@ -12,7 +12,7 @@ from PyQt6.QtWidgets import (
 )
 
 
-INPUT_SIGNAL_TYPES: tuple[Any] = (str, int, float)
+INPUT_SIGNAL_TYPES: tuple[Any, ...] = (str, int, float)
 
 
 class InputDialog(QDialog):

{jbqt-0.1.12 → jbqt-0.1.13}/jbqt/models/chip_button.py

@@ -1,13 +1,10 @@
 """Model for chips widget"""
 
-from abc import abstractmethod, ABC
-
-from PyQt6.QtCore import QObject
 from PyQt6.QtWidgets import QWidget
 
 
 class IChipButton(QWidget):
     """ChipButton model"""
 
-    def __init__(self, parent: QObject = None) -> None:
+    def __init__(self, parent: QWidget | None = None) -> None:
         super().__init__(parent)

{jbqt-0.1.12 → jbqt-0.1.13}/jbqt/models/chips.py

@@ -1,7 +1,5 @@
 """Model for chips widget"""
 
-from abc import abstractmethod, ABC
-
 from PyQt6.QtCore import QObject
 from PyQt6.QtWidgets import QWidget
 
@@ -11,9 +9,9 @@ from jbqt.models.chip_button import IChipButton
 class IChipsWidget(QWidget):
     """ChipsWidget model"""
 
-    def __init__(self, parent: QObject = None) -> None:
+    def __init__(self, parent: QWidget | None = None) -> None:
         super().__init__(parent)
-        self.values: list = None
+        self.values: list[str] = []
 
     def add_chip(self):
         pass

jbqt-0.1.13/jbqt/types/__init__.py

@@ -0,0 +1,14 @@
+"""Common type definitions for the jbqt package"""
+
+from typing import Protocol, Optional, runtime_checkable
+from PyQt6.QtGui import QIcon, QColor
+from PyQt6.QtCore import QSize
+
+
+@runtime_checkable
+class IconGetter(Protocol):
+    """Factory function that assembles a QIcon instance"""
+
+    def __call__(
+        self, color: Optional[str | QColor] = ..., size: QSize | int | None = ...
+    ) -> QIcon: ...

{jbqt-0.1.12 → jbqt-0.1.13}/jbqt/widgets/chip_button.py

@@ -11,13 +11,12 @@ from PyQt6.QtWidgets import (
     QWidget,
 )
 
-from jbqt.common import consts
-from jbqt.common.consts import STYLES, COLORS
+import jbqt.consts as consts
+from jbconsts import STYLES, COLORS
 from jbqt.models import IChipButton
 from jbqt.widgets.simple import ClickableLabel
 from jbqt.dialogs import InputDialog
 from jbqt.widgets.widget_utils import (
-    debug_scroll_pos,
     preserve_scroll,
 )
 
@@ -29,12 +28,11 @@ class ChipButton(IChipButton):
         on_update: Callable,
         on_remove: Callable,
         use_weight: bool = False,
-        weight_re: Pattern = None,
-        debug: bool = False,
+        weight_re: Pattern | None = None,
     ):
         super().__init__()
 
-        self._tag = tag
+        self._tag: str = tag
         self.weight: float = 1.0
         self.use_weight: bool = use_weight
 
@@ -64,7 +62,7 @@ class ChipButton(IChipButton):
         self.tag_label.setFixedHeight(24)
         self.tag_label.clicked.connect(self.toggle_edit_mode)
 
-        self.weight_button: QPushButton = None
+        self.weight_button: QPushButton | None = None
 
         if use_weight:
             self.weight_button = QPushButton(consts.ICONS.CODE(), "")
@@ -137,17 +135,24 @@ class ChipButton(IChipButton):
     def text(self, value: str) -> None:
         self._tag = value
 
-    def eventFilter(self, obj: QObject, event: QKeyEvent) -> bool:
-        focus = consts.GlobalRefs.app.focusWidget()
-        """ if event.type() == QEvent.Type.KeyPress:
-            print("focus", focus) """
-        if event.type() == QEvent.Type.KeyPress and focus == self.edit_line:
-            match event.key():
+    def eventFilter(
+        self, a0: QObject | None, a1: QKeyEvent | QEvent | None
+    ) -> bool:
+        focus: QWidget | None = None
+
+        if consts.QtGlobalRefs.app:
+            focus = consts.QtGlobalRefs.app.focusWidget()
+
+        if not a1 or not isinstance(a1, QKeyEvent):
+            return super().eventFilter(a0, a1)
+
+        if a1.type() == QEvent.Type.KeyPress and focus == self.edit_line:
+            match a1.key():
                 case Qt.Key.Key_Return | Qt.Key.Key_Enter:
                     self.edit_tag()
                 case Qt.Key.Key_Escape:
                     self.cancel()
-        return super().eventFilter(obj, event)
+        return super().eventFilter(a0, a1)
 
     def toggle_hidden(self, hide: bool = True) -> None:
         for widget in self.widgets:
@@ -167,7 +172,9 @@ class ChipButton(IChipButton):
         self.edit_line.setMinimumWidth(self.tag_label.width() + 10)
         self.toggle_hidden(False)
 
-    def emit_update(self, text: str = None, weight: float = None) -> None:
+    def emit_update(
+        self, text: str | None = None, weight: float | None = None
+    ) -> None:
         text = text or self._tag
         if weight is None:
             weight = self.weight

{jbqt-0.1.12 → jbqt-0.1.13}/jbqt/widgets/chips.py

@@ -14,11 +14,10 @@ from PyQt6.QtWidgets import (
 )
 
 import jbutils as utils
-from jbqt.common import consts
+import jbqt.consts as consts
 from jbqt.models import IChipsWidget
 from jbqt.widgets.chip_button import ChipButton
 from jbqt.widgets.multiselect import MultiSelectComboBox
-from jbqt.widgets.widget_utils import debug_scroll_pos
 
 
 class ChipsWidget(IChipsWidget):
@@ -26,16 +25,16 @@ class ChipsWidget(IChipsWidget):
 
     def __init__(
         self,
-        chips=None,
-        data: dict = None,
+        chips: list[str] | None = None,
+        data: dict | list | None = None,
         path: str = "",
         label: str = "",
-        weight_re: Pattern = None,
+        weight_re: Pattern | None = None,
         use_weight: bool = False,
         debug: bool = False,
     ):
         super().__init__()
-        self.values = chips or []
+        self.values: list[str] = chips or []
         # Main layout
         main_layout = QVBoxLayout()
         self.debug = debug
@@ -48,10 +47,10 @@ class ChipsWidget(IChipsWidget):
             weight_re = weight_re or consts.TAG_RE
 
         self.weight_re = weight_re
-        self.options = data
+        self.options = data or {}
         self.data = data or {}
         self.data_path = path
-        self.list_widget: QComboBox | MultiSelectComboBox = None
+        self.list_widget: QComboBox | MultiSelectComboBox | None = None
 
         if data is not None:
             if isinstance(data, dict):
@@ -112,21 +111,32 @@ class ChipsWidget(IChipsWidget):
 
         self.setLayout(main_layout)
 
-    def eventFilter(self, obj: QObject, event: QKeyEvent) -> bool:
-        focus = consts.GlobalRefs.app.focusWidget()
+    def eventFilter(
+        self, a0: QObject | None, a1: QKeyEvent | QEvent | None
+    ) -> bool:
+        focus: QWidget | None = None
+        if consts.QtGlobalRefs.app:
+            focus = consts.QtGlobalRefs.app.focusWidget()
 
-        if event.type() == QEvent.Type.KeyPress and focus == self.input_field:
-            match event.key():
+        if not a1 or not isinstance(a1, QKeyEvent):
+            return super().eventFilter(a0, a1)
+
+        if a1.type() == QEvent.Type.KeyPress and focus == self.input_field:
+            match a1.key():
                 case Qt.Key.Key_Return | Qt.Key.Key_Enter:
                     self.add_chip()
-        return super().eventFilter(obj, event)
+        return super().eventFilter(a0, a1)
 
     def get_unweight_chip(self, tag: str) -> str:
-        if self.weight_re and self.weight_re.search(tag):
-            return self.weight_re.search(tag).groups()[0]
+        if self.weight_re:
+            search_re = self.weight_re.search(tag)
+            if search_re:
+                return search_re.groups()[0]
+
         return tag
 
-    def get_chip_list(self, tags: list[str]) -> list[str]:
+    def get_chip_list(self, tags: list[str] | None = None) -> list[str]:
+        tags = tags or []
         return [self.get_unweight_chip(tag) for tag in tags]
 
     def same_values(self, values: list[str]) -> bool:
@@ -146,6 +156,9 @@ class ChipsWidget(IChipsWidget):
         self.set_items(selections, debug=True)
 
     def update_multiselect(self, values: list[str]) -> None:
+        if not self.list_widget:
+            return
+
         if isinstance(self.list_widget, MultiSelectComboBox):
             self.list_widget.set_selected(values, emit=False)
         else:
@@ -154,17 +167,27 @@ class ChipsWidget(IChipsWidget):
 
     def clear_widgets(self) -> None:
         while self.chip_layout.count():
-            widget = self.chip_layout.takeAt(0).widget()
+            layout = self.chip_layout.takeAt(0)
+            if not layout:
+                return
+
+            widget = layout.widget()
+
             if widget is not None:
                 widget.deleteLater()
 
     def set_items(
-        self, values: list[str] = None, emit: bool = True, debug: bool = False
+        self,
+        values: list[str] | None = None,
+        emit: bool = True,
+        debug: bool = False,
     ) -> None:
         self.clear_widgets()
+        if self.values is None:
+            self.values = []
         # TODO: Temp fix for weighted/custom tags and incoming multiselect values
         if values:
-            tags = self.get_tag_list(self.values)
+            tags = self.get_chip_list(self.values)
             for value in values:
                 if value not in tags:
                     self.values.append(value)
@@ -172,22 +195,18 @@ class ChipsWidget(IChipsWidget):
             self.values = utils.dedupe_list(self.values)
         self.values = [value for value in self.values if value]
         for item in self.values:
-            if not consts.GlobalRefs.debug_set:
+            if not consts.QtGlobalRefs.debug_set:
                 debug = True
-                consts.GlobalRefs.debug_set = True
+                consts.QtGlobalRefs.debug_set = True
             else:
                 debug = False
             chip_button = ChipButton(
                 item,
                 self.update_chip,
                 self.remove_chip,
-                debug=debug,
                 weight_re=self.weight_re,
                 use_weight=self.use_weight,
             )
-            """ chip_button.setToolTip(
-                f"Tag Count: {consts.TAG_COUNTS.get(item, "N/A")}"
-            ) """
 
             self.chip_layout.addWidget(chip_button)
 
@@ -212,7 +231,7 @@ class ChipsWidget(IChipsWidget):
             self.emit_changes()
             self.input_field.setText("")
 
-    def remove_chip(self, button: ChipButton):
+    def remove_chip(self, button: ChipButton):  # type: ignore
         self.chip_layout.removeWidget(button)
         button.deleteLater()  # Schedule button widget for deletion
         self.values.remove(button.text)
@@ -227,6 +246,6 @@ class ChipsWidget(IChipsWidget):
         self.set_items()
 
     def remove_all(self, *_) -> None:
-        self.values = []
+        self.values.clear()
         self.clear_widgets()
         self.emit_changes()

{jbqt-0.1.12 → jbqt-0.1.13}/jbqt/widgets/multiselect.py

@@ -1,11 +1,12 @@
 from re import Pattern
 
-from PyQt6.QtCore import QObject, pyqtSignal, Qt
+from PyQt6.QtCore import QObject, pyqtSignal, Qt, QEvent
 from PyQt6.QtGui import QCursor, QMouseEvent, QWheelEvent
-from PyQt6.QtWidgets import QComboBox, QListWidget, QListWidgetItem
+from PyQt6.QtWidgets import QComboBox, QListWidget, QListWidgetItem, QLineEdit
 
 import jbutils as utils
-from jbqt.common import consts, qt_utils
+import jbqt.consts as consts
+from jbqt.common import qt_utils
 
 
 class MultiSelectComboBox(QComboBox):
@@ -13,11 +14,11 @@ class MultiSelectComboBox(QComboBox):
 
     def __init__(
         self,
-        data: list | dict = None,
-        selected: list[str] = None,
+        data: list | dict | None = None,
+        selected: list[str] | None = None,
         multi_enabled: bool = True,
         use_weight: bool = False,
-        weight_re: Pattern = None,
+        weight_re: Pattern | None = None,
     ):
         super().__init__()
 
@@ -30,11 +31,12 @@ class MultiSelectComboBox(QComboBox):
         self._multi_select_enabled: bool = multi_enabled
         # Make the combo box read-only and use a custom view
         self.setEditable(True)
-        self.lineEdit().setReadOnly(True)
+
+        self.line_edit().setReadOnly(True)
         # Override the mouse press event of the QLineEdit
-        self.lineEdit().installEventFilter(self)
+        self.line_edit().installEventFilter(self)
 
-        self.view: QListWidget = QListWidget()
+        self.view: QListWidget = QListWidget()  # type: ignore
         self._selected = selected or []
 
         # Set the custom view
@@ -52,26 +54,32 @@ class MultiSelectComboBox(QComboBox):
         self.view.itemClicked.connect(self.toggle_check_state)
         self.update_display_text()
 
-    def eventFilter(self, obj: QObject, event: QMouseEvent) -> bool:
+    def line_edit(self) -> QLineEdit:
+        return self.lineEdit() or QLineEdit(parent=self)
+
+    def eventFilter(
+        self, a0: QObject | None, a1: QMouseEvent | QEvent | None
+    ) -> bool:
 
         if (
-            obj == self.lineEdit()
-            and event.type() == QMouseEvent.Type.MouseButtonRelease
+            a0 == self.lineEdit()
+            and isinstance(a1, QMouseEvent)
+            and a1.type() == QMouseEvent.Type.MouseButtonRelease
         ):
             self.showPopup()
 
             return True
-        return super().eventFilter(obj, event)
+        return super().eventFilter(a0, a1)
 
-    def wheelEvent(self, event: QWheelEvent):
+    def wheelEvent(self, e: QWheelEvent | None):
         # Check if the mouse cursor is within the bounds of the line edit
         pos = self.mapFromGlobal(QCursor.pos())
-        if self.lineEdit().rect().contains(pos):
+        if self.line_edit().rect().contains(pos):
             # Consume the wheel event to prevent scrolling
             return
 
         # If not over the line edit, let the base class handle it (scrolling)
-        super().wheelEvent(event)
+        super().wheelEvent(e)
 
     def toggle_check_state(self, item: QListWidgetItem):
         # Toggle check state if the item is selectable
@@ -94,7 +102,7 @@ class MultiSelectComboBox(QComboBox):
 
         for i in range(self.view.count()):
             item = self.view.item(i)
-            if item != selected:
+            if item and item != selected:
                 item.setCheckState(Qt.CheckState.Unchecked)
         self.update_display_text()
 
@@ -143,11 +151,11 @@ class MultiSelectComboBox(QComboBox):
         selected_items = []
         for i in range(self.view.count()):
             item = self.view.item(i)
-            if item.checkState() == Qt.CheckState.Checked:
+            if item and item.checkState() == Qt.CheckState.Checked:
                 selected_items.append(item.text().strip())
 
         text = ", ".join(selected_items)
-        self.lineEdit().setText(text)
+        self.line_edit().setText(text)
 
     def showPopup(self):
         # Override showPopup to update text when the dropdown is shown
@@ -173,8 +181,10 @@ class MultiSelectComboBox(QComboBox):
         self.selectedChanged.emit(self.get_selected())
 
     def get_unweight_chip(self, tag: str) -> str:
-        if self.weight_re and self.weight_re.search(tag):
-            return self.weight_re.search(tag).groups()[0]
+        if self.weight_re:
+            search_re = self.weight_re.search(tag)
+            if search_re:
+                return search_re.groups()[0]
         return tag
 
     def get_chip_list(self, tags: list[str]) -> list[str]:
@@ -190,6 +200,8 @@ class MultiSelectComboBox(QComboBox):
         # Update the checked state of items based on the new selection
         for i in range(self.view.count()):
             item = self.view.item(i)
+            if not item:
+                continue
 
             item.setCheckState(
                 Qt.CheckState.Checked

{jbqt-0.1.12 → jbqt-0.1.13}/jbqt/widgets/simple.py

@@ -14,9 +14,9 @@ class ClickableLabel(QLabel):
         super().__init__(text, parent)
         self.setAlignment(Qt.AlignmentFlag.AlignCenter)
 
-    def mousePressEvent(self, event):
+    def mousePressEvent(self, ev):
         self.clicked.emit()
-        super().mousePressEvent(event)
+        super().mousePressEvent(ev)
 
 
 def is_valid_key(event: QKeyEvent) -> bool:
@@ -37,6 +37,7 @@ def is_valid_key(event: QKeyEvent) -> bool:
 
     if event.keyCombination().keyboardModifiers().name == "ControlModifier":
         return True
+    return False
 
 
 class LongIntSpinBox(QLineEdit):
@@ -55,13 +56,16 @@ class LongIntSpinBox(QLineEdit):
         if value != self.value():
             self.setText(str(value))
 
-    def value(self) -> int:
+    def value(self) -> int | None:
         text = self.text()
         if NUM_RE.match(text):
             return int(text)
 
-    def eventFilter(self, obj: QObject, event: QKeyEvent) -> bool:
-        if event.type() == QEvent.Type.KeyPress:
-            if not is_valid_key(event):
-                return True
-        return super().eventFilter(obj, event)
+    def eventFilter(
+        self, a0: QObject | None, a1: QKeyEvent | QEvent | None
+    ) -> bool:
+        if isinstance(a1, QKeyEvent):
+            if a1.type() == QEvent.Type.KeyPress:
+                if not is_valid_key(a1):
+                    return True
+        return super().eventFilter(a0, a1)

jbqt-0.1.13/jbqt/widgets/widget_utils.py

@@ -0,0 +1,88 @@
+from collections.abc import Callable
+
+from jbqt.consts import QtGlobalRefs
+
+
+def debug_scroll_pos(func: Callable):
+    def wrapper(self, *args, **kwargs):
+        if QtGlobalRefs.scroll_area is None:
+            return func(self, *args, **kwargs)
+        focus = None
+        if QtGlobalRefs.main_window:
+            focus = QtGlobalRefs.main_window.focusWidget()
+        print(f"scroll pos {func.__name__}")
+        print("before", QtGlobalRefs.scroll_area.verticalScrollBar().value(), focus)
+        result = func(self, *args, **kwargs)
+
+        if QtGlobalRefs.main_window:
+            focus = QtGlobalRefs.main_window.focusWidget()
+        print(
+            f"after {QtGlobalRefs.scroll_area.verticalScrollBar().value()} {focus}\n"
+        )
+
+        return result
+
+    return wrapper
+
+
+def debug_scroll_pos_no_args(func: Callable):
+    def wrapper(self):
+        if QtGlobalRefs.scroll_area is None:
+            return func(self)
+        focus = None
+        if QtGlobalRefs.main_window:
+            focus = QtGlobalRefs.main_window.focusWidget()
+        print(f"scroll pos {func.__name__}")
+        print("before", QtGlobalRefs.scroll_area.verticalScrollBar().value(), focus)
+        result = func(self)
+        if QtGlobalRefs.main_window:
+            focus = QtGlobalRefs.main_window.focusWidget()
+        print(
+            f"after {QtGlobalRefs.scroll_area.verticalScrollBar().value()} {focus}\n"
+        )
+
+        return result
+
+    return wrapper
+
+
+def _call_func(func: Callable, *args, **kwargs):
+    if args and kwargs:
+        return func(*args, **kwargs)
+    elif args:
+        return func(*args)
+    elif kwargs:
+        return func(**kwargs)
+    else:
+        return func()
+
+
+def preserve_scroll(func: Callable):
+    def wrapper(self, *args, **kwargs):
+        if QtGlobalRefs.scroll_area is None:
+            return _call_func(func, self, *args, **kwargs)
+
+        scrollbar = QtGlobalRefs.scroll_area.verticalScrollBar()
+        if not scrollbar:
+            return
+
+        scroll_pos = scrollbar.value()
+
+        if not QtGlobalRefs.app:
+            return
+
+        focus = QtGlobalRefs.app.focusWidget()
+        if not focus:
+            return
+
+        result = _call_func(
+            func,
+            self,
+            *args,
+            **kwargs,
+        )
+        scrollbar.setValue(scroll_pos)
+        focus.setFocus()
+        return result
+
+    return wrapper

{jbqt-0.1.12 → jbqt-0.1.13}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "jbqt"
-version = "0.1.12"
+version = "0.1.13"
 description = ""
 authors = [ "Joseph Bochinski <stirgejr@gmail.com>",]
 readme = "README.md"
@@ -14,4 +14,5 @@ python = "^3.12"
 pyqt6 = "^6.9.0"
 fuzzywuzzy = "^0.18.0"
 python-levenshtein = "^0.27.1"
-jbutils = "^0.1.21"
+jbconsts = "^0.1.1"
+jbutils = "^0.1.23"

jbqt-0.1.12/jbqt/common/__init__.py

@@ -1,16 +0,0 @@
-"""Const exports"""
-
-from jbqt.common import consts, qt_utils
-from jbqt.common.consts import COLORS, STYLES, SIZES, GlobalRefs, ICONS
-from jbqt.common.qt_utils import register_app
-
-__all__ = [
-    "COLORS",
-    "consts",
-    "GlobalRefs",
-    "ICONS",
-    "qt_utils",
-    "register_app",
-    "SIZES",
-    "STYLES",
-]

jbqt-0.1.12/jbqt/types/__init__.py

@@ -1,8 +0,0 @@
-from collections.abc import Callable
-from typing import Optional
-
-from PyQt6.QtCore import QSize
-from PyQt6.QtGui import QIcon, QColor
-
-
-IconGetter = Callable[[Optional[str | QColor], QSize | int | None], QIcon]

jbqt-0.1.12/jbqt/widgets/widget_utils.py

@@ -1,77 +0,0 @@
-from collections.abc import Callable
-
-from jbqt.common.consts import GlobalRefs
-
-
-def debug_scroll_pos(func: Callable):
-    def wrapper(self, *args, **kwargs):
-        if GlobalRefs.scroll_area is None:
-            return func(self, *args, **kwargs)
-        focus = None
-        if GlobalRefs.main_window:
-            focus = GlobalRefs.main_window.focusWidget()
-        print(f"scroll pos {func.__name__}")
-        print("before", GlobalRefs.scroll_area.verticalScrollBar().value(), focus)
-        result = func(self, *args, **kwargs)
-
-        if GlobalRefs.main_window:
-            focus = GlobalRefs.main_window.focusWidget()
-        print(
-            f"after {GlobalRefs.scroll_area.verticalScrollBar().value()} {focus}\n"
-        )
-
-        return result
-
-    return wrapper
-
-
-def debug_scroll_pos_no_args(func: Callable):
-    def wrapper(self):
-        if GlobalRefs.scroll_area is None:
-            return func(self)
-        focus = None
-        if GlobalRefs.main_window:
-            focus = GlobalRefs.main_window.focusWidget()
-        print(f"scroll pos {func.__name__}")
-        print("before", GlobalRefs.scroll_area.verticalScrollBar().value(), focus)
-        result = func(self)
-        if GlobalRefs.main_window:
-            focus = GlobalRefs.main_window.focusWidget()
-        print(
-            f"after {GlobalRefs.scroll_area.verticalScrollBar().value()} {focus}\n"
-        )
-
-        return result
-
-    return wrapper
-
-
-def _call_func(func: Callable, *args, **kwargs):
-    if args and kwargs:
-        return func(*args, **kwargs)
-    elif args:
-        return func(*args)
-    elif kwargs:
-        return func(**kwargs)
-    else:
-        return func()
-
-
-def preserve_scroll(func: Callable):
-    def wrapper(self, *args, **kwargs):
-        if GlobalRefs.scroll_area is None:
-            return _call_func(func, self, *args, **kwargs)
-
-        scroll_pos = GlobalRefs.scroll_area.verticalScrollBar().value()
-        focus = GlobalRefs.app.focusWidget()
-        result = _call_func(
-            func,
-            self,
-            *args,
-            **kwargs,
-        )
-        GlobalRefs.scroll_area.verticalScrollBar().setValue(scroll_pos)
-        focus.setFocus()
-        return result
-
-    return wrapper