GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-11 08:19:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename WelcomDialog to WelcomeDialogItem

Browse Source 
CURA-6435
This commit is contained in:
Lipu Fei 2019-04-04 15:52:31 +02:00
parent 2dd4a30586
commit a030e4a264
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
resources/qml/Cura.qml
View File

@ -46,7 +46,7 @@ UM.MainWindow
{ {
id: greyOutBackground id: greyOutBackground
anchors.fill: parent anchors.fill: parent
visible: welcomeDialog.visible visible: welcomeDialogItem.visible
color: UM.Theme.getColor("window_disabled_background") color: UM.Theme.getColor("window_disabled_background")
opacity: 0.7 opacity: 0.7
z: stageMenu.z + 1 z: stageMenu.z + 1
@ -61,9 +61,9 @@ UM.MainWindow
} }
} }
WelcomeDialog WelcomeDialogItem
{ {
id: welcomeDialog id: welcomeDialogItem
visible: true // True, so if somehow no preferences are found/loaded, it's shown anyway. visible: true // True, so if somehow no preferences are found/loaded, it's shown anyway.
z: greyOutBackground.z + 1 z: greyOutBackground.z + 1
} }
@ -86,11 +86,11 @@ UM.MainWindow
if (CuraApplication.needToShowUserAgreement) if (CuraApplication.needToShowUserAgreement)
{ {
welcomeDialog.visible = true welcomeDialogItem.visible = true
} }
else else
{ {
welcomeDialog.visible = false welcomeDialogItem.visible = false
} }
// TODO: While the new onboarding process contains the user-agreement, // TODO: While the new onboarding process contains the user-agreement,
// it should probably not entirely rely on 'needToShowUserAgreement' for show/hide. // it should probably not entirely rely on 'needToShowUserAgreement' for show/hide.

8
resources/qml/WelcomePages/WelcomeDialog.qml → resources/qml/WelcomePages/WelcomeDialogItem.qml
View File

@ -11,7 +11,7 @@ import Cura 1.1 as Cura
// //
// This is a no-frame dialog that shows the welcome process. // This is an Item that tries to mimic a dialog for showing the welcome process.
// //
Item Item
{ {
@ -38,7 +38,7 @@ Item
WizardPanel WizardPanel
{ {
id: stepPanel id: wizardPanel
anchors.fill: parent anchors.fill: parent
model: dialog.model model: dialog.model
} }
@ -48,8 +48,8 @@ Item
{ {
id: shadow id: shadow
radius: UM.Theme.getSize("first_run_shadow_radius").width radius: UM.Theme.getSize("first_run_shadow_radius").width
anchors.fill: stepPanel anchors.fill: wizardPanel
source: stepPanel source: wizardPanel
horizontalOffset: shadowOffset horizontalOffset: shadowOffset
verticalOffset: shadowOffset verticalOffset: shadowOffset
color: UM.Theme.getColor("first_run_shadow") color: UM.Theme.getColor("first_run_shadow")