qpuiq 0.15__tar.gz → 0.17__tar.gz

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

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

{qpuiq-0.15 → qpuiq-0.17}/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():

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

@@ -73,10 +73,25 @@ class PUIQtCanvas(QtWidgets.QWidget):
 
         node.width = self.geometry().width()
         node.height = self.geometry().height()
-        node.painter(node, *node.args)
-
+        immediate = node.painter(node, *node.args)
         node.qpainter.end()
         node.qpainter = None
+        if immediate:
+            self.update()
+
+class ImageResource():
+    def crop(self, x, y, width, height):
+        ir = ImageResource()
+        ir.qimage = self.qimage.copy(x, y, width, height)
+        return ir
+
+    def scale(self, width, height, keepAspectRatio=True, quality=0):
+        ir = ImageResource()
+        method = {
+            0: QtCore.Qt.TransformationMode.FastTransformation
+        }.get(quality, QtCore.Qt.TransformationMode.SmoothTransformation)
+        ir.qimage = self.qimage.scaled(width, height, QtCore.Qt.AspectRatioMode.KeepAspectRatio if keepAspectRatio else QtCore.Qt.IgnoreAspectRatio, method)
+        return ir
 
 class Canvas(QtBaseWidget):
     def __init__(self, painter, *args):
@@ -300,16 +315,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 +337,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)

{qpuiq-0.15 → qpuiq-0.17}/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)

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

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

{qpuiq-0.15 → qpuiq-0.17}/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

{qpuiq-0.15 → qpuiq-0.17}/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)

{qpuiq-0.15 → qpuiq-0.17}/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

{qpuiq-0.15 → qpuiq-0.17}/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()

{qpuiq-0.15 → qpuiq-0.17}/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:

{qpuiq-0.15 → qpuiq-0.17}/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

{qpuiq-0.15 → qpuiq-0.17}/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)

{qpuiq-0.15 → qpuiq-0.17}/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 → qpuiq-0.17/qpuiq.egg-info}/PKG-INFO

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