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

contributes to #CURA-256

Browse Source
This commit is contained in:
Tamara Hogenhout 2015-10-12 18:39:53 +02:00
parent 9aeb9bb37d
commit a855da5c4c
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
resources/qml/WizardPages/AddMachine.qml
View File

@ -128,14 +128,7 @@ Item
text: model.name text: model.name
onClicked: { onClicked: ListView.view.currentIndex = index;
ListView.view.currentIndex = index;
if(model.pages.length > 0) {
base.wizard.nextAvailable = true;
} else {
base.wizard.nextAvailable = false;
}
}
Label Label
{ {

14
resources/qml/WizardPages/SelectUpgradedParts.qml
View File

@ -50,15 +50,25 @@ Item
} }
CheckBox CheckBox
{ {
id: heatedBedCheckBox1
text: catalog.i18nc("@option:check","Heated printer bed (standard kit)") text: catalog.i18nc("@option:check","Heated printer bed (standard kit)")
y: checkBox.height * 1 y: checkBox.height * 1
onClicked: UM.MachineManager.setMachineSettingValue("machine_heated_bed", true) onClicked: {
UM.MachineManager.setMachineSettingValue("machine_heated_bed", true)
if (heatedBedCheckBox2.checked == true)
heatedBedCheckBox2.checked = false
}
} }
CheckBox CheckBox
{ {
id: heatedBedCheckBox2
text: catalog.i18nc("@option:check","Heated printer bed (self built)") text: catalog.i18nc("@option:check","Heated printer bed (self built)")
y: checkBox.height * 2 y: checkBox.height * 2
onClicked: UM.MachineManager.setMachineSettingValue("machine_heated_bed", true) onClicked: {
UM.MachineManager.setMachineSettingValue("machine_heated_bed", true)
if (heatedBedCheckBox1.checked == true)
heatedBedCheckBox1.checked = false
}
} }
CheckBox CheckBox
{ {

13
resources/qml/WizardPages/UltimakerCheckup.qml
View File

@ -20,7 +20,7 @@ Item
property bool heater_works: false property bool heater_works: false
property int extruder_target_temp: 0 property int extruder_target_temp: 0
property int bed_target_temp: 0 property int bed_target_temp: 0
property variant printer_connection: UM.USBPrinterManager.connectedPrinterList.rowCount() != 0 ? UM.USBPrinterManager.connectedPrinterList.getItem(0).printer: null property variant printer_connection: UM.USBPrinterManager.connectedPrinterList.rowCount() != 0 ? UM.USBPrinterManager.connectedPrinterList.getItem(0).printer : null
UM.I18nCatalog { id: catalog; name:"cura"} UM.I18nCatalog { id: catalog; name:"cura"}
Component.onCompleted: Component.onCompleted:
@ -65,7 +65,6 @@ Item
anchors.top: parent.top anchors.top: parent.top
anchors.left: parent.left anchors.left: parent.left
text: catalog.i18nc("@action:button","Start Printer Check"); text: catalog.i18nc("@action:button","Start Printer Check");
enabled: manager.progress >= 100;
onClicked: { onClicked: {
checkupContent.visible = true checkupContent.visible = true
startCheckButton.enabled = false startCheckButton.enabled = false
@ -80,7 +79,6 @@ Item
anchors.left: parent.width < wizardPage.width ? startCheckButton.right : parent.left anchors.left: parent.width < wizardPage.width ? startCheckButton.right : parent.left
anchors.leftMargin: parent.width < wizardPage.width ? UM.Theme.sizes.default_margin.width : 0 anchors.leftMargin: parent.width < wizardPage.width ? UM.Theme.sizes.default_margin.width : 0
text: catalog.i18nc("@action:button","Skip Printer Check"); text: catalog.i18nc("@action:button","Skip Printer Check");
enabled: manager.progress >= 100;
onClicked: { onClicked: {
base.currentPage += 1 base.currentPage += 1
} }
@ -109,7 +107,7 @@ Item
anchors.left: connectionLabel.right anchors.left: connectionLabel.right
anchors.top: parent.top anchors.top: parent.top
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
text: UM.USBPrinterManager.connectedPrinterList.count ? catalog.i18nc("@info:status","Done"):catalog.i18nc("@info:status","Incomplete") text: UM.USBPrinterManager.connectedPrinterList.rowCount() > 0 ? catalog.i18nc("@info:status","Done"):catalog.i18nc("@info:status","Incomplete")
} }
////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////
Label Label
@ -205,7 +203,7 @@ Item
{ {
if(printer_connection != null) if(printer_connection != null)
{ {
heater_status_label.text = catalog.i18nc("@info:progress","Checking") nozzleTempStatus.text = catalog.i18nc("@info:progress","Checking")
printer_connection.heatupNozzle(190) printer_connection.heatupNozzle(190)
wizardPage.extruder_target_temp = 190 wizardPage.extruder_target_temp = 190
} }
@ -300,13 +298,14 @@ Item
z_min_pressed = true z_min_pressed = true
} }
} }
onExtruderTemperatureChanged: onExtruderTemperatureChanged:
{ {
if(printer_connection.extruderTemperature > wizardPage.extruder_target_temp - 10 && printer_connection.extruderTemperature < wizardPage.extruder_target_temp + 10) if(printer_connection.extruderTemperature > wizardPage.extruder_target_temp - 10 && printer_connection.extruderTemperature < wizardPage.extruder_target_temp + 10)
{ {
if(printer_connection != null) if(printer_connection != null)
{ {
heater_status_label.text = catalog.i18nc("@info:status","Works") nozzleTempStatus.text = catalog.i18nc("@info:status","Works")
printer_connection.heatupNozzle(0) printer_connection.heatupNozzle(0)
} }
} }
@ -315,7 +314,7 @@ Item
{ {
if(printer_connection.bedTemperature > wizardPage.bed_target_temp - 5 && printer_connection.bedTemperature < wizardPage.bed_target_temp + 5) if(printer_connection.bedTemperature > wizardPage.bed_target_temp - 5 && printer_connection.bedTemperature < wizardPage.bed_target_temp + 5)
{ {
bed_status_label.text = catalog.i18nc("@info:status","Works") bedTempStatus.text = catalog.i18nc("@info:status","Works")
printer_connection.heatupBed(0) printer_connection.heatupBed(0)
} }
} }