gtk-stream 0.13.5__tar.gz → 0.14__tar.gz

{gtk_stream-0.13.5 → gtk_stream-0.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: gtk-stream
-Version: 0.13.5
+Version: 0.14
 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.5 → gtk_stream-0.14}/gtk_stream/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.13.5'
-__version_tuple__ = version_tuple = (0, 13, 5)
+__version__ = version = '0.14'
+__version_tuple__ = version_tuple = (0, 14)

{gtk_stream-0.13.5 → gtk_stream-0.14}/gtk_stream/application.py

@@ -89,6 +89,9 @@ class GtkStreamApp(Gtk.Application):
         if id is not None:
             self.named_widgets[id] = w
 
+    def wait_for_init(self):
+        self.attrs_set.acquire()
+        
     def set_attrs(self, attrs):
         for name, val in attrs.items():
             set_parse_prop(self, self, name, val)
@@ -138,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.5 → gtk_stream-0.14}/gtk_stream/command_line.py

@@ -93,8 +93,5 @@ function GTK.receive() {
         parser_thread = threading.Thread(target = parser_main, daemon = True)
         parser_thread.start()
 
-        # When the parser parses the 'application' tag, it sets the
-        # application attributes, and releases the semaphore so the
-        # application can start
-        app.attrs_set.acquire() 
+        app.wait_for_init()
         app.run()

{gtk_stream-0.13.5 → gtk_stream-0.14}/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.5 → gtk_stream-0.14}/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.5 → gtk_stream-0.14}/gtk_stream/documents/classes/Document.py

@@ -42,6 +42,8 @@ class Document:
             val = v(self.app)
             self.app.logger.debug("Setting property '%s' to '%s' in widget %s", p, val, self.__class__)
             w.set_property(p, val)
+        if self.id:
+            w.set_property("name", self.id)
         w.insert_child = lambda d: self.insert_child(w, d)
     def render(self):
         w = self.render_raw()
@@ -49,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.5 → gtk_stream-0.14}/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.5 → gtk_stream-0.14}/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.5 → gtk_stream-0.14}/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.5 → gtk_stream-0.14}/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.5 → gtk_stream-0.14}/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.5 → gtk_stream-0.14}/gtk_stream.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: gtk-stream
-Version: 0.13.5
+Version: 0.14
 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/