qpuiq 0.15__py3-none-any.whl → 0.16__py3-none-any.whl

PUI/PySide6/base.py

@@ -186,6 +186,11 @@ class QtBaseLayout(PUINode):
         super().destroy(direct)
 
     def update(self, prev=None):
+        if prev and prev.ui:
+            self.mounted_children = prev.mounted_children
+        else:
+            self.mounted_children = []
+
         super().update(prev)
         _apply_params(self.ui, self)
 
@@ -194,6 +199,7 @@ class QtBaseLayout(PUINode):
         from .layout import Spacer
         if isinstance(child, Spacer):
             self.qtlayout.insertItem(idx, child.outer)
+            self.mounted_children.insert(idx, child)
         elif isinstance(child, Modal):
             pass
         elif isinstance(child, QtBaseWidget) or isinstance(child, QtBaseLayout):
@@ -201,16 +207,29 @@ class QtBaseLayout(PUINode):
             if not child.layout_weight is None:
                 params["stretch"] = child.layout_weight
             self.qtlayout.insertWidget(idx, child.outer, **params)
+            self.mounted_children.insert(idx, child)
 
     def removeChild(self, idx, child):
         from .modal import Modal
         from .layout import Spacer
         if isinstance(child, Spacer):
             self.qtlayout.removeItem(child.outer)
+            self.mounted_children.pop(idx)
         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):
+        super().postUpdate()
+
+        for i, child in enumerate(self.mounted_children):
+            child = child.get_node()
+            self.mounted_children[i] = child.get_node()
+
+            weight = child.layout_weight
+            self.qtlayout.setStretch(i, weight if weight else 0)
 
     def qt(self, **kwargs):
         for k,v in kwargs.items():

PUI/PySide6/canvas.py

@@ -78,6 +78,12 @@ class PUIQtCanvas(QtWidgets.QWidget):
         node.qpainter.end()
         node.qpainter = None
 
+class ImageResource():
+    def scale(self, width, height):
+        ir = ImageResource()
+        ir.qimage = self.qimage.scaled(width, height)
+        return ir
+
 class Canvas(QtBaseWidget):
     def __init__(self, painter, *args):
         super().__init__()
@@ -300,16 +306,18 @@ class Canvas(QtBaseWidget):
             raise RuntimeError(f"Not implemented: drawShapely({type(shape).__name__}) {dir(shape)}")
 
     def loadImage(self, image_path):
-        return QImage(image_path)
+        ir = ImageResource()
+        ir.qimage = QImage(image_path)
+        return ir
 
     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():
+        if image.qimage.isNull():
             return
 
         if src_width is None:
-            src_width = image.width() - src_x
+            src_width = image.qimage.width() - src_x
         if src_height is None:
-            src_height = image.height() - src_y
+            src_height = image.qimage.height() - src_y
 
         source_rect = QtCore.QRect(src_x, src_y, src_width, src_height)
 
@@ -320,5 +328,5 @@ class Canvas(QtBaseWidget):
 
         dest_rect = QtCore.QRect(x, y, width, height)
         self.qpainter.setOpacity(opacity)
-        self.qpainter.drawImage(dest_rect, image, source_rect)
+        self.qpainter.drawImage(dest_rect, image.qimage, source_rect)
         self.qpainter.setOpacity(1.0)

PUI/PySide6/textfield.py

@@ -35,7 +35,7 @@ class TextField(QtBaseWidget):
 
         super().update(prev)
 
-    def on_editing_finished(self):
+    def on_editing_finished(self): # finish editing
         node = self.get_node()
         node.editing = False
         value = self.ui.text()
@@ -51,14 +51,12 @@ class TextField(QtBaseWidget):
         self._change(e)
         node.ui.clearFocus()
 
-    def on_textchanged(self):
+    def on_textchanged(self): # editing
         node = self.get_node()
+        self.editing = True
         value = self.ui.text()
         if node.edit_model:
-            node.editing = True
             node.edit_model.value = value
-        else:
-            node.model.value = value
         e = PUIEvent()
         e.value = value
         self._input(e)

