jbqt 0.1.16__py3-none-any.whl → 0.1.18__py3-none-any.whl

jbqt/dialogs/__init__.py

@@ -1,7 +1,8 @@
 """jbqt Dialog exports"""
 
-from jbqt.dialogs.input_form import InputDialog
+from jbqt.dialogs.input_form import InputFormDialog
+from jbqt.dialogs.single_input import InputDialog
 from jbqt.dialogs.text_preview import TextPreviewDialog
 from jbqt.dialogs.file_dialog import JbFileDialog
 
-__all__ = ["InputDialog", "TextPreviewDialog", "JbFileDialog"]
+__all__ = ["InputDialog", "InputFormDialog", "TextPreviewDialog", "JbFileDialog"]

jbqt/dialogs/input_form.py

@@ -1,3 +1,4 @@
+from dataclasses import dataclass
 from typing import Any, Callable
 
 from PyQt6.QtCore import pyqtSignal
@@ -5,81 +6,135 @@ from PyQt6.QtWidgets import (
     QDialog,
     QDialogButtonBox,
     QDoubleSpinBox,
+    QHBoxLayout,
     QLabel,
+    QLayout,
     QLineEdit,
+    QPushButton,
     QSpinBox,
     QVBoxLayout,
+    QWidget,
 )
 
+from PyQt6 import QtWidgets
 
-INPUT_SIGNAL_TYPES: tuple[Any, ...] = (str, int, float)
+from jbqt.models import DialogOptions
 
 
-class InputDialog(QDialog):
-    signal_types: tuple[Any] = INPUT_SIGNAL_TYPES
-    """ reference value for external use """
+def get_widget(name: str) -> QWidget | None:
+    widget: QWidget | None = None
+    if hasattr(QtWidgets, name):
+        widget = getattr(QtWidgets, name)
+    """ elif hasattr(widgets, name):
+        widget = getattr(widgets, name) """
 
-    value = pyqtSignal(*([ptype] for ptype in INPUT_SIGNAL_TYPES))
+    if widget:
+        if not callable(widget):
+            return
+
+        widget = widget()
+        if isinstance(widget, QWidget):
+            return widget
+    return None
+
+
+def get_widget_val(widget: QWidget) -> str | int | float | None:
+    # Emit the custom signal with data when the dialog is accepted
+    value = None
+    if isinstance(widget, QLineEdit):
+        value = widget.text()
+    elif isinstance(widget, QSpinBox):
+        value = widget.value()
+    elif isinstance(widget, QDoubleSpinBox):
+        value = widget.value()
+
+    return value
+
+
+class InputFormDialog(QDialog):
+    """reference value for external use"""
+
+    value = pyqtSignal(dict)
 
     def __init__(
         self,
         parent=None,
-        title: str = "Input",
-        msg_str: str = "Enter Input:",
-        input_type: type = str,
-        **opts,
+        form_data: list[dict] | None = None,
+        opts: DialogOptions | None = None,
     ):
         super().__init__(parent)
 
-        self.setWindowTitle(title)
+        opts = opts or DialogOptions(title="Input")
+        opts.apply(self)
 
-        QBtn = (
-            QDialogButtonBox.StandardButton.Cancel
-            | QDialogButtonBox.StandardButton.Open
-        )
+        self.form_data: list[dict] = [obj.copy() for obj in form_data or []]
+        self.input_widgets: dict[str, QWidget] = {}
 
-        self.buttonBox = QDialogButtonBox(QBtn)
-        self.buttonBox.accepted.connect(self.accept)
-        self.buttonBox.rejected.connect(self.reject)
+        self.main_layout = QVBoxLayout()
+        self.construct_widgets()
 
-        layout = QVBoxLayout()
-        message = QLabel(msg_str)
-        layout.addWidget(message)
+        button_box = QHBoxLayout()
+        submit_btn = QPushButton("Submit", parent=self)
+        submit_btn.clicked.connect(self.submit)
 
-        self.input_widget = None
-        if input_type is str:
-            self.input_widget = QLineEdit()
-        elif input_type is int:
-            self.input_widget = QSpinBox()
-        elif input_type is float:
-            self.input_widget = QDoubleSpinBox()
+        cancel_btn = QPushButton("Cancel", parent=self)
+        cancel_btn.clicked.connect(self.close)
 
-        self._init_widget(**opts)
+        button_box.addWidget(submit_btn)
+        button_box.addWidget(cancel_btn)
+        self.main_layout.addLayout(button_box)
 
-        layout.addWidget(self.input_widget)
-        layout.addWidget(self.buttonBox)
-        self.setLayout(layout)
+        self.setLayout(self.main_layout)
 
