qpuiq 0.13__tar.gz → 0.14__tar.gz

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

@@ -1,12 +1,19 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: qpuiq
-Version: 0.13
+Version: 0.14
 Summary: "PUI" Python Declarative UI Framework
 Home-page: https://github.com/buganini/PUI
 Author: Buganini Chiu
 Author-email: buganini@b612.tw
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: summary
 
 # What is PUI
 PUI is a reactive/declarative UI framework with two-way data binding.
@@ -205,8 +212,9 @@ Then PUI will take care of view update [(code)](https://github.com/buganini/PUI/
 * textual (Text Mode)
     * no canvas
 
-# Components
-[Reference](REFERENCE.md)
+# Documents
+* [Components Reference](REFERENCE.md)
+* [Sizing Strategy](https://html-preview.github.io/?url=https://github.com/buganini/PUI/blob/main/doc/Sizing.html)
 
 # Used by
 * https://github.com/buganini/kikit-ui

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

@@ -193,20 +193,20 @@ class QtBaseLayout(PUINode):
         from .modal import Modal
         from .layout import Spacer
         if isinstance(child, Spacer):
-            self.layout.insertItem(idx, child.outer)
+            self.qtlayout.insertItem(idx, child.outer)
         elif isinstance(child, Modal):
             pass
         elif isinstance(child, QtBaseWidget) or isinstance(child, QtBaseLayout):
             params = {}
             if not child.layout_weight is None:
                 params["stretch"] = child.layout_weight
-            self.layout.insertWidget(idx, child.outer, **params)
+            self.qtlayout.insertWidget(idx, child.outer, **params)
 
     def removeChild(self, idx, child):
         from .modal import Modal
         from .layout import Spacer
         if isinstance(child, Spacer):
-            self.layout.removeItem(child.outer)
+            self.qtlayout.removeItem(child.outer)
         elif isinstance(child, Modal):
             pass
         elif isinstance(child, QtBaseWidget) or isinstance(child, QtBaseLayout):

{qpuiq-0.13 → qpuiq-0.14}/PUI/PySide6/canvas.py

@@ -2,8 +2,7 @@ from .. import *
 from .base import *
 
 from PySide6 import QtWidgets, QtGui
-from PySide6.QtGui import QPainter, QColor, QPainterPath
-from PySide6.QtCore import QPoint
+from PySide6.QtGui import QPainter, QColor, QPainterPath, QImage
 
 class PUIQtCanvas(QtWidgets.QWidget):
     def __init__(self, node, width=None, height=None):
@@ -46,6 +45,17 @@ class PUIQtCanvas(QtWidgets.QWidget):
         e.x_delta = event.pixelDelta().x()
         e.v_delta = event.angleDelta().y()
         e.h_delta = event.angleDelta().x()
+        modifier = 0
+        emodifiers = event.modifiers()
+        if emodifiers & QtCore.Qt.ShiftModifier:
+            modifier |= KeyModifier.SHIFT
+        if emodifiers & QtCore.Qt.ControlModifier:
+            modifier |= KeyModifier.CTRL
+        if emodifiers & QtCore.Qt.AltModifier:
+            modifier |= KeyModifier.ALT
+        if emodifiers & QtCore.Qt.MetaModifier:
+            modifier |= KeyModifier.META
+        e.modifiers = modifier
         self.node._wheel(e)
 
     def paintEvent(self, event):
@@ -61,6 +71,8 @@ class PUIQtCanvas(QtWidgets.QWidget):
             rect = QtCore.QRect(0, 0, self.width or self.geometry().width(), self.height or self.geometry().height())
             node.qpainter.fillRect(rect, bgBrush)
 
+        node.width = self.geometry().width()
+        node.height = self.geometry().height()
         node.painter(node, *node.args)
 
         node.qpainter.end()
@@ -286,3 +298,27 @@ class Canvas(QtBaseWidget):
             self.drawPolyline(shape.coords, color=stroke, width=width)
         else:
             raise RuntimeError(f"Not implemented: drawShapely({type(shape).__name__}) {dir(shape)}")
+
+    def loadImage(self, image_path):
+        return QImage(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.isNull():
+            return
+
+        if src_width is None:
+            src_width = image.width() - src_x
+        if src_height is None:
+            src_height = image.height() - src_y
+
+        source_rect = QtCore.QRect(src_x, src_y, src_width, src_height)
+
+        if width is None:
+            width = src_width
+        if height is None:
+            height = src_height
+
+        dest_rect = QtCore.QRect(x, y, width, height)
+        self.qpainter.setOpacity(opacity)
+        self.qpainter.drawImage(dest_rect, image, source_rect)
+        self.qpainter.setOpacity(1.0)

{qpuiq-0.13 → qpuiq-0.14}/PUI/PySide6/combobox.py

@@ -24,13 +24,16 @@ class ComboBox(QtBaseWidget):
         super().update(prev)
 
     def postSync(self):
+        index = 0
+        text = ""
+
         if self.index_model:
             index = self.index_model.value
             text = self.children[index].text
         elif self.text_model:
             text = str(self.text_model.value)
             try:
-                index = [c.text for c in self.children].index(text)
+                index = [c.value for c in self.children].index(text)
             except:
                 index = 0
 
@@ -51,11 +54,15 @@ class ComboBox(QtBaseWidget):
     def on_currentIndexChanged(self, idx):
         if self.index_model:
             self.index_model.value = idx
+        if self.text_model:
+            self.text_model.value = self.children[idx].value
         e = PUIEvent()
         e.value = idx
         self._change(e)
 
     def on_currentTextChanged(self, text):
+        if not self.editable:
+            return
         if self.text_model:
             self.text_model.value = text
         e = PUIEvent()
@@ -69,7 +76,10 @@ class ComboBox(QtBaseWidget):
         self.ui.removeItem(idx)
 
 class ComboBoxItem(PUINode):
-    def __init__(self, text):
+    def __init__(self, text, value=None):
         super().__init__()
         self.id(text)
         self.text = text
+        if value is None:
+            value = text
+        self.value = value

{qpuiq-0.13 → qpuiq-0.14}/PUI/PySide6/image.py

@@ -1,5 +1,8 @@
 from .. import *
 from .base import *
+from .label import ClickableQLabel
+from PySide6.QtWidgets import QSizePolicy
+import os
 
 class Image(QtBaseWidget):
     def __init__(self, path):
@@ -10,13 +13,28 @@ class Image(QtBaseWidget):
     def update(self, prev):
         if prev and prev.ui:
             self.ui = prev.ui
+            self.eventFilter = prev.eventFilter
             self.curr_path = prev.curr_path
+            self.curr_path_mtime = prev.curr_path_mtime
             self.pixmap = prev.pixmap
         else:
-            self.ui = QtWidgets.QLabel()
+            self.ui = ClickableQLabel()
+            self.ui.clicked.connect(self._clicked)
             self.curr_path = Prop()
+            self.curr_path_mtime = Prop()
 
-        if self.curr_path.set(self.path):
+        if self._onClicked:
+            self.ui.setCursor(QtCore.Qt.PointingHandCursor)
+
+        if self.layout_weight:
+            # XXX keep aspect ratio
+            self.ui.setScaledContents(True)
+            self.ui.setSizePolicy(QSizePolicy(QSizePolicy.Policy.Ignored, QSizePolicy.Policy.Ignored))
+        else:
+            self.ui.setScaledContents(False)
+            self.ui.setSizePolicy(QSizePolicy(QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Preferred))
+
+        if self.curr_path.set(self.path) or self.curr_path_mtime.set(os.path.getmtime(self.path)):
             self.pixmap = QtGui.QPixmap(self.path)
             if self.layout_width is not None and self.layout_height is not None:
                 self.pixmap = self.pixmap.scaled(self.layout_width, self.layout_height, QtCore.Qt.KeepAspectRatio, mode=QtCore.Qt.SmoothTransformation)

{qpuiq-0.13 → qpuiq-0.14}/PUI/PySide6/layout.py

@@ -5,24 +5,24 @@ class HBox(QtBaseLayout):
     def update(self, prev):
         if prev and prev.ui:
             self.ui = prev.ui
-            self.layout = prev.layout
+            self.qtlayout = prev.qtlayout
         else:
             self.ui = QtWidgets.QWidget()
-            self.layout = QtWidgets.QHBoxLayout()
-            self.layout.setContentsMargins(0,0,0,0)
-            self.ui.setLayout(self.layout)
+            self.qtlayout = QtWidgets.QHBoxLayout()
+            self.qtlayout.setContentsMargins(0,0,0,0)
+            self.ui.setLayout(self.qtlayout)
         super().update(prev)
 
 class VBox(QtBaseLayout):
     def update(self, prev):
         if prev and prev.ui:
             self.ui = prev.ui
-            self.layout = prev.layout
+            self.qtlayout = prev.qtlayout
         else:
             self.ui = QtWidgets.QWidget()
-            self.layout = QtWidgets.QVBoxLayout()
-            self.layout.setContentsMargins(0,0,0,0)
-            self.ui.setLayout(self.layout)
+            self.qtlayout = QtWidgets.QVBoxLayout()
+            self.qtlayout.setContentsMargins(0,0,0,0)
+            self.ui.setLayout(self.qtlayout)
         super().update(prev)
 
 class Spacer(PUINode):

{qpuiq-0.13 → qpuiq-0.14}/PUI/PySide6/tree.py

@@ -2,6 +2,9 @@ from .. import *
 from .base import *
 from PySide6.QtCore import Qt, QModelIndex, QAbstractItemModel
 
+# XXX
+# If click handler triggers a model reset, dblclick handler will not be called
+
 class QAbstractItemModelAdapter(QtCore.QAbstractItemModel):
     def __init__(self, model: "BaseTreeAdapter"):
         super().__init__()
@@ -77,13 +80,12 @@ class QAbstractItemModelAdapter(QtCore.QAbstractItemModel):
         self.model.collapsed(node)
 
 class QTreeNodeModelAdapter(QtCore.QAbstractItemModel):
-    def __init__(self, rootnode):
+    def __init__(self):
         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
+        parent_node = parent.internalPointer() if parent.isValid() else self.node
         if 0 <= row and row < len(parent_node.children):
             child = parent_node.children[row]
             return self.createIndex(row, column, child)
@@ -130,14 +132,14 @@ class QTreeNodeModelAdapter(QtCore.QAbstractItemModel):
         return None
 
     def rowCount(self, parent):
-        parent_node = parent.internalPointer() if parent.isValid() else self.rootnode
+        parent_node = parent.internalPointer() if parent.isValid() else self.node
         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
+        parent_node = parent.internalPointer() if parent.isValid() else self.node
         return len(parent_node.children) > 0
 
     def clicked(self, node):
@@ -167,15 +169,21 @@ class Tree(QtBaseWidget):
             self.ui = prev.ui
             self.qt_model = prev.qt_model
             self.curr_model = prev.curr_model
+
+            self.ui.clicked.disconnect()
+            self.ui.doubleClicked.disconnect()
+            self.ui.expanded.disconnect()
+            self.ui.collapsed.disconnect()
         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)
+
+        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):
@@ -186,11 +194,13 @@ class Tree(QtBaseWidget):
                 self.qt_model.modelReset.emit()
         else:
             if not self.qt_model:
-                self.qt_model = QTreeNodeModelAdapter(self)
+                self.qt_model = QTreeNodeModelAdapter()
                 self.qt_model.node = self
                 self.ui.setModel(self.qt_model)
             else:
-                self.qt_model.modelReset.emit()
+                self.qt_model.beginResetModel()
+                self.qt_model.node = self
+                self.qt_model.endResetModel()
 
         for pending in self.pendings:
             pending[0](*pending[1:])
@@ -239,19 +249,19 @@ class Tree(QtBaseWidget):
 
     def on_item_clicked(self, index):
         treenode = index.internalPointer()
-        self.qt_model.clicked(treenode)
+        self.get_node().qt_model.clicked(treenode)
 
     def on_item_double_clicked(self, index):
         treenode = index.internalPointer()
-        self.qt_model.dblclicked(treenode)
+        self.get_node().qt_model.dblclicked(treenode)
 
     def on_item_expanded(self, index):
         treenode = index.internalPointer()
-        self.qt_model.expanded(treenode)
+        self.get_node().qt_model.expanded(treenode)
 
     def on_item_collapsed(self, index):
         treenode = index.internalPointer()
-        self.qt_model.collapsed(treenode)
+        self.get_node().qt_model.collapsed(treenode)
 
 class TreeNode(PUINode):
     def __init__(self, data=""):

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

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

{qpuiq-0.13 → qpuiq-0.14}/PUI/common.py

@@ -18,3 +18,9 @@ class MouseButton(IntEnum):
     MIDDLE = 4
     X1 = 8
     X2 = 16
+
+class KeyModifier(IntEnum):
+    SHIFT = 1
+    CTRL = 2
+    ALT = 4
+    META = 8

{qpuiq-0.13 → qpuiq-0.14}/PUI/textual/__init__.py

@@ -30,5 +30,6 @@ class DummyWidget(TBase):
 Canvas = DummyWidget
 Combobox = DummyWidget
 ComboboxItem = DummyWidget
+Divider = lambda: None
 
 PUI_BACKEND = "textual"

qpuiq-0.14/PUI/textual/base.py

@@ -0,0 +1,148 @@
+from .. import *
+from textual import widgets, containers
+
+class TBase(PUINode):
+    scroll = False
+    container_x = False # axis
+    container_y = False # axis
+    expand_x_prio = 0
+    expand_y_prio = 0
+    expand_x1_children = 0
+    expand_x2_children = 0
+    expand_x3_children = 0
+    expand_x4_children = 0
+    expand_y1_children = 0
+    expand_y2_children = 0
+    expand_y3_children = 0
+    expand_y4_children = 0
+    cached_tparent = None
+
+    @property
+    def expand_x(self):
+        parent = self.cached_tparent
+        expand = self.expand_x_prio
+        if not parent:
+            return False
+
+        # textual handles 1fr as shrinkable, but we need scrolller's content not to shrink
+        # See Exp.1 in refs/textual_layout.py
+        if parent.scroll:
+            return False
+
+        # textual populates auto(1fr) to be 1fr(1fr), but we require expanding not to go over the container
+        # See Exp.2 in refs/textual_layout.py
+        if not parent.expand_x and expand < 3:
+            return False
+
+        return expand
+
+    @property
+    def expand_y(self):
+        parent = self.cached_tparent
+        expand = self.expand_y_prio
+        if not parent:
+            return False
+
+        # textual handles 1fr as shrinkable, but we need scrolller's content not to shrink
+        # See Exp.1 in refs/textual_layout.py
+        if parent.scroll:
+            return False
+
+        # textual populates auto(1fr) to be 1fr(1fr), but we require expanding not to go over the container
+        # See Exp.2 in refs/textual_layout.py
+        if not parent.expand_y and expand < 3:
+            return False
+
+        return expand
+
+    def tremove(self):
+        self.ui.remove()
+
+    def destroy(self, direct):
+        self.ui.remove()
+        return super().destroy(direct)
+
+    def update(self, prev):
+        super().update(prev)
+
+        self.cached_tparent = parent = self.tparent
+        if parent:
+            if self.layout_weight:
+                if parent.container_x:
+                    self.expand_x_prio = 4
+                if parent.container_y:
+                    self.expand_y_prio = 4
+
+            if self.expand_x_prio >= 1:
+                parent.expand_x1_children += 1
+            if self.expand_x_prio >= 2:
+                parent.expand_x2_children += 1
+            if self.expand_x_prio >= 3:
+                parent.expand_x3_children += 1
+            if self.expand_x_prio >= 4:
+                parent.expand_x4_children += 1
+
+            if self.expand_y_prio >= 1:
+                parent.expand_y1_children += 1
+            if self.expand_y_prio >= 2:
+                parent.expand_y2_children += 1
+            if self.expand_y_prio >= 3:
+                parent.expand_y3_children += 1
+            if self.expand_y_prio >= 4:
+                parent.expand_y4_children += 1
+
+    def postUpdate(self):
+        super().postUpdate()
+        parent = self.cached_tparent
+        if parent:
+            if parent.container_x:
+                if self.expand_x_prio < 1 and parent.expand_x1_children > 0:
+                    self.expand_x_prio = 0
+                if self.expand_x_prio < 2 and parent.expand_x2_children > 0:
+                    self.expand_x_prio = 0
+                if self.expand_x_prio < 3 and parent.expand_x3_children > 0:
+                    self.expand_x_prio = 0
+                if self.expand_x_prio < 4 and parent.expand_x4_children > 0:
+                    self.expand_x_prio = 0
+
+            if parent.container_y:
+                if self.expand_y_prio < 1 and parent.expand_y1_children > 0:
+                    self.expand_y_prio = 0
+                if self.expand_y_prio < 2 and parent.expand_y2_children > 0:
+                    self.expand_y_prio = 0
+                if self.expand_y_prio < 3 and parent.expand_y3_children > 0:
+                    self.expand_y_prio = 0
+                if self.expand_y_prio < 4 and parent.expand_y4_children > 0:
+                    self.expand_y_prio = 0
+
+        self.t_update_layout()
+
+    @property
+    def tparent(self):
+        parent = self.parent
+        while not isinstance(parent, TBase):
+            if parent==parent.parent:
+                parent = None
+                break
+            parent = parent.parent
+        return parent
+
+    def t_update_layout(self):
+        if not self.ui:
+            return
+
+        width = "auto"
+        if self.expand_x:
+            width = "1fr"
+
+        height = "auto"
+        if self.expand_y:
+            height = "1fr"
+
+        if self._debug:
+            print("layout", self.key, f"{width}:{height} expand_x={self.expand_x}", f"expand_y={self.expand_y}", f"expand_x_prio={self.expand_x_prio}", f"expand_y_prio={self.expand_y_prio}")
+        self.ui.styles.width = width
+        self.ui.styles.height = height
+
+class TPUIView(PUIView):
+    pui_virtual = True

{qpuiq-0.13 → qpuiq-0.14}/PUI/textual/label.py

@@ -13,13 +13,12 @@ class Label(TBase):
             self.widget = prev.widget
         else:
             self.ui = containers.Container()
-            self.ui.set_styles("width: auto; height: auto;")
         if self._onClicked:
             if self.widget is None or not isinstance(self.widget, widgets.Button):
                 if self.widget:
                     self.widget.remove()
                 self.widget = widgets.Button(self.text)
-                self.widget.set_styles("height: auto; border-top: none; border-bottom: none;")
+                self.widget.set_styles("border-top: none; border-bottom: none;")
                 self.widget.puinode = self
             else:
                 self.widget.label = self.text
@@ -33,4 +32,5 @@ class Label(TBase):
         super().update(prev)
 
     def postUpdate(self):
+        super().postUpdate()
         self.ui.mount(self.widget)

{qpuiq-0.13 → qpuiq-0.14}/PUI/textual/layout.py

@@ -3,6 +3,8 @@ from .base import *
 
 class VBox(TBase):
     container_y = True
+    expand_x_prio = 1
+    expand_y_prio = 2
     def update(self, prev):
         if prev and prev.ui:
             self.ui = prev.ui
@@ -20,6 +22,8 @@ class VBox(TBase):
 
 class HBox(TBase):
     container_x = True
+    expand_x_prio = 2
+    expand_y_prio = 1
     def update(self, prev):
         if prev and prev.ui:
             self.ui = prev.ui

{qpuiq-0.13 → qpuiq-0.14}/PUI/textual/scroll.py

@@ -4,8 +4,6 @@ import math
 
 class Scroll(TBase):
     END = -0.0
-    weak_expand_x = True
-    weak_expand_y = True
     scroll = True
     def __init__(self, vertical=None, horizontal=False):
         self.vertical = vertical
@@ -19,23 +17,27 @@ class Scroll(TBase):
             self.ui = prev.ui
         else:
             self.ui = containers.ScrollableContainer()
+
         v = "auto"
         self.container_y = True
+        self.expand_y_prio = 3
         if self.vertical is True:
             v = "scroll"
         elif self.vertical is False:
             v = "hidden"
             self.container_y = False
-            self.nweak_expand_y = True # discard weak_expand_x from self
+            self.expand_y_prio = 1
 
         h = "auto"
         self.container_x = True
+        self.expand_x_prio = 3
         if self.horizontal is True:
             h = "scroll"
         elif self.horizontal is False:
             h = "hidden"
             self.container_x = False
-            self.nweak_expand_x = True # discard weak_expand_y from self
+            self.expand_x_prio = 1
+
         self.ui.set_styles(f"overflow-x: {h}; overflow-y: {v};")
 
         super().update(prev)

{qpuiq-0.13 → qpuiq-0.14}/PUI/tkinter/canvas.py

@@ -3,6 +3,9 @@ from .base import *
 import itertools
 class Canvas(TkBaseWidget):
     pui_terminal = True
+    expand_x_prio = 2
+    expand_y_prio = 2
+
     def __init__(self, painter, *args):
         super().__init__()
         self.painter = painter