gtk-stream 0.5__tar.gz → 0.6__tar.gz

{gtk_stream-0.5 → gtk_stream-0.6}/PKG-INFO

@@ -1,9 +1,10 @@
 Metadata-Version: 2.1
 Name: gtk-stream
-Version: 0.5
+Version: 0.6
 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/
+Project-URL: Homepage, https://coiffier.net/projects/gtk-stream/
+Project-URL: Source, https://coiffier.net/projects/gtk-stream/code/
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Environment :: X11 Applications :: GTK

{gtk_stream-0.5 → gtk_stream-0.6}/gtk_stream/application.py

@@ -81,5 +81,5 @@ class GtkStreamApp(Gtk.Application):
     def setProp(self, id, name, value):
         def cb():
             w = self.namedWidgets[id]
-            w.set_property(name, parse_property(get_prop_type(w.__class__, name), value))
+            w.set_property(name, parse_property(get_prop_type(w.__class__, name), value)(self))
         self.run_when_idle(cb)

{gtk_stream-0.5 → gtk_stream-0.6}/gtk_stream/documents/__init__.py

@@ -14,3 +14,4 @@ from .classes.ScrolledWindow import ScrolledWindow
 from .classes.Paned          import Paned
 from .classes.Frame          import Frame, FrameLabel
 from .classes.Grid           import Grid, Cell
+from .classes.Stack          import Stack

{gtk_stream-0.5 → gtk_stream-0.6}/gtk_stream/documents/classes/Document.py

@@ -18,7 +18,7 @@ class Document:
         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.set_property(p, v(self.app))
         w.insert_child = lambda d: self.insert_child(w, d)
     def render(self):
         w = self.render_raw()

gtk_stream-0.6/gtk_stream/documents/classes/Stack.py

@@ -0,0 +1,11 @@
+from ... import Gtk
+from .. import Document, PseudoDocument
+
+class Stack(Document):
+    __g_class__ = Gtk.Stack
+    def __init__(self, app, **kwargs):
+        super().__init__(app, **kwargs)
+    def render_raw(self):
+        return Gtk.Stack()
+    def insert_child(self, w, d):
+        w.add_child(d.render())

{gtk_stream-0.5 → gtk_stream-0.6}/gtk_stream/documents/classes/Switch.py

@@ -7,7 +7,7 @@ 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('gboolean', managed)
+        self.managed = parse_property('gboolean', managed)(app)
     def render_raw(self):
         ret = Gtk.Switch()
         ret.connect('state-set', printEvent('switch', self.id,

{gtk_stream-0.5 → gtk_stream-0.6}/gtk_stream/parser.py

@@ -28,7 +28,8 @@ WIDGET_DOCUMENTS = {
     'switch'          : docs.Switch,
     'picture'         : docs.Picture,
     'separator'       : docs.Separator,
-    'scrolled-window' : docs.ScrolledWindow
+    'scrolled-window' : docs.ScrolledWindow,
+    'stack'           : docs.Stack
 }
 
 class GtkStreamXMLHandler(sax.ContentHandler):

{gtk_stream-0.5 → gtk_stream-0.6}/gtk_stream/properties.py

@@ -2,24 +2,28 @@ import sys
 
 from . import Gtk
 
+def _const(x):
+    return lambda _: x
 def _parse_orientation_property(val):
-    return (Gtk.Orientation.HORIZONTAL) if val == "horizontal" else (Gtk.Orientation.VERTICAL)
+    return _const((Gtk.Orientation.HORIZONTAL) if val == "horizontal" else (Gtk.Orientation.VERTICAL))
 def _parse_boolean_property(val):
-    return True if val == "true" else False
+    return _const(True if val == "true" else False)
 def _parse_float_property(val):
-    return float(val)
+    return _const(float(val))
 def _parse_int_property(val):
-    return int(val)
+    return _const(int(val))
 def _parse_searchMode_property(val):
     match val:
         case 'exact':
-            return Gtk.StringFilterMatchMode.EXACT
+            return _const(Gtk.StringFilterMatchMode.EXACT)
         case 'substring':
-            return Gtk.StringFilterMatchMode.SUBSTRING
+            return _const(Gtk.StringFilterMatchMode.SUBSTRING)
         case _:
-            return Gtk.StringFilterMatchMode.PREFIX
+            return _const(Gtk.StringFilterMatchMode.PREFIX)
 def _parse_css_classes_property(val):
-    return val.split()
+    return _const(val.split())
+def _parse_widget_property(val):
+    return lambda app: app.namedWidgets[val]
         
 _PARSE_TYPE_PROPERTY = {
     'GStrv'                    : _parse_css_classes_property,
@@ -28,11 +32,13 @@ _PARSE_TYPE_PROPERTY = {
     'gfloat'                   : _parse_float_property,
     'gint'                     : _parse_int_property,
     'gboolean'                 : _parse_boolean_property,
-    'GtkStringFilterMatchMode' : _parse_searchMode_property
+    'GtkStringFilterMatchMode' : _parse_searchMode_property,
+    'GtkWidget'                : _parse_widget_property,
+    'gchararray'               : _const,
 }
 
 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)
+    return _PARSE_TYPE_PROPERTY[prop_type](val)
 def get_prop_type(klass, prop):
     return klass.find_property(prop).value_type.name

{gtk_stream-0.5 → gtk_stream-0.6}/gtk_stream.egg-info/PKG-INFO

@@ -1,9 +1,10 @@
 Metadata-Version: 2.1
 Name: gtk-stream
-Version: 0.5
+Version: 0.6
 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/
+Project-URL: Homepage, https://coiffier.net/projects/gtk-stream/
+Project-URL: Source, https://coiffier.net/projects/gtk-stream/code/
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Environment :: X11 Applications :: GTK

{gtk_stream-0.5 → gtk_stream-0.6}/gtk_stream.egg-info/SOURCES.txt

@@ -24,5 +24,6 @@ gtk_stream/documents/classes/Picture.py
 gtk_stream/documents/classes/ProgressBar.py
 gtk_stream/documents/classes/ScrolledWindow.py
 gtk_stream/documents/classes/Separator.py
+gtk_stream/documents/classes/Stack.py
 gtk_stream/documents/classes/Switch.py
 gtk_stream/documents/classes/__init__.py

{gtk_stream-0.5 → gtk_stream-0.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "gtk-stream"
-version = "0.5"
+version = "0.6"
 description = "A simple stream-oriented GUI protocol"
 authors = [
  { name = "Marc Coiffier", email = "marc.coiffier@univ-grenoble-alpes.fr" }
@@ -20,7 +20,8 @@ classifiers = [
   ]
 
 [project.urls]
-Homepage = "https://coiffiem.gricad-pages.univ-grenoble-alpes.fr/gtk-stream/"
+Homepage = "https://coiffier.net/projects/gtk-stream/"
+Source = "https://coiffier.net/projects/gtk-stream/code/"
 
 [project.scripts]
 gtk-stream = "gtk_stream.command_line:main"