From: Alan Knowles <alan@roojs.com>
Date: Mon, 7 Nov 2016 04:34:07 +0000 (+0800)
Subject: BrowserWindow.bjs
X-Git-Url: http://git.roojs.org/?p=app.webkitpdf;a=commitdiff_plain;h=2927a700d13ee004f2ec94777964d2ae6d03f73e

BrowserWindow.bjs
BrowserWindow.vala
webkitpdf.vala.c
BrowserWindow.vala.c
---

diff --git a/BrowserWindow.bjs b/BrowserWindow.bjs
index eeb7cc8..e87f369 100644
--- a/BrowserWindow.bjs
+++ b/BrowserWindow.bjs
@@ -29,7 +29,7 @@
        "| void printit" : "() {\n   print(\"load_finsihed\\n\");\n   \n   if (this.print_started) {\n      print(\"load_finsihed - already printing..\\n\");\n      return;\n  }\n   \n    this.print_started = true; // flag to stop double call.\n    \n    \n\t// inject any javascript if needed..\n\tif (webkitpdf.opt_inject_js != null) {\n\t\n\t\tprint(\"injecting javascript files \\n\");\n\t\tforeach(var inject_js in  webkitpdf.opt_inject_js) {\n\t\tprint(\"inject? %s\\n\", inject_js);\n\t\t\tstring str;\n\t\t\ttry {\n\t\t\t\tFileUtils.get_contents( inject_js, out str);\n\t\t\t} catch(FileError e) {\n\t\t\t\tprint(\"Failed to inject %s\\n\",  inject_js);\n\t\t\t\tcontinue;\n\t\t\t}\n#if GTK3\n\t\t\tGLib.MainLoop mainloop = new GLib.MainLoop();\n\t\t\tthis.el.run_javascript.begin(str, null, (obj,res) => {\n\t\t\t\tmainloop.quit();\n\t\t\t});\n\t\t\tmainloop.run();\n\t\t\t\n#else \t\t\t\n\t\t\tthis.el.execute_script(str);\n#endif\n\t\t}\n\t}\n\t\n\t\n\t\n\tprint(\"calling print in %d seconds\\n\", (int)webkitpdf.opt_delay);\n\tif (webkitpdf.opt_target_pdf != null) {\n\t\tGLib.Timeout.add_seconds(webkitpdf.opt_delay, () => { \n\n\t\t\tthis.printpdf();\n\t\t\t return false;\n\t\t}, GLib.Priority.DEFAULT);\n\t\treturn;\n\t}\n\t\t\n\n#if GTK3\n\tprint(\"PNG not supported in webkit2\\n\");\n\treturn;\n#else\n\t\t\n    GLib.Timeout.add_seconds(webkitpdf.opt_delay, () => { \n   \n\t\t\n\t\t// ----------------- JPEG \n\t\t// resize the window...\n\t\t// window.document.documentElement.scrollHeight\n\t\tvar scroll_height = (int) _this.view.el.get_dom_document().document_element.scroll_height;\n\t\tprint(\"Scroll height %d\\n\", scroll_height);\n\t\tif (scroll_height> 1024 || webkitpdf.opt_width > 0  || webkitpdf.opt_height > 0  ) {\n\t\t\tvar w = webkitpdf.opt_width > 0 ?  webkitpdf.opt_width  : 1200;\n\t\t\tvar h = int.min(scroll_height, 6000);\n\t\t\t_this.scrolled_window.el.set_size_request( w, h); \n\t\t\t_this.el.resize (w+50, h+50);\n\t\t\tprint(\"Resize to %d, %d\\n\", w,h);\n\t\t    GLib.Timeout.add_seconds(webkitpdf.opt_delay > 0 ? webkitpdf.opt_delay : 1 , () => { \n\t\t\t\tthis.printpng();\n\t\t\t\treturn false;\n\t\t\t  }, GLib.Priority.DEFAULT);\n  \t\t    return false;\n\t\t}\n\t\tthis.printpng();\t\t\n\t\treturn false;\n\t  }, GLib.Priority.DEFAULT);\n\n\n#endif    \n    \n}\n",
        "* pack" : "add",
        "xtype" : "WebView",
