gtk-stream 0.9__py3-none-any.whl → 0.10__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.9'
-__version_tuple__ = version_tuple = (0, 9)
+__version__ = version = '0.10'
+__version_tuple__ = version_tuple = (0, 10)

gtk_stream/application.py

@@ -17,7 +17,16 @@
 import sys
 from . import Gtk, GLib, Gdk
 from .common import printEvent
-from .properties import parse_property, get_prop_type
+from .properties import parse_property, get_prop_type, set_parse_prop
+
+def piloted(f):
+    """A decorator for methods that are both called from the pilot
+    application and need access to the gtk main thread"""
+    def ret(self, *args, **kwargs):
+        def cb():
+            f(self, *args, **kwargs)
+        self.run_when_idle(cb)
+    return ret
 
 class GtkStreamApp(Gtk.Application):
     def __init__(self, logger, name = None, **kwargs):
@@ -28,14 +37,18 @@ class GtkStreamApp(Gtk.Application):
         self.namedWidgets = { }
         self.namedWindows = { }
         
-        self.callback_queue = []
-
+        # The first messages from the pilot may arrive before the
+        # application is ready to process them.
+        # 
+        # If that happens, store the actions until they can be taken
+        # (when the "startup" signal is called)
+        callback_queue = []
         def run_when_idle_before_startup(cb):
-            self.callback_queue.append(cb)
+            callback_queue.append(cb)
         self.run_when_idle = run_when_idle_before_startup
         
         def on_startup(_):
-            for cb in self.callback_queue:
+            for cb in callback_queue:
                 GLib.idle_add(cb)
             self.run_when_idle = GLib.idle_add
         self.connect('startup', on_startup)
@@ -44,58 +57,61 @@ class GtkStreamApp(Gtk.Application):
         if id is not None:
             self.namedWidgets[id] = w
 
+    @piloted
     def openFileDialog(self, id, parent):
-        def cb():
-            dialog = Gtk.FileDialog()
-            dialog.props.modal = True
-            def on_choose(_, b):
-                try:
-                    file = dialog.open_finish(b)
-                    print(f"{id}:selected:{file.get_path()}")
-                    sys.stdout.flush()
-                except GLib.GError as e:
-                    print(f"{id}:none-selected")
-                    sys.stdout.flush()
-                    
-            dialog.open(parent = self.namedWindows[parent], callback = on_choose)
-        self.run_when_idle(cb)
-    def newWindow(self, document, id, title = "Window", width = None, height = None):
-        def cb():
-            win = Gtk.Window(application=self)
-            win.set_title(title)
-            if width != None and height != None:
-                win.set_default_size(int(width), int(height))
-            self.namedWindows[id] = win
-            win.set_child(document.render())
-            win.connect('close-request', printEvent(self.logger, 'close-request', id))
-            win.present()
-            return False
-        self.run_when_idle(cb)
+        dialog = Gtk.FileDialog()
+        dialog.props.modal = True
+        def on_choose(_, b):
+            try:
+                file = dialog.open_finish(b)
+                print(f"{id}:selected:{file.get_path()}")
+                sys.stdout.flush()
+            except GLib.GError as e:
+                print(f"{id}:none-selected")
+                sys.stdout.flush()
+                
+        dialog.open(parent = self.namedWindows[parent], callback = on_choose)
+
+    @piloted
+    def newWindow(self, document, id, **attrs):
+        win = Gtk.Window(application=self)
+        for (attr_name, attr_val) in attrs.items():
+            set_parse_prop(self, win, attr_name, attr_val)
+        self.namedWindows[id] = win
+        win.set_child(document.render())
+        win.connect('close-request', printEvent(self.logger, 'close-request', id))
+        win.present()
+
+    @piloted
     def addStyle(self, style):
-        def cb():
-            provider = Gtk.CssProvider()
-            provider.load_from_data(style)
-            Gtk.StyleContext.add_provider_for_display(Gdk.Display.get_default(), provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
-        self.run_when_idle(cb)
+        provider = Gtk.CssProvider()
+        provider.load_from_data(style)
+        Gtk.StyleContext.add_provider_for_display(Gdk.Display.get_default(), provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
+
+    @piloted
+    def addIconPath(self, path):
+        theme = Gtk.IconTheme.get_for_display(Gdk.Display.get_default())
+        theme.add_search_path(path)
+        
+    @piloted
     def closeWindow(self, id):
-        def cb():
-            self.namedWindows[id].close()
-        self.run_when_idle(cb)
+        self.namedWindows[id].close()
+
+    @piloted
     def removeWidget(self, id):
-        def cb():
-            w = self.namedWidgets[id]
-            w.get_parent().remove(w)
-        self.run_when_idle(cb)
+        w = self.namedWidgets[id]
+        w.get_parent().remove(w)
+
+    @piloted
     def insertWidget(self, to, document):
-        def cb():
-            if to in self.namedWidgets:
-                w = self.namedWidgets[to]
-                w.insert_child(document)
-            else:
-                raise Exception(f"Error: unknown widget id '{to}'")
-        self.run_when_idle(cb)
+        if to in self.namedWidgets:
+            w = self.namedWidgets[to]
+            w.insert_child(document)
+        else:
+            raise Exception(f"Error: unknown widget id '{to}'")
+    
+    @piloted
     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)(self))
-        self.run_when_idle(cb)
+        w = self.namedWidgets[id]
+        w.set_property(name, parse_property(get_prop_type(w.__class__, name), value)(self))
+

gtk_stream/parser.py

