Differential D17561 Diff 48593 applets/notifications/package/contents/ui/Jobs.qml

Changeset View

Standalone View

View Options

applets/notifications/package/contents/ui/Jobs.qml

Show First 20 Lines • Show All 51 Lines • ▼ Show 20 Line(s)50 onSourceRemoved: {
52 for (var i = 0, len = jobs.count; i < len; ++i) { 52​ for (var i = 0, len = jobs.count; i < len; ++i) {
53 if (jobs.get(i).name === source) { 53​ if (jobs.get(i).name === source) {
54 jobs.remove(i) 54​ jobs.remove(i)
55 break 55​ break
56 } 56​ }
57 } 57​ }
58 58​
59 if (!notifications) { 59​ if (!notifications) {
60​ delete runningJobs[source]
60 return 61​ return
61 } 62​ }
62 63​
63 var error = runningJobs[source]["error"] 64​ var error = runningJobs[source]["error"]
64 var errorText = runningJobs[source]["errorText"] 65​ var errorText = runningJobs[source]["errorText"]
65 66​
66 // 1 = ERR_USER_CANCELED - don't show any notification at all 67​ // 1 = ERR_USER_CANCELED - don't show any notification at all
67 if (error == 1) { 68​ if (error == 1) {
69​ delete runningJobs[source]
68 return 70​ return
broulikUnsubmitted
Not Done

What about here?

broulik: What about here?
69 } 71​ }
70 72​
71 var message = runningJobs[source]["label1"] ? runningJobs[source]["label1"] : runningJobs[source]["label0"] 73​ var message = runningJobs[source]["label1"] ? runningJobs[source]["label1"] : runningJobs[source]["label0"]
72 var infoMessage = runningJobs[source]["infoMessage"] 74​ var infoMessage = runningJobs[source]["infoMessage"]
73 if (!message && !infoMessage) { 75​ if (!message && !infoMessage) {
76​ delete runningJobs[source]
74 return 77​ return
broulikUnsubmitted
Not Done

and here?

broulik: and here?
75 } 78​ }
76 79​
77 var summary = infoMessage ? i18nc("the job, which can be anything, has finished", "%1: Finished", infoMessage) : i18n("Job Finished") 80​ var summary = infoMessage ? i18nc("the job, which can be anything, has finished", "%1: Finished", infoMessage) : i18n("Job Finished")
78 81​
79 if (error) { 82​ if (error) {
80 summary = infoMessage ? i18nc("the job, which can be anything, failed to complete", "%1: Failed", infoMessage) : i18n("Job Failed") 83​ summary = infoMessage ? i18nc("the job, which can be anything, failed to complete", "%1: Failed", infoMessage) : i18n("Job Failed")
81 } 84​ }
82 85​
▲ Show 20 Lines • Show All 85 Lines • Show Last 20 Lines