PUI/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.15"
+__version__ = "0.16"
 
 from .node import *
 from .view import *

PUI/flet/textfield.py

@@ -30,19 +30,17 @@ class TextField(FBase):
 
         super().update(prev)
 
-    def on_textbox_changed(self, e):
+    def on_textbox_changed(self, e): # editing
         node = self.get_node()
+        node.editing = True
         value = e.control.value
         if node.edit_model:
-            node.editing = True
             node.edit_model.value = value
-        else:
-            node.model.value = value
         e = PUIEvent()
         e.value = value
         self._input(e)
 
-    def on_change(self, e):
+    def on_change(self, e): # finish editing
         node = self.get_node()
         node.editing = False
         value = e.control.value

PUI/textual/application.py

@@ -22,10 +22,10 @@ class PUITextualApp(App):
         event.radio_button.puinode.get_node()._changed(event.value)
 
     def on_input_changed(self, event: Input.Changed) -> None:
-        event.input.puinode.get_node()._changed(event.value)
+        event.input.puinode.get_node()._tchanged(event.value)
 
     def on_input_submitted(self, event: Input.Submitted) -> None:
-        event.input.puinode.get_node()._submitted(event.value)
+        event.input.puinode.get_node()._tsubmitted(event.value)
 
     def on_checkbox_changed(self, event: Checkbox.Changed) -> None:
         event.checkbox.puinode.get_node()._changed(event.value)

PUI/textual/textfield.py

@@ -11,16 +11,20 @@ class TextField(TBase):
 
     def update(self, prev):
         model_value = str(self.model.value)
+
         if prev and prev.ui:
             self.editing = prev.editing
             self.ui = prev.ui
             self.curr_value = prev.curr_value
+            self.changing = prev.changing
 
             if self.curr_value.set(model_value) and not self.editing:
+                self.changing = True # block changed event from next line
                 self.ui.value = model_value
         else:
             self.ui = widgets.Input(model_value)
             self.curr_value = Prop(model_value)
+            self.changing = True # block changed event from initialization
 
         if self.edit_model and not self.editing:
             self.edit_model.value = model_value
@@ -28,19 +32,19 @@ class TextField(TBase):
         self.ui.puinode = self
         super().update(prev)
 
-
-    def _changed(self, value):
+    def _tchanged(self, value): # editing
+        if self.changing:
+            self.changing = False
+            return
         node = self.get_node()
+        node.editing = True
         if node.edit_model:
-            node.editing = True
             node.edit_model.value = value
-        else:
-            node.model.value = value
         e = PUIEvent()
         e.value = value
         self._input(e)
 
-    def _submitted(self, value):
+    def _tsubmitted(self, value): # finish editing
         node = self.get_node()
         node.editing = False
         node.model.value = value

PUI/tkinter/textfield.py

@@ -30,16 +30,14 @@ class TextField(TkBaseWidget):
 
         super().update(prev)
 
-    def on_variable_changed(self, var, index, mode):
+    def on_variable_changed(self, var, index, mode): # editing
         node = self.get_node()
+        node.editing = True
         if node.edit_model:
-            node.editing = True
             node.edit_model.value = self.variable.get()
-        else:
-            node.model.value = self.variable.get()
         self._input()
 
-    def on_change(self):
+    def on_change(self): # finish editing
         node = self.get_node()
         node.editing = False
         value = self.variable.get()

PUI/wx/base.py

@@ -193,9 +193,9 @@ class WxBaseLayout(WXBase):
 
             weight = child.layout_weight
             if self.container_x and child.expand_x:
-                si.SetProportion(weight if weight else 1 if child.expand_x  else 0)
+                si.SetProportion(weight if weight else 1 if child.expand_x else 0)
             elif self.container_y and child.expand_y:
-                si.SetProportion(weight if weight else 1 if child.expand_y  else 0)
+                si.SetProportion(weight if weight else 1 if child.expand_y else 0)
 
             p = 0
             if child.layout_padding:

PUI/wx/progressbar.py

@@ -2,6 +2,8 @@ from .. import *
 from .base import *
 
 class ProgressBar(WxBaseWidget):
