gtk-stream 0.9__tar.gz → 0.10__tar.gz

{gtk_stream-0.9 → gtk_stream-0.10}/PKG-INFO

@@ -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 → gtk_stream-0.10}/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-0.10/gtk_stream/application.py

@@ -0,0 +1,117 @@
+# Gtk-Stream : A stream-based GUI protocol
+# Copyright (C) 2024  Marc Coiffier
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+import sys
+from . import Gtk, GLib, Gdk
+from .common import printEvent
+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):
+        super().__init__(**kwargs)
+        self.logger = logger
+        if name != None:
+            GLib.set_application_name(name)
+        self.namedWidgets = { }
+        self.namedWindows = { }
+        
+        # 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):
+            callback_queue.append(cb)
+        self.run_when_idle = run_when_idle_before_startup
+        
+        def on_startup(_):
+            for cb in callback_queue:
+                GLib.idle_add(cb)
+            self.run_when_idle = GLib.idle_add
+        self.connect('startup', on_startup)
+        
+    def nameWidget(self, id, w):
+        if id is not None:
+            self.namedWidgets[id] = w
+
+    @piloted
+    def openFileDialog(self, id, parent):
+        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):
+        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):
+        self.namedWindows[id].close()
+
+    @piloted
+    def removeWidget(self, id):
+        w = self.namedWidgets[id]
+        w.get_parent().remove(w)
+
+    @piloted
+    def insertWidget(self, to, document):
+        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):
+        w = self.namedWidgets[id]
+        w.set_property(name, parse_property(get_prop_type(w.__class__, name), value)(self))
+

{gtk_stream-0.9 → gtk_stream-0.10}/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-0.9 → gtk_stream-0.10}/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 → gtk_stream-0.10}/gtk_stream.egg-info/PKG-INFO

@@ -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/gtk_stream/application.py

@@ -1,101 +0,0 @@
-# Gtk-Stream : A stream-based GUI protocol
-# Copyright (C) 2024  Marc Coiffier
-# 
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-import sys
-from . import Gtk, GLib, Gdk
-from .common import printEvent
-from .properties import parse_property, get_prop_type
-
-class GtkStreamApp(Gtk.Application):
-    def __init__(self, logger, name = None, **kwargs):
-        super().__init__(**kwargs)
-        self.logger = logger
-        if name != None:
-            GLib.set_application_name(name)
-        self.namedWidgets = { }
-        self.namedWindows = { }
-        
-        self.callback_queue = []
-
-        def run_when_idle_before_startup(cb):
-            self.callback_queue.append(cb)
-        self.run_when_idle = run_when_idle_before_startup
-        
-        def on_startup(_):
-            for cb in self.callback_queue:
-                GLib.idle_add(cb)
-            self.run_when_idle = GLib.idle_add
-        self.connect('startup', on_startup)
-        
-    def nameWidget(self, id, w):
-        if id is not None:
-            self.namedWidgets[id] = w
-
-    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)
-    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)
-    def closeWindow(self, id):
-        def cb():
-            self.namedWindows[id].close()
-        self.run_when_idle(cb)
-    def removeWidget(self, id):
-        def cb():
-            w = self.namedWidgets[id]
-            w.get_parent().remove(w)
-        self.run_when_idle(cb)
-    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)
-    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)