3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 06:45:09 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'WIP_onboarding' of https://github.com/Ultimaker/Cura into WIP_onboarding

Browse source
This commit is contained in:
Remco Burema 2019-03-06 14:07:44 +01:00
commit 5f335b4401
73 changed files with 41698 additions and 30106 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/Dialogs/AddMachineDialog.qml
View file

@ -303,7 +303,7 @@ UM.Dialog
{
base.visible = false
var item = machineList.model.getItem(machineList.currentIndex);
Cura.MachineManager.addMachine(machineName.text, item.id)
Cura.MachineManager.addMachine(item.id, machineName.text)
base.machineAdded(item.id) // Emit signal that the user added a machine.
}

5
resources/qml/Preferences/Materials/MaterialsView.qml
View file

@ -90,7 +90,7 @@ TabView
y: UM.Theme.getSize("default_lining").height
width: base.width
property real rowHeight: textField.height + UM.Theme.getSize("default_lining").height
property real rowHeight: brandTextField.height + UM.Theme.getSize("default_lining").height
MessageDialog
{
@ -143,7 +143,7 @@ TabView
Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Brand") }
ReadOnlyTextField
{
id: textField;
id: brandTextField;
width: scrollView.columnWidth;
text: properties.brand;
readOnly: !base.editingEnabled;
@ -153,6 +153,7 @@ TabView
Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Material Type") }
ReadOnlyTextField
{
id: materialTypeField;
width: scrollView.columnWidth;
text: properties.material;
readOnly: !base.editingEnabled;

1
resources/qml/Preferences/ProfileTab.qml
View file

@ -27,6 +27,7 @@ Tab
{
anchors.fill: parent
anchors.margins: UM.Theme.getSize("default_margin").width
id: profileSettingsView
Component
{