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

gtk_stream/application.py

@@ -2,7 +2,7 @@ import sys
 
 from . import Gtk, GLib, Gdk
 from .common import printEvent
-from .properties import parse_property
+from .properties import parse_property, get_prop_type
 
 class GtkStreamApp(Gtk.Application):
     def __init__(self, name = None, **kwargs):
@@ -70,16 +70,16 @@ 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)
     def setProp(self, id, name, value):
         def cb():
             w = self.namedWidgets[id]
-            w.set_property(name, parse_property(name, value))
+            w.set_property(name, parse_property(get_prop_type(w.__class__, name), value))
         self.run_when_idle(cb)

gtk_stream/documents/__init__.py

@@ -1,12 +1,14 @@
-from .classes.Document import Document
+from .classes.Document import Document, PseudoDocument
 
 from .classes.Label import Label
-from .classes.Button import Button, LinkButton
+from .classes.Picture import Picture
 from .classes.ProgressBar import ProgressBar
+
+from .classes.Button import Button, LinkButton
 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,22 @@
 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):
+    __g_class__ = Gtk.Box
     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

@@ -3,21 +3,23 @@ from ...common import printEvent
 from .. import Document
 
 class Button(Document):
+    __g_class__ = Gtk.Button
     def __init__(self, app, id, **kwargs):
         super().__init__(app, id = id, **kwargs)
     def render_raw(self):
         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):
+    __g_class__ = Gtk.LinkButton
     def __init__(self, app, id, **kwargs):
         super().__init__(app, id=id, **kwargs)
     def render_raw(self):
         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

@@ -1,11 +1,11 @@
-import sys
-from ...properties import parse_property
+from ...properties import parse_property, get_prop_type
 
 class Document:
+    __g_class__ = None
     def __init__(self, app, id = None, **attrs):
         self.id = id
         self.app = app
-        self.props = { attr: parse_property(attr, val) for (attr, val) in attrs.items() }
+        self.props = { attr: parse_property(get_prop_type(self.__g_class__, attr), val) for (attr, val) in attrs.items() }
         self.children = []
 
     def add_child(self, child):
@@ -17,14 +17,24 @@ class Document:
     def set_properties(self, w):
         self.app.nameWidget(self.id, w)
         for (p,v) in self.props.items():
+            # print(f"Setting property '{p}' to '{v}' in widget {self.__class__}", file=sys.stderr)
             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

@@ -22,6 +22,7 @@ class _ItemObject(GObject.Object):
         return self.value
         
 class Dropdown(Document):
+    __g_class__ = Gtk.DropDown
     def __init__(self, app, id, **kwargs):
         super().__init__(app, id=id, **kwargs)
     def render_raw(self):
@@ -44,5 +45,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,18 @@
 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):
+    __g_class__ = Gtk.Frame
+    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,24 +1,20 @@
 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):
+    __g_class__ = Gtk.Grid
     def __init__(self, app, **kwargs):
         super().__init__(app, **kwargs)
 
     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/documents/classes/Label.py

@@ -2,6 +2,7 @@ from ... import Gtk
 from .. import Document
 
 class Label(Document):
+    __g_class__ = Gtk.Label
     def __init__(self, app, text, **kwargs):
         super().__init__(app, **kwargs)
         self.text = text

gtk_stream/documents/classes/Paned.py

@@ -2,6 +2,7 @@ from ... import Gtk
 from .. import Document
 
 class Paned(Document):
+    __g_class__ = Gtk.Paned
     def __init__(self, app, **kwargs):
         super().__init__(app, **kwargs)
     def render(self):

gtk_stream/documents/classes/Picture.py

@@ -0,0 +1,11 @@
+import sys
+from ... import Gtk
+from .. import Document
+
+class Picture(Document):
+    __g_class__ = Gtk.Picture
+    def __init__(self, app, src, **kwargs):
+        super().__init__(app, **kwargs)
+        self.src = src
+    def render_raw(self):
+        return Gtk.Picture.new_for_filename(self.src)

gtk_stream/documents/classes/ProgressBar.py

@@ -2,6 +2,7 @@ from ... import Gtk
 from .. import Document
 
 class ProgressBar(Document):
+    __g_class__ = Gtk.ProgressBar
     def __init__(self, app, **kwargs):
         super().__init__(app, **kwargs)
     def render_raw(self):

