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

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

Browse source
This commit is contained in:
ChrisTerBeke 2018-12-19 10:47:03 +01:00
commit 60335681c7
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugins/MachineSettingsAction/MachineSettingsAction.qml
View file

@ -13,7 +13,8 @@ import Cura 1.0 as Cura
Cura.MachineAction
{
id: base
property var extrudersModel: CuraApplication.getExtrudersModel()
property var extrudersModel: Cura.ExtrudersModel{} // Do not retrieve the Model from a backend. Otherwise the tabs
// in tabView will not removed/updated. Probably QML bug
property int extruderTabsCount: 0
property var activeMachineId: Cura.MachineManager.activeMachine != null ? Cura.MachineManager.activeMachine.id : ""

1
resources/qml/PrinterTypeLabel.qml
View file

@ -19,6 +19,7 @@ Item
{
anchors.fill: parent
color: UM.Theme.getColor("printer_type_label_background")
radius: UM.Theme.getSize("checkbox_radius").width
}
Label