From 6474f3eb254fad8cf538e39be4b25a5fda34b436 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Fri, 24 Mar 2017 09:12:48 +0100 Subject: [PATCH 1/3] Ups the limit of the maximum cost of a spool of filament This is necessary for currencies such as Japanese Yen or South Korean Won, where prices can easily exceed 1000. This PR sets the limit to 100,000,000. If the price of a spool exceeds this amount, perhaps the user should consider moving to a more stable country. Fixes https://github.com/Ultimaker/Cura/issues/1567 --- resources/qml/Preferences/MaterialView.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Preferences/MaterialView.qml b/resources/qml/Preferences/MaterialView.qml index ba36674b40..3e17943310 100644 --- a/resources/qml/Preferences/MaterialView.qml +++ b/resources/qml/Preferences/MaterialView.qml @@ -153,7 +153,7 @@ TabView value: base.getMaterialPreferenceValue(properties.guid, "spool_cost") prefix: base.currency + " " decimals: 2 - maximumValue: 1000 + maximumValue: 100000000 onValueChanged: { base.setMaterialPreferenceValue(properties.guid, "spool_cost", parseFloat(value)) From 0f0b8cd5dd2a40a673b5fc444797007b804c9db5 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 24 Mar 2017 10:47:47 +0100 Subject: [PATCH 2/3] Lower QtQuick requirement further to 2.2 2.2 is required for the modifications we make to the Button objects. --- resources/qml/OpenFilesIncludingProjectsDialog.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/OpenFilesIncludingProjectsDialog.qml b/resources/qml/OpenFilesIncludingProjectsDialog.qml index 377c9a65ee..c27bee6d9d 100644 --- a/resources/qml/OpenFilesIncludingProjectsDialog.qml +++ b/resources/qml/OpenFilesIncludingProjectsDialog.qml @@ -1,7 +1,7 @@ -// Copyright (c) 2015 Ultimaker B.V. +// Copyright (c) 2017 Ultimaker B.V. // Cura is released under the terms of the AGPLv3 or higher. -import QtQuick 2.6 +import QtQuick 2.5 import QtQuick.Controls 1.1 import QtQuick.Controls.Styles 1.1 import QtQuick.Layouts 1.1 From e76c3f72e721509b83a6e33bd735da00621ebf60 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 24 Mar 2017 10:47:47 +0100 Subject: [PATCH 3/3] Lower QtQuick requirement further to 2.2 2.2 is required for the modifications we make to the Button objects. --- resources/qml/OpenFilesIncludingProjectsDialog.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/OpenFilesIncludingProjectsDialog.qml b/resources/qml/OpenFilesIncludingProjectsDialog.qml index 377c9a65ee..af7b1c0f47 100644 --- a/resources/qml/OpenFilesIncludingProjectsDialog.qml +++ b/resources/qml/OpenFilesIncludingProjectsDialog.qml @@ -1,7 +1,7 @@ -// Copyright (c) 2015 Ultimaker B.V. +// Copyright (c) 2017 Ultimaker B.V. // Cura is released under the terms of the AGPLv3 or higher. -import QtQuick 2.6 +import QtQuick 2.2 import QtQuick.Controls 1.1 import QtQuick.Controls.Styles 1.1 import QtQuick.Layouts 1.1