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

Fix context of pause, resume and abort labels

Browse source 
More in line with what we have in the rest of our code base.

Discovered during work on CL-1053 and CURA-5729.
This commit is contained in:
Ghostkeeper 2018-09-18 11:25:35 +02:00
parent a7a022eca0
commit ac4ee8c428
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
resources/qml/MonitorButton.qml
View file

@ -1,5 +1,5 @@
// Copyright (c) 2017 Ultimaker B.V. //Copyright (c) 2018 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher. //Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.2 import QtQuick 2.2
import QtQuick.Controls 1.1 import QtQuick.Controls 1.1
@ -281,16 +281,16 @@ Item
text: { text: {
if (!printerConnected || activePrintJob == null) if (!printerConnected || activePrintJob == null)
{ {
return catalog.i18nc("@label:", "Pause"); return catalog.i18nc("@label", "Pause");
} }
if (activePrintJob.state == "paused") if (activePrintJob.state == "paused")
{ {
return catalog.i18nc("@label:", "Resume"); return catalog.i18nc("@label", "Resume");
} }
else else
{ {
return catalog.i18nc("@label:", "Pause"); return catalog.i18nc("@label", "Pause");
} }
} }
onClicked: onClicked:
@ -322,7 +322,7 @@ Item
height: UM.Theme.getSize("save_button_save_to_button").height height: UM.Theme.getSize("save_button_save_to_button").height
text: catalog.i18nc("@label:", "Abort Print") text: catalog.i18nc("@label", "Abort Print")
onClicked: confirmationDialog.visible = true onClicked: confirmationDialog.visible = true
style: UM.Theme.styles.sidebar_action_button style: UM.Theme.styles.sidebar_action_button