gtk_stream/documents/classes/Switch.py

@@ -4,9 +4,10 @@ from .. import Document
 from ...properties import parse_property
 
 class Switch(Document):
+    __g_class__ = Gtk.Switch
     def __init__(self, app, id, managed = "false", **kwargs):
         super().__init__(app, id=id, **kwargs)
-        self.managed = parse_property('managed', managed)
+        self.managed = parse_property('gboolean', managed)
     def render_raw(self):
         ret = Gtk.Switch()
         ret.connect('state-set', printEvent('switch', self.id,

gtk_stream/parser.py

@@ -1,27 +1,32 @@
 import threading
 import signal
+import sys
 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 . import documents as docs
+
 from .application import GtkStreamApp
 
 class _Object:
     pass
    
 WIDGET_DOCUMENTS = {
-    'progress-bar': ProgressBar,
-    'label': Label,
-    'box': Box,
-    'button': Button,
-    'dropdown': Dropdown,
-    'item': Item,
-    'paned': Paned,
-    'grid': Grid,
-    'cell': Cell,
-    'frame': Frame,
-    'link': LinkButton,
-    'switch': Switch
+    'progress-bar' : docs.ProgressBar,
+    'label'        : docs.Label,
+    'box'          : docs.Box,
+    'box-prepend'  : docs.BoxPrepend,
+    'button'       : docs.Button,
+    'dropdown'     : docs.Dropdown,
+    'item'         : docs.Item,
+    'paned'        : docs.Paned,
+    'grid'         : docs.Grid,
+    'cell'         : docs.Cell,
+    'frame'        : docs.Frame,
+    'frame-label'  : docs.FrameLabel,
+    'link'         : docs.LinkButton,
+    'switch'       : docs.Switch,
+    'picture'      : docs.Picture
 }
 
 class GtkStreamXMLHandler(sax.ContentHandler):
@@ -78,11 +83,12 @@ class GtkStreamXMLHandler(sax.ContentHandler):
         match name:
             case 'style':
                 style = _Object()
+                style.chars = []
                 def onchars(s):
-                    style.chars = s
+                    style.chars.append(s)
                 def leave():
                     self.transition_chars = self.ignore_chars
-                    self.app.addStyle(style.chars)
+                    self.app.addStyle(" ".join(style.chars))
                 self.transition_chars = onchars
                 self.transition_enter = self.transE_final
                 self.transition_leave = self.transL_tag('style', self.transE_message, leave_parent, leave)
@@ -123,14 +129,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/properties.py

@@ -1,3 +1,5 @@
+import sys
+
 from . import Gtk
 
 def _parse_orientation_property(val):
@@ -19,23 +21,18 @@ def _parse_searchMode_property(val):
 def _parse_css_classes_property(val):
     return val.split()
         
-_PARSE_PROPERTY = {
-    'css-classes':       _parse_css_classes_property, 
-    'orientation':       _parse_orientation_property,
-    'fraction':          _parse_float_property,
-    'show-text':         _parse_boolean_property,
-    'enable-search':     _parse_boolean_property,
-    'search-match-mode': _parse_searchMode_property,
-    'visited':           _parse_boolean_property,
-    'hexpand':           _parse_boolean_property,
-    'hexpand-set':       _parse_boolean_property,
-    'vexpand':           _parse_boolean_property,
-    'vexpand-set':       _parse_boolean_property,
-    'xalign':            _parse_float_property,
-    'yalign':            _parse_float_property,
-    'state':             _parse_boolean_property,
-    'managed':           _parse_boolean_property
+_PARSE_TYPE_PROPERTY = {
+    'GStrv'                    : _parse_css_classes_property,
+    'GtkOrientation'           : _parse_orientation_property,
+    'gdouble'                  : _parse_float_property,
+    'gfloat'                   : _parse_float_property,
+    'gint'                     : _parse_int_property,
+    'gboolean'                 : _parse_boolean_property,
+    'GtkStringFilterMatchMode' : _parse_searchMode_property
 }
 
-def parse_property(prop, val):
-    return _PARSE_PROPERTY.get(prop, lambda x: x)(val)
+def parse_property(prop_type, val):
+    # print(f"Parsing property '{val}' of type '{prop_type}'", file=sys.stderr)
+    return _PARSE_TYPE_PROPERTY.get(prop_type, lambda x: x)(val)
+def get_prop_type(klass, prop):
+    return klass.find_property(prop).value_type.name

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

@@ -1,11 +1,12 @@
 Metadata-Version: 2.1
 Name: gtk-stream
-Version: 0.2.2
+Version: 0.4
 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/
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
+Classifier: Environment :: X11 Applications :: GTK
 Classifier: Topic :: Software Development :: User Interfaces
 Classifier: License :: OSI Approved :: GNU General Public License v2 (GPLv2)
 Requires-Dist: pygobject

gtk_stream-0.4.dist-info/RECORD

@@ -0,0 +1,24 @@
+gtk_stream/__init__.py,sha256=pDhUSN4AYNsP8_tilU1zmDCYdiv7ak4PE1TW0qFrDlg,99
+gtk_stream/application.py,sha256=e_Xvi9xG1kCD979CnZyAZlFj0F8cDUf_9_Tad2bmirs,3111
+gtk_stream/command_line.py,sha256=c2ghqIQB5hYxtCszss1z84yKoeRYvaMJJMi4aiTspWg,312
+gtk_stream/common.py,sha256=sEw15nVw9SVp8eLVOB5Zj1JITVhUhCF0i3PSwpd8lis,590
+gtk_stream/parser.py,sha256=KRzJ8yic5GcSnHUTo7vJ7HRvY7SILLrQMCC9oXOoErc,7028
+gtk_stream/properties.py,sha256=jxd7f-9Xl2cfMQpXuVEc_0VrgjfWcRjES7EzfhjQ5Rw,1392
+gtk_stream/documents/__init__.py,sha256=u_TgDNy8m_aNR9TYjfgxbFn1r9zASHy3LKYGCHz6pFE,456
+gtk_stream/documents/classes/Box.py,sha256=-L0OSIcPCOYedJqD9zPpe183EJJkClboX1-3yGHmnL0,661
+gtk_stream/documents/classes/Button.py,sha256=HeIYBix4qLVZc_a6Fs_MofyqxHeXbuZzsk_FneGLGb4,809
+gtk_stream/documents/classes/Document.py,sha256=w3DXEmEvqRO8efJ5ovre_ToGylSVjN5C1vu81LiNl1U,1379
+gtk_stream/documents/classes/Dropdown.py,sha256=-H344e7PsfwlnHT7eYBC35rVFkwVPSRJL3szU6w2A8U,1706
+gtk_stream/documents/classes/Frame.py,sha256=xG8Wts9xBw0Kk7VKv_YHSq-zf2coeRRtQKQkdtJMXAc,502
+gtk_stream/documents/classes/Grid.py,sha256=HG7zW6i4h9MMVnmBwvDI8A1mspmRk35HOc0lwGYxPQc,529
+gtk_stream/documents/classes/Label.py,sha256=3KI9JyVaBhgw0RZ7jK1NEn6mZg7GG0LrZz-Y_NSS2Kg,303
+gtk_stream/documents/classes/Paned.py,sha256=4xG_BWNlOn3Esd_99953OAMGmjWkdkGSHKJhnprtzG8,672
+gtk_stream/documents/classes/Picture.py,sha256=fNtM3TLkr2au92m8MCJmE3fYvyajFgw1VxMfj7dYV3s,298
+gtk_stream/documents/classes/ProgressBar.py,sha256=aegonsruP3jPGA6Wguk-MdIm5e3y-4Ug3q_cGglDcAA,246
+gtk_stream/documents/classes/Switch.py,sha256=AQYK8MTwiB7vzJpv1JB8RTgWpW3bZ-EGY7_8MX-29TY,640
+gtk_stream/documents/classes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+gtk_stream-0.4.dist-info/METADATA,sha256=ogiVCA8s4UOOvDsDpOII5rqSLgH55NI2fSU0pzpa_SE,555
+gtk_stream-0.4.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+gtk_stream-0.4.dist-info/entry_points.txt,sha256=PmhKTb4MMQM6dN2HJcoDSMI8L0lZIFIlFn-BgdfPDpo,60
+gtk_stream-0.4.dist-info/top_level.txt,sha256=vE9zfHGe9Ke7FSe0wBK2WYJI-BpcQNu6xDC3Cu5O8rQ,11
+gtk_stream-0.4.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,,