From 409e97012f027e7388ce34125546582b431bbe53 Mon Sep 17 00:00:00 2001
From: Nico Alt <nicoalt@posteo.org>
Date: Fri, 27 Mar 2020 12:00:08 +0000
Subject: [PATCH] Use action instead of add_contact_pressed function
---
briar-gtk/briar_gtk/actions/add_contact.py | 8 ++++++++
briar-gtk/briar_gtk/containers/add_contact.py | 4 ++--
briar-gtk/data/ui/add_contact.ui | 2 +-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/briar-gtk/briar_gtk/actions/add_contact.py b/briar-gtk/briar_gtk/actions/add_contact.py
index aadeed8..bc99649 100644
--- a/briar-gtk/briar_gtk/actions/add_contact.py
+++ b/briar-gtk/briar_gtk/actions/add_contact.py
@@ -15,15 +15,23 @@ class AddContactActions(Actions):
self._setup_actions()
def _setup_actions(self):
+ self._setup_add_contact_action()
self._setup_proceed_from_links_action()
self._setup_return_from_alias_action()
+ def _setup_add_contact_action(self):
+ self._setup_action("add-contact", None, self._add_contact)
+
def _setup_proceed_from_links_action(self):
self._setup_action("proceed-from-links", None, self._proceed_from_links)
def _setup_return_from_alias_action(self):
self._setup_action("return-from-alias", None, self._return_from_alias)
+ # pylint: disable=unused-argument
+ def _add_contact(self, action, parameter):
+ self.widget.on_add_contact_pressed()
+
# pylint: disable=unused-argument
def _proceed_from_links(self, action, parameter):
self.widget.proceed_from_links()
diff --git a/briar-gtk/briar_gtk/containers/add_contact.py b/briar-gtk/briar_gtk/containers/add_contact.py
index 9689fa8..012e917 100644
--- a/briar-gtk/briar_gtk/containers/add_contact.py
+++ b/briar-gtk/briar_gtk/containers/add_contact.py
@@ -99,14 +99,14 @@ class AddContactContainer(Container):
# pylint: disable=unused-argument
def _on_alias_enter(self, widget):
- self.on_add_contact_pressed(None)
+ self.on_add_contact_pressed()
def show_links_page(self):
links_page = self.builder.get_object("links_page")
self.add_contact_flow_stack.set_visible_child(links_page)
# pylint: disable=unused-argument
- def on_add_contact_pressed(self, button):
+ def on_add_contact_pressed(self):
alias_error_label = self.builder.get_object(
"alias_error_label")
if self._alias_is_empty():
diff --git a/briar-gtk/data/ui/add_contact.ui b/briar-gtk/data/ui/add_contact.ui
index 0ba33b2..7ff67d0 100644
--- a/briar-gtk/data/ui/add_contact.ui
+++ b/briar-gtk/data/ui/add_contact.ui
@@ -247,7 +247,7 @@
<property name="use_underline">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Add contact</property>
- <signal name="clicked" handler="on_add_contact_pressed"/>
+ <property name="action_name">add-contact.add-contact</property>
<style>
<class name="suggested-action"/>
</style>
--
GitLab