BrowserWindow.bjs

BrowserWindow.vala
webkitpdf.vala.c
BrowserWindow.vala.c

diff --git a/BrowserWindow.bjs b/BrowserWindow.bjs
index ca59d46..20afbdc 100644 (file)
--- a/BrowserWindow.bjs
+++ b/BrowserWindow.bjs
@@ -31,7 +31,7 @@
        "* 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            this.delete_cookiefile(); \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            this.delete_cookiefile(); \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\nGLib.MainLoop mainloop = new GLib.MainLoop();\n  _this.view.el.get_snapshot.begin(WebKit.SnapshotRegion.FULL_DOCUMENT, WebKit.SnapshotOptions.NONE, null, (obj, res) => {\n  \t\t var sf = _this.view.el.get_snapshot.end(res);\n  \t\t sf.write_to_png(webkitpdf.opt_target_png, \"png\");\n     \tprint(\"Saved to %s\\n\", webkitpdf.opt_target_png);\n  \t\t mainloop.quit();\n  \t\t \n  });\n\n\tmainloop.run();\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#endif       \n   this.delete_cookiefile(); \n   \n    Gtk.main_quit();\n     \n\n    \n    \n\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\nGLib.MainLoop mainloop = new GLib.MainLoop();\n  _this.view.el.get_snapshot.begin(WebKit.SnapshotRegion.FULL_DOCUMENT, WebKit.SnapshotOptions.NONE, null, (obj, res) => {\n  \t\t var sf = _this.view.el.get_snapshot.end(res);\n  \t\t sf.write_to_png(webkitpdf.opt_target_png);\n     \tprint(\"Saved to %s\\n\", webkitpdf.opt_target_png);\n  \t\t mainloop.quit();\n  \t\t \n  });\n\n\tmainloop.run();\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#endif       \n   this.delete_cookiefile(); \n   \n    Gtk.main_quit();\n     \n\n    \n    \n\n}\n",
        "bool print_started" : false,
        "$ xns" : "WebKit",
        "int load_try" : 0,

diff --git a/BrowserWindow.vala b/BrowserWindow.vala
index e67dfd0..3bd2bcd 100644 (file)
--- a/BrowserWindow.vala
+++ b/BrowserWindow.vala
@@ -419,7 +419,7 @@ public class BrowserWindow : Object
         GLib.MainLoop mainloop = new GLib.MainLoop();
           _this.view.el.get_snapshot.begin(WebKit.SnapshotRegion.FULL_DOCUMENT, WebKit.SnapshotOptions.NONE, null, (obj, res) => {
                         var sf = _this.view.el.get_snapshot.end(res);
-                        sf.write_to_png(webkitpdf.opt_target_png, "png");
+                        sf.write_to_png(webkitpdf.opt_target_png);
                print("Saved to %s\n", webkitpdf.opt_target_png);
                         mainloop.quit();