-    def _init_widget(self, **opts) -> None:
-        for key, value in opts.items():
-            setter_key = f"set{key[0].upper() + key[1:]}"
-            if hasattr(self.input_widget, setter_key):
-                setter = getattr(self.input_widget, setter_key)
-                if setter:
-                    setter(value)
+    def construct_widgets(self) -> None:
+        for widget_def in self.form_data:
+            if not "type" in widget_def:
+                continue
 
-    def connect(self, callback: Callable) -> None:
-        for parm_type in self.signal_types:
-            self.value[parm_type].connect(callback)
+            layout = QHBoxLayout()
 
-    def accept(self):
-        # Emit the custom signal with data when the dialog is accepted
+            w_type = widget_def.pop("type")
+            label = widget_def.pop("label", "")
+            key = widget_def.pop("key", "")
+            if not key:
+                continue
 
-        if isinstance(self.input_widget, QLineEdit):
-            self.value[str].emit(self.input_widget.text())
-        elif isinstance(self.input_widget, QSpinBox):
-            self.value[int].emit(self.input_widget.value())
-        elif isinstance(self.input_widget, QDoubleSpinBox):
-            self.value[float].emit(self.input_widget.value())
+            widget = get_widget(w_type)
+            if not widget:
+                continue
+            if label and isinstance(label, str):
+                layout.addWidget(QLabel(label))
 
-        super().accept()
+            if widget_def:
+                self._init_widget(widget, **widget_def)
+            layout.addWidget(widget)
+            self.main_layout.addLayout(layout)
+            self.input_widgets[key] = widget
+
+    def get_form_data(self) -> dict:
+        form_values: dict[str, Any] = {}
+
+        for key, widget in self.input_widgets.items():
+            value = get_widget_val(widget)
+            if value:
+                form_values[key] = value
+
+        return form_values
+
+    def submit(self) -> None:
+        form_data = self.get_form_data()
+        self.value.emit(form_data)
+        self.close()
+
+    def close(self) -> bool:
+        self.deleteLater()
+
+        return super().close()
+
+    def _init_widget(self, widget: QWidget, **opts) -> None:
+        for key, value in opts.items():
+            setter_key = f"set{key[0].upper() + key[1:]}"
+            if hasattr(widget, setter_key):
+                setter = getattr(widget, setter_key)
+                if setter:
+                    setter(value)

jbqt/dialogs/single_input.py

@@ -0,0 +1,85 @@
+from typing import Any, Callable
+
+from PyQt6.QtCore import pyqtSignal
+from PyQt6.QtWidgets import (
+    QDialog,
+    QDialogButtonBox,
+    QDoubleSpinBox,
+    QLabel,
+    QLineEdit,
+    QSpinBox,
+    QVBoxLayout,
+)
+
+
+INPUT_SIGNAL_TYPES: tuple[Any, ...] = (str, int, float)
+
+
+class InputDialog(QDialog):
+    signal_types: tuple[Any] = INPUT_SIGNAL_TYPES
+    """ reference value for external use """
+
+    value = pyqtSignal(*([ptype] for ptype in INPUT_SIGNAL_TYPES))
+
+    def __init__(
+        self,
+        parent=None,
+        title: str = "Input",
+        msg_str: str = "Enter Input:",
+        input_type: type = str,
+        **opts,
+    ):
+        super().__init__(parent)
+
+        self.setWindowTitle(title)
+
+        QBtn = (
+            QDialogButtonBox.StandardButton.Cancel
+            | QDialogButtonBox.StandardButton.Open
+        )
+
+        self.buttonBox = QDialogButtonBox(QBtn)
+        self.buttonBox.accepted.connect(self.accept)
+        self.buttonBox.rejected.connect(self.reject)
+
+        layout = QVBoxLayout()
+        message = QLabel(msg_str)
+        layout.addWidget(message)
+
+        self.input_widget = None
+        if input_type is str:
+            self.input_widget = QLineEdit()
+        elif input_type is int:
+            self.input_widget = QSpinBox()
+        elif input_type is float:
+            self.input_widget = QDoubleSpinBox()
+
+        self._init_widget(**opts)
+
+        layout.addWidget(self.input_widget)
+        layout.addWidget(self.buttonBox)
+        self.setLayout(layout)
+
+    def _init_widget(self, **opts) -> None:
+        for key, value in opts.items():
+            setter_key = f"set{key[0].upper() + key[1:]}"
+            if hasattr(self.input_widget, setter_key):
+                setter = getattr(self.input_widget, setter_key)
+                if setter:
+                    setter(value)
+
+    def connect(self, callback: Callable) -> None:
+        for parm_type in self.signal_types:
+            self.value[parm_type].connect(callback)
+
+    def accept(self):
+        # Emit the custom signal with data when the dialog is accepted
+
+        if isinstance(self.input_widget, QLineEdit):
+            self.value[str].emit(self.input_widget.text())
+        elif isinstance(self.input_widget, QSpinBox):
+            self.value[int].emit(self.input_widget.value())
+        elif isinstance(self.input_widget, QDoubleSpinBox):
+            self.value[float].emit(self.input_widget.value())
+
+        super().accept()

