qpuiq 0.11__tar.gz → 0.13__tar.gz

{qpuiq-0.11 → qpuiq-0.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qpuiq
-Version: 0.11
+Version: 0.13
 Summary: "PUI" Python Declarative UI Framework
 Home-page: https://github.com/buganini/PUI
 Author: Buganini Chiu
@@ -17,8 +17,23 @@ PUI doesn't do UI itself, it turns imperative UI libraries into reactive/declara
 [CPPUI: Experimental C++ Version](https://github.com/buganini/CPPUI)
 
 # Installation
-```
+``` shell
 pip install QPUIQ
+
+# Optional, for hot-reload
+pip install jurigged
+
+# Optional, for PySide6 backend
+pip install PySide6
+
+# Optional, for textual backend
+pip install textual
+
+# Optional, for wxPython backend
+pip install wxPython
+
+# Optional, for flet backend
+pip install flet
 ```
 
 # Get Started

{qpuiq-0.11 → qpuiq-0.13}/PUI/PySide6/base.py

@@ -72,6 +72,19 @@ class QtPUIView(PUIView):
             self.qt_params[k] = v
         return self
 
+class EventFilter(QtCore.QObject):
+    def __init__(self):
+        super().__init__()
+        self.node = None
+
+    def eventFilter(self, obj, event):
+        node = self.node.get_node()
+        if event.type() == QtCore.QEvent.DragEnter:
+            return node.handleDragEnterEvent(event)
+        elif event.type() == QtCore.QEvent.Drop:
+            return node.handleDropEvent(event)
+        return super().eventFilter(obj, event)
+
 class QtBaseWidget(PUINode):
     pui_terminal = True
 
@@ -89,6 +102,12 @@ class QtBaseWidget(PUINode):
     def update(self, prev=None):
         super().update(prev)
 
+        if prev:
+            self.eventFilter = prev.eventFilter
+        else:
+            self.eventFilter = EventFilter()
+        self.eventFilter.node = self
+
         sizePolicy = self.ui.sizePolicy()
         if self.layout_width is not None:
             sizePolicy.setHorizontalPolicy(QtWidgets.QSizePolicy.Preferred)
@@ -102,6 +121,29 @@ class QtBaseWidget(PUINode):
 
         _apply_params(self.ui, self)
 
+    def postUpdate(self):
+        if self.ui:
+            if self._onDropped:
+                self.ui.setAcceptDrops(True)
+                self.ui.installEventFilter(self.eventFilter)
+            else:
+                self.ui.setAcceptDrops(False)
+        super().postUpdate()
+
+    def handleDragEnterEvent(self, event):
+        if self._onDragEntered:
+            self._onDragEntered[0](event, *self._onDragEntered[1], **self._onDragEntered[2])
+        else:
+            event.setDropAction(QtCore.Qt.CopyAction)
+            event.accept()
+
+    def handleDropEvent(self, event):
+        if self._onDropped:
+            self._onDropped[0](event, *self._onDropped[1], **self._onDropped[2])
+        else:
+            print("Dropped", event)
+            event.ignore()
+
     def qtSizeHint(self):
         node = self.get_node()
         if not node.ui:

{qpuiq-0.11 → qpuiq-0.13}/PUI/PySide6/table.py

@@ -49,8 +49,45 @@ class QtTableModelAdapter(QtCore.QAbstractTableModel):
         return self.model.columnCount()
 
 
+class QtTableNodeModelAdapter(QtCore.QAbstractTableModel):
+    def __init__(self, children):
+        super().__init__()
+        self.children = children
+
+    def data(self, index, role):
+        if role == QtCore.Qt.DisplayRole:
+            data = self.children[index.row()].children[index.column()].data
+            if isinstance(data, BaseBinding):
+                return str(data.value)
+            return data
+        return None
+
+    def setData(self, index, value, role):
+        if role == QtCore.Qt.EditRole:
+            n = self.children[index.row()].children[index.column()]
+            if isinstance(n.data, BaseBinding):
+                n.data.value = value
+            else:
+                n._set(value)
+            return True
+
+    def flags(self, index):
+        flags = super().flags(index)
+        n = self.children[index.row()].children[index.column()]
+        if isinstance(n.data, BaseBinding) or n._set_callback:
+            flags |= QtCore.Qt.ItemIsEditable
+        return flags
+
+    def rowCount(self, index):
+        return len(self.children)
+
+    def columnCount(self, index):
+        if self.children:
+            return len(self.children[0].children)
+        return 0
+
 class Table(QtBaseWidget):
-    def __init__(self, model, autofit=True):
+    def __init__(self, model=None, autofit=True):
         super().__init__()
         self.layout_weight = 1
         self.model = model
@@ -67,23 +104,44 @@ class Table(QtBaseWidget):
             self.curr_model = Prop()
             self.ui = QtWidgets.QTableView()
 
-        if self.model.columnHeader is None:
-            self.ui.horizontalHeader().hide()
-        else:
-            self.ui.horizontalHeader().show()
+        if self.model:
+            if self.model.columnHeader is None:
+                self.ui.horizontalHeader().hide()
+            else:
+                self.ui.horizontalHeader().show()
 
-        if self.model.rowHeader is None:
-            self.ui.verticalHeader().hide()
-        else:
-            self.ui.verticalHeader().show()
+            if self.model.rowHeader is None:
+                self.ui.verticalHeader().hide()
+            else:
+                self.ui.verticalHeader().show()
 
-        if self.curr_model.set(self.model):
-            self.qt_model = QtTableModelAdapter(self.model)
-            self.ui.setModel(self.qt_model)
+            if self.curr_model.set(self.model):
+                self.qt_model = QtTableModelAdapter(self.model)
+                self.ui.setModel(self.qt_model)
+            else:
+                self.qt_model.refresh()
         else:
-            self.qt_model.refresh()
+            self.ui.horizontalHeader().hide()
+            self.ui.verticalHeader().hide()
+            self.qt_model = QtTableNodeModelAdapter(self.children)
+            self.ui.setModel(self.qt_model)
 
         if self.autofit:
             self.ui.resizeColumnsToContents()
 
         super().update(prev)
+
+class TableNode(PUINode):
+    def __init__(self, data=""):
+        super().__init__()
+        self._set_callback = None
+        self.data = data
+
+    def set(self, cb, *args, **kwargs):
+        self._set_callback = (cb, args, kwargs)
+        return self
+
+    def _set(self, data):
+        if self._set_callback:
+            cb, args, kwargs = self._set_callback
+            cb(data, *args, **kwargs)

qpuiq-0.13/PUI/PySide6/tree.py

@@ -0,0 +1,280 @@
+from .. import *
+from .base import *
+from PySide6.QtCore import Qt, QModelIndex, QAbstractItemModel
+
+class QAbstractItemModelAdapter(QtCore.QAbstractItemModel):
+    def __init__(self, model: "BaseTreeAdapter"):
+        super().__init__()
+        self.model = model
+        self.node = None
+
+    def index(self, row, column, parent = QtCore.QModelIndex()):
+        parent_node = parent.internalPointer() if parent.isValid() else None
+        if 0 <= row and row < self.model.rowCount(parent_node):
+            child = self.model.child(parent_node, row)
+            return self.createIndex(row, column, child)
+        return QtCore.QModelIndex()
+
+    def flags(self, index):
+        if not index.isValid():
+            return QtCore.Qt.ItemIsDropEnabled
+
+        defaultFlags = super().flags(index)
+
+        return defaultFlags | QtCore.Qt.ItemIsDragEnabled | QtCore.Qt.ItemIsDropEnabled
+
+    def canDropMimeData(self, data, action, row, column, parent):
+        if parent.isValid():
+            pass
+        else:
+            return bool(self.node._onDropped)
+
+    def dropMimeData(self, data, action, row, column, parent):
+        if parent.isValid():
+            pass
+        else:
+            event = QtGui.QDropEvent(QtCore.QPoint(0,0), action, data, QtCore.Qt.MouseButton.LeftButton, QtCore.Qt.KeyboardModifier.NoModifier, QtCore.QEvent.Drop)
+            self.node._onDropped[0](event, *self.node._onDropped[1], **self.node._onDropped[2])
+
+    def parent(self, index):
+        if not index.isValid():
+            return QModelIndex()
+        node = index.internalPointer()
+        parent_node = self.model.parent(node)
+        if parent_node:
+            return self.createIndex(0, 0, parent_node)
+        return QModelIndex()
+
+    def data(self, index, role):
+        if not index.isValid():
+            return None
+        node = index.internalPointer()
+        if role == QtCore.Qt.DisplayRole:
+            return self.model.data(node)
+        return None
+
+    def rowCount(self, parent):
+        parent_node = parent.internalPointer() if parent.isValid() else None
+        return self.model.rowCount(parent_node)
+
+    def columnCount(self, parent):
+        return 1
+
+    def hasChildren(self, parent):
+        parent_node = parent.internalPointer() if parent.isValid() else None
+        return self.model.rowCount(parent_node) > 0
+
+    def clicked(self, node):
+        self.model.clicked(node)
+
+    def dblclicked(self, node):
+        self.model.dblclicked(node)
+
+    def expanded(self, node):
+        self.model.expanded(node)
+
+    def collapsed(self, node):
+        self.model.collapsed(node)
+
+class QTreeNodeModelAdapter(QtCore.QAbstractItemModel):
+    def __init__(self, rootnode):
+        super().__init__()
+        self.node = None
+        self.rootnode = rootnode
+
+    def index(self, row, column, parent = QtCore.QModelIndex()):
+        parent_node = parent.internalPointer() if parent.isValid() else self.rootnode
+        if 0 <= row and row < len(parent_node.children):
+            child = parent_node.children[row]
+            return self.createIndex(row, column, child)
+        return QtCore.QModelIndex()
+
+    def flags(self, index):
+        if not index.isValid():
+            return QtCore.Qt.ItemIsDropEnabled
+
+        defaultFlags = super().flags(index)
+
+        return defaultFlags | QtCore.Qt.ItemIsDragEnabled | QtCore.Qt.ItemIsDropEnabled
+
+    def canDropMimeData(self, data, action, row, column, parent):
+        if parent.isValid():
+            pass
+        else:
+            return bool(self.node._onDropped)
+
+    def dropMimeData(self, data, action, row, column, parent):
+        if parent.isValid():
+            pass
+        else:
+            event = QtGui.QDropEvent(QtCore.QPoint(0,0), action, data, QtCore.Qt.MouseButton.LeftButton, QtCore.Qt.KeyboardModifier.NoModifier, QtCore.QEvent.Drop)
+            self.node._onDropped[0](event, *self.node._onDropped[1], **self.node._onDropped[2])
+
+    def parent(self, index):
+        if not index.isValid():
+            return QModelIndex()
+        node = index.internalPointer()
+        parent_node = node.parent
+        if not isinstance(parent_node, TreeNode):
+            parent_node = None
+        if parent_node:
+            return self.createIndex(0, 0, parent_node)
+        return QModelIndex()
+
+    def data(self, index, role):
+        if not index.isValid():
+            return None
+        node = index.internalPointer()
+        if role == QtCore.Qt.DisplayRole:
+            return node.data
+        return None
+
+    def rowCount(self, parent):
+        parent_node = parent.internalPointer() if parent.isValid() else self.rootnode
+        return len(parent_node.children)
+
+    def columnCount(self, parent):
+        return 1
+
+    def hasChildren(self, parent):
+        parent_node = parent.internalPointer() if parent.isValid() else self.rootnode
+        return len(parent_node.children) > 0
+
+    def clicked(self, node):
+        node._clicked(None)
+
+    def dblclicked(self, node):
+        node._dblclicked(None)
+
+    def expanded(self, node):
+        node._expanded()
+
+    def collapsed(self, node):
+        node._collapsed()
+
+class Tree(QtBaseWidget):
+    def __init__(self, model=None):
+        super().__init__()
+        self.layout_weight = 1
+        self.model = model
+        self.curr_model = None
+        self.pendings = []
+        self._expand_callback = None
+        self._collapse_callback = None
+
+    def update(self, prev):
+        if prev and prev.ui:
+            self.ui = prev.ui
+            self.qt_model = prev.qt_model
+            self.curr_model = prev.curr_model
+        else:
+            self.qt_model = None
+            self.curr_model = Prop()
+            self.ui = QtWidgets.QTreeView()
+            self.ui.setHeaderHidden(True)
+            self.ui.clicked.connect(self.on_item_clicked)
+            self.ui.doubleClicked.connect(self.on_item_double_clicked)
+            self.ui.expanded.connect(self.on_item_expanded)
+            self.ui.collapsed.connect(self.on_item_collapsed)
+
+        if self.model:
+            if self.curr_model.set(self.model):
+                self.qt_model = QAbstractItemModelAdapter(self.model)
+                self.qt_model.node = self
+                self.ui.setModel(self.qt_model)
+            else:
+                self.qt_model.modelReset.emit()
+        else:
+            if not self.qt_model:
+                self.qt_model = QTreeNodeModelAdapter(self)
+                self.qt_model.node = self
+                self.ui.setModel(self.qt_model)
+            else:
+                self.qt_model.modelReset.emit()
+
+        for pending in self.pendings:
+            pending[0](*pending[1:])
+        self.pendings = []
+
+        super().update(prev)
+
+    def expandAll(self):
+        if self.ui:
+            self.ui.expandAll()
+        else:
+            self.pendings.append([self.expandAll])
+        return self
+
+    def collapseAll(self):
+        if self.ui:
+            self.ui.collapseAll()
+        else:
+            self.pendings.append([self.collapseAll])
+        return self
+
+    def expandable(self, enabled):
+        if self.ui:
+            self.ui.setItemsExpandable(enabled)
+        else:
+            self.pendings.append([self.expandable, enabled])
+        return self
+
+    def expand(self, cb, *args, **kwargs):
+        self._expand_callback = (cb, args, kwargs)
+        return self
+
+    def _expanded(self):
+        if self._expand_callback:
+            cb, args, kwargs = self._expand_callback
+            cb(*args, **kwargs)
+
+    def collapse(self, cb, *args, **kwargs):
+        self._collapse_callback = (cb, args, kwargs)
+        return self
+
+    def _collapsed(self):
+        if self._collapse_callback:
+            cb, args, kwargs = self._collapse_callback
+            cb(*args, **kwargs)
+
+    def on_item_clicked(self, index):
+        treenode = index.internalPointer()
+        self.qt_model.clicked(treenode)
+
+    def on_item_double_clicked(self, index):
+        treenode = index.internalPointer()
+        self.qt_model.dblclicked(treenode)
+
+    def on_item_expanded(self, index):
+        treenode = index.internalPointer()
+        self.qt_model.expanded(treenode)
+
+    def on_item_collapsed(self, index):
+        treenode = index.internalPointer()
+        self.qt_model.collapsed(treenode)
+
+class TreeNode(PUINode):
+    def __init__(self, data=""):
+        super().__init__()
+        self._set_callback = None
+        self.data = data
+        self._expand_callback = None
+        self._collapse_callback = None
+
+    def expand(self, cb, *args, **kwargs):
+        self._expand_callback = (cb, args, kwargs)
+        return self
+
+    def _expanded(self):
+        if self._expand_callback:
+            cb, args, kwargs = self._expand_callback
+            cb(*args, **kwargs)
+
+    def collapse(self, cb, *args, **kwargs):
+        self._collapse_callback = (cb, args, kwargs)
+        return self
+
+    def _collapsed(self):
+        if self._collapse_callback:
+            cb, args, kwargs = self._collapse_callback
+            cb(*args, **kwargs)

{qpuiq-0.11 → qpuiq-0.13}/PUI/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.11"
+__version__ = "0.13"
 
 from .node import *
 from .view import *

{qpuiq-0.11 → qpuiq-0.13}/PUI/node.py

@@ -73,6 +73,8 @@ class PUINode():
         self._onMouseUp = None
         self._onMouseMove = None
         self._onWheel = None
+        self._onDragEntered = None
+        self._onDropped = None
 
         self.ui = None
         self.args = args
@@ -306,6 +308,14 @@ class PUINode():
         self.genKey()
         return self
 
+    def dragEnter(self, callback, *cb_args, **cb_kwargs):
+        self._onDragEntered = callback, cb_args, cb_kwargs
+        return self
+
+    def drop(self, callback, *cb_args, **cb_kwargs):
+        self._onDropped = callback, cb_args, cb_kwargs
+        return self
+
     def click(self, callback, *cb_args, **cb_kwargs):
         self._onClicked = callback, cb_args, cb_kwargs
         return self

{qpuiq-0.11 → qpuiq-0.13}/PUI/state.py

@@ -8,7 +8,10 @@ class DummyBinding():
     def __init__(self, value):
         self.value = value
 
-class AttrBinding():
+class BaseBinding():
+    pass
+
+class AttrBinding(BaseBinding):
     def __init__(self, state, key):
         try:
             self.viewroot = find_puiview()
@@ -52,7 +55,7 @@ class AttrBinding():
             listeners.update(l)
         _notify(getattr(self.state, "_StateObject__pending"), listeners)
 
-class ListBinding():
+class ListBinding(BaseBinding):
     def __init__(self, state, key):
         try:
             self.viewroot = find_puiview()
@@ -93,7 +96,7 @@ class ListBinding():
     def emit(self):
         _notify(getattr(self.state, "_StateList__pending"), getattr(self.state, "_StateList__listeners"))
 
-class DictBinding():
+class DictBinding(BaseBinding):
     def __init__(self, state, key):
         try:
             self.viewroot = find_puiview()

{qpuiq-0.11 → qpuiq-0.13}/QPUIQ.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qpuiq
-Version: 0.11
+Version: 0.13
 Summary: "PUI" Python Declarative UI Framework
 Home-page: https://github.com/buganini/PUI
 Author: Buganini Chiu
@@ -17,8 +17,23 @@ PUI doesn't do UI itself, it turns imperative UI libraries into reactive/declara
 [CPPUI: Experimental C++ Version](https://github.com/buganini/CPPUI)
 
 # Installation
-```
+``` shell
 pip install QPUIQ
+
+# Optional, for hot-reload
+pip install jurigged
+
+# Optional, for PySide6 backend
+pip install PySide6
+
+# Optional, for textual backend
+pip install textual
+
+# Optional, for wxPython backend
+pip install wxPython
+
+# Optional, for flet backend
+pip install flet
 ```
 
 # Get Started

{qpuiq-0.11 → qpuiq-0.13}/README.md

@@ -7,8 +7,23 @@ PUI doesn't do UI itself, it turns imperative UI libraries into reactive/declara
 [CPPUI: Experimental C++ Version](https://github.com/buganini/CPPUI)
 
 # Installation
-```
+``` shell
 pip install QPUIQ
+
+# Optional, for hot-reload
+pip install jurigged
+
+# Optional, for PySide6 backend
+pip install PySide6
+
+# Optional, for textual backend
+pip install textual
+
+# Optional, for wxPython backend
+pip install wxPython
+
+# Optional, for flet backend
+pip install flet
 ```
 
 # Get Started

qpuiq-0.11/PUI/PySide6/tree.py

@@ -1,120 +0,0 @@
-from .. import *
-from .base import *
-from PySide6.QtCore import Qt, QModelIndex, QAbstractItemModel
-
-class QAbstractItemModelAdapter(QtCore.QAbstractItemModel):
-    def __init__(self, model: "BaseTreeAdapter"):
-        super().__init__()
-        self.model = model
-
-    def index(self, row, column, parent = QtCore.QModelIndex()):
-        parent_node = parent.internalPointer() if parent.isValid() else None
-        if 0 <= row and row < self.model.rowCount(parent_node):
-            child = self.model.child(parent_node, row)
-            return self.createIndex(row, column, child)
-        return QtCore.QModelIndex()
-
-    def parent(self, index):
-        if not index.isValid():
-            return QModelIndex()
-        node = index.internalPointer()
-        parent_node = self.model.parent(node)
-        if parent_node:
-            return self.createIndex(0, 0, parent_node)
-        return QModelIndex()
-
-    def data(self, index, role):
-        if not index.isValid():
-            return None
-        node = index.internalPointer()
-        if role == QtCore.Qt.DisplayRole:
-            return self.model.data(node)
-        return None
-
-    def rowCount(self, parent):
-        parent_node = parent.internalPointer() if parent.isValid() else None
-        return self.model.rowCount(parent_node)
-
-    def columnCount(self, parent):
-        return 1
-
-    def hasChildren(self, parent):
-        parent_node = parent.internalPointer() if parent.isValid() else None
-        return self.model.rowCount(parent_node) > 0
-
-
-class Tree(QtBaseWidget):
-    def __init__(self, model):
-        super().__init__()
-        self.layout_weight = 1
-        self.model = model
-        self.curr_model = None
-        self.pendings = []
-
-    def update(self, prev):
-        if prev and prev.ui:
-            self.ui = prev.ui
-            self.qt_model = prev.qt_model
-            self.curr_model = prev.curr_model
-        else:
-            self.qt_model = None
-            self.curr_model = Prop()
-            self.ui = QtWidgets.QTreeView()
-            self.ui.setHeaderHidden(True)
-            self.ui.clicked.connect(self.on_item_clicked)
-            self.ui.doubleClicked.connect(self.on_item_double_clicked)
-            self.ui.expanded.connect(self.on_item_expanded)
-            self.ui.collapsed.connect(self.on_item_collapsed)
-
-        if self.curr_model.set(self.model):
-            self.qt_model = QAbstractItemModelAdapter(self.model)
-            self.ui.setModel(self.qt_model)
-        else:
-            self.qt_model.modelReset.emit()
-
-        for pending in self.pendings:
-            pending[0](*pending[1:])
-        self.pendings = []
-
-        super().update(prev)
-
-    def expandAll(self):
-        if self.ui:
-            self.ui.expandAll()
-        else:
-            self.pendings.append([self.expandAll])
-        return self
-
-    def collapseAll(self):
-        if self.ui:
-            self.ui.collapseAll()
-        else:
-            self.pendings.append([self.collapseAll])
-        return self
-
-    def expandable(self, enabled):
-        if self.ui:
-            self.ui.setItemsExpandable(enabled)
-        else:
-            self.pendings.append([self.expandable, enabled])
-        return self
-
-    def on_item_clicked(self, index):
-        node = self.get_node()
-        treenode = index.internalPointer()
-        node.model.clicked(treenode)
-
-    def on_item_double_clicked(self, index):
-        node = self.get_node()
-        treenode = index.internalPointer()
-        node.model.dblclicked(treenode)
-
-    def on_item_expanded(self, index):
-        node = self.get_node()
-        treenode = index.internalPointer()
-        node.model.expanded(treenode)
-
-    def on_item_collapsed(self, index):
-        node = self.get_node()
-        treenode = index.internalPointer()
-        node.model.collapsed(treenode)