3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2026-03-14 15:26:02 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2017-05-08 10:31:10 +02:00
commit 8ba0ee126e
3 changed files with 24 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plugins/MachineSettingsAction/MachineSettingsAction.qml
View file

@ -29,7 +29,11 @@ Cura.MachineAction
repeat: false
interval: 1
onTriggered: base.extruderTabsCount = (machineExtruderCountProvider.properties.value > 1) ? parseInt(machineExtruderCountProvider.properties.value) : 0
onTriggered:
{
var extruderCount = parseInt(machineExtruderCountProvider.properties.value);
base.extruderTabsCount = (extruderCount > 1) ? extruderCount : 0;
}
}
Connections
@ -42,6 +46,7 @@ Cura.MachineAction
onAccepted: manager.onFinishAction()
onRejected: manager.onFinishAction()
onClosing: manager.onFinishAction()
onVisibilityChanged: extruderTabsCountDelay.start()
}
anchors.fill: parent;

2
plugins/USBPrinting/USBPrinterOutputDeviceManager.py
View file

@ -259,7 +259,7 @@ class USBPrinterOutputDeviceManager(QObject, OutputDevicePlugin, Extension):
i = 0
while True:
values = winreg.EnumValue(key, i)
if not only_list_usb or "USBSER" in values[0]:
if not only_list_usb or "USBSER" or "VCP" in values[0]:
base_list += [values[1]]
i += 1
except Exception as e: