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

This commit is contained in:
Jaime van Kessel 2017-01-23 15:09:48 +01:00
commit 858886d6b7
2 changed files with 1 additions and 4 deletions

View file

@ -12,11 +12,9 @@ UM.Dialog
{ {
width: 350 * Screen.devicePixelRatio; width: 350 * Screen.devicePixelRatio;
minimumWidth: 350 * Screen.devicePixelRatio; minimumWidth: 350 * Screen.devicePixelRatio;
maximumWidth: 350 * Screen.devicePixelRatio;
height: 250 * Screen.devicePixelRatio; height: 250 * Screen.devicePixelRatio;
minimumHeight: 250 * Screen.devicePixelRatio; minimumHeight: 250 * Screen.devicePixelRatio;
maximumHeight: 250 * Screen.devicePixelRatio;
title: catalog.i18nc("@title:window", "Convert Image...") title: catalog.i18nc("@title:window", "Convert Image...")

View file

@ -15,11 +15,10 @@ UM.Dialog
width: 550 width: 550
minimumWidth: 550 minimumWidth: 550
maximumWidth: 550
height: 350 height: 350
minimumHeight: 350 minimumHeight: 350
maximumHeight: 350
property int spacerHeight: 10 property int spacerHeight: 10
property bool dontShowAgain: true property bool dontShowAgain: true