jbqt 0.1.13__tar.gz → 0.1.15__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jbqt
-Version: 0.1.13
+Version: 0.1.15
 Summary: 
 Author: Joseph Bochinski
 Author-email: stirgejr@gmail.com
@@ -12,6 +12,7 @@ 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)
+Requires-Dist: rich (>=14.0.0,<15.0.0)
 Description-Content-Type: text/markdown
 
 

jbqt-0.1.15/jbqt/models/__init__.py

@@ -0,0 +1,14 @@
+"""Model exports"""
+
+from jbqt.models.chips import IChipsWidget
+from jbqt.models.chip_button import IChipButton
+from jbqt.models.model_consts import RegisteredFunctions
+from jbqt.models.model_utils import get_fct, register_fct
+
+__all__ = [
+    "get_fct",
+    "IChipButton",
+    "IChipsWidget",
+    "register_fct",
+    "RegisteredFunctions",
+]

jbqt-0.1.15/jbqt/models/model_consts.py

@@ -0,0 +1,9 @@
+"""Constant values local to the models package"""
+
+from jbutils.types import Function
+
+
+RegisteredFunctions: dict[str, Function] = {}
+
+
+__all__ = ["RegisteredFunctions"]

jbqt-0.1.15/jbqt/models/model_utils.py

@@ -0,0 +1,24 @@
+"""Collection of utility functions local to the models package"""
+
+from jbutils.types import Function
+from rich import print
+
+from jbqt.models.model_consts import RegisteredFunctions
+
+
+def register_fct(name: str, fct: Function, override: bool = False) -> None:
+    if name not in RegisteredFunctions:
+        RegisteredFunctions[name] = fct
+        if override and name in RegisteredFunctions:
+            # TODO improve logging
+            print(
+                f"[yellow][Warning][/yellow]: Function '{name}' already defined and was overwritten"
+            )
+    print(f"[yellow][Warning][/yellow]: Function '{name}' already defined")
+
+
+def get_fct(name: str, fallback: Function | None = None) -> Function | None:
+    return RegisteredFunctions.get(name, fallback)
+
+
+__all__ = ["register_fct", "get_fct"]

jbqt-0.1.15/jbqt/models/toolbar_button.py

@@ -0,0 +1,58 @@
+"""Collection of models for PyQt6"""
+
+from collections.abc import Callable
+from dataclasses import dataclass
+
+from PyQt6.QtCore import QSize, QObject
+from PyQt6.QtGui import QIcon, QColor, QAction
+
+from jbconsts import COLORS
+from jbqt.consts import ICONS, QtIconSizes
+from jbqt.models import model_utils
+
+
+@dataclass
+class ToolbarButton:
+    name: str = ""
+    icon: QIcon | str = ""
+    color: QColor | str = COLORS.BLUE_GRAY
+    checkable: bool = False
+    checked: bool = False
+    status_tip: str = ""
+    size: QSize | str = QtIconSizes.ICON_MD
+    function: Callable[..., None] | str | None = None
+    text: str = ""
+
+    def __post_init__(self) -> None:
+        if isinstance(self.function, str):
+            fct = model_utils.get_fct(self.function)
+            print("fct:", fct)
+            self.function = fct if fct else None
+
+    def to_action(self, parent: QObject | None = None) -> QAction:
+        color: QColor | str = self.color
+        if isinstance(color, str):
+            color = COLORS.get(color, color)
+
+        size = self.size
+        if isinstance(size, str):
+            size = QtIconSizes.get(size)
+
+        icon = self.icon
+        if isinstance(icon, str):
+            icon_getter = ICONS.get(icon)
+            if callable(icon_getter):
+                icon = icon_getter(color, size)
+
+            icon = QIcon() if isinstance(icon, str) else icon
+
+        action = QAction(icon=icon, text=self.text, parent=parent)
+        if self.checkable:
+            action.setCheckable(True)
+            action.setChecked(self.checkable)
+        if self.status_tip:
+            action.setStatusTip(self.status_tip)
+        if self.function:
+            action.triggered.connect(self.function)
+
+        return action

{jbqt-0.1.13 → jbqt-0.1.15}/jbqt/view_icons.py

@@ -45,8 +45,9 @@ args = parser.parse_args()
 THEMES_DIR = "/usr/share/icons"
 
 
+# TODO: fix type checking
 class Toast(QLabel):
-    def __init__(self, text: str, parent: QWidget = None, duration_ms: int = 1500):
+    def __init__(self, text: str, parent: QWidget = None, duration_ms: int = 1500):  # type: ignore
         super().__init__(parent)
 
         self.setText(text)
@@ -97,8 +98,8 @@ class Window(QMainWindow):
         central_widget = QWidget()
         self.setCentralWidget(central_widget)
 
