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

Remove hack in WelcomePagesModel and add WhatsNewPagesModel

Browse source 
CURA-6447
This commit is contained in:
Lipu Fei 2019-04-12 12:10:56 +02:00
parent e0e3c9609f
commit 9494173f43
7 changed files with 116 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

78
resources/qml/Cura.qml
View file

@ -68,32 +68,54 @@ UM.MainWindow
z: greyOutBackground.z + 1
}
Component.onCompleted:
Connections
{
CuraApplication.setMinimumWindowSize(UM.Theme.getSize("window_minimum_size"))
// Workaround silly issues with QML Action's shortcut property.
//
// Currently, there is no way to define shortcuts as "Application Shortcut".
// This means that all Actions are "Window Shortcuts". The code for this
// implements a rather naive check that just checks if any of the action's parents
// are a window. Since the "Actions" object is a singleton it has no parent by
// default. If we set its parent to something contained in this window, the
// shortcut will activate properly because one of its parents is a window.
//
// This has been fixed for QtQuick Controls 2 since the Shortcut item has a context property.
Cura.Actions.parent = backgroundItem
CuraApplication.purgeWindows()
target: CuraApplication
onInitializationFinished:
{
CuraApplication.setMinimumWindowSize(UM.Theme.getSize("window_minimum_size"))
// Workaround silly issues with QML Action's shortcut property.
//
// Currently, there is no way to define shortcuts as "Application Shortcut".
// This means that all Actions are "Window Shortcuts". The code for this
// implements a rather naive check that just checks if any of the action's parents
// are a window. Since the "Actions" object is a singleton it has no parent by
// default. If we set its parent to something contained in this window, the
// shortcut will activate properly because one of its parents is a window.
//
// This has been fixed for QtQuick Controls 2 since the Shortcut item has a context property.
Cura.Actions.parent = backgroundItem
CuraApplication.purgeWindows()
if (CuraApplication.getWelcomePagesModel().shouldShowWelcomeFlow)
{
welcomeDialogItem.visible = true
}
else
{
welcomeDialogItem.visible = false
if (CuraApplication.shouldShowWelcomeDialog())
{
welcomeDialogItem.visible = true
}
else
{
welcomeDialogItem.visible = false
}
if (CuraApplication.shouldShowWhatsNewDialog())
{
showWhatsNewDialogTimer.start()
}
}
}
// HACK: Use a timer here because if we call "Cura.Actions.whatsNew.trigger()" or "whatsNewDialog.show()" when
// the component gets completed or when the application finishes its initialization, the main window has not been
// fully initialized yet. If we should the dialog before the main window is fully initialized, you will see the
// dialog first but when the main windows is fully initialized, the dialog will disappear. Adding a timer here is
// to bypass this problem.
Timer
{
id: showWhatsNewDialogTimer
repeat: false
interval: 1000
onTriggered: Cura.Actions.whatsNew.trigger()
}
Item
{
id: backgroundItem
@ -780,6 +802,20 @@ UM.MainWindow
progressBarVisible: false
}
Cura.WizardDialog
{
id: whatsNewDialog
title: catalog.i18nc("@title:window", "What's New")
model: CuraApplication.getWhatsNewPagesModel()
progressBarVisible: false
}
Connections
{
target: Cura.Actions.whatsNew
onTriggered: whatsNewDialog.show()
}
Connections
{
target: Cura.Actions.addMachine