3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 06:57:28 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Transfer the "What's new" and "Changelog" pages at the end of wizard

Browse source 
To match the requirements specified in the ticket.

CURA-8014
This commit is contained in:
Kostas Karmas 2021-03-25 13:29:17 +01:00
parent 7af6ea5cc5
commit 179d77ef5c
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
cura/UI/WelcomePagesModel.py
View file

@ -239,10 +239,6 @@ class WelcomePagesModel(ListModel):
{"id": "user_agreement", {"id": "user_agreement",
"page_url": self._getBuiltinWelcomePagePath("UserAgreementContent.qml"), "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", {"id": "data_collections",
"page_url": self._getBuiltinWelcomePagePath("DataCollectionsContent.qml"), "page_url": self._getBuiltinWelcomePagePath("DataCollectionsContent.qml"),
}, },
@ -260,13 +256,21 @@ class WelcomePagesModel(ListModel):
}, },
{"id": "add_cloud_printers", {"id": "add_cloud_printers",
"page_url": self._getBuiltinWelcomePagePath("AddCloudPrintersView.qml"), "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", "Next"),
"next_page_button_text": self._catalog.i18nc("@action:button", "Finish"), "next_page_id": "whats_new",
}, },
{"id": "machine_actions", {"id": "machine_actions",
"page_url": self._getBuiltinWelcomePagePath("FirstStartMachineActionsContent.qml"), "page_url": self._getBuiltinWelcomePagePath("FirstStartMachineActionsContent.qml"),
"should_show_function": self.shouldShowMachineActions, "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 pages_to_show = all_pages_list

2
resources/qml/WelcomePages/AddCloudPrintersView.qml
View file

@ -215,7 +215,7 @@ Item
id: finishButton id: finishButton
anchors.right: parent.right anchors.right: parent.right
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
text: catalog.i18nc("@button", "Finish") text: base.currentItem.next_page_button_text
onClicked: onClicked:
{ {
discoveredCloudPrintersModel.clear() discoveredCloudPrintersModel.clear()