3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-08 07:27:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed firmware update screen. CURA-2079.

Browse source
This commit is contained in:
Jack Ha 2016-08-10 12:57:01 +02:00
parent 9bf4dbd24f
commit 48792aa8f3
4 changed files with 48 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
plugins/USBPrinting/FirmwareUpdateWindow.qml
View file

@ -32,16 +32,16 @@ UM.Dialog
}
text: {
if (manager.progress == 0)
{
//: Firmware update status label
return catalog.i18nc("@label","Starting firmware update, this may take a while.")
}
else if (manager.progress > 99)
if (manager.firmwareUpdateCompleteStatus)
{
//: Firmware update status label
return catalog.i18nc("@label","Firmware update completed.")
}
else if (manager.progress == 0)
{
//: Firmware update status label
return catalog.i18nc("@label","Starting firmware update, this may take a while.")
}
else
{
//: Firmware update status label
@ -55,10 +55,10 @@ UM.Dialog
ProgressBar
{
id: prog
value: manager.progress
value: manager.firmwareUpdateCompleteStatus ? 100 : manager.progress
minimumValue: 0
maximumValue: 100
indeterminate: manager.progress < 100
indeterminate: (manager.progress < 1) && (!manager.firmwareUpdateCompleteStatus)
anchors
{
left: parent.left;
@ -79,7 +79,7 @@ UM.Dialog
Button
{
text: catalog.i18nc("@action:button","Close");
enabled: manager.progress >= 100;
enabled: manager.firmwareUpdateCompleteStatus;
onClicked: base.visible = false;
}
]