Port UI to GTK 4 (close #85)

src/connectionpanel.py

@@ -2,9 +2,11 @@
 
 
 import gi
-gi.require_version('Gtk', '3.0')
+gi.require_version('Gtk', '4.0')
+gi.require_version('Adw', '1')
+import locale
 
-from gi.repository import Gtk, GObject
+from gi.repository import Gtk, Gio, GObject, Adw
 
 from mcg.zeroconf import ZeroconfProvider
 
@@ -12,29 +14,22 @@ from mcg.zeroconf import ZeroconfProvider
 
 
 @Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/connection-panel.ui')
-class ConnectionPanel(Gtk.Box):
+class ConnectionPanel(Adw.Bin):
     __gtype_name__ = 'McgConnectionPanel'
     __gsignals__ = {
         'connection-changed': (GObject.SIGNAL_RUN_FIRST, None, (str, int, str))
     }
 
     # Widgets
+    toolbar = Gtk.Template.Child()
     zeroconf_list = Gtk.Template.Child()
-    host_entry = Gtk.Template.Child()
+    host_row = Gtk.Template.Child()
     port_spinner = Gtk.Template.Child()
-    password_entry = Gtk.Template.Child()
+    password_row = Gtk.Template.Child()
 
 
-    def __init__(self):
-        super().__init__()
-        self._services = Gtk.ListStore(str, str, int)
-        self._profile = None
-
-        # Zeroconf
-        self.zeroconf_list.set_model(self._services)
-        renderer = Gtk.CellRendererText()
-        column = Gtk.TreeViewColumn("Zeroconf", renderer, text=0)
-        self.zeroconf_list.append_column(column)
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
 
         # Zeroconf provider
         self._zeroconf_provider = ZeroconfProvider()
@@ -43,25 +38,26 @@ class ConnectionPanel(Gtk.Box):
 
     def on_new_service(self, service):
         name, host, port = service
-        self._services.append([name, host, port])
+
+        row_button = Gtk.Button()
+        row_button.set_label(locale.gettext("use"))
+        row_button.connect("clicked", self.on_service_selected, host, port)
+
+        row = Adw.ActionRow()
+        row.set_title(name)
+        row.set_subtitle("{} ({})".format(host, port))
+        row.add_suffix(row_button)
+
+        self.zeroconf_list.insert(row, -1)
+
+
+    def on_service_selected(self, widget, host, port):
+        self.set_host(host)
+        self.set_port(port)
 
 
     @Gtk.Template.Callback()
-    def on_service_selected(self, selection):
-        model, treeiter = selection.get_selected()
-        if treeiter != None:
-            service = model[treeiter]
-            self.set_host(service[1])
-            self.set_port(service[2])
-
-
-    @Gtk.Template.Callback()
-    def on_zeroconf_list_outfocused(self, widget, event):
-        self.zeroconf_list.get_selection().unselect_all()
-
-
-    @Gtk.Template.Callback()
-    def on_host_entry_outfocused(self, widget, event):
+    def on_host_entry_apply(self, widget):
         self._call_back()
 
 
@@ -70,17 +66,12 @@ class ConnectionPanel(Gtk.Box):
         self._call_back()
 
 
-    @Gtk.Template.Callback()
-    def on_password_entry_outfocused(self, widget, event):
-        self._call_back()
-
-
     def set_host(self, host):
-        self.host_entry.set_text(host)
+        self.host_row.set_text(host)
 
 
     def get_host(self):
-        return self.host_entry.get_text()
+        return self.host_row.get_text()
 
 
     def set_port(self, port):
@@ -94,11 +85,11 @@ class ConnectionPanel(Gtk.Box):
     def set_password(self, password):
         if password is None:
             password = ""
-        self.password_entry.set_text(password)
+        self.password_row.set_text(password)
 
 
     def get_password(self):
-        if self.password_entry.get_text() == "":
+        if self.password_row.get_text() == "":
             return None
         else:
             return self.password_entry.get_text()