3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-02 15:21:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge branch 'master' of github.com:Ultimaker/Cura into CURA-6435_new_style_add_machine

Browse source
This commit is contained in:
Jaime van Kessel 2019-04-17 11:06:30 +02:00
commit ef92aad6bb
25 changed files with 185 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

1
resources/qml/WelcomePages/WelcomeDialogItem.qml
View file

@ -26,6 +26,7 @@ Item
property int shadowOffset: 1 * screenScaleFactor
property alias progressBarVisible: wizardPanel.progressBarVisible
property var model: CuraApplication.getWelcomePagesModel()
onVisibleChanged:

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

@ -51,7 +51,7 @@ Item
id: getStartedButton
anchors.right: parent.right
anchors.bottom: parent.bottom
text: catalog.i18nc("@button", "Next")
text: base.currentItem.next_page_button_text
onClicked: base.showNextPage()
}
}