From 20fc27fbdf45b8fba68993a1cf442e706be835c8 Mon Sep 17 00:00:00 2001
From: DexterFromLab <bartoszczarnota1@gmail.com>
Date: Thu, 5 Mar 2026 13:12:30 +0100
Subject: [PATCH] Migrate to Gtk.Application for proper app lifecycle and
 custom icon

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 bterminal.py | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/bterminal.py b/bterminal.py
index 84cf5f4..3888a3d 100755
--- a/bterminal.py
+++ b/bterminal.py
@@ -1860,7 +1860,7 @@ class BTerminalApp(Gtk.Window):
     def __init__(self):
         super().__init__(title=APP_NAME)
         self.set_default_size(1200, 700)
-        self.set_icon_name("utilities-terminal")
+        self.set_icon_name("bterminal")
 
         # Apply CSS
         css_provider = Gtk.CssProvider()
@@ -2062,15 +2062,30 @@ class BTerminalApp(Gtk.Window):
         return False
 
     def _on_delete_event(self, widget, event):
-        Gtk.main_quit()
         return False
 
 
 # ─── Main ─────────────────────────────────────────────────────────────────────
 
 def main():
-    app = BTerminalApp()
-    Gtk.main()
+    GLib.set_prgname("bterminal")
+    GLib.set_application_name("BTerminal")
+
+    application = Gtk.Application(
+        application_id="com.github.DexterFromLab.BTerminal",
+        flags=Gio.ApplicationFlags.FLAGS_NONE,
+    )
+
+    def on_activate(app):
+        windows = app.get_windows()
+        if windows:
+            windows[0].present()
+            return
+        win = BTerminalApp()
+        app.add_window(win)
+
+    application.connect("activate", on_activate)
+    application.run(None)
 
 
 if __name__ == "__main__":