Merge branch 'main' into feat/cava

4 files changed, 19 insertions, 14 deletions

diff --git a/examples/py/.gitignore b/examples/py/.gitignore
index b0bff8b..c18dd8d 100644
--- a/examples/py/.gitignore
+++ b/examples/py/.gitignore
@@ -1,3 +1 @@
-pygobject-stubs/
-*.pyi
 __pycache__/
diff --git a/examples/py/simple-bar/app.py b/examples/py/simple-bar/app.py
index f5a8a80..17b6782 100755
--- a/examples/py/simple-bar/app.py
+++ b/examples/py/simple-bar/app.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import sys
 import versions
-from gi.repository import Astal, Gio
+from gi.repository import AstalIO, Astal, Gio
 from widget.Bar import Bar
 from pathlib import Path
 
@@ -10,23 +10,27 @@ css = "/tmp/style.css"
 
 
 class App(Astal.Application):
-    def do_request(self, msg: str, conn: Gio.SocketConnection) -> None:
+    def do_astal_application_request(
+        self, msg: str, conn: Gio.SocketConnection
+    ) -> None:
         print(msg)
-        Astal.write_sock(conn, "hello")
+        AstalIO.write_sock(conn, "hello")
 
     def do_activate(self) -> None:
         self.hold()
-        Astal.Process.execv(["sass", scss, css])
+        AstalIO.Process.execv(["sass", scss, css])
         self.apply_css(css, True)
+        print("hello")
         for mon in self.get_monitors():
             self.add_window(Bar(mon))
 
 
-instance_name = "simple-bar"
+instance_name = "python"
 app = App(instance_name=instance_name)
 
 if __name__ == "__main__":
-    if app.acquire_socket():
+    try:
+        print(app.acquire_socket())
         app.run(None)
-    else:
-        print(Astal.Application.send_message(instance_name, "".join(sys.argv[1:])))
+    except Exception as e:
+        print(AstalIO.send_message(instance_name, "".join(sys.argv[1:])))
diff --git a/examples/py/simple-bar/versions.py b/examples/py/simple-bar/versions.py
index a8a1ab8..0e57708 100644
--- a/examples/py/simple-bar/versions.py
+++ b/examples/py/simple-bar/versions.py
@@ -1,6 +1,7 @@
 import gi
 
-gi.require_version("Astal", "0.1")
+gi.require_version("AstalIO", "0.1")
+gi.require_version("Astal", "3.0")
 gi.require_version("Gtk", "3.0")
 gi.require_version("Gdk", "3.0")
 gi.require_version("Gio", "2.0")
diff --git a/examples/py/simple-bar/widget/Bar.py b/examples/py/simple-bar/widget/Bar.py
index 89581f1..3b09dce 100644
--- a/examples/py/simple-bar/widget/Bar.py
+++ b/examples/py/simple-bar/widget/Bar.py
@@ -1,5 +1,6 @@
 import math
 from gi.repository import (
+    AstalIO,
     Astal,
     Gtk,
     Gdk,
@@ -125,8 +126,8 @@ class SysTray(Gtk.Box):
             app.add_icons(theme)
 
         menu = item.create_menu()
-        btn = Astal.Button()
-        icon = Astal.Icon()
+        btn = Astal.Button(visible=True)
+        icon = Astal.Icon(visible=True)
 
         def on_clicked(btn):
             if menu:
@@ -143,6 +144,7 @@ class SysTray(Gtk.Box):
         item.bind_property("gicon", icon, "gicon", SYNC)
         self.add(btn)
         self.items[id] = btn
+        self.show_all()
 
     def remove_item(self, _: Tray.Tray, id: str):
         if id in self.items:
@@ -203,7 +205,7 @@ class Time(Astal.Label):
     def __init__(self, format="%H:%M - %A %e."):
         super().__init__()
         self.format = format
-        self.interval = Astal.Time.interval(1000, self.sync)
+        self.interval = AstalIO.Time.interval(1000, self.sync)
         self.connect("destroy", self.interval.cancel)
         Astal.widget_set_class_names(self, ["Time"])