3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-03 15:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch '4.0' into STAR-322_cloud-connection

Browse source
This commit is contained in:
ChrisTerBeke 2019-01-14 14:16:35 +01:00
commit f2922e2405
7 changed files with 68 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
resources/qml/PrinterSelector/MachineSelector.qml
View file

@ -26,7 +26,14 @@ Cura.ExpandablePopup
headerItem: Cura.IconWithText
{
text: isNetworkPrinter ? Cura.MachineManager.activeMachineNetworkGroupName : Cura.MachineManager.activeMachineName
text:
{
if (isNetworkPrinter && Cura.MachineManager.activeMachineNetworkGroupName != "")
{
return Cura.MachineManager.activeMachineNetworkGroupName
}
return Cura.MachineManager.activeMachineName
}
source:
{
if (isGroup)