qpuiq 0.17__tar.gz → 0.19__tar.gz

{qpuiq-0.17/qpuiq.egg-info → qpuiq-0.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qpuiq
-Version: 0.17
+Version: 0.19
 Summary: "PUI" Python Declarative UI Framework
 Home-page: https://github.com/buganini/PUI
 Author: Buganini Chiu
@@ -213,38 +213,29 @@ Then PUI will take care of view update [(code)](https://github.com/buganini/PUI/
     * no canvas
 
 # Documents
-* [Components Reference](REFERENCE.md)
-* [Sizing Strategy](https://html-preview.github.io/?url=https://github.com/buganini/PUI/blob/main/doc/Sizing.html)
+* [Components Reference](https://buganini.github.io/PUI/doc/Reference.html)
+* [Layout Strategy](https://buganini.github.io/PUI/doc/Layout.html)
 
 # Used by
-* https://github.com/buganini/kikit-ui
+* https://github.com/buganini/Kikakuka
 * https://github.com/solvcon/modmesh
 
 # TODO
-* Merge node and view
 * Dump with layout parameters and add test cases
 * [Toga](https://beeware.org/project/projects/libraries/toga/)
-* [ISSUE] textual layout sizing (cookbook scroll example)
 * [ISSUE] flet layout sizing (cookbook scroll example)
 * nested state trigger
     * set state in PUIView __init__
     * set state in setup() ?
 * Tabs(`tabposition`)
 * Lazy List
-* StateObject decorator
 * UI Flow
     * Navigation Stack
     * View Router
     * Model Window/Dialog
 * Layout
-    * ZBox
     * SwiftUI style overlay ??
 * Canvas
-    * Rect
     * Arc
-    * Image
     * ...
-* Table
-* Tree
-* Dialog
 * State with Pydantic support?

{qpuiq-0.17 → qpuiq-0.19}/PUI/PySide6/base.py

@@ -132,17 +132,17 @@ class QtBaseWidget(PUINode):
 
     def handleDragEnterEvent(self, event):
         if self._onDragEntered:
-            self._onDragEntered[0](event, *self._onDragEntered[1], **self._onDragEntered[2])
+            return self._onDragEntered[0](event, *self._onDragEntered[1], **self._onDragEntered[2])
         else:
-            event.setDropAction(QtCore.Qt.CopyAction)
-            event.accept()
+            event.ignore()
+            return True
 
     def handleDropEvent(self, event):
         if self._onDropped:
-            self._onDropped[0](event, *self._onDropped[1], **self._onDropped[2])
+            return self._onDropped[0](event, *self._onDropped[1], **self._onDropped[2])
         else:
-            print("Dropped", event)
             event.ignore()
+            return False
 
     def qtSizeHint(self):
         node = self.get_node()
@@ -162,7 +162,11 @@ class QtBaseWidget(PUINode):
             self.qt_params[k] = v
         return self
 
-class QtBaseLayout(PUINode):
+class QtBaseLayout(QtBaseWidget):
+    pui_terminal = False
+    container_x = False
+    container_y = False
+
     def __init__(self):
         super().__init__()
         self.qt_params = {}
@@ -178,11 +182,7 @@ class QtBaseLayout(PUINode):
         return self.layout
 
     def destroy(self, direct):
-        if direct:
-            if self.ui:
-                self.ui.deleteLater()
         self.layout = None
-        self.ui = None
         super().destroy(direct)
 
     def update(self, prev=None):
@@ -192,7 +192,6 @@ class QtBaseLayout(PUINode):
             self.mounted_children = []
 
         super().update(prev)
-        _apply_params(self.ui, self)
 
     def addChild(self, idx, child):
         from .modal import Modal
@@ -222,19 +221,22 @@ class QtBaseLayout(PUINode):
             self.mounted_children.pop(idx)
 
     def postUpdate(self):
-        super().postUpdate()
+        if self.ui:
+            if self._onDropped:
+                self.ui.setAcceptDrops(True)
+                self.ui.installEventFilter(self.eventFilter)
+            else:
+                self.ui.setAcceptDrops(False)
 
-        for i, child in enumerate(self.mounted_children):
-            child = child.get_node()
-            self.mounted_children[i] = child.get_node()
+        super().postUpdate()
 
-            weight = child.layout_weight
-            self.qtlayout.setStretch(i, weight if weight else 0)
+        if self.container_x or self.container_y:
+            for i, child in enumerate(self.mounted_children):
+                child = child.get_node()
+                self.mounted_children[i] = child.get_node()
 
-    def qt(self, **kwargs):
-        for k,v in kwargs.items():
-            self.qt_params[k] = v
-        return self
+                weight = child.layout_weight
+                self.qtlayout.setStretch(i, weight if weight else 0)
 
 class QtBaseFrame(QtBaseWidget):
     pui_terminal = False

{qpuiq-0.17 → qpuiq-0.19}/PUI/PySide6/canvas.py

@@ -80,6 +80,12 @@ class PUIQtCanvas(QtWidgets.QWidget):
             self.update()
 
 class ImageResource():
+    @staticmethod
+    def load(path):
+        ir = ImageResource()
+        ir.qimage = QImage(path)
+        return ir
+
     def crop(self, x, y, width, height):
         ir = ImageResource()
         ir.qimage = self.qimage.copy(x, y, width, height)
@@ -315,9 +321,7 @@ class Canvas(QtBaseWidget):
             raise RuntimeError(f"Not implemented: drawShapely({type(shape).__name__}) {dir(shape)}")
 
     def loadImage(self, image_path):
-        ir = ImageResource()
-        ir.qimage = QImage(image_path)
-        return ir
+        return ImageResource.load(image_path)
 
     def drawImage(self, image, x=0, y=0, width=None, height=None, src_x=0, src_y=0, src_width=None, src_height=None, opacity=1.0):
         if image.qimage.isNull():

{qpuiq-0.17 → qpuiq-0.19}/PUI/PySide6/layout.py

@@ -1,7 +1,74 @@
 from .. import *
 from .base import *
 
+class Stack(QtBaseLayout):
+    pui_terminal = False
+    pui_reversed_order = True
+
+    def __init__(self):
+        super().__init__()
+        self.qt_params = {}
+        if not isinstance(self.non_virtual_parent, QtBaseLayout):
+            self.layout_padding = (11,11,11,11)
+
+    @property
+    def outer(self):
+        return self.ui
+
+    @property
+    def inner(self):
+        return self.layout
+
+    def destroy(self, direct):
+        self.layout = None
+        super().destroy(direct)
+
+    def update(self, prev=None):
+        if prev and prev.ui:
+            self.ui = prev.ui
+            self.qtlayout = prev.qtlayout
+        else:
+            self.ui = QtWidgets.QWidget()
+            self.qtlayout = QtWidgets.QStackedLayout()
+            self.qtlayout.setStackingMode(QtWidgets.QStackedLayout.StackAll)
+            self.qtlayout.setContentsMargins(0,0,0,0)
+            self.ui.setLayout(self.qtlayout)
+        super().update(prev)
+
+    def addChild(self, idx, child):
+        from .modal import Modal
+        from .layout import Spacer
+        if isinstance(child, Spacer):
+            pass
+        elif isinstance(child, Modal):
+            pass
+        elif isinstance(child, QtBaseWidget) or isinstance(child, QtBaseLayout):
+            self.qtlayout.insertWidget(idx, child.outer)
+            self.mounted_children.insert(idx, child)
+
+    def removeChild(self, idx, child):
+        from .modal import Modal
+        from .layout import Spacer
+        if isinstance(child, Spacer):
+            pass
+        elif isinstance(child, Modal):
+            pass
+        elif isinstance(child, QtBaseWidget) or isinstance(child, QtBaseLayout):
+            child.outer.setParent(None)
+            self.mounted_children.pop(idx)
+
+    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()
+
 class HBox(QtBaseLayout):
+    container_x = True
     def update(self, prev):
         if prev and prev.ui:
             self.ui = prev.ui
@@ -14,6 +81,7 @@ class HBox(QtBaseLayout):
         super().update(prev)
 
 class VBox(QtBaseLayout):
+    container_y = True
     def update(self, prev):
         if prev and prev.ui:
             self.ui = prev.ui

{qpuiq-0.17 → qpuiq-0.19}/PUI/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.17"
+__version__ = "0.19"
 
 from .node import *
 from .view import *

{qpuiq-0.17 → qpuiq-0.19}/PUI/dom.py

@@ -17,6 +17,8 @@ def sortGridDOMInPlace(dom):
     dom.sort(key=lambda c:(c.grid_row, c.grid_column, c.grid_rowspan, c.grid_columnspan))
 
 def dom_remove_node(dom_parent, dom_offset, child):
+    if DEBUG:
+        print(f"dom_remove_node key={child.key} virtual={child.pui_virtual} children={len(child.children)} dom_parent={dom_parent.key} dom_offset={dom_offset}")
     if child.pui_virtual:
         ret = [child]
         for c in child.children:
@@ -49,15 +51,30 @@ def sync(node, dom_parent, dom_offset, oldVDOM, newVDOM, depth=0):
     if node.pui_grid_layout:
         sortGridDOMInPlace(oldVDOM)
         sortGridDOMInPlace(newVDOM)
+    else:
+        oldOrdered = [c for c in oldVDOM if not c.pui_outoforder]
+        oldOutOfOrdered = [c for c in oldVDOM if c.pui_outoforder]
+        newOrdered = [c for c in newVDOM if not c.pui_outoforder]
+        newOutOfOrdered = [c for c in newVDOM if c.pui_outoforder]
+
+        if node.pui_reversed_order:
+            oldOrdered.reverse()
+            newOrdered.reverse()
+
+        oldVDOM.clear()
+        oldVDOM.extend(oldOrdered + oldOutOfOrdered)
+        newVDOM.clear()
+        newVDOM.extend(newOrdered + newOutOfOrdered)
 
     if DEBUG:
         print(f"{(depth+1)*'    '}===OLD===")
         for c in oldVDOM:
-            print(f"{(depth+1)*'    '}{c.key} virtual={c.pui_virtual} ui={c.ui}")
+            print(f"{(depth+1)*'    '}{c.key} virtual={c.pui_virtual} children={len(c.children)} ui={c.ui}")
 
         print(f"{(depth+1)*'    '}===NEW===")
         for c in newVDOM:
-            print(f"{(depth+1)*'    '}{c.key} virtual={c.pui_virtual}")
+            print(f"{(depth+1)*'    '}{c.key} virtual={c.pui_virtual} children={len(c.children)}")
+        print(f"{(depth+1)*'    '}=========")
 
     oldVMap = [x.key for x in oldVDOM]
     newVMap = [x.key for x in newVDOM]
@@ -213,13 +230,18 @@ def sync(node, dom_parent, dom_offset, oldVDOM, newVDOM, depth=0):
             break # finish
 
     # Step 4. trim removed trail
+    if DEBUG:
+        print(f"{(depth+1)*'    '}S4. TRIM")
     nl = len(newVDOM)
+    if DEBUG:
+        print(f"{(depth+1)*'    '}S4. TRIM", f"dom_offset={dom_offset}", len(oldVDOM), "=>", len(newVDOM))
     while len(oldVDOM) > nl:
         old = oldVDOM.pop(nl)
+        print(f"{(depth+2)*'    '}", f"key={old.key} virtual={old.pui_virtual} children={len(old.children)}")
         oldVMap.pop(nl)
         nodes = dom_remove_node(dom_parent, dom_offset + nl, old)
         dom_children_num -= len([n for n in nodes if not n.pui_virtual and not n.pui_outoforder])
-        toBeDeleted.extend(nodes)
+        toBeDeleted.append(old)
 
     for c in newVDOM:
         c.postUpdate()

{qpuiq-0.17 → qpuiq-0.19}/PUI/flet/__init__.py

@@ -2,6 +2,7 @@ from .application import *
 from .button import *
 from .canvas import *
 from .checkbox import *
+from .divider import *
 from .label import *
 from .layout import *
 from .progressbar import *

qpuiq-0.19/PUI/flet/divider.py

@@ -0,0 +1,14 @@
+from .. import *
+from .base import *
+
+class Divider(FBase):
+    def update(self, prev):
+        if prev and prev.ui:
+            self.ui = prev.ui
+            try:
+                self.ui.update()
+            except:
+                pass
+        else:
+            self.ui = ft.Divider()
+        self.ui.expand = self.layout_weight

{qpuiq-0.17 → qpuiq-0.19}/PUI/node.py

@@ -27,6 +27,9 @@ class PUINode():
     # Menu and window-like UI elements, are out-of-order, so they are moved to the end of siblings before DOM syncing to simplify the process
     pui_outoforder = False
 
+    # When enabled, children are added in reverse order, used by Stack
+    pui_reversed_order = False
+
     # Used by PUIView
     pui_isview = False
 

{qpuiq-0.17 → qpuiq-0.19}/README.md

@@ -196,38 +196,29 @@ Then PUI will take care of view update [(code)](https://github.com/buganini/PUI/
     * no canvas
 
 # Documents
-* [Components Reference](REFERENCE.md)
-* [Sizing Strategy](https://html-preview.github.io/?url=https://github.com/buganini/PUI/blob/main/doc/Sizing.html)
+* [Components Reference](https://buganini.github.io/PUI/doc/Reference.html)
+* [Layout Strategy](https://buganini.github.io/PUI/doc/Layout.html)
 
 # Used by
-* https://github.com/buganini/kikit-ui
+* https://github.com/buganini/Kikakuka
 * https://github.com/solvcon/modmesh
 
 # TODO
-* Merge node and view
 * Dump with layout parameters and add test cases
 * [Toga](https://beeware.org/project/projects/libraries/toga/)
-* [ISSUE] textual layout sizing (cookbook scroll example)
 * [ISSUE] flet layout sizing (cookbook scroll example)
 * nested state trigger
     * set state in PUIView __init__
     * set state in setup() ?
 * Tabs(`tabposition`)
 * Lazy List
-* StateObject decorator
 * UI Flow
     * Navigation Stack
     * View Router
     * Model Window/Dialog
 * Layout
-    * ZBox
     * SwiftUI style overlay ??
 * Canvas
-    * Rect
     * Arc
-    * Image
     * ...
-* Table
-* Tree
-* Dialog
 * State with Pydantic support?

{qpuiq-0.17 → qpuiq-0.19/qpuiq.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qpuiq
-Version: 0.17
+Version: 0.19
 Summary: "PUI" Python Declarative UI Framework
 Home-page: https://github.com/buganini/PUI
 Author: Buganini Chiu
@@ -213,38 +213,29 @@ Then PUI will take care of view update [(code)](https://github.com/buganini/PUI/
     * no canvas
 
 # Documents
-* [Components Reference](REFERENCE.md)
-* [Sizing Strategy](https://html-preview.github.io/?url=https://github.com/buganini/PUI/blob/main/doc/Sizing.html)
+* [Components Reference](https://buganini.github.io/PUI/doc/Reference.html)
+* [Layout Strategy](https://buganini.github.io/PUI/doc/Layout.html)
 
 # Used by
-* https://github.com/buganini/kikit-ui
+* https://github.com/buganini/Kikakuka
 * https://github.com/solvcon/modmesh
 
 # TODO
-* Merge node and view
 * Dump with layout parameters and add test cases
 * [Toga](https://beeware.org/project/projects/libraries/toga/)
-* [ISSUE] textual layout sizing (cookbook scroll example)
 * [ISSUE] flet layout sizing (cookbook scroll example)
 * nested state trigger
     * set state in PUIView __init__
     * set state in setup() ?
 * Tabs(`tabposition`)
 * Lazy List
-* StateObject decorator
 * UI Flow
     * Navigation Stack
     * View Router
     * Model Window/Dialog
 * Layout
-    * ZBox
     * SwiftUI style overlay ??
 * Canvas
-    * Rect
     * Arc
-    * Image
     * ...
-* Table
-* Tree
-* Dialog
 * State with Pydantic support?

{qpuiq-0.17 → qpuiq-0.19}/qpuiq.egg-info/SOURCES.txt

@@ -44,6 +44,7 @@ PUI/flet/base.py
 PUI/flet/button.py
 PUI/flet/canvas.py
 PUI/flet/checkbox.py
+PUI/flet/divider.py
 PUI/flet/label.py
 PUI/flet/layout.py
 PUI/flet/progressbar.py