gtk-stream 0.13.6__tar.gz → 0.14.1__tar.gz

{gtk_stream-0.13.6 → gtk_stream-0.14.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: gtk-stream
-Version: 0.13.6
+Version: 0.14.1
 Summary: A simple stream-oriented GUI protocol
 Author-email: Marc Coiffier <marc.coiffier@univ-grenoble-alpes.fr>
 Project-URL: Homepage, https://coiffier.net/projects/gtk-stream/

{gtk_stream-0.13.6 → gtk_stream-0.14.1}/gtk_stream/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.13.6'
-__version_tuple__ = version_tuple = (0, 13, 6)
+__version__ = version = '0.14.1'
+__version_tuple__ = version_tuple = (0, 14, 1)

{gtk_stream-0.13.6 → gtk_stream-0.14.1}/gtk_stream/application.py

@@ -141,7 +141,7 @@ class GtkStreamApp(Gtk.Application):
     @app_message('remove')
     def remove_widget(self, id):
         w = self.named_widgets[id]
-        w.get_parent().remove(w)
+        w.remove_self()
 
     @app_message('insert', multiple_store)
     def insert_widgets(self, documents, into):

{gtk_stream-0.13.6 → gtk_stream-0.14.1}/gtk_stream/documents/classes/Box.py

@@ -29,10 +29,12 @@ class Box(Document):
     def render_raw(self):
         return Gtk.Box()
     def insert_child(self, w, d):
+        child = d.render_in(w)
         if isinstance(d, BoxPrepend):
             if d.after != None:
-                w.insert_child_after(d.render(), self.app.named_widgets[d.after])
+                w.insert_child_after(child, self.app.named_widgets[d.after])
             else:
-                w.prepend(d.render())
+                w.prepend(child)
         else:
-            w.append(d.render())
+            w.append(child)
+            

{gtk_stream-0.13.6 → gtk_stream-0.14.1}/gtk_stream/documents/classes/Button.py

@@ -26,7 +26,7 @@ class Button(Document):
         self.connect_event(button, 'clicked', 'clicked')
         return button
     def insert_child(self, w, d):
-        w.set_child(d.render())
+        w.set_child(d.render_in(w))
 
 class LinkButton(Button):
     __g_class__ = Gtk.LinkButton
@@ -39,4 +39,4 @@ class LinkButton(Button):
             retval = True)
         return button
     def insert_child(self, w, d):
-        w.set_child(d.render())
+        w.set_child(d.render_in(w))

{gtk_stream-0.13.6 → gtk_stream-0.14.1}/gtk_stream/documents/classes/Document.py

@@ -51,6 +51,10 @@ class Document:
         for child in self.children:
             self.insert_child(w, child)
         return w
+    def render_in(self, w):
+        ret = self.render()
+        ret.remove_self = lambda: w.remove(ret)
+        return ret
     
     def insert_child(self, w, child):
         raise Exception("Unimplemented method 'insert_child'")

{gtk_stream-0.13.6 → gtk_stream-0.14.1}/gtk_stream/documents/classes/Dropdown.py

@@ -18,10 +18,11 @@ from ... import Gtk, Gio, GObject
 from .. import Document
 
 class Item(Document):
-    def __init__(self, app, value, **kwargs):
+    def __init__(self, app, value, key = None, **kwargs):
         super().__init__(app, **kwargs)
         self.child = None
         self.value = value
+        self.key = key if key != None else value
     def add_child(self, child):
         self.child = child
     def render(self):
@@ -31,6 +32,7 @@ class _ItemObject(GObject.Object):
         super().__init__()
         self.doc = doc
         self.value = doc.value
+        self.key = doc.key
 
     @GObject.Property(type=str)
     def item_value(self):
@@ -41,29 +43,27 @@ class Dropdown(Document):
     def __init__(self, app, id, **kwargs):
         super().__init__(app, id=id, **kwargs)
     def render_raw(self):