-       "| bool printpdf" : "() {\n\n\n\n\t\tvar list = Gtk.PaperSize.get_paper_sizes(false);\n\t    var psetup = new Gtk.PageSetup();\n\t    for(var i = 0; i < list.length(); i++ ) {\n\t        var entry = list.nth_data(i).copy();\n\t        if (entry.get_name() == \"iso_a2\") {\n\t            psetup.set_paper_size(entry);\n\t        }\n\t    }\n\t    \n\n#if GTK3\t \n\n\t\tvar  pe = new  WebKit.PrintOperation(this.el);\n\t\tpe.set_page_setup(psetup);\n\t\tpe.finished.connect( () => {\n\t\t\tprint(\"print completed\\n\");\n\t\t\t Gtk.main_quit();\n    \t\t\n\t\t});\n\t\t\n\t\tvar ps = new Gtk.PrintSettings();\n\t    ps.set_printer(\"Print to File\");\n\t    ps.set(\"output-file-format\", \"pdf\");\n\t    ps.set(\"output-uri\", \"file://\" + webkitpdf.opt_target_pdf);\n\n\t\t\n\t\tpe.set_print_settings(ps);\n\t\t\n\n\t\tpe.print();\n            \t\t  \n\n#else\t    \n\t\tvar  pe = new  Gtk.PrintOperation();\n\t\tpe.export_filename = webkitpdf.opt_target_pdf;\n\t\tprint(\"got callback for print\\n\");\n\t\tpe.ref();\n\t\t/*pe.failed.connect(() => {\n\t\t\tprint(\"print failed\\n\");\n\t\t\t Gtk.main_quit();\n    \t\t\n\t\t})\n\t\t*/;\n\t\t pe.done.connect(() => {\n\t\t\tprint(\"print completed\\n\");\n\t\t\t Gtk.main_quit();\n    \t\t\n\t\t});\n\t\t\n\t\t//pe.run_dialog(_this.el);\n\t \n\t\t\n\t        \n\n\n\t    pe.set_default_page_setup(psetup);\n\t    print(\"Calling Print?\\n\");\n\t    //pe.run_dialog(_this.el);\n\t    \n\t    \n\n\t\tthis.el.get_main_frame().print(pe);\n\n\n\t    try {\n\t\t    this.el.get_main_frame().print_full(pe,Gtk.PrintOperationAction.EXPORT);\n\t    } catch (Error e) {\n\t\t\t// print failed...\n\t\t}\n#endif\t    \n\t    \n\t     \n\t\treturn false;\n}\n",
+       "| bool printpdf" : "() {\n\n\n\n\t\tvar list = Gtk.PaperSize.get_paper_sizes(false);\n\t    var psetup = new Gtk.PageSetup();\n\t    for(var i = 0; i < list.length(); i++ ) {\n\t        var entry = list.nth_data(i).copy();\n\t        if (entry.get_name() == \"iso_a2\") {\n\t            psetup.set_paper_size(entry);\n\t        }\n\t    }\n\t    \n\n#if GTK3\t \n\n\t\tvar  pe = new  WebKit.PrintOperation(this.el);\n\t\tpe.set_page_setup(psetup);\n\t\tpe.finished.connect( () => {\n\t\t\tprint(\"print completed\\n\");\n\t\t\t Gtk.main_quit();\n    \t\t\n\t\t});\n\t\t\n\t\tvar ps = new Gtk.PrintSettings();\n\t    ps.set_printer(\"Print to File\");\n\t    ps.set(\"output-file-format\", \"pdf\");\n\t    ps.set(\"output-uri\", \"file://\" + webkitpdf.opt_target_pdf);\n\n\t\t\n\t\tpe.set_print_settings(ps);\n\t\t\n\n\t\tpe.print();\n            \t\t  \n\n#else\t    \n\t\tvar  pe = new  Gtk.PrintOperation();\n\t\tpe.export_filename = webkitpdf.opt_target_pdf;\n\t\tprint(\"got callback for print\\n\");\n\t\tpe.ref();\n\t\t/*pe.failed.connect(() => {\n\t\t\tprint(\"print failed\\n\");\n\t\t\t Gtk.main_quit();\n    \t\t\n\t\t})\n\t\t*/;\n\t\t pe.done.connect(() => {\n\t\t\tprint(\"print completed\\n\");\n\t\t\t Gtk.main_quit();\n    \t\t\n\t\t});\n\t\t\n\t\t//pe.run_dialog(_this.el);\n\t \n\t\t\n\t        \n\n\n\t    pe.set_default_page_setup(psetup);\n\t    print(\"Calling Print?\\n\");\n\t    //pe.run_dialog(_this.el);\n\t    \n\t    \n\n\n\n\t    try {\n\t\t    this.el.get_main_frame().print_full(pe,Gtk.PrintOperationAction.EXPORT);\n\t    } catch (Error e) {\n\t\t\t// print failed...\n\t\t}\n#endif\t    \n\t    \n\t     \n\t\treturn false;\n}\n",
        "| void printpng" : "() {\n    //var filename = \"/tmp/test.pdf\";\n    //print(\"load_changed %d ?= %d\\n\", le, LoadEvent.FINISHED);\n\n    //if (le != LoadEvent.FINISHED) {\n    //    return;\n   // }\n   \n// what size is the documet.\n\n     print(\"making screenshot\\n\");\n#if GTK3\n\n#else     \n    // fix vapi - get_snapshot add '?' to all null.\n    var pixmap = _this.view.el.get_snapshot( null );\n\n    \n    \n    int w,h;\n    \n    // add out to gdkpixmap.get_size\n\tpixmap.get_size( out  w , out   h);\n\tvar pixbuf  = Gdk.pixbuf_get_from_drawable(null, pixmap, null , 0, 0, 0, 0, w, h);\n\tprint(\"pixbuf size: %d x %d\\n \", w,h);\n\t \n    \n    \n     pixbuf.save(webkitpdf.opt_target_png, \"png\");\n     print(\"Saved to %s\\n\", webkitpdf.opt_target_png);\n    //view.get_snapshot.begin(WebKit.SnapshotRegion.FULL_DOCUMENT, WebKit.SnapshotOptions.NONE, null, (obj, res) => {\n    //    var sf = view.get_snapshot.end(res);\n\n    //    sf.write_to_png(Browser.opt_target_png);\n    //});\n    Gtk.main_quit();\n     \n#endif   \n    \n    \n\n}\n",
        "bool print_started" : false,
        "$ xns" : "WebKit"
diff --git a/BrowserWindow.vala b/BrowserWindow.vala
index b1dc3b9..6efbbd4 100644
--- a/BrowserWindow.vala
+++ b/BrowserWindow.vala
@@ -286,7 +286,6 @@ public class BrowserWindow : Object
         	    
         	    
         
-        		this.el.get_main_frame().print(pe);
         
         
         	    try {