GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-11 19:58:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use the PrintInformation object for displaying the print duration in the Save button

Browse Source
This commit is contained in:
Arjen Hiemstra 2015-04-21 17:21:15 +02:00
parent 49e80c30e5
commit 298b5a3025
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
qml/SaveButton.qml
View File

@ -19,9 +19,8 @@ Button {
property bool defaultOverride: false; property bool defaultOverride: false;
property bool defaultAmbiguous: false; property bool defaultAmbiguous: false;
property real printDurationHours: Math.floor(Printer.printDuration / 3600); property variant printDuration: PrintInformation.currentPrintTime;
property real printDurationMinutes: Math.round(((Printer.printDuration / 3600) - printDurationHours) * 60); property real printMaterialAmount: PrintInformation.materialAmount < 0 ? -1 : PrintInformation.materialAmount;
property real printMaterialAmount: Printer.printMaterialAmount < 0 ? -1 : Math.round(Printer.printMaterialAmount / 10) / 100;
iconSource: UM.Theme.icons[Printer.outputDevices[base.currentDevice].icon]; iconSource: UM.Theme.icons[Printer.outputDevices[base.currentDevice].icon];
tooltip: Printer.outputDevices[base.currentDevice].description; tooltip: Printer.outputDevices[base.currentDevice].description;
@ -138,23 +137,31 @@ Button {
font: UM.Theme.fonts.default; font: UM.Theme.fonts.default;
text: { text: {
if(control.printDurationHours < 0 || control.printDurationMinutes < 0) if(!control.printDuration)
{ {
return ""; return "";
} }
if(control.printDurationHours > 1) var days = ""
var day_count = control.printDuration.getDate() - 1;
if(day_count > 0)
{ {
return qsTr("%1 hours %2 minutes").arg(control.printDurationHours).arg(control.printDurationMinutes); days = Qt.formatDateTime(control.printDuration, qsTr("d 'day(s)'", "", day_count));
} }
else if(control.printDurationHours > 0)
var hours = ""
if(control.printDuration.getHours() > 0)
{ {
return qsTr("1 hour %1 minutes").arg(control.printDurationMinutes); hours = Qt.formatDateTime(control.printDuration, qsTr("h 'hour(s)'", "", control.printDuration.getHours()));
} }
else
var minutes = ""
if(control.printDuration.getMinutes() > 0)
{ {
return qsTr("%2 minutes").arg(control.printDurationMinutes); minutes = Qt.formatDateTime(control.printDuration, qsTr("m 'minute(s)'", "", control.printDuration.getMinutes()));
} }
return [days, hours, minutes].join(" ");
} }
} }
Label { Label {