From 1e52ce1129c43c5f30a79f4c95277e7ba84f2f63 Mon Sep 17 00:00:00 2001
From: Albert Graef <aggraef@gmail.com>
Date: Thu, 22 Oct 2020 23:02:59 +0200
Subject: [PATCH] Improved print dialog with user interaction.
---
pd/nw/pdgui.js | 48 ++++--------------------------------------------
1 file changed, 4 insertions(+), 44 deletions(-)
diff --git a/pd/nw/pdgui.js b/pd/nw/pdgui.js
index 64e80ab85..44d1bbbd8 100644
--- a/pd/nw/pdgui.js
+++ b/pd/nw/pdgui.js
@@ -1160,52 +1160,12 @@ function menu_saveas(name) {
exports.menu_saveas = menu_saveas;
function gui_canvas_print(name, initfile, initdir) {
- // AG: This works mostly like gui_canvas_saveas above, except that we
- // create a pdf file and use a different input element and callback.
- var input, chooser,
- span = patchwin[name].window.document.querySelector("#printDialogSpan");
- if (!fs.existsSync(initdir)) {
- initdir = pwd;
- }
- // If we don't have a ".pd" file extension (e.g., "Untitled-1", add one)
- if (initfile.slice(-3) !== ".pd") {
- initfile += ".pd";
- }
- // Adding an "f" now gives .pdf which is what we want.
- initfile += "f";
- input = build_file_dialog_string({
- style: "display: none;",
- type: "file",
- id: "printDialog",
- nwsaveas: path.join(initdir, initfile),
- nwworkingdir: initdir,
- accept: ".pdf"
- });
- span.innerHTML = input;
- chooser = patchwin[name].window.document.querySelector("#printDialog");
- chooser.onchange = function() {
- print_callback(name, this.value);
- // reset value so that we can open the same file twice
- this.value = null;
- console.log("tried to print something");
- }
- chooser.click();
+ // AG: We simply ignore initfile and initdir, as the print dialog will
+ // present its own file picker anyway if PDF output is chosen.
+ patchwin[name].print({ autoprint: false, headerString: initfile, footerString: path.join(initdir, initfile) });
+ post("printed "+initfile);
}
-function print_callback(cid, file) {
- var filename = defunkify_windows_path(file);
- // It probably isn't possible to arrive at the callback with an
- // empty string. But I've only tested on Debian so far...
- if (filename === null) {
- return;
- }
- // Let nw.js do the rest (requires nw.js 0.14.6+)
- patchwin[cid].print({ pdf_path: filename, headerFooterEnabled: false });
- post("printed to: " + filename);
-}
-
-exports.print_callback = print_callback;
-
function menu_print(name) {
pdsend(name + " menuprint");
}
--
GitLab