gtk-stream 0.13.6__py3-none-any.whl → 0.14.1__py3-none-any.whl

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/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/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/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/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/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/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/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/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/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/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.dist-info → gtk_stream-0.14.1.dist-info}/METADATA

@@ -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.dist-info → gtk_stream-0.14.1.dist-info}/RECORD

@@ -1,31 +1,31 @@
 gtk_stream/__init__.py,sha256=y6JLknVFexWrSo_Zl7-TXrPR6EQ5XVMeFO1bUzLN9Lg,98
-gtk_stream/_version.py,sha256=zzSYUoANo8Flx9JbASsXdKUFyreIjmnWWP8bU7b8Jvk,413
-gtk_stream/application.py,sha256=Apdizg7fHimXhjCwR2SyTwEzRYqvpOEXlxS4g64hWeU,5571
+gtk_stream/_version.py,sha256=2Ctgubb5b_lxFG2ixV07ZYKw5eto45wRlKsBIObkGsg,413
+gtk_stream/application.py,sha256=1C0AsqemyV2VX_z7C7PWH6eYlQ0Q5jo7PAFjolaO0HM,5562
 gtk_stream/command_line.py,sha256=57slfbV-EUWVI8bsA50IzmCLqNjN9aZpz8J8Gtituro,3105
 gtk_stream/common.py,sha256=2USRh42DmmxtPO1y8gpeU0hMuHfhcqJBPuxtvd46YHg,2112
 gtk_stream/parser.py,sha256=lt1cHYwhrd0SwSQfbxtbK6NdwbnFmgeBDIeNY0eepwc,5709
 gtk_stream/properties.py,sha256=DCcRCP3REdfWDkPEVUsNHi1b2XxXU5toL3pf_SxmqQ4,4039
 gtk_stream/documents/__init__.py,sha256=cMWSmjD2_5oJ2EoSk3Jy9-LPeAGKDIidYNRJvqUzdU8,856
-gtk_stream/documents/classes/Box.py,sha256=TIxRLO0_SjRpE3soimHuNE0q4jDbU_BUCpcuspSPAzg,1382
-gtk_stream/documents/classes/Button.py,sha256=21bVI7DUWmiusboxdsimTgcqKtLqzQydhS9ifIt4R64,1512
-gtk_stream/documents/classes/Document.py,sha256=8N90bTSL5qYFUvoVhb8NAgZCAN1idomWZEXMrf17D1o,2425
-gtk_stream/documents/classes/Dropdown.py,sha256=8fIUX1HCWIjUfKLPy9NYsW6OskhkontoNDTsCZ7qKxw,2446
+gtk_stream/documents/classes/Box.py,sha256=3GUaeG4kZks0NPUJT4JmwVCAJJ3aXtNvtG3b1xv2-iE,1411
+gtk_stream/documents/classes/Button.py,sha256=UbFi3FeJzpfBCAArtlnmmkcB24kpEyCmpCORnGuKJsc,1520
+gtk_stream/documents/classes/Document.py,sha256=MnKQs3L9yANSOPaYv3hRfocsRZjsK_Kl4epmIIqF97s,2548
+gtk_stream/documents/classes/Dropdown.py,sha256=yMK1f-Jko36nILPlpgH9-bAlaBRXORGFn4Tk5Z7RzTM,2482
 gtk_stream/documents/classes/Entry.py,sha256=KcBwjSu4tI30bQxPlSFSLPxFEUbTaqAdoAzd0XSQciY,1112
