From 6a75ea56fdfa44a7f9ea8af7356a21d331786141 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 4 Jan 2024 17:08:01 +0100 Subject: [PATCH] clan-vm-manager: make joining clan url more logical The icon is confusing. It distracts from the actual "Join" label. Also when a user copy in an URL we can assume they trust the content, which might be not the case when they just clicked on an URL. --- .../clan_vm_manager/windows/join.py | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/pkgs/clan-vm-manager/clan_vm_manager/windows/join.py b/pkgs/clan-vm-manager/clan_vm_manager/windows/join.py index a8f27947..d315820d 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/windows/join.py +++ b/pkgs/clan-vm-manager/clan_vm_manager/windows/join.py @@ -38,15 +38,14 @@ class Trust(Gtk.Box): ) layout = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, expand=True) layout.set_border_width(20) - - upper = Gtk.Box(orientation="vertical") - upper.set_spacing(20) + layout.set_spacing(20) if self.url is not None: self.entry = Gtk.Label(label=str(self.url)) - upper.add(Gtk.Label(label="Clan URL")) + layout.add(icon) + layout.add(Gtk.Label(label="Clan URL")) else: - upper.add(Gtk.Label(label="Enter Clan URL")) + layout.add(Gtk.Label(label="Enter Clan URL")) self.entry = Gtk.Entry() # Autocomplete # TODO: provide intelligent suggestions @@ -61,17 +60,16 @@ class Trust(Gtk.Box): self.entry.set_completion(completion) self.entry.set_placeholder_text("clan://") - upper.add(icon) - upper.add(self.entry) + layout.add(self.entry) + + if self.url is None: + trust_button = Gtk.Button(label="Load cLAN-URL") + else: + trust_button = Gtk.Button(label="Trust cLAN-URL") - lower = Gtk.Box(orientation="vertical") - lower.set_spacing(20) - trust_button = Gtk.Button(label="Trust") trust_button.connect("clicked", self.on_trust_clicked) - lower.add(trust_button) + layout.add(trust_button) - layout.pack_start(upper, expand=True, fill=True, padding=0) - layout.pack_end(lower, expand=True, fill=True, padding=0) self.set_center_widget(layout) def on_trust_clicked(self, widget: Gtk.Widget) -> None: