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

Merge branch 'master' into feature_print_monitoring

Browse source 
# Conflicts:
#	resources/qml/Cura.qml
This commit is contained in:
fieldOfView 2016-06-24 14:55:12 +02:00
commit 55af0af755
5 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
resources/qml/Cura.qml
View file

@ -17,6 +17,11 @@ UM.MainWindow
title: catalog.i18nc("@title:window","Cura");
viewportRect: Qt.rect(0, 0, (base.width - sidebar.width) / base.width, 1.0)
property bool monitoringPrint: false
Component.onCompleted:
{
Printer.setMinimumWindowSize(UM.Theme.getSize("window_minimum_size"))
}
Item
{
id: backgroundItem;
@ -574,9 +579,6 @@ UM.MainWindow
}
}
UM.PreferencesDialog
{
id: preferences