+    expand_x_prio = 1
+
     def __init__(self, progress, maximum=1):
         super().__init__()
         self.progress = progress

PUI/wx/textfield.py

@@ -21,10 +21,11 @@ class TextField(WxBaseWidget):
                 self.ui.SetValue(model_value)
         else:
             self.curr_value = Prop(model_value)
-            self.ui = wx.TextCtrl(getWindow(self.parent))
+            self.ui = wx.TextCtrl(getWindow(self.parent), style=wx.TE_PROCESS_ENTER)
             self.ui.SetValue(model_value)
             self.ui.Bind(wx.EVT_TEXT, self.on_textchanged)
             self.ui.Bind(wx.EVT_KILL_FOCUS, self.on_kill_focus)
+            self.ui.Bind(wx.EVT_TEXT_ENTER, self.on_enter)
 
         self.ui.SetMinSize((self.layout_width, self.layout_height))
 
@@ -33,7 +34,17 @@ class TextField(WxBaseWidget):
 
         super().update(prev)
 
-    def on_textchanged(self, *args):
+    def on_enter(self, event):
+        from .window import Window
+        p = self.parent
+        while p:
+            if isinstance(p, Window):
+                p.panel.SetFocus()
+                break
+            p = p.parent
+        event.Skip()
+
+    def on_textchanged(self, event): # editing
         node = self.get_node()
         node.editing = True
         value = self.ui.GetValue()
@@ -43,15 +54,13 @@ class TextField(WxBaseWidget):
         e.value = value
         self._input(e)
 
-    def on_kill_focus(self, *args):
+    def on_kill_focus(self, event): # finish editing
         node = self.get_node()
+        node.editing = False
         value = self.ui.GetValue()
         node.model.value = value
         if node.edit_model:
-            node.editing = True
             node.edit_model.value = value
-        else:
-            node.model.value = value
         e = PUIEvent()
         e.value = value
         self._change(e)

PUI/wx/window.py

@@ -16,15 +16,21 @@ class Window(WxBaseWidget):
         self.fullscreen = fullscreen
         self.curr_fullscreen = None
 
+    @property
+    def inner(self):
+        return self.panel
+
     def update(self, prev=None):
         if prev and prev.ui:
             self.ui = prev.ui
+            self.panel = prev.panel
             self.curr_icon = prev.curr_icon
             self.curr_size = prev.curr_size
             self.curr_maximize = prev.curr_maximize
             self.curr_fullscreen = prev.curr_fullscreen
         else:
             self.ui = wx.Frame(None)
+            self.panel = wx.Panel(self.ui) # to grab focus when clicked
             self.curr_icon = Prop()
             self.curr_size = Prop()
             self.curr_maximize = Prop()

