Skip to content

Fixes in "printers@cinnamon.org" #13524

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hans-fritz-pommes wants to merge 3 commits into
base: master
Choose a base branch
from
+56 −16
Open

Fixes in "printers@cinnamon.org" #13524

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7be72e3
Fixed ugliness and not-working "cancel all jobs"
hans-fritz-pommes Feb 1, 2026
55ba527
Update applet.js
hans-fritz-pommes Feb 1, 2026
58917a3
Update applet.js
hans-fritz-pommes Feb 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 56 additions & 16 deletions files/usr/share/cinnamon/applets/printers@cinnamon.org/applet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,43 @@ const PANEL_EDIT_MODE_KEY = "panel-edit-mode";
const APPLET_PATH = imports.ui.appletManager.appletMeta['printers@cinnamon.org'].path;


function formatBytes(bytesStr) {
const bytes = parseInt(bytesStr, 10);
if (isNaN(bytes) || bytes === 0) return "0 Bytes";

const k = 1024;
const sizes = ["Bytes", "KB", "MB", "GB", "TB"];
const i = Math.floor(Math.log(bytes) / Math.log(k));
const value = bytes / Math.pow(k, i);

return value.toLocaleString(undefined, {
minimumFractionDigits: 1,
maximumFractionDigits: 1
}) + " " + sizes[i];
}


function parseLpq(lpq_output) {
var parsedData = {};
lpq_output = lpq_output.split(/\n/);
let line = [];
let joined_line = [];

for(var n = 0; n < lpq_output.length - 1; n++) {
line = lpq_output[n].split(/\s+/);
if (line.length < 5) continue;
joined_line = [];
joined_line.push(line[0]);
joined_line.push(line[1]);
joined_line.push(line.slice(3, -2).join(' '));
joined_line.push(line[line.length-2]);
parsedData[line[2]] = joined_line;
}

return parsedData;
}


class CinnamonPrintersApplet extends Applet.TextIconApplet {
constructor(metadata, orientation, panel_height, instance_id) {
super(orientation, panel_height, instance_id);
Expand Down Expand Up @@ -39,6 +76,7 @@ class CinnamonPrintersApplet extends Applet.TextIconApplet {
this.updating = false;
this.showLater = false;
this.printers = [];
this.jobs = [];
this.set_applet_icon_symbolic_name('xsi-printer');
this.update();
}
Expand Down Expand Up @@ -104,8 +142,8 @@ class CinnamonPrintersApplet extends Applet.TextIconApplet {
onCancelAllJobsClicked() {
Util.spawn_async(['python3', APPLET_PATH + '/cancel-print-dialog.py', 'all'], Lang.bind(this, function(out) {
if(out.trim() == "Cancel") {
for(var n = 0; n < this.printers.length; n++) {
Util.spawn(['cancel', '-a', this.printers[n]]);
for(var n = 0; n < this.jobs.length; n++) {
Util.spawn(['cancel', this.jobs[n].job]);
}
}
}));
Expand All @@ -120,7 +158,7 @@ class CinnamonPrintersApplet extends Applet.TextIconApplet {
}

onSendToFrontClicked(item) {
Util.spawn(['lp', '-i', item.job, '-q 100']);
Util.spawn(['lp', '-i', item.job, '-H', 'immediate']);
}

update() {
Expand Down Expand Up @@ -162,6 +200,7 @@ class CinnamonPrintersApplet extends Applet.TextIconApplet {

//Add Jobs
Util.spawn_async(['/usr/bin/lpstat', '-o'], Lang.bind(this, function(out) {
this.jobs = [];
//Cancel all Jobs
if(out.length > 0) {
let cancelAll = new PopupMenu.PopupIconMenuItem(_("Cancel all jobs"), 'xsi-edit-delete', St.IconType.SYMBOLIC);
Expand All @@ -176,33 +215,34 @@ class CinnamonPrintersApplet extends Applet.TextIconApplet {
//Cancel Job
out = out.split(/\n/);
this.jobsCount = out.length - 1;
Util.spawn_async(['/usr/bin/lpstat', '-o'], Lang.bind(this, function(out2) {
out2 = out2.replace(/\n/g, ' ').split(/\s+/);
Util.spawn_async(['/usr/bin/lpq', '-a'], Lang.bind(this, function(out2) {
let jobInfo = parseLpq(out2);
let sendJobs = [];
for(var n = 0; n < out.length - 1; n++) {
let line = out[n].split(' ')[0].split('-');
let job = line.slice(-1)[0];
let printer = line.slice(0, -1).join('-');
let doc = out2[out2.indexOf(job) + 1];
for(var m = out2.indexOf(job) + 2; m < out2.length - 1; m++) {
if(isNaN(out2[m]) || out2[m + 1] != 'bytes') {
doc = doc + ' ' + out2[m];
} else {
break;
}
}
let doc = jobInfo[job][2];
let user = jobInfo[job][1];
let size = formatBytes(jobInfo[job][3]);

if(doc.length > 30) {
doc = doc + '...';
}

let text = '(' + job + ') ' + _("'%s' on %s").format(doc, printer);
text = text + ' (' + size + ')' + _(" - by %s").format(user);
let jobItem = new PopupMenu.PopupIconMenuItem(text, 'xsi-edit-delete', St.IconType.SYMBOLIC);
if(out2[out2.indexOf(job) - 2] == 'active') {
jobItem.addActor(new St.Icon({ style_class: 'popup-menu-icon', icon_name: 'xsi-emblem-default', icon_type: St.IconType.SYMBOLIC }));
if(jobInfo[job][0] == 'active') {
jobItem.addActor(new St.Icon({ style_class: 'popup-menu-icon', icon_name: 'xsi-printer-printing', icon_type: St.IconType.SYMBOLIC }));
} else {
jobItem.addActor(new St.Icon({ style_class: 'popup-menu-icon', icon_name: 'xsi-time', icon_type: St.IconType.SYMBOLIC }));
}
jobItem.job = job;
jobItem.connect('activate', Lang.bind(jobItem, this.onCancelJobClicked));
this.cancelSubMenu.addMenuItem(jobItem);
if(out2[out2.indexOf(job) - 2] != 'active' && out2[out2.indexOf(job) - 2] != '1st') {
this.jobs.push(jobItem);
if(jobInfo[job][0] != 'active' && jobInfo[job][0] != '1st') {
sendJobs.push(new PopupMenu.PopupIconMenuItem(text, 'xsi-go-up', St.IconType.SYMBOLIC));
sendJobs[sendJobs.length - 1].job = job;
sendJobs[sendJobs.length - 1].connect('activate', Lang.bind(sendJobs[sendJobs.length - 1], this.onSendToFrontClicked));
Expand Down
Loading