-        model = Gio.ListStore(item_type=_ItemObject)
-        for item in self.children:
-            model.append(_ItemObject(item))
+        self.model = Gio.ListStore(item_type=_ItemObject)
 
         factory = Gtk.SignalListItemFactory()
         def on_list_setup(_, list_item):
-            list_item.item_value = None
+            list_item.item_key = None
         def on_list_bind(_, list_item):
             item = list_item.get_item()
-            if list_item.item_value != item.value:
-                list_item.item_value = item.value
+            if list_item.item_key != item.key:
+                list_item.item_key = item.key
                 list_item.set_child(item.doc.render())
         factory.connect("setup", on_list_setup)
         factory.connect("bind", on_list_bind)
 
         ret = Gtk.DropDown(
-            model=model,
+            model=self.model,
             expression=Gtk.PropertyExpression.new(_ItemObject, None, 'item_value'),
             factory=factory)
         
         self.connect_event(
             ret, 'notify::selected-item', 'selected',
-            get_data = lambda w,_: w.get_selected_item().value)
+            get_data = lambda w,_: w.get_selected_item().key)
         return ret
     def insert_child(self, w, d):
-        pass
+        self.model.append(_ItemObject(d))

{gtk_stream-0.13.6 → gtk_stream-0.14.1}/gtk_stream/documents/classes/FlowBox.py

@@ -28,7 +28,8 @@ class FlowBox(Document):
     def render_raw(self):
         return Gtk.FlowBox()
     def insert_child(self, w, d):
+        child = d.render_in(w)
         if isinstance(d, FlowBoxPrepend):
-            w.prepend(d.render())
+            w.prepend(child)
         else:
-            w.append(d.render())
+            w.append(child)

{gtk_stream-0.13.6 → gtk_stream-0.14.1}/gtk_stream/documents/classes/Frame.py

@@ -28,7 +28,8 @@ class Frame(Document):
     def render_raw(self):
         return Gtk.Frame()
     def insert_child(self, w, d):
+        child = d.render_in(w)
         if isinstance(d, FrameLabel):
-            w.set_label_widget(d.render())
+            w.set_label_widget(child)
         else:
-            w.set_child(d.render())
+            w.set_child(child)

{gtk_stream-0.13.6 → gtk_stream-0.14.1}/gtk_stream/documents/classes/Grid.py

@@ -33,4 +33,4 @@ class Grid(Document):
     def render_raw(self):
         return Gtk.Grid()
     def insert_child(self, w, d):
-        w.attach(d.render(), d.x, d.y, d.w, d.h)
+        w.attach(d.render_in(w), d.x, d.y, d.w, d.h)

{gtk_stream-0.13.6 → gtk_stream-0.14.1}/gtk_stream/documents/classes/ScrolledWindow.py

@@ -24,4 +24,4 @@ class ScrolledWindow(Document):
     def render_raw(self):
         return Gtk.ScrolledWindow()
     def insert_child(self, w, d):
-        w.set_child(d.render())
+        w.set_child(d.render_in(w))

{gtk_stream-0.13.6 → gtk_stream-0.14.1}/gtk_stream/documents/classes/Stack.py

@@ -38,7 +38,7 @@ class Stack(Document):
     def render_raw(self):
         return Gtk.Stack()
     def insert_child(self, w, d):
-        child = d.render()
+        child = d.render_in(w)
         w.add_child(child)
         if isinstance(d, StackPage):
             page = w.get_page(child)

{gtk_stream-0.13.6 → gtk_stream-0.14.1}/gtk_stream.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: gtk-stream
-Version: 0.13.6
+Version: 0.14.1
 Summary: A simple stream-oriented GUI protocol
 Author-email: Marc Coiffier <marc.coiffier@univ-grenoble-alpes.fr>
 Project-URL: Homepage, https://coiffier.net/projects/gtk-stream/