3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 22:54:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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

Browse source
This commit is contained in:
Jaime van Kessel 2016-09-19 15:33:30 +02:00
commit f4cfe75ab1
2 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/MachineSettingsAction/MachineSettingsAction.qml
View file

@ -148,7 +148,15 @@ Cura.MachineAction
ComboBox
{
model: ["RepRap (Marlin/Sprinter)", "UltiGCode", "Repetier"]
currentIndex: machineGCodeFlavorProvider.properties.value != model[1] ? 0 : 1
currentIndex:
{
var index = model.indexOf(machineGCodeFlavorProvider.properties.value);
if(index == -1)
{
index = 0;
}
return index
}
onActivated:
{
machineGCodeFlavorProvider.setPropertyValue("value", model[index]);

13
resources/qml/Cura.qml
View file

@ -402,7 +402,18 @@ UM.MainWindow
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenterOffset: - UM.Theme.getSize("sidebar").width / 2
visible: base.monitoringPrint
source: Cura.MachineManager.printerOutputDevices.length > 0 && Cura.MachineManager.printerOutputDevices[0].cameraImage ? Cura.MachineManager.printerOutputDevices[0].cameraImage : ""
source:
{
if(!base.monitoringPrint)
{
return "";
}
if(Cura.MachineManager.printerOutputDevices.length > 0 && Cura.MachineManager.printerOutputDevices[0].cameraImage)
{
return Cura.MachineManager.printerOutputDevices[0].cameraImage;
}
return "";
}
}
UM.MessageStack