diff options
| author | Kostas Karmas <konskarm@gmail.com> | 2021-03-25 15:29:17 +0300 |
|---|---|---|
| committer | Kostas Karmas <konskarm@gmail.com> | 2021-03-25 15:29:17 +0300 |
| commit | 179d77ef5cc3ee1608fa7f17c7a40fc7bacc4f4f (patch) | |
| tree | 669481197e446870196e8b7d08779fe6e976f04f /cura/UI | |
| parent | 7af6ea5cc54f6ad2b8486fbc30af56ce30af3e99 (diff) | |
Transfer the "What's new" and "Changelog" pages at the end of wizard
To match the requirements specified in the ticket.
CURA-8014
Diffstat (limited to 'cura/UI')
| -rw-r--r-- | cura/UI/WelcomePagesModel.py | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/cura/UI/WelcomePagesModel.py b/cura/UI/WelcomePagesModel.py index 3fdcebe0a0..3c2d0503ab 100644 --- a/cura/UI/WelcomePagesModel.py +++ b/cura/UI/WelcomePagesModel.py @@ -239,10 +239,6 @@ class WelcomePagesModel(ListModel): {"id": "user_agreement", "page_url": self._getBuiltinWelcomePagePath("UserAgreementContent.qml"), }, - {"id": "whats_new", - "page_url": self._getBuiltinWelcomePagePath("WhatsNewContent.qml"), - "next_page_button_text": self._catalog.i18nc("@action:button", "Skip"), - }, {"id": "data_collections", "page_url": self._getBuiltinWelcomePagePath("DataCollectionsContent.qml"), }, @@ -260,13 +256,21 @@ class WelcomePagesModel(ListModel): }, {"id": "add_cloud_printers", "page_url": self._getBuiltinWelcomePagePath("AddCloudPrintersView.qml"), - "is_final_page": True, # If we end up in this page, the next button will close the dialog - "next_page_button_text": self._catalog.i18nc("@action:button", "Finish"), + "next_page_button_text": self._catalog.i18nc("@action:button", "Next"), + "next_page_id": "whats_new", }, {"id": "machine_actions", "page_url": self._getBuiltinWelcomePagePath("FirstStartMachineActionsContent.qml"), "should_show_function": self.shouldShowMachineActions, }, + {"id": "whats_new", + "page_url": self._getBuiltinWelcomePagePath("WhatsNewContent.qml"), + "next_page_button_text": self._catalog.i18nc("@action:button", "Skip"), + }, + {"id": "changelog", + "page_url": self._getBuiltinWelcomePagePath("ChangelogContent.qml"), + "next_page_button_text": self._catalog.i18nc("@action:button", "Finish"), + }, ] pages_to_show = all_pages_list |