diff --git a/resources/qml/SaveButton.qml b/resources/qml/SaveButton.qml index b0f5943e67..c51eb9f7bb 100644 --- a/resources/qml/SaveButton.qml +++ b/resources/qml/SaveButton.qml @@ -10,20 +10,45 @@ import UM 1.1 as UM Rectangle { id: base; + UM.I18nCatalog { id: catalog; name:"cura"} property real progress: UM.Backend.progress; property bool activity: Printer.getPlatformActivity; - Behavior on progress { NumberAnimation { duration: 250; } } + //Behavior on progress { NumberAnimation { duration: 250; } } property int totalHeight: childrenRect.height + UM.Theme.sizes.default_margin.height property string fileBaseName + property string statusText: { + if(progress == 0) { + if(!activity) { + return catalog.i18nc("@label:PrintjobStatus","Please load a 3d model"); + } else { + return catalog.i18nc("@label:PrintjobStatus","Preparing to slice..."); + } + } else if(base.progress < 0.99) { + return catalog.i18nc("@label:PrintjobStatus","Slicing..."); + } else { + return catalog.i18nc("@label:PrintjobStatus","Ready to ") + UM.OutputDeviceManager.activeDeviceShortDescription; + } + } - UM.I18nCatalog { id: catalog; name:"cura"} + Label { + id: statusLabel + width: parent.width - 2 * UM.Theme.sizes.default_margin.width + anchors.top: parent.top + anchors.left: parent.left + anchors.leftMargin: UM.Theme.sizes.default_margin.width + + color: UM.Theme.colors.text + font: UM.Theme.fonts.large + text: statusText; + } Rectangle{ id: progressBar width: parent.width - 2 * UM.Theme.sizes.default_margin.width height: UM.Theme.sizes.progressbar.height - anchors.top: parent.top + anchors.top: statusLabel.bottom + anchors.topMargin: UM.Theme.sizes.default_margin.height/4 anchors.left: parent.left anchors.leftMargin: UM.Theme.sizes.default_margin.width radius: UM.Theme.sizes.progressbar_radius.width diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json index 6fedd57fbe..a04d882d48 100644 --- a/resources/themes/cura/theme.json +++ b/resources/themes/cura/theme.json @@ -115,7 +115,7 @@ "setting_category_disabled_border": [127, 127, 127, 255], "setting_category_hover_border": [12, 159, 227, 255], "setting_category_active_border": [245, 245, 245, 255], - "setting_category_active_hover_border": [12, 159, 227, 255], + "setting_category_active_hover_border": [245, 245, 245, 255], "setting_control": [255, 255, 255, 255], "setting_control_selected": [24, 41, 77, 255],