From a20f81d1fc79d86f13019d966f695dc08fd8589f Mon Sep 17 00:00:00 2001
From: Nico Alt <nicoalt@posteo.org>
Date: Fri, 27 Mar 2020 12:00:12 +0000
Subject: [PATCH] Use action for going back from registration passwords page
---
briar-gtk/briar_gtk/actions/registration.py | 9 +++++++++
briar-gtk/briar_gtk/containers/registration.py | 6 +-----
briar-gtk/data/ui/registration.ui | 2 +-
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/briar-gtk/briar_gtk/actions/registration.py b/briar-gtk/briar_gtk/actions/registration.py
index 1b50fee..3e7daae 100644
--- a/briar-gtk/briar_gtk/actions/registration.py
+++ b/briar-gtk/briar_gtk/actions/registration.py
@@ -16,11 +16,20 @@ class RegistrationActions(Actions):
def _setup_actions(self):
self._setup_proceed_from_nickname_action()
+ self._setup_return_from_passwords_action()
def _setup_proceed_from_nickname_action(self):
self._setup_action("proceed-from-nickname", None,
self._proceed_from_nickname)
+ def _setup_return_from_passwords_action(self):
+ self._setup_action("return-from-passwords", None,
+ self._return_from_passwords)
+
# pylint: disable=unused-argument
def _proceed_from_nickname(self, action, parameter):
self.widget.proceed_from_nickname()
+
+ # pylint: disable=unused-argument
+ def _return_from_passwords(self, action, parameter):
+ self.widget.show_nickname_page()
diff --git a/briar-gtk/briar_gtk/containers/registration.py b/briar-gtk/briar_gtk/containers/registration.py
index 360881e..177b965 100644
--- a/briar-gtk/briar_gtk/containers/registration.py
+++ b/briar-gtk/briar_gtk/containers/registration.py
@@ -87,11 +87,7 @@ class RegistrationContainer(Container):
def _on_passwords_enter(self, event):
self.on_create_account_pressed(None)
- # pylint: disable=unused-argument
- def on_create_account_back_pressed(self, button):
- self._show_nickname_page()
-
- def _show_nickname_page(self):
+ def show_nickname_page(self):
nickname_page = self.builder.get_object("nickname_page")
self.registration_flow_stack.set_visible_child(nickname_page)
diff --git a/briar-gtk/data/ui/registration.ui b/briar-gtk/data/ui/registration.ui
index 49a1e8d..7751596 100644
--- a/briar-gtk/data/ui/registration.ui
+++ b/briar-gtk/data/ui/registration.ui
@@ -254,7 +254,7 @@
<object class="GtkButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <signal name="clicked" handler="on_create_account_back_pressed"/>
+ <property name="action_name">registration.return-from-passwords</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
--
GitLab