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

CURA-4400 code style

Browse Source
This commit is contained in:
Jack Ha 2018-03-08 14:32:10 +01:00
parent 138f77179d
commit 5135a972a2
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
resources/qml/Cura.qml
View File

@ -194,22 +194,26 @@ UM.MainWindow
NozzleMenu { title: Cura.MachineManager.activeDefinitionVariantsName; visible: Cura.MachineManager.hasVariants; extruderIndex: index } NozzleMenu { title: Cura.MachineManager.activeDefinitionVariantsName; visible: Cura.MachineManager.hasVariants; extruderIndex: index }
MaterialMenu { title: catalog.i18nc("@title:menu", "&Material"); visible: Cura.MachineManager.hasMaterials; extruderIndex: index } MaterialMenu { title: catalog.i18nc("@title:menu", "&Material"); visible: Cura.MachineManager.hasMaterials; extruderIndex: index }
MenuSeparator { MenuSeparator
{
visible: Cura.MachineManager.hasVariants || Cura.MachineManager.hasMaterials visible: Cura.MachineManager.hasVariants || Cura.MachineManager.hasMaterials
} }
MenuItem { MenuItem
{
text: catalog.i18nc("@action:inmenu", "Set as Active Extruder") text: catalog.i18nc("@action:inmenu", "Set as Active Extruder")
onTriggered: Cura.MachineManager.setExtruderIndex(model.index) onTriggered: Cura.MachineManager.setExtruderIndex(model.index)
} }
MenuItem { MenuItem
{
text: catalog.i18nc("@action:inmenu", "Enable Extruder") text: catalog.i18nc("@action:inmenu", "Enable Extruder")
onTriggered: Cura.MachineManager.setExtruderEnabled(model.index, true) onTriggered: Cura.MachineManager.setExtruderEnabled(model.index, true)
visible: !Cura.MachineManager.getExtruder(model.index).isEnabled visible: !Cura.MachineManager.getExtruder(model.index).isEnabled
} }
MenuItem { MenuItem
{
text: catalog.i18nc("@action:inmenu", "Disable Extruder") text: catalog.i18nc("@action:inmenu", "Disable Extruder")
onTriggered: Cura.MachineManager.setExtruderEnabled(model.index, false) onTriggered: Cura.MachineManager.setExtruderEnabled(model.index, false)
visible: Cura.MachineManager.getExtruder(model.index).isEnabled visible: Cura.MachineManager.getExtruder(model.index).isEnabled

9
resources/qml/Settings/SettingExtruder.qml
View File

@ -17,7 +17,8 @@ SettingItem
id: control id: control
anchors.fill: parent anchors.fill: parent
model: Cura.ExtrudersModel { model: Cura.ExtrudersModel
{
onModelChanged: { onModelChanged: {
control.color = getItem(control.currentIndex).color; control.color = getItem(control.currentIndex).color;
} }
@ -27,10 +28,12 @@ SettingItem
onActivated: onActivated:
{ {
if (model.getItem(index).enabled) { if (model.getItem(index).enabled)
{
forceActiveFocus(); forceActiveFocus();
propertyProvider.setPropertyValue("value", model.getItem(index).index); propertyProvider.setPropertyValue("value", model.getItem(index).index);
} else { } else
{
currentIndex = propertyProvider.properties.value; // keep the old value currentIndex = propertyProvider.properties.value; // keep the old value
} }
} }