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

Merge pull request #636 from Ultimaker/feature_um2upgrades

Browse source 
Support UM2 with Olsson block
This commit is contained in:
Jaime van Kessel 2016-02-24 12:07:35 +01:00
commit dc1ee1d73b
22 changed files with 601 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
resources/qml/WizardPages/AddMachine.qml
View file

@ -231,6 +231,9 @@ Item
case "SelectUpgradedParts":
base.wizard.appendPage(Qt.resolvedUrl("SelectUpgradedParts.qml"), catalog.i18nc("@title", "Select Upgraded Parts"));
break;
case "SelectUpgradedPartsUM2":
base.wizard.appendPage(Qt.resolvedUrl("SelectUpgradedPartsUM2.qml"), catalog.i18nc("@title", "Select Upgraded Parts"));
break;
case "UpgradeFirmware":
base.wizard.appendPage(Qt.resolvedUrl("UpgradeFirmware.qml"), catalog.i18nc("@title", "Upgrade Firmware"));
break;

80
resources/qml/WizardPages/SelectUpgradedPartsUM2.qml Normal file
View file

@ -0,0 +1,80 @@
// Copyright (c) 2015 Ultimaker B.V.
// Cura is released under the terms of the AGPLv3 or higher.
import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Window 2.1
import UM 1.1 as UM
Item
{
id: wizardPage
property string title
SystemPalette{id: palette}
UM.I18nCatalog { id: catalog; name:"cura"}
property variant wizard: null;
Connections
{
target: wizardPage.wizard
onNextClicked: //You can add functions here that get triggered when the final button is clicked in the wizard-element
{
if(wizardPage.wizard.lastPage == true){
wizardPage.wizard.visible = false
}
}
}
Component.onDestruction:
{
if (hotendCheckBox.checked == true){
switch(UM.MachineManager.getMachineDefinitionType()) {
case "ultimaker2":
UM.MachineManager.setMachineDefinitionType("ultimaker2_olsson")
break;
case "ultimaker2_extended":
UM.MachineManager.setMachineDefinitionType("ultimaker2_extended_olsson")
break;
}
}
}
Label
{
id: pageTitle
width: parent.width
text: catalog.i18nc("@title", "Select Upgraded Parts")
wrapMode: Text.WordWrap
font.pointSize: 18
}
Label
{
id: pageDescription
anchors.top: pageTitle.bottom
anchors.topMargin: UM.Theme.sizes.default_margin.height
width: parent.width
wrapMode: Text.WordWrap
text: catalog.i18nc("@label","To assist you in having better default settings for your Ultimaker. Cura would like to know which upgrades you have in your machine:")
}
Item
{
id: pageCheckboxes
height: childrenRect.height
anchors.left: parent.left
anchors.leftMargin: UM.Theme.sizes.default_margin.width
anchors.top: pageDescription.bottom
anchors.topMargin: UM.Theme.sizes.default_margin.height
width: parent.width - UM.Theme.sizes.default_margin.width
CheckBox
{
id: hotendCheckBox
text: catalog.i18nc("@option:check","Olsson Block")
checked: false
}
}
ExclusiveGroup { id: printerGroup; }
}