From cffb349fa74867ef07d79fddc413e16cde97c285 Mon Sep 17 00:00:00 2001
From: Nico Alt <nicoalt@posteo.org>
Date: Fri, 27 Mar 2020 12:00:10 +0000
Subject: [PATCH] Use action instead of on_nickname_pressed function
---
briar-gtk/briar_gtk/actions/registration.py | 9 ++++++++-
briar-gtk/briar_gtk/containers/registration.py | 4 ++--
briar-gtk/data/ui/registration.ui | 2 +-
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/briar-gtk/briar_gtk/actions/registration.py b/briar-gtk/briar_gtk/actions/registration.py
index a43875b..b771833 100644
--- a/briar-gtk/briar_gtk/actions/registration.py
+++ b/briar-gtk/briar_gtk/actions/registration.py
@@ -15,4 +15,11 @@ class RegistrationActions(Actions):
self._setup_actions()
def _setup_actions(self):
- pass
+ self._setup_proceed_from_nickname_action()
+
+ def _setup_proceed_from_nickname_action(self):
+ self._setup_action("proceed-from-nickname", None, self._proceed_from_nickname)
+
+ # pylint: disable=unused-argument
+ def _proceed_from_nickname(self, action, parameter):
+ self.widget.proceed_from_nickname()
diff --git a/briar-gtk/briar_gtk/containers/registration.py b/briar-gtk/briar_gtk/containers/registration.py
index 7a19a0d..360881e 100644
--- a/briar-gtk/briar_gtk/containers/registration.py
+++ b/briar-gtk/briar_gtk/containers/registration.py
@@ -51,10 +51,10 @@ class RegistrationContainer(Container):
# pylint: disable=unused-argument
def _on_nickname_enter(self, event):
- self.on_nickname_next_pressed(None)
+ self.proceed_from_nickname()
# pylint: disable=unused-argument
- def on_nickname_next_pressed(self, button):
+ def proceed_from_nickname(self):
nickname_error_label = self.builder.get_object("nickname_error_label")
if self._nickname_is_empty():
nickname_error_label.show()
diff --git a/briar-gtk/data/ui/registration.ui b/briar-gtk/data/ui/registration.ui
index bafce11..49a1e8d 100644
--- a/briar-gtk/data/ui/registration.ui
+++ b/briar-gtk/data/ui/registration.ui
@@ -230,7 +230,7 @@
<property name="use_underline">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Next</property>
- <signal name="clicked" handler="on_nickname_next_pressed"/>
+ <property name="action_name" translatable="yes">registration.proceed-from-nickname</property>
<style>
<class name="suggested-action"/>
</style>
--
GitLab