-gtk_stream/documents/classes/FlowBox.py,sha256=UoVYS2j_osOV-IgbVoaqluTBCiaXus5dq2e9qhAu2Xo,1225
-gtk_stream/documents/classes/Frame.py,sha256=zAZvsT-YTZMijsgk7p0YVf6siAmFoCCSXouZo9XDpsA,1222
-gtk_stream/documents/classes/Grid.py,sha256=jDJ9U1GJZ45hi1VvPsCwFILN7CwEkgjqYqhTzMdtX9o,1249
+gtk_stream/documents/classes/FlowBox.py,sha256=R6HOf_k2Dgl43JDk_ErA-jK-YM8EsPnu3T46-fXoEic,1246
+gtk_stream/documents/classes/Frame.py,sha256=2clm6-Ww7aYWHlSEMmAU6zB1mvi0KJtXV9zWft1NSJ0,1243
+gtk_stream/documents/classes/Grid.py,sha256=QgEGnPXecHg0E7Sb5d1aMPNyf319u6z0wYtnLlcqLTM,1253
 gtk_stream/documents/classes/Label.py,sha256=bBNBTvGs6fM8uLf4EDb2Ro8FmCeS27cnU1Ao-44nRYs,1023
 gtk_stream/documents/classes/Paned.py,sha256=q1goKJMWBg1d3hS0eanPBxzBqLB-Pz5hUnH9N-RXXh8,1392
 gtk_stream/documents/classes/Picture.py,sha256=p84N1ntCHu47O84m48zC8uKFgso3-38yXpPlAjr4IKU,1153
 gtk_stream/documents/classes/ProgressBar.py,sha256=NPJtP3qaKiZUEAYEHZk4FEoWSFn2KVorI2SVb8cDnW0,966
 gtk_stream/documents/classes/Scale.py,sha256=6rW6sBCdpPaqgDEGUPZi5UR8CT3bPmaZQqXXhnl-oaw,1124
-gtk_stream/documents/classes/ScrolledWindow.py,sha256=WaTPgz6GBC-hjH83SQT2OGUdCapHAgO3xEmSMJZ8q70,1041
+gtk_stream/documents/classes/ScrolledWindow.py,sha256=SIn_AWtE96QcbTHwNAgYqB0qO_KAjxQlZVkqpJjqypE,1045
 gtk_stream/documents/classes/Separator.py,sha256=uw_EgAKs_6pNA8nrOLzruIlJfk4uaogB0p_jeoY0PHM,960
-gtk_stream/documents/classes/Stack.py,sha256=icg1TOlCD0IFPv_42uMa7jHbEAgEnuELrTEbnTKiPgU,1568
+gtk_stream/documents/classes/Stack.py,sha256=diZyuBLwuCjn_WE3wx5MBgHN_ty6WXSsyIFRVAbe8yI,1572
 gtk_stream/documents/classes/Switch.py,sha256=jQVuxqS9Pmpp1ymB_dbJPxasJNpm4e35ry0JYPHdAsk,1275
 gtk_stream/documents/classes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-gtk_stream-0.13.6.dist-info/METADATA,sha256=hQPjDI84xGVp-c_lr3T5TZewh_M8w_HHW2DSDsmPpuo,807
-gtk_stream-0.13.6.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-gtk_stream-0.13.6.dist-info/entry_points.txt,sha256=PmhKTb4MMQM6dN2HJcoDSMI8L0lZIFIlFn-BgdfPDpo,60
-gtk_stream-0.13.6.dist-info/top_level.txt,sha256=vE9zfHGe9Ke7FSe0wBK2WYJI-BpcQNu6xDC3Cu5O8rQ,11
-gtk_stream-0.13.6.dist-info/RECORD,,
+gtk_stream-0.14.1.dist-info/METADATA,sha256=B4eL7_HTd7ln0PsJXOL1-DY8nHs6OdHQH7frU0Bhi-8,807
+gtk_stream-0.14.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+gtk_stream-0.14.1.dist-info/entry_points.txt,sha256=PmhKTb4MMQM6dN2HJcoDSMI8L0lZIFIlFn-BgdfPDpo,60
+gtk_stream-0.14.1.dist-info/top_level.txt,sha256=vE9zfHGe9Ke7FSe0wBK2WYJI-BpcQNu6xDC3Cu5O8rQ,11
+gtk_stream-0.14.1.dist-info/RECORD,,