gtk-stream 0.2.2__tar.gz → 0.4__tar.gz

{gtk_stream-0.2.2 → gtk_stream-0.4}/PKG-INFO

@@ -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.2.2 → gtk_stream-0.4}/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-0.2.2 → gtk_stream-0.4}/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-0.4/gtk_stream/documents/classes/Box.py

@@ -0,0 +1,22 @@
+from ... import Gtk
+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 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-0.2.2 → gtk_stream-0.4}/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-0.4/gtk_stream/documents/classes/Document.py

@@ -0,0 +1,40 @@
+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(get_prop_type(self.__g_class__, attr), val) for (attr, val) in attrs.items() }
+        self.children = []
+
+    def add_child(self, child):
+        self.children.append(child)
+        
+    def render_raw(self):
+        """Method to render the document to a widet"""
+        raise Exception("Method 'render' not implemented")
+    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.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.insert_child(w, child)
+        return w
+    
+    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-0.2.2 → gtk_stream-0.4}/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-0.4/gtk_stream/documents/classes/Frame.py

@@ -0,0 +1,18 @@
+from ... import Gtk
+from .. import Document, PseudoDocument
+
+class FrameLabel(PseudoDocument):
+    def __init__(self, app):
+        super().__init__(app)
+
+class Frame(Document):
+    __g_class__ = Gtk.Frame
+    def __init__(self, app, **kwargs):
+        super().__init__(app,**kwargs)
+    def render_raw(self):
+        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-0.2.2 → gtk_stream-0.4}/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-0.2.2 → gtk_stream-0.4}/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-0.2.2 → gtk_stream-0.4}/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-0.4/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-0.2.2 → gtk_stream-0.4}/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-0.2.2 → gtk_stream-0.4}/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-0.2.2 → gtk_stream-0.4}/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-0.4/gtk_stream/properties.py

@@ -0,0 +1,38 @@
+import sys
+
+from . import Gtk
+
+def _parse_orientation_property(val):
+    return (Gtk.Orientation.HORIZONTAL) if val == "horizontal" else (Gtk.Orientation.VERTICAL)
+def _parse_boolean_property(val):
+    return True if val == "true" else False
+def _parse_float_property(val):
+    return float(val)
+def _parse_int_property(val):
+    return int(val)
+def _parse_searchMode_property(val):
+    match val:
+        case 'exact':
+            return Gtk.StringFilterMatchMode.EXACT
+        case 'substring':
+            return Gtk.StringFilterMatchMode.SUBSTRING
+        case _:
+            return Gtk.StringFilterMatchMode.PREFIX
+def _parse_css_classes_property(val):
+    return val.split()
+        
+_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_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 → gtk_stream-0.4}/gtk_stream.egg-info/PKG-INFO

@@ -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.2.2 → gtk_stream-0.4}/gtk_stream.egg-info/SOURCES.txt

@@ -20,6 +20,7 @@ gtk_stream/documents/classes/Frame.py
 gtk_stream/documents/classes/Grid.py
 gtk_stream/documents/classes/Label.py
 gtk_stream/documents/classes/Paned.py
+gtk_stream/documents/classes/Picture.py
 gtk_stream/documents/classes/ProgressBar.py
 gtk_stream/documents/classes/Switch.py
 gtk_stream/documents/classes/__init__.py

{gtk_stream-0.2.2 → gtk_stream-0.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "gtk-stream"
-version = "0.2.2"
+version = "0.4"
 description = "A simple stream-oriented GUI protocol"
 authors = [
  { name = "Marc Coiffier", email = "marc.coiffier@univ-grenoble-alpes.fr" }
@@ -14,6 +14,7 @@ dependencies = [ "pygobject" ]
 classifiers = [
   "Development Status :: 4 - Beta",
   "Intended Audience :: Developers",
+  "Environment :: X11 Applications :: GTK",
   "Topic :: Software Development :: User Interfaces",
   "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
   ]

gtk_stream-0.2.2/gtk_stream/documents/classes/Box.py

@@ -1,10 +0,0 @@
-from ... import Gtk
-from .. import Document
-
-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())

gtk_stream-0.2.2/gtk_stream/documents/classes/Document.py

@@ -1,30 +0,0 @@
-import sys
-from ...properties import parse_property
-
-class Document:
-    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.children = []
-
-    def add_child(self, child):
-        self.children.append(child)
-        
-    def render_raw(self):
-        """Method to render the document to a widet"""
-        raise Exception("Method 'render' not implemented")
-    def set_properties(self, w):
-        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)
-    def render(self):
-        w = self.render_raw()
-        self.set_properties(w)
-        for child in self.children:
-            self.attach_child(w, child)
-        return w
-    
-    def attach_child(self, w, child):
-        raise Exception("Unimplemented method 'attach_child'")

gtk_stream-0.2.2/gtk_stream/documents/classes/Frame.py

@@ -1,14 +0,0 @@
-from ... import Gtk
-from .. import Document
-
-class Frame(Document):
-    def __init__(self, app, label=None, **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())

gtk_stream-0.2.2/gtk_stream/properties.py

@@ -1,41 +0,0 @@
-from . import Gtk
-
-def _parse_orientation_property(val):
-    return (Gtk.Orientation.HORIZONTAL) if val == "horizontal" else (Gtk.Orientation.VERTICAL)
-def _parse_boolean_property(val):
-    return True if val == "true" else False
-def _parse_float_property(val):
-    return float(val)
-def _parse_int_property(val):
-    return int(val)
-def _parse_searchMode_property(val):
-    match val:
-        case 'exact':
-            return Gtk.StringFilterMatchMode.EXACT
-        case 'substring':
-            return Gtk.StringFilterMatchMode.SUBSTRING
-        case _:
-            return Gtk.StringFilterMatchMode.PREFIX
-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
-}
-
-def parse_property(prop, val):
-    return _PARSE_PROPERTY.get(prop, lambda x: x)(val)