gtk-stream 0.2.2__py3-none-any.whl → 0.3__py3-none-any.whl

gtk_stream/application.py

@@ -70,11 +70,11 @@ class GtkStreamApp(Gtk.Application):
             w = self.namedWidgets[id]
             w.get_parent().remove(w)
         self.run_when_idle(cb)
-    def appendWidget(self, to, document):
+    def insertWidget(self, to, document):
         def cb():
             if to in self.namedWidgets:
                 w = self.namedWidgets[to]
-                w.attach_child(document)
+                w.insert_child(document)
             else:
                 raise Exception(f"Error: unknown widget id '{to}'")
         self.run_when_idle(cb)

gtk_stream/documents/__init__.py

@@ -1,4 +1,4 @@
-from .classes.Document import Document
+from .classes.Document import Document, PseudoDocument
 
 from .classes.Label import Label
 from .classes.Button import Button, LinkButton
@@ -6,7 +6,7 @@ from .classes.ProgressBar import ProgressBar
 from .classes.Dropdown import Dropdown, Item
 from .classes.Switch import Switch
 
-from .classes.Box import Box
+from .classes.Box import Box, BoxPrepend
 from .classes.Paned import Paned
-from .classes.Frame import Frame
+from .classes.Frame import Frame, FrameLabel
 from .classes.Grid import Grid, Cell

gtk_stream/documents/classes/Box.py

@@ -1,10 +1,21 @@
 from ... import Gtk
-from .. import Document
+from .. import Document, PseudoDocument
+
+class BoxPrepend(PseudoDocument):
+    def __init__(self, app, after = None):
+        super().__init__(app)
+        self.after = after
 
 class Box(Document):
     def __init__(self, app, **kwargs):
         super().__init__(app, **kwargs)
     def render_raw(self):
         return Gtk.Box()
-    def attach_child(self, w, d):
-        w.append(d.render())
+    def insert_child(self, w, d):
+        if isinstance(d, BoxPrepend):
+            if d.after != None:
+                w.insert_child_after(d.render(), self.app.namedWidgets[d.after])
+            else:
+                w.prepend(d.render())
+        else:
+            w.append(d.render())

gtk_stream/documents/classes/Button.py

@@ -9,7 +9,7 @@ class Button(Document):
         button = Gtk.Button()
         button.connect('clicked', printEvent('clicked', self.id))
         return button
-    def attach_child(self, w, d):
+    def insert_child(self, w, d):
         w.set_child(d.render())
 
 class LinkButton(Button):
@@ -19,5 +19,5 @@ class LinkButton(Button):
         button = Gtk.LinkButton()
         button.connect('activate-link', printEvent('clicked', self.id, True))
         return button
-    def attach_child(self, w, d):
+    def insert_child(self, w, d):
         w.set_child(d.render())

gtk_stream/documents/classes/Document.py

@@ -18,13 +18,22 @@ class Document:
         self.app.nameWidget(self.id, w)
         for (p,v) in self.props.items():
             w.set_property(p, v)
-        w.attach_child = lambda d: self.attach_child(w, d)
+        w.insert_child = lambda d: self.insert_child(w, d)
     def render(self):
         w = self.render_raw()
         self.set_properties(w)
         for child in self.children:
-            self.attach_child(w, child)
+            self.insert_child(w, child)
         return w
     
-    def attach_child(self, w, child):
-        raise Exception("Unimplemented method 'attach_child'")
+    def insert_child(self, w, child):
+        raise Exception("Unimplemented method 'insert_child'")
+
+class PseudoDocument(Document):
+    def __init__(self, app):
+        super().__init__(app)
+        self.child = None
+    def add_child(self, child):
+        self.child = child
+    def render(self):
+        return self.child.render()

gtk_stream/documents/classes/Dropdown.py

@@ -44,5 +44,5 @@ class Dropdown(Document):
         
         ret.connect('notify::selected-item', printEvent('selected', self.id, get_data = lambda w,_: w.get_selected_item().value))
         return ret
-    def attach_child(self, w, d):
+    def insert_child(self, w, d):
         pass

gtk_stream/documents/classes/Frame.py

@@ -1,14 +1,17 @@
 from ... import Gtk
-from .. import Document
+from .. import Document, PseudoDocument
+
+class FrameLabel(PseudoDocument):
+    def __init__(self, app):
+        super().__init__(app)
 
 class Frame(Document):
-    def __init__(self, app, label=None, **kwargs):
+    def __init__(self, app, **kwargs):
         super().__init__(app,**kwargs)
-        self.label = label
     def render_raw(self):
-        ret = Gtk.Frame()
-        if self.label != None:
-            ret.set_label(self.label)
-        return ret
-    def attach_child(self, w, d):
-        w.set_child(d.render())
+        return Gtk.Frame()
+    def insert_child(self, w, d):
+        if isinstance(d, FrameLabel):
+            w.set_label_widget(d.render())
+        else:
+            w.set_child(d.render())

gtk_stream/documents/classes/Grid.py

@@ -1,18 +1,13 @@
 from ... import Gtk
-from .. import Document
+from .. import Document, PseudoDocument
 
