3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 14:04:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch 'master' into container_stack_improvements

Browse source
This commit is contained in:
ChrisTerBeke 2017-10-26 10:19:45 +02:00
commit c54dc0a723
13 changed files with 154 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugins/CuraEngineBackend/ProcessSlicedLayersJob.py
View file

@ -240,3 +240,4 @@ class ProcessSlicedLayersJob(Job):
else:
if self._progress_message:
self._progress_message.hide()

2
plugins/PluginBrowser/PluginBrowser.qml
View file

@ -114,7 +114,7 @@ UM.Dialog
anchors.rightMargin: UM.Theme.getSize("default_margin").width
Label
{
text: "<b>" + model.name + "</b> - " + model.author
text: "<b>" + model.name + "</b>" + ((model.author !== "") ? (" - " + model.author) : "")
width: contentWidth
height: contentHeight + UM.Theme.getSize("default_margin").height
verticalAlignment: Text.AlignVCenter

4
plugins/UM3NetworkPrinting/NetworkClusterPrinterOutputDevice.py
View file

@ -220,7 +220,9 @@ class NetworkClusterPrinterOutputDevice(NetworkPrinterOutputDevice.NetworkPrinte
self.setPrinters(json_data)
def materialHotendChangedMessage(self, callback):
pass # Do nothing.
# When there is just one printer, the activate configuration option is enabled
if (self._cluster_size == 1):
super().materialHotendChangedMessage(callback = callback)
def _startCameraStream(self):
## Request new image

10
plugins/UM3NetworkPrinting/UM3InfoComponents.qml
View file

@ -115,8 +115,16 @@ Item
{
tooltip: catalog.i18nc("@info:tooltip", "Load the configuration of the printer into Cura")
text: catalog.i18nc("@action:button", "Activate Configuration")
visible: printerConnected
visible: printerConnected && !isClusterPrinter()
onClicked: manager.loadConfigurationFromPrinter()
function isClusterPrinter() {
var clusterSize = Cura.MachineManager.printerOutputDevices[0].clusterSize
// This is a non cluster printer or the cluster it is just one printer
if (clusterSize == undefined || clusterSize == 1)
return false
return true
}
}
}