jbqt/models/__init__.py

@@ -2,11 +2,13 @@
 
 from jbqt.models.chips import IChipsWidget
 from jbqt.models.chip_button import IChipButton
+from jbqt.models.dialog_options import DialogOptions
 from jbqt.models.model_consts import RegisteredFunctions
 from jbqt.models.model_utils import get_fct, register_fct
 from jbqt.models.toolbar_button import ToolbarButton
 
 __all__ = [
+    "DialogOptions",
     "get_fct",
     "IChipButton",
     "IChipsWidget",

jbqt/models/dialog_options.py

@@ -0,0 +1,28 @@
+from dataclasses import dataclass
+
+from PyQt6.QtCore import QObject
+from PyQt6.QtWidgets import QWidget, QMainWindow, QApplication, QDialog
+
+
+@dataclass
+class DialogOptions:
+    title: str = ""
+    x_pos: int | None = None
+    y_pos: int | None = None
+    height: int | None = None
+    width: int | None = None
+
+    def apply(self, q_obj: QWidget | QMainWindow | QDialog):
+        if self.title:
+            q_obj.setWindowTitle(self.title)
+
+        h, w, x, y = self.height, self.width, self.x_pos, self.y_pos
+        if h or w:
+            h = h or 400
+            w = w or 400
+            q_obj.resize(w, h)
+
+        if x is not None or y is not None:
+            x = x or 0
+            y = y or 0
+            q_obj.move(x, y)

jbqt/widgets/chips.py

@@ -96,7 +96,7 @@ class ChipsWidget(IChipsWidget):
         input_layout = QHBoxLayout()
         self.input_field = QLineEdit(self)
         self.add_button = QPushButton("Add", self)
-        self.add_button.clicked.connect(self.add_chip)
+        self.add_button.clicked.connect(self.parse_chip_input)
 
         self.clear_button = QPushButton(consts.ICONS.TRASH("darkred"), "", self)
         self.clear_button.clicked.connect(self.remove_all)
@@ -124,7 +124,7 @@ class ChipsWidget(IChipsWidget):
         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()
+                    self.parse_chip_input()
         return super().eventFilter(a0, a1)
 
     def get_unweight_chip(self, tag: str) -> str:
@@ -221,8 +221,16 @@ class ChipsWidget(IChipsWidget):
     def emit_changes(self):
         self.valuesChanged.emit(self.values)
 
+    def parse_chip_input(self) -> None:
+        text = self.input_field.text().strip()
+        if "," in text:
+            self.add_chips(utils.parse_csv_line(text))
+        else:
+            self.add_chip()
+
     def add_chip(self):
         text = self.input_field.text().strip()
+
         if text and text not in self.values:
             chip_button = ChipButton(text, self.update_chip, self.remove_chip)
 

{jbqt-0.1.16.dist-info → jbqt-0.1.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jbqt
-Version: 0.1.16
+Version: 0.1.18
 Summary: 
 Author: Joseph Bochinski
 Author-email: stirgejr@gmail.com
@@ -9,7 +9,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: fuzzywuzzy (>=0.18.0,<0.19.0)
 Requires-Dist: jbconsts (>=0.1.1,<0.2.0)
-Requires-Dist: jbutils (>=0.1.23,<0.2.0)
+Requires-Dist: jbutils (>=0.1.27,<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)

{jbqt-0.1.16.dist-info → jbqt-0.1.18.dist-info}/RECORD

@@ -2,13 +2,15 @@ jbqt/__init__.py,sha256=qGE1sO5jh_hT3pr4AQQBKELiPxqSFna__j8u-sJz2nU,161
 jbqt/common/__init__.py,sha256=knxf7Rc2gEN9qjWgZQdSu8oIznNlR6Z8D4zD_KU3UCE,151
 jbqt/common/qt_utils.py,sha256=ag_CJfEQK-xFg8PvX6m4A5GplMjcRKFVCledVQVF9CA,2300
 jbqt/consts/__init__.py,sha256=J2-z6t848A-FzSiZ7sASONSKn9Zn7VOSIphMNhv9zTE,6018
-jbqt/dialogs/__init__.py,sha256=DZi-qwW75JKfTLk33bowjt9Nhn1mpOO6kmP7mSMGz0o,245
+jbqt/dialogs/__init__.py,sha256=8FBzE6e-0rupN4ODzNpTHHJZxfKGyciLIfYWSEKSrGs,318
 jbqt/dialogs/file_dialog.py,sha256=QMUxgSNt1IGLqgPgKqrEwlPjKIQ7D5qrY2cJCXmW654,1830
-jbqt/dialogs/input_form.py,sha256=pJVuP5fYc9USiwLmaSm66hrr-iW8XeZSY3eqxIUnVd0,2456
+jbqt/dialogs/input_form.py,sha256=VYq8DRqMb3ZEOhyCl6NH_TssU8ekCVUxnTm75No7xSM,3741
+jbqt/dialogs/single_input.py,sha256=pJVuP5fYc9USiwLmaSm66hrr-iW8XeZSY3eqxIUnVd0,2456
 jbqt/dialogs/text_preview.py,sha256=5rZjMvvMPq0jenPQkxKTFsGzuebdH_EnjKsdgNzv93o,1244
-jbqt/models/__init__.py,sha256=Wqk71mCSqtxWHIielBecnsw5TmlgQxjk48UbKo1Lu9M,417
+jbqt/models/__init__.py,sha256=ZftJAf2S8rqoN1o_pJ2yYAhoENnKsofttt64b1kYxdE,491
 jbqt/models/chip_button.py,sha256=lG76aNgnrZcSw5QzAJ6UUHMbNNkDI-yZAp3iJlKr0Ms,220
 jbqt/models/chips.py,sha256=Qil50f1DcmYDHxiQgf0qs0kqERb-PTH37eOLHCuWA2o,625
+jbqt/models/dialog_options.py,sha256=r3_0eVC3swrfUcbaV2mTXszuoBs4mbFK9r5okHB3boE,730
 jbqt/models/model_consts.py,sha256=84xPj4RNCGib7d4dBOOybzD3z0_uav37jrzqGfZkAQ8,170
 jbqt/models/model_utils.py,sha256=Tf8QwJKHj3vpAkSTn-qP3XdihKnPqJvr5gq2c-8cCJM,809
 jbqt/models/toolbar_button.py,sha256=5jQisgsFaQ7_b0D-bV9jiHDIMOO6-j_H8qgA2Qdn7NU,1736
@@ -16,11 +18,11 @@ jbqt/types/__init__.py,sha256=er6dhNIqsfQr8mdpA2f7LIvX2CPmRG2Xyqj0cneitpg,407
 jbqt/view_icons.py,sha256=Jy_o5dFSzKZGUX7oBq0sEi8jTrI5eI4COu5e4bWKT9o,6559
 jbqt/widgets/__init__.py,sha256=WxDWM5MDnB9NkvaYxE4AiT7tFjGB9fBirEx2iZUujeU,523
 jbqt/widgets/chip_button.py,sha256=mmh9EZfYY-d0hiQbGIZDvmi6RrBfKgGein_f_69gnCY,6362
-jbqt/widgets/chips.py,sha256=DH6Y1xr7vydq7dNOlETcXaOPy6rTu8IfrdUO8BAKjmg,8123
+jbqt/widgets/chips.py,sha256=THekZ4LUHQ5lXMbQoh16y0vYAb-0ulWNIv8YI5HMKwc,8349
 jbqt/widgets/multiselect.py,sha256=ucL6QeFHs12DnHAHASMwdOD9YFYu4x4NDCYa6Pl41HM,7328
 jbqt/widgets/simple.py,sha256=pj2PBdR1am7VtPi4jGxsKm5nOLyTwiZV4jCuTd58rpk,1841
 jbqt/widgets/toast.py,sha256=S85PgcydbmICnjSY5VR6KUG_UZv4UERjvE_mP_zE9GA,1179
 jbqt/widgets/widget_utils.py,sha256=IEVg60rJ6hL0_9wre7j-_aprg-fccNZhwwOtbVEmHvw,2525
-jbqt-0.1.16.dist-info/METADATA,sha256=w4GgzEmkvlAPj0BhqiV1FD12BVNXMEnDQyOhBCOFTyQ,544
-jbqt-0.1.16.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-jbqt-0.1.16.dist-info/RECORD,,
+jbqt-0.1.18.dist-info/METADATA,sha256=LuBD7VrwmWKKUeaDh81szdCSGcoC38FmX_SaUXPy7s0,544
+jbqt-0.1.18.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+jbqt-0.1.18.dist-info/RECORD,,