-class Cell(Document):
+class Cell(PseudoDocument):
     def __init__(self, app, x, y, w="1", h="1"):
         super().__init__(app)
-        self.child = None
         self.x = int(x)
         self.y = int(y)
         self.w = int(w)
         self.h = int(h)
-    def render(self):
-        return self.child.render()
-    def add_child(self, child):
-        self.child = child
 
 class Grid(Document):
     def __init__(self, app, **kwargs):
@@ -20,5 +15,5 @@ class Grid(Document):
 
     def render_raw(self):
         return Gtk.Grid()
-    def attach_child(self, w, d):
+    def insert_child(self, w, d):
         w.attach(d.render(), d.x, d.y, d.w, d.h)

gtk_stream/parser.py

@@ -3,7 +3,7 @@ import signal
 import xml.sax as sax
 
 from . import GLib
-from .documents import Document, Label, Box, Button, ProgressBar, Dropdown, Item, Paned, Frame, Grid, Cell, LinkButton, Switch
+from .documents import Document, Label, Box, Button, ProgressBar, Dropdown, Item, Paned, Frame, Grid, Cell, LinkButton, Switch, FrameLabel, BoxPrepend
 from .application import GtkStreamApp
 
 class _Object:
@@ -13,6 +13,7 @@ WIDGET_DOCUMENTS = {
     'progress-bar': ProgressBar,
     'label': Label,
     'box': Box,
+    'box-prepend': BoxPrepend,
     'button': Button,
     'dropdown': Dropdown,
     'item': Item,
@@ -20,6 +21,7 @@ WIDGET_DOCUMENTS = {
     'grid': Grid,
     'cell': Cell,
     'frame': Frame,
+    'frame-label': FrameLabel,
     'link': LinkButton,
     'switch': Switch
 }
@@ -123,14 +125,14 @@ class GtkStreamXMLHandler(sax.ContentHandler):
                 self.transition_enter = self.transE_final
                 self.transition_leave = self.transL_tag('set-prop', self.transE_message, leave_parent)
                 
-            case 'append':
-                if 'to' in attrs:
+            case 'insert':
+                if 'into' in attrs:
                     children = []
                     def leave():
                         for child in children:
-                            self.app.appendWidget(attrs['to'], child)
+                            self.app.insertWidget(attrs['into'], child)
                     self.transition_enter = self.transE_addChild(lambda child: children.append(child))
-                    self.transition_leave = self.transL_tag('append', self.transE_message, leave_parent, leave)
+                    self.transition_leave = self.transL_tag('insert', self.transE_message, leave_parent, leave)
                 else:
                     raise Exception("Expected 'to' attribute of 'append' message")
 

{gtk_stream-0.2.2.dist-info → gtk_stream-0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gtk-stream
-Version: 0.2.2
+Version: 0.3
 Summary: A simple stream-oriented GUI protocol
 Author-email: Marc Coiffier <marc.coiffier@univ-grenoble-alpes.fr>
 Project-URL: Homepage, https://coiffiem.gricad-pages.univ-grenoble-alpes.fr/gtk-stream/

gtk_stream-0.3.dist-info/RECORD

@@ -0,0 +1,23 @@
+gtk_stream/__init__.py,sha256=pDhUSN4AYNsP8_tilU1zmDCYdiv7ak4PE1TW0qFrDlg,99
+gtk_stream/application.py,sha256=jnVejsyc8EqH6e8XgM2x3mrTAmFY2vIMnRmYO5G9FII,3068
+gtk_stream/command_line.py,sha256=c2ghqIQB5hYxtCszss1z84yKoeRYvaMJJMi4aiTspWg,312
+gtk_stream/common.py,sha256=sEw15nVw9SVp8eLVOB5Zj1JITVhUhCF0i3PSwpd8lis,590
+gtk_stream/parser.py,sha256=GTkh0M6AJFSChn8W62IgcuCLwGt9DW09tvGP2Qjk8jk,6887
+gtk_stream/properties.py,sha256=9bYzvqmUq8EidtBDZdKupLgYM9ucIGyxmahcIp9TxT8,1542
+gtk_stream/documents/__init__.py,sha256=NfRHkr2-hRZjR1pcokLFAM8FZ6sEwfzKg1QA20LAQDE,418
+gtk_stream/documents/classes/Box.py,sha256=8HApUyNBBtX1ErTaAMBNrM1SPueizQFgNoKIkIrFDKw,635
+gtk_stream/documents/classes/Button.py,sha256=Hh7999KPs-9JPV7wu1cWi2J5fjfkTGfajbEqMqvejqE,747
+gtk_stream/documents/classes/Document.py,sha256=CC7XMXbyldPpxU0PgwQIVbxd13KN0fTSOgoUK-LnpR0,1219
+gtk_stream/documents/classes/Dropdown.py,sha256=NYTCSPS8Plib_3KuCdpzLeiFzGJ6WyA-P2DtMo08SC0,1675
+gtk_stream/documents/classes/Frame.py,sha256=5rigOtrrY1rQxuU98sxX5mUJ0ClvgabZUOW6BSxDE4w,474
+gtk_stream/documents/classes/Grid.py,sha256=CD_B5Gr5tPvgBl39aJxcesybTqH1M0bHvHKYl2vPcEI,502
+gtk_stream/documents/classes/Label.py,sha256=BeL3zlf9YPuBGYS_YtHI0Q-MoVVLPao7kPIzPlwpyHY,275
+gtk_stream/documents/classes/Paned.py,sha256=4jZGEebhv9pNzTyYbQ8lyx_nsKd9Nmr10703V5n_kNw,644
+gtk_stream/documents/classes/ProgressBar.py,sha256=2_KCboyweGsqpBck61TvVGZYIsN8QVzAyqwwTDh-pDU,212
+gtk_stream/documents/classes/Switch.py,sha256=uXmd_cZPZXkM31wYE4Z5d1-wuxqdt7wvS6qoE8ubaGc,610
+gtk_stream/documents/classes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+gtk_stream-0.3.dist-info/METADATA,sha256=bzz6Ac4DhmmpkF-unA0WW8ay4_yITRHuTru7rixRNKI,504
+gtk_stream-0.3.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+gtk_stream-0.3.dist-info/entry_points.txt,sha256=PmhKTb4MMQM6dN2HJcoDSMI8L0lZIFIlFn-BgdfPDpo,60
+gtk_stream-0.3.dist-info/top_level.txt,sha256=vE9zfHGe9Ke7FSe0wBK2WYJI-BpcQNu6xDC3Cu5O8rQ,11
+gtk_stream-0.3.dist-info/RECORD,,

gtk_stream-0.2.2.dist-info/RECORD

@@ -1,23 +0,0 @@
-gtk_stream/__init__.py,sha256=pDhUSN4AYNsP8_tilU1zmDCYdiv7ak4PE1TW0qFrDlg,99
-gtk_stream/application.py,sha256=FZe4gQm5U0NGKKpi_Pp7VqxMtlbdbNJOYhcradzeSH4,3068
-gtk_stream/command_line.py,sha256=c2ghqIQB5hYxtCszss1z84yKoeRYvaMJJMi4aiTspWg,312
-gtk_stream/common.py,sha256=sEw15nVw9SVp8eLVOB5Zj1JITVhUhCF0i3PSwpd8lis,590
-gtk_stream/parser.py,sha256=ZyCm1WKgKH6syqyUCY7ZyTW642LMpzQ_dDSNsvcNsLY,6797
-gtk_stream/properties.py,sha256=9bYzvqmUq8EidtBDZdKupLgYM9ucIGyxmahcIp9TxT8,1542
-gtk_stream/documents/__init__.py,sha256=vTgKiiafqqkSOIUwOIzO40VsSdCpHFnGOGRm8rRv9mY,378
-gtk_stream/documents/classes/Box.py,sha256=6l9Z3GpC0Yv34jcGNTwlNLM5DpYyQ1iDihJsu1nxcy8,259
-gtk_stream/documents/classes/Button.py,sha256=_NjoOrgdSVK4RQbh0V-QiZ_hfHasaMc9LQ2bf2egbe4,747
-gtk_stream/documents/classes/Document.py,sha256=scoJrdHen_1WRuqn3aN6FJUesHXPZZyKwmPuPDjjbzI,985
-gtk_stream/documents/classes/Dropdown.py,sha256=0Y9Sua_0Y_1F6bq4SQe1IDdJThhh5KVpepAExcPo8bg,1675
-gtk_stream/documents/classes/Frame.py,sha256=p8OcgYBki1NWe2tveZfRwb0aQzRAeHQa9wHmpjgRJoc,391
-gtk_stream/documents/classes/Grid.py,sha256=SRDbMhPZHV372KN7Qr9vvamH2xwr39eojeWmI0Rf8hE,622
-gtk_stream/documents/classes/Label.py,sha256=BeL3zlf9YPuBGYS_YtHI0Q-MoVVLPao7kPIzPlwpyHY,275
-gtk_stream/documents/classes/Paned.py,sha256=4jZGEebhv9pNzTyYbQ8lyx_nsKd9Nmr10703V5n_kNw,644
-gtk_stream/documents/classes/ProgressBar.py,sha256=2_KCboyweGsqpBck61TvVGZYIsN8QVzAyqwwTDh-pDU,212
-gtk_stream/documents/classes/Switch.py,sha256=uXmd_cZPZXkM31wYE4Z5d1-wuxqdt7wvS6qoE8ubaGc,610
-gtk_stream/documents/classes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-gtk_stream-0.2.2.dist-info/METADATA,sha256=YSIp8eUE3NYgYYotyx-SJ4gJlXVsdUprK0MayqS6rCE,506
-gtk_stream-0.2.2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-gtk_stream-0.2.2.dist-info/entry_points.txt,sha256=PmhKTb4MMQM6dN2HJcoDSMI8L0lZIFIlFn-BgdfPDpo,60
-gtk_stream-0.2.2.dist-info/top_level.txt,sha256=vE9zfHGe9Ke7FSe0wBK2WYJI-BpcQNu6xDC3Cu5O8rQ,11
-gtk_stream-0.2.2.dist-info/RECORD,,