Fix some warnings

Contributes to CL-1152
This commit is contained in:
Ian Paschal 2018-12-10 15:05:01 +01:00
parent 2db5d2b231
commit 32f2b7ec1f
4 changed files with 10 additions and 2 deletions

View File

@ -54,6 +54,10 @@ UM.Dialog
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
text: text:
{ {
if (!printer.activePrintJob)
{
return ""
}
var topLine var topLine
if (materialsAreKnown(printer.activePrintJob)) if (materialsAreKnown(printer.activePrintJob))
{ {

View File

@ -60,6 +60,10 @@ Item
height: 0.5 * printJobPreview.height height: 0.5 * printJobPreview.height
source: source:
{ {
if (!printJob)
{
return ""
}
if (printJob.configurationChanges.length > 0) if (printJob.configurationChanges.length > 0)
{ {
return "../svg/warning-icon.svg" return "../svg/warning-icon.svg"

View File

@ -55,7 +55,7 @@ Item
left: progressBar.right left: progressBar.right
leftMargin: 18 * screenScaleFactor // TODO: Theme! leftMargin: 18 * screenScaleFactor // TODO: Theme!
} }
text: Math.round(printJob.progress * 100) + "%" text: printJob ? Math.round(printJob.progress * 100) + "%" : "0%"
color: printJob && printJob.isActive ? "#374355" : "#babac1" // TODO: Theme! color: printJob && printJob.isActive ? "#374355" : "#babac1" // TODO: Theme!
width: contentWidth width: contentWidth
font: UM.Theme.getFont("medium") // 14pt, regular font: UM.Theme.getFont("medium") // 14pt, regular

View File

@ -182,7 +182,7 @@ Item {
abortConfirmationDialog.visible = true; abortConfirmationDialog.visible = true;
popup.close(); popup.close();
} }
text: printJob.state == "aborting" ? catalog.i18nc("@label", "Aborting...") : catalog.i18nc("@label", "Abort"); text: printJob && printJob.state == "aborting" ? catalog.i18nc("@label", "Aborting...") : catalog.i18nc("@label", "Abort");
visible: { visible: {
if (!printJob) { if (!printJob) {
return false; return false;