Handle GTK+ signals via glade too.

diff --git a/sigrok-meter b/sigrok-meter
index b2d459c0b5bec53adb7cb1f2d05a6b3b2dd6d2c7..9711c83a0cfc1f25e286ad81260220a871e6177d 100755 (executable)
--- a/sigrok-meter
+++ b/sigrok-meter
@@ -21,11 +21,15 @@
 
 from gi.repository import Gtk
 
+# Handler class for various GTK+ signals.
+class Handler:
+    def onDeleteWindow(self, *args):
+        Gtk.main_quit(*args)
+
 builder = Gtk.Builder()
 builder.add_from_file("sigrok-meter.glade")
-
+builder.connect_signals(Handler())
 win = builder.get_object("main-window")
-win.connect("delete-event", Gtk.main_quit)
 win.show_all()
 Gtk.main()
 

diff --git a/sigrok-meter.glade b/sigrok-meter.glade
index 6907ef1a2cb410bdcbfe33986ae04d10e8a27da6..5456512d71858b816ef165a44cd3ef47d208236f 100644 (file)
--- a/sigrok-meter.glade
+++ b/sigrok-meter.glade
@@ -3,6 +3,7 @@
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="main-window">
     <property name="can_focus">False</property>
+    <signal name="delete-event" handler="onDeleteWindow" swapped="no"/>
     <child>
       <placeholder/>
     </child>