3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-05 04:54:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix merge conflicts

Browse source
This commit is contained in:
Lipu Fei 2019-03-22 10:25:07 +01:00
commit 77720c9039
4 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
resources/qml/WelcomePages/StepPanel.qml
View file

@ -31,7 +31,7 @@ Item
signal showNextPage()
signal showPreviousPage()
signal passLastPage() // Emitted when there is no more page to show
signal gotoPage(string page_id) // Go to a specific page by the given page_id.
signal goToPage(string page_id) // Go to a specific page by the given page_id.
onShowNextPage:
{
@ -52,7 +52,7 @@ Item
}
}
onGotoPage:
onGoToPage:
{
// find the page index
var page_index = -1
@ -108,7 +108,6 @@ Item
source: parent
horizontalOffset: base.shadowOffset
verticalOffset: base.shadowOffset
visible: true
color: UM.Theme.getColor("monitor_shadow")
transparentBorder: true
// Should always be drawn behind the background.