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

Fix a couple of qml casting errors

Browse Source
This commit is contained in:
fieldOfView 2016-08-01 15:22:21 +02:00
parent a9ed562a58
commit 0c8d0a11a9
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resources/qml/AddMachineDialog.qml
View File

@ -16,6 +16,7 @@ UM.Dialog
{ {
id: base id: base
title: catalog.i18nc("@title:window", "Add Printer") title: catalog.i18nc("@title:window", "Add Printer")
property bool firstRun: false
property string preferredCategory: "Ultimaker" property string preferredCategory: "Ultimaker"
property string activeCategory: preferredCategory property string activeCategory: preferredCategory
@ -32,7 +33,7 @@ UM.Dialog
signal machineAdded(string id) signal machineAdded(string id)
function getMachineName() function getMachineName()
{ {
var name = machineList.model.get(machineList.currentIndex).name var name = machineList.model.get(machineList.currentIndex) != undefined ? machineList.model.get(machineList.currentIndex).name : ""
return name return name
} }

1
resources/qml/Cura.qml
View File

@ -677,6 +677,7 @@ UM.MainWindow
id: addMachineDialog id: addMachineDialog
onMachineAdded: onMachineAdded:
{ {
machineActionsWizard.firstRun = addMachineDialog.firstRun
machineActionsWizard.start(id) machineActionsWizard.start(id)
} }
} }

6
resources/qml/Preferences/MachinesPage.qml
View File

@ -83,7 +83,7 @@ UM.ManagementPage
Repeater Repeater
{ {
id: machineActionRepeater id: machineActionRepeater
model: Cura.MachineActionManager.getSupportedActions(Cura.MachineManager.getDefinitionByMachineId(base.currentItem.id)) model: base.currentItem ? Cura.MachineActionManager.getSupportedActions(Cura.MachineManager.getDefinitionByMachineId(base.currentItem.id)) : null
Button Button
{ {
@ -125,8 +125,8 @@ UM.ManagementPage
spacing: UM.Theme.getSize("default_margin").height spacing: UM.Theme.getSize("default_margin").height
Label { text: catalog.i18nc("@label", "Type") } Label { text: catalog.i18nc("@label", "Type"); visible: base.currentItem }
Label { text: base.currentItem ? base.currentItem.metadata.definition_name : "" } Label { text: (base.currentItem && base.currentItem.metadata) ? base.currentItem.metadata.definition_name : "" }
} }
UM.I18nCatalog { id: catalog; name: "uranium"; } UM.I18nCatalog { id: catalog; name: "uranium"; }