From fe6842af7a792415b208cd510a8a6a11b9d508bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <philipp@hoerist.com>
Date: Fri, 29 Nov 2019 23:29:01 +0100
Subject: [PATCH] Assistant: Add get_page()
Use get_page() instead of page specific methods
---
gajim/gtk/assistant.py | 7 ++-----
test/gtk/assistant.py | 18 ++++++++++--------
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/gajim/gtk/assistant.py b/gajim/gtk/assistant.py
index aa7500540d..5416f91ebc 100644
--- a/gajim/gtk/assistant.py
+++ b/gajim/gtk/assistant.py
@@ -114,11 +114,8 @@ def show_page(self, name, transition=Gtk.StackTransitionType.NONE):
self._set_buttons_visible(buttons)
self._ui.stack.set_visible_child_full(name, transition)
- def get_error_page(self):
- return self._pages['error']
-
- def get_success_page(self):
- return self._pages['success']
+ def get_page(self, name):
+ return self._pages[name]
def _set_buttons_visible(self, buttons):
for button in self._buttons.values():
diff --git a/test/gtk/assistant.py b/test/gtk/assistant.py
index 8a049a72c8..d988e87fae 100644
--- a/test/gtk/assistant.py
+++ b/test/gtk/assistant.py
@@ -20,6 +20,16 @@ def __init__(self):
self.add_default_page('error')
self.add_default_page('success')
+ success_page = self.get_page('success')
+ success_page.set_title('Success')
+ success_page.set_heading('Success Heading')
+ success_page.set_text('This is the success text')
+
+ error_page = self.get_page('error')
+ error_page.set_title('Error')
+ error_page.set_heading('Error Heading')
+ error_page.set_text('This is the error text')
+
self.add_button('forward', 'Forward', 'suggested-action')
self.add_button('close', 'Close', 'destructive-action')
self.add_button('back', 'Back')
@@ -77,17 +87,9 @@ def _on_page_changed(self, _assistant, page_name):
self.set_default_button('forward')
elif page_name == 'success':
- success_page = self.get_success_page()
- success_page.set_title('Success')
- success_page.set_heading('Success Heading')
- success_page.set_text('This is the success text')
self.set_default_button('forward')
elif page_name == 'error':
- error_page = self.get_error_page()
- error_page.set_title('Error')
- error_page.set_heading('Error Heading')
- error_page.set_text('This is the error text')
self.set_default_button('back')
--
GitLab