@@ -127,6 +127,13 @@ class GtkStreamXMLHandler(sax.ContentHandler):
                 self.transition_chars = onchars
                 self.transition_enter = self.transE_final
                 self.transition_leave = self.transL_tag('style', self.transE_message, leave_parent, leave)
+
+            case 'add-icon-path':
+                if 'path' in attrs:
+                    def leave():
+                        self.app.addIconPath(attrs['path'])
+                    self.transition_enter = self.transE_final
+                    self.transition_leave = self.transL_tag('add-icon-path', self.transE_message, leave_parent, leave)
                 
             case 'window':
                 if 'id' in attrs:

gtk_stream/properties.py

@@ -57,4 +57,9 @@ def parse_property(prop_type, val):
     # print(f"Parsing property '{val}' of type '{prop_type}'", file=sys.stderr)
     return _PARSE_TYPE_PROPERTY[prop_type](val)
 def get_prop_type(klass, prop):
-    return klass.find_property(prop).value_type.name
+    try:
+        return klass.find_property(prop).value_type.name
+    except AttributeError:
+        raise Exception(f"Unknown GTK property '{prop}' of class '{klass}'")
+def set_parse_prop(app, w, prop_name, val):
+    w.set_property(prop_name, parse_property(get_prop_type(w.__class__, prop_name), val)(app))

{gtk_stream-0.9.dist-info → gtk_stream-0.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gtk-stream
-Version: 0.9
+Version: 0.10
 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.9.dist-info → gtk_stream-0.10.dist-info}/RECORD

@@ -1,10 +1,10 @@
 gtk_stream/__init__.py,sha256=y6JLknVFexWrSo_Zl7-TXrPR6EQ5XVMeFO1bUzLN9Lg,98
-gtk_stream/_version.py,sha256=hKX8UWcecrr9nhVjGc3l22za_VMbIrPYQgL_u8Ufa58,406
-gtk_stream/application.py,sha256=gOsJv6AUizfQZrwNe9LxVz9dOKScxzw97XO3lRTmxRs,3886
+gtk_stream/_version.py,sha256=wg35lkz1DoondiGS1z7m4ZtbxPvMGnIj2qR4wzIH4-U,408
+gtk_stream/application.py,sha256=s-2A8JSSIum9QDo35oxri-10OLg5BUIfTKS0FZDQd6A,4114
 gtk_stream/command_line.py,sha256=Ej4mmPiuYjr5-1JrvjGK0BDitKUCfVEI9uHp1p_FAr4,1520
 gtk_stream/common.py,sha256=xdscxYgBg_Ux6iyk26gB-AMSgoUIqlZUPgso5YS_gKE,2106
-gtk_stream/parser.py,sha256=Ip5x63_Lx-Eu4kpTD_2TMTVLiE_oYCqs6qqTcAnUeRY,8427
-gtk_stream/properties.py,sha256=r_zxYIBe5g8SGueuhtf5CIAWesmm2tXv6llh6657a74,2374
+gtk_stream/parser.py,sha256=rcZtH0T5s6ttVXvbHZjX2hBoasWNbtDR5LEa8yiHUj4,8772
+gtk_stream/properties.py,sha256=oCG4EIMWS4WdKY4YzQZzllddoIY33GvnbgvMG3C5Muo,2630
 gtk_stream/documents/__init__.py,sha256=MVqnPXrTuoKyUHJ41jgqbFr3VA5JWfI6QFfXAIE6DuQ,789
 gtk_stream/documents/classes/Box.py,sha256=d01o2-JQ3-k0VjvvY8E7mly-u_f1v1NqYz1IDjHZLUo,1381
 gtk_stream/documents/classes/Button.py,sha256=0Cs5DOt-FoDVLWIktJHuH6OasI58TNI0Gs3uIKJDj2o,1563
@@ -23,8 +23,8 @@ gtk_stream/documents/classes/Separator.py,sha256=uw_EgAKs_6pNA8nrOLzruIlJfk4uaog
 gtk_stream/documents/classes/Stack.py,sha256=YA6NDzZL2u4Ko8GXtx8Or-jEWGMCEw2cC1HNkAMRw-8,1030
 gtk_stream/documents/classes/Switch.py,sha256=OLCWWNeVyNrk4Tu3JDe64FqsLhedh3dDzKDKne2CyDw,1382
 gtk_stream/documents/classes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-gtk_stream-0.9.dist-info/METADATA,sha256=enjy2jWEEX9cFvPCW86EDe4TuyF4uvKIxeIFnoLrbco,804
-gtk_stream-0.9.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-gtk_stream-0.9.dist-info/entry_points.txt,sha256=PmhKTb4MMQM6dN2HJcoDSMI8L0lZIFIlFn-BgdfPDpo,60
-gtk_stream-0.9.dist-info/top_level.txt,sha256=vE9zfHGe9Ke7FSe0wBK2WYJI-BpcQNu6xDC3Cu5O8rQ,11
-gtk_stream-0.9.dist-info/RECORD,,
+gtk_stream-0.10.dist-info/METADATA,sha256=Tmq513moUwqczsg1EYEh0-eBcz-SJs3gTVAXUHGlt_Y,805
+gtk_stream-0.10.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+gtk_stream-0.10.dist-info/entry_points.txt,sha256=PmhKTb4MMQM6dN2HJcoDSMI8L0lZIFIlFn-BgdfPDpo,60
+gtk_stream-0.10.dist-info/top_level.txt,sha256=vE9zfHGe9Ke7FSe0wBK2WYJI-BpcQNu6xDC3Cu5O8rQ,11
+gtk_stream-0.10.dist-info/RECORD,,