{qpuiq-0.15.dist-info → qpuiq-0.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qpuiq
-Version: 0.15
+Version: 0.16
 Summary: "PUI" Python Declarative UI Framework
 Home-page: https://github.com/buganini/PUI
 Author: Buganini Chiu

{qpuiq-0.15.dist-info → qpuiq-0.16.dist-info}/RECORD

@@ -1,4 +1,4 @@
-PUI/__init__.py,sha256=2Jbb5tT35Wh-P7iIVZvi104eGc8KVBOYVdQa0Yj5EhU,966
+PUI/__init__.py,sha256=3BShn__8Wpr8flOXyM3C8xPyT7q-6XN_X1TTWZYNKyw,966
 PUI/common.py,sha256=fUJmHOu5lSCeiOhFDF6YqulJxFqWmsneqnDZ2kZFFmM,581
 PUI/decorator.py,sha256=BN3POYv69QCDomoHENN-UA-d4wY_vfARIb5RJ2qEnS8,483
 PUI/dom.py,sha256=RgdDyv6vSFgkCoj9G2cjzQQOiymG8DwmmSoAZfxYvJM,10141
@@ -10,9 +10,9 @@ PUI/utils.py,sha256=canb7_Uz0sQ1UZDzyDuIsfAVXzEfZCkc9F81sMY4rTE,505
 PUI/view.py,sha256=Oe6sXLHD554GnlLlO5QpY7kegngkzrmMEYRHrdzGZUQ,4623
 PUI/PySide6/__init__.py,sha256=z895ldBVUaEqfGQW4CvYhWh2F6L0qGQA1MXUHVMf9Ms,1110
 PUI/PySide6/application.py,sha256=OsIE47efST4I13txD-7rS1cTWAGhynckl45Wdb1bafk,1471
-PUI/PySide6/base.py,sha256=bhIxbw16l78lgkSpN4_s2cV33pObj3O3yGhtiNIJ10w,7916
+PUI/PySide6/base.py,sha256=zhRrm5vDkieIXTEKpBRkVjSxfm0yBW-yMrqoMDw0Gvg,8564
 PUI/PySide6/button.py,sha256=mHfcH98dABYgksuT58fK0amSwtCM9aaYwr7Y2EArEJA,561
-PUI/PySide6/canvas.py,sha256=Qad87bLpQJoh8U5hjqH3g3mSbodPwweT0TOqnB5LPyI,10416
+PUI/PySide6/canvas.py,sha256=NpfyW0YpRQ9wWpWwKuMKRDPWBDXVdCIAg7QJcXPoNaM,10657
 PUI/PySide6/checkbox.py,sha256=Rsns0BleE4g9yTDdlsD8IADU3qcQkVO2VsFVvYlNL88,900
 PUI/PySide6/combobox.py,sha256=4FvMt8D9MSyGk_oNHZ0jDuop7A-dkrxEesUXMdKghuw,2503
 PUI/PySide6/dialog.py,sha256=4rAyLMqd47ALDxrBGLFHS5FD75SP1I8tkMSKBdaPkv0,2364
@@ -31,7 +31,7 @@ PUI/PySide6/splitter.py,sha256=ObjcC8UgkAL7o-xXhi4XIkDEKhC4s5Ukk7tKMNa023Q,797
 PUI/PySide6/tab.py,sha256=tMkhEfD4Wb_7Hs4-u4nOzm87GSHqmehcnwcFm24qRIg,953
 PUI/PySide6/table.py,sha256=TTCMf_YNKmkFiqs_qLqw3qbvFsxoBNnz9VMObx_2l3s,4800
 PUI/PySide6/text.py,sha256=4kRRZiuH-bLLJMNZ6hK9zAWOorsG-l4uujHbG6I5S20,1069
-PUI/PySide6/textfield.py,sha256=Us-UZMDCwrREwFLjPKKa3e3c_1U4WWD2kzFCe3xiY0k,2140
+PUI/PySide6/textfield.py,sha256=mjaQErUTqJ1VUeWXLfzoInTbCuKICX5o-tXAAQQS04s,2112
 PUI/PySide6/toolbar.py,sha256=NPkn99D5xK4RLBA0vxLD7EqYu5eh9ucCL2y1vSJWQl4,1800
 PUI/PySide6/tree.py,sha256=skMsCykh8kWXFTg4Yv--PevJ58fqEeZV566ICjBVO4E,9324
 PUI/PySide6/window.py,sha256=8_Y1DV_KobKeh5TS4VP9MV1hluz7pJr8jNakTVyrQlM,2845
@@ -48,10 +48,10 @@ PUI/flet/radiobutton.py,sha256=IrgP_SvOImhZvFAZ6ZeAXv6KTUw3bEaGAIsxfODiO9I,830
 PUI/flet/scroll.py,sha256=B2IKoE6yo5CB8BykH_wAh3hbEavTnboYtajdknpp3b4,2212
 PUI/flet/tab.py,sha256=T26PZ-Ma_LPUx7u9qbxEnYqxuR1-qlytWiB9TDpu7G8,997
 PUI/flet/text.py,sha256=HGnhOTDwG5pqceK8x_C6wCZj1AKuqZ9vEZB_NFwXZo4,1465
-PUI/flet/textfield.py,sha256=7BPRrdf4pv8rDM5BpZzMQ9b456kZpXm81y7sVW3K4XM,1802
+PUI/flet/textfield.py,sha256=1N3WwKrDkTkQGtA8pNAXeSL-CZhfpg1TDYhFFjbhnL0,1774
 PUI/flet/window.py,sha256=NqUnGYvhk2Mpo_G2WthZOEvlU6VMx6AM-jWMKcUqGDM,650
 PUI/textual/__init__.py,sha256=cPf0_BXd2Q-6w-0UHyxFQ6QLfTVDaoo7XmSCW_1kpyc,732
-PUI/textual/application.py,sha256=FNpZ1j05EbE3XNxqMBDfsU_IPQ1k2Y7xw-5KLtwuFnI,2514
+PUI/textual/application.py,sha256=ot7H0RRNf65PU9tF6EU6x2qLq7Yhv9tCA9Q4ZyZ7doo,2516
 PUI/textual/base.py,sha256=W0tfxGlZErrsCoLb9IuFjgmNa93vZFCYNgZr1V6VEjE,4821
 PUI/textual/button.py,sha256=VF7fmgi5mHeOzptZzy4oBfcuCeUURq5eFrLvN4Fgg30,436
 PUI/textual/checkbox.py,sha256=pkBxZz0qXl2KUz2-Lqap-r2Y3DBI0CET3wQgEpYKb7U,518
@@ -62,7 +62,7 @@ PUI/textual/radiobutton.py,sha256=zFKG2LeUnPXnxpxeW3cYqPwd91DQZWFUctundau-4b0,62
 PUI/textual/scroll.py,sha256=u6-tFygXZR_giVsCaePahKxTb0xTbdBHCNisQA9jpWc,1974
 PUI/textual/tab.py,sha256=wcvyH1MZZNwwout8iJDifty_lqe6YuhfRpE3F0lUTBM,2158
 PUI/textual/text.py,sha256=BHvgK3JqBU_LrnWbaaKBFxQ_50Z9lFhcdEJoVJqbcSc,782
-PUI/textual/textfield.py,sha256=u01i-fhtSEMi_6F_bPWgf5TvRUQvuudaxi58Yp6WTbg,1412
+PUI/textual/textfield.py,sha256=SVSOfVcdr0XtI9jyDwWgxDX5umSEbqL7_f7XC76A6Ak,1656
 PUI/textual/window.py,sha256=ygb1txNlo2bjQkKVzSD4UgU2OTzJ-zeEjM0p8wcYZJA,181
 PUI/tkinter/__init__.py,sha256=VQjdak9UO-zI7n9Kr4q_B-kgCXgag2DVoWWP_QdH2uk,982
 PUI/tkinter/application.py,sha256=NxWfU9NHJuceKMdLiGeklUKU5WjYVUomGL_hJpRtrbs,1141
@@ -77,11 +77,11 @@ PUI/tkinter/radiobutton.py,sha256=RBcC9u9v1N5RDTn6GxEwbJr0kYh43j-r7zB6Ic1pIqI,75
 PUI/tkinter/scroll.py,sha256=MhBuGcKRlqiMiNG1I5bI_wCJT4rwLQbB4ViOsXHcdi8,6685
 PUI/tkinter/tab.py,sha256=-1r95U0q3hnSLokD1QU3hsQ2wiDteZ6KZwula7rwbVQ,1426
 PUI/tkinter/text.py,sha256=5IJOD86iodYqUD-lFnLUnD4vYvUw-8wUPoLNq_RuBsA,501
-PUI/tkinter/textfield.py,sha256=-jab7t5-wpIejINRftXczv0685cze-H7pm3lWigOT5w,1788
+PUI/tkinter/textfield.py,sha256=R4YNLfoxC7VSCuAFyVqaqKPTno7fUGO1u5YjkMrQ1Zk,1746
 PUI/tkinter/window.py,sha256=IIieSxxanhGIvPy0krQuLrStsL_jTUdx6TKbEf64nyQ,1606
 PUI/wx/__init__.py,sha256=j8L1kzL4CK_xeF0x5_NZekGETYP_1Dhq3-BuV1LtXoY,391
 PUI/wx/application.py,sha256=Ku_mloCyiw-KTl8a09uTIhV7uupG_7urqw8jXIwQMLc,965
-PUI/wx/base.py,sha256=3NKfMbfuH9qClFBP5bVIQtJyhnGRqsNuXwY0vvlyFnU,7596
+PUI/wx/base.py,sha256=geBeTK_iyBC_0Wj7rK4tX6FZY4i5_MYAU52wERxv3rg,7594
 PUI/wx/button.py,sha256=ww3Iyn16zomP4zkQhvXTirmHBvlVMJxmiV1pfXtgrSo,447
 PUI/wx/canvas.py,sha256=uL4z0ghM15IWNlvmDyV3lVw8Li4RNMJWXHvwd7jZSiw,8487
 PUI/wx/checkbox.py,sha256=XgLxsi-tk2f9bnlEvhvEZV4boBGFB3u62ZE1cs8X9tU,674
@@ -90,14 +90,14 @@ PUI/wx/dialog.py,sha256=HVLVdzRkZhRndkHTYl0RgNfzIQBdtik7DIDg93Dp9JA,2572
 PUI/wx/divider.py,sha256=qnaUVpspAOND6YhZyQsZeos1LC02L-ljfdAtVp1vdzw,516
 PUI/wx/label.py,sha256=qr3hGfHtjvYjeXJSB2cD5u30LYodEzix4Q0FYw8p6p0,509
 PUI/wx/layout.py,sha256=nVO31_Xu4aDcTLxlz66DJ5PK2RPHk0yq6qdzyWuGVz8,1460
-PUI/wx/progressbar.py,sha256=gj5j6f-zG78XW1mEIRqiOEYMoYjG16jzS44Vnh4i148,472
+PUI/wx/progressbar.py,sha256=OXLZRiBy9oYzBiI-mhQhARcoeSoawEa1Ur8b0CjWr2U,495
 PUI/wx/radiobutton.py,sha256=x7WnCGXuNPV98MqF-tRLzMOOExim22rayNL8jAYVZWk,769
 PUI/wx/scroll.py,sha256=pvRmt04XEgObpIgwl9i52Kf1wI9ubUfZM77fPHGW9zU,1494
 PUI/wx/text.py,sha256=YeIyDyHH0xBcD_iXbYSTtvL25YDtug1QJNVPvCSAqEk,544
-PUI/wx/textfield.py,sha256=BmMebfqlDJqacaKdh2SON88xF73l0csC7L7hoNjz-qs,1778
-PUI/wx/window.py,sha256=juAsn3W4SzmH8f5LDGvjwppvPD8fDObRUJ_MkQFKCIE,1847
-qpuiq-0.15.dist-info/licenses/LICENSE.txt,sha256=1Xwik2AmLNGoIYhAPzvNC28M08Q3EvkOe4TtlQuSd_E,1072
-qpuiq-0.15.dist-info/METADATA,sha256=81rbs87gprJ8SDPPbK6UVwCh59ZCQuzkrf32_uGZ2to,5994
-qpuiq-0.15.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-qpuiq-0.15.dist-info/top_level.txt,sha256=zMudhifPite0CEVGYvdi-5W3P_dpum71xjU7_g-ZHS0,4
-qpuiq-0.15.dist-info/RECORD,,
+PUI/wx/textfield.py,sha256=v3cSnmsyBix_G8xFXgZZrNLydlLTA6gQQPpkTdJ29hk,2086
+PUI/wx/window.py,sha256=HBiWRpuhjSS89pjbdlbstjQmfR0mSECTsOPLu7ymLjo,2017
+qpuiq-0.16.dist-info/licenses/LICENSE.txt,sha256=1Xwik2AmLNGoIYhAPzvNC28M08Q3EvkOe4TtlQuSd_E,1072
+qpuiq-0.16.dist-info/METADATA,sha256=FD9q5IlhlI9XqZX3ov-S568x9CRaPNHw2zv5rAyKtYQ,5994
+qpuiq-0.16.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+qpuiq-0.16.dist-info/top_level.txt,sha256=zMudhifPite0CEVGYvdi-5W3P_dpum71xjU7_g-ZHS0,4
+qpuiq-0.16.dist-info/RECORD,,