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

Replace with the new add machine dialog

Browse Source 
CURA-6435
This commit is contained in:
Lipu Fei 2019-04-04 16:00:49 +02:00
parent 8f755f8818
commit 8e9a934035
1 changed files with 20 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
resources/qml/Cura.qml
View File

@ -731,44 +731,6 @@ UM.MainWindow
}
}
AddMachineDialog
{
id: addMachineDialog
onMachineAdded:
{
machineActionsWizard.firstRun = addMachineDialog.firstRun
machineActionsWizard.start(id)
}
}
// Dialog to handle first run machine actions
UM.Wizard
{
id: machineActionsWizard;
title: catalog.i18nc("@title:window", "Add Printer")
property var machine;
function start(id)
{
var actions = Cura.MachineActionManager.getFirstStartActions(id)
resetPages() // Remove previous pages
for (var i = 0; i < actions.length; i++)
{
actions[i].displayItem.reset()
machineActionsWizard.appendPage(actions[i].displayItem, catalog.i18nc("@title", actions[i].label));
}
//Only start if there are actions to perform.
if (actions.length > 0)
{
machineActionsWizard.currentPage = 0;
show()
}
}
}
MessageDialog
{
id: messageDialog
@ -812,10 +774,23 @@ UM.MainWindow
}
}
Cura.WizardDialog
{
id: addMachineDialog
title: catalog.i18nc("@title:window", "Add Printer")
model: CuraApplication.getAddPrinterPagesModel()
}
Connections
{
target: Cura.Actions.addMachine
onTriggered: addMachineDialog.visible = true;
onTriggered: addMachineDialog.show()
}
Connections
{
target: CuraApplication
onRequestAddPrinter: addMachineDialog.show()
}
AboutDialog
@ -829,31 +804,17 @@ UM.MainWindow
onTriggered: aboutDialog.visible = true;
}
Connections
{
target: CuraApplication
onRequestAddPrinter:
{
addMachineDialog.visible = true
addMachineDialog.firstRun = false
}
}
Timer
{
id: startupTimer;
interval: 100;
repeat: false;
running: true;
id: startupTimer
interval: 100
repeat: false
running: true
onTriggered:
{
if(!base.visible)
if (!base.visible)
{
base.visible = true;
}
if(!CuraApplication.needToShowUserAgreement && Cura.MachineManager.activeMachine == null)
{
addMachineDialog.open();
base.visible = true
}
}
}