jbqt 0.1.6__tar.gz → 0.1.8__tar.gz

{jbqt-0.1.6 → jbqt-0.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jbqt
-Version: 0.1.6
+Version: 0.1.8
 Summary: 
 Author: Joseph Bochinski
 Author-email: stirgejr@gmail.com

{jbqt-0.1.6 → jbqt-0.1.8}/jbqt/common/consts.py

@@ -1,12 +1,15 @@
 import os
 import re
 
+
 import jbutils
 
 from PyQt6.QtWidgets import QApplication, QMainWindow, QScrollArea, QWidget
 from PyQt6.QtCore import Qt, QSize
 from PyQt6.QtGui import QIcon, QPixmap, QPainter, QColor
 
+from jbqt.types import IconGetter
+
 TAG_RE = re.compile(r"^\((.+)\)(\d+\.\d+)$")
 LIST_ITEM_ROLE = Qt.ItemDataRole.UserRole - 1
 
@@ -15,16 +18,16 @@ COLORS = jbutils.COLORS
 
 
 class GlobalRefs:
-    app: QApplication = None
-    main_window: QMainWindow = None
-    scroll_area: QScrollArea = None
+    app: QApplication | None = None
+    main_window: QMainWindow | None = None
+    scroll_area: QScrollArea | None = None
     server_active: bool = False
     debug_set: bool = False
-    seed_widget: QWidget = None
+    seed_widget: QWidget | None = None
 
 
 class QtPaths:
-    icon_dir: str = None
+    icon_dir: str | None = None
 
 
 THEME_ICONS: dict[str, QIcon] = {
@@ -91,14 +94,14 @@ def icon_dir(file_name: str) -> str:
 
 
 def recolor_icon(
-    image_path: str, color: str | QColor, scale: QSize = None
+    image_path: str, color: str | QColor, scale: QSize | None = None
 ) -> QIcon:
     if not color:
         color = QColor("black")
     if isinstance(color, str):
         color = QColor(color)
 
-    if not scale:
+    if scale is None:
         scale = SIZES.ICON_MD
     pixmap = QPixmap(image_path)
     icon_key = os.path.splitext(os.path.basename(image_path))[0]
@@ -127,12 +130,11 @@ def recolor_icon(
     return QIcon(recolored_pixmap.scaled(scale, Qt.AspectRatioMode.KeepAspectRatio))
 
 
-def get_icon(file_name: str) -> QIcon:
-    def getter(color: str = "", size: QSize | int = None):
+def get_icon(file_name: str) -> IconGetter:
+    def getter(color: str = "", size: QSize | int | None = None) -> QIcon:
         if isinstance(size, int):
             size = QSize(size, size)
 
-        # return QIcon(QPixmap(_icon_dir(file_name)))
         return recolor_icon(icon_dir(file_name), color, size)
 
     return getter
@@ -160,7 +162,7 @@ class ICONS:
     SYNC = get_icon("sync.png")
 
     @classmethod
-    def get(cls, name: str, default: str = "") -> str:
+    def get(cls, name: str, default: str = "") -> IconGetter | str:
         if hasattr(cls, name):
             return getattr(cls, name)
         else:

jbqt-0.1.8/jbqt/types/__init__.py

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

{jbqt-0.1.6 → jbqt-0.1.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "jbqt"
-version = "0.1.6"
+version = "0.1.8"
 description = ""
 authors = [ "Joseph Bochinski <stirgejr@gmail.com>",]
 readme = "README.md"