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

Merge remote-tracking branch 'origin/3.6' into CURA-5821_fix_camera_memory_leak

Browse source
This commit is contained in:
Lipu Fei 2018-10-25 14:53:42 +02:00
commit 31bdeb8b73
5 changed files with 45 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plugins/UM3NetworkPrinting/resources/qml/PrintWindow.qml
View file

@ -8,9 +8,6 @@ import UM 1.1 as UM
UM.Dialog {
id: base;
property var printersModel: {
return ListModel{};
}
height: minimumHeight;
leftButtons: [
Button {
@ -87,7 +84,9 @@ UM.Dialog {
id: printerSelectionCombobox;
Behavior on height { NumberAnimation { duration: 100 } }
height: 40 * screenScaleFactor;
model: base.printersModel;
model: ListModel {
id: printersModel;
}
textRole: "name";
width: parent.width;
}