From d277b168070e251740798a4dbde89439b1b53ec1 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 7 Jul 2017 13:08:28 +0200 Subject: [PATCH 1/2] Capitalise '3D' 3d looks ugly to me. --- resources/qml/SaveButton.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/SaveButton.qml b/resources/qml/SaveButton.qml index 411da0c392..2ea7dafc91 100644 --- a/resources/qml/SaveButton.qml +++ b/resources/qml/SaveButton.qml @@ -1,4 +1,4 @@ -// 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.2 @@ -24,7 +24,7 @@ Item { { if(!activity) { - return catalog.i18nc("@label:PrintjobStatus", "Please load a 3d model"); + return catalog.i18nc("@label:PrintjobStatus", "Please load a 3D model"); } switch(base.backendState) From 4edd91de231e847d5f8a35c23a8aad96ba299dfb Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 7 Jul 2017 13:37:02 +0200 Subject: [PATCH 2/2] Fig passing signals to topbar Topbar is now in the lead on whether the print monitor should be shown or not. As it should be. Contributes to issue CURA-4010. --- resources/qml/Cura.qml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index b1e5c8f2f2..2c76bb0914 100755 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -1,4 +1,4 @@ -// 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.2 @@ -25,7 +25,14 @@ UM.MainWindow target: Printer onShowPrintMonitor: { - base.showPrintMonitor = show; + if (show) + { + topbar.startMonitoringPrint() + } + else + { + topbar.stopMonitoringPrint() + } } }