-        self.layout = QVBoxLayout()
-        central_widget.setLayout(self.layout)
+        self.layout = QVBoxLayout()  # type: ignore
+        central_widget.setLayout(self.layout)  # type: ignore
 
         self.search_bar = QLineEdit()
         self.search_bar.setPlaceholderText("Search icons...")
@@ -106,8 +107,8 @@ class Window(QMainWindow):
 
         self.table = QTableWidget()
         self.table.setColumnCount(4)  # 4 columns of icons
-        self.table.horizontalHeader().setVisible(False)
-        self.table.verticalHeader().setVisible(False)
+        self.table.horizontalHeader().setVisible(False)  # type: ignore
+        self.table.verticalHeader().setVisible(False)  # type: ignore
         self.table.setIconSize(QSize(64, 64))
         self.table.setShowGrid(False)
         self.table.setEditTriggers(QTableWidget.EditTrigger.NoEditTriggers)
@@ -122,8 +123,8 @@ class Window(QMainWindow):
         """
         )
 
-        self.layout.addWidget(self.search_bar)
-        self.layout.addWidget(self.table)
+        self.layout.addWidget(self.search_bar)  # type: ignore
+        self.layout.addWidget(self.table)  # type: ignore
 
         cur_theme = QIcon.themeName()
         self.icon_src = "standard"
@@ -154,7 +155,7 @@ class Window(QMainWindow):
         item = self.table.item(row, column)
         if item and item.text():
             text = f'"{item.text()}"' if args.add_quotes else item.text()
-            QApplication.clipboard().setText(text)
+            QApplication.clipboard().setText(text)  # type: ignore
             print(f"Copied '{item.text()}' to clipboard")
             Toast(f"Copied '{item.text()}'", parent=self).show()
 
@@ -191,7 +192,7 @@ class Window(QMainWindow):
                     case _:
 
                         pixmapi = getattr(QStyle.StandardPixmap, name)
-                        icon = self.style().standardIcon(pixmapi)
+                        icon = self.style().standardIcon(pixmapi)  # type: ignore
 
                 item = QTableWidgetItem(name)
                 item.setIcon(icon)

{jbqt-0.1.13 → jbqt-0.1.15}/jbqt/widgets/widget_utils.py

@@ -11,13 +11,14 @@ def debug_scroll_pos(func: Callable):
         if QtGlobalRefs.main_window:
             focus = QtGlobalRefs.main_window.focusWidget()
         print(f"scroll pos {func.__name__}")
-        print("before", QtGlobalRefs.scroll_area.verticalScrollBar().value(), focus)
+        # TODO: fix type checking
+        print("before", QtGlobalRefs.scroll_area.verticalScrollBar().value(), focus)  # type: ignore
         result = func(self, *args, **kwargs)
 
         if QtGlobalRefs.main_window:
             focus = QtGlobalRefs.main_window.focusWidget()
         print(
-            f"after {QtGlobalRefs.scroll_area.verticalScrollBar().value()} {focus}\n"
+            f"after {QtGlobalRefs.scroll_area.verticalScrollBar().value()} {focus}\n"  # type: ignore
         )
 
         return result
@@ -32,13 +33,14 @@ def debug_scroll_pos_no_args(func: Callable):
         focus = None
         if QtGlobalRefs.main_window:
             focus = QtGlobalRefs.main_window.focusWidget()
+        # TODO: fix type checking
         print(f"scroll pos {func.__name__}")
-        print("before", QtGlobalRefs.scroll_area.verticalScrollBar().value(), focus)
+        print("before", QtGlobalRefs.scroll_area.verticalScrollBar().value(), focus)  # type: ignore
         result = func(self)
         if QtGlobalRefs.main_window:
             focus = QtGlobalRefs.main_window.focusWidget()
         print(
-            f"after {QtGlobalRefs.scroll_area.verticalScrollBar().value()} {focus}\n"
+            f"after {QtGlobalRefs.scroll_area.verticalScrollBar().value()} {focus}\n"  # type: ignore
         )
 
         return result

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

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "jbqt"
-version = "0.1.13"
+version = "0.1.15"
 description = ""
 authors = [ "Joseph Bochinski <stirgejr@gmail.com>",]
 readme = "README.md"
@@ -16,3 +16,4 @@ fuzzywuzzy = "^0.18.0"
 python-levenshtein = "^0.27.1"
 jbconsts = "^0.1.1"
 jbutils = "^0.1.23"
+rich = "^14.0.0"

jbqt-0.1.13/jbqt/models/__init__.py

@@ -1,6 +0,0 @@
-"""Model exports"""
-
-from jbqt.models.chips import IChipsWidget
-from jbqt.models.chip_button import IChipButton
-
-__all__ = ["IChipButton", "IChipsWidget"]