BrowserWindow.bjs

[app.webkitpdf] / BrowserWindow.vala

diff --git a/BrowserWindow.vala b/BrowserWindow.vala
index 188df4d..6efbbd4 100644 (file)
--- a/BrowserWindow.vala
+++ b/BrowserWindow.vala
@@ -48,6 +48,7 @@ public class BrowserWindow : Object
                // if we have not finished in 25 seconds
                // call printit...
                  GLib.Timeout.add_seconds(25, () => { 
+                       print("Calling printit - timeout 25 seconds");
                                _this.view.printit();
                                return true;
                });
@@ -113,8 +114,8 @@ public class BrowserWindow : Object
 
             {
             #if GTK3
-             this.el.load_changed.connect( (ev ) => {
-                                       if (ev == WebKit.LoadEvent.FINISHED) {. 
+                        this.el.load_changed.connect( (ev ) => {
+                                       if (ev == WebKit.LoadEvent.FINISHED) {
                                   this.printit(); 
                                }
                          
@@ -122,26 +123,18 @@ public class BrowserWindow : Object
             
             #else
              //listeners
-                        this.el.resource_request_starting.connect( (p0, webres, netreq ) => {
-                          print("resource req. started %s\n", netreq.uri);
+                      //  this.el.resource_request_starting.connect( (p0, webres, netreq ) => {
+                        //  print("resource req. started %s\n", netreq.uri);
                              
-                        });
+                      //  });
                         
                         this.el.load_finished.connect( ( ) => {
                                         
                                this.printit(); 
                          
                         });
-                        
             #endif
             }
-
-            //listeners
-            this.el.load_finished.connect( ( ) => {
-                        
-                   this.printit(); 
-             
-            });
         }
 
         // user defined functions
@@ -169,7 +162,16 @@ public class BrowserWindow : Object
                                        print("Failed to inject %s\n",  inject_js);
                                        continue;
                                }
+        #if GTK3
+                               GLib.MainLoop mainloop = new GLib.MainLoop();
+                               this.el.run_javascript.begin(str, null, (obj,res) => {
+                                       mainloop.quit();
+                               });
+                               mainloop.run();
+                               
+        #else                  
                                this.el.execute_script(str);
+        #endif
                        }
                }
                
@@ -185,6 +187,11 @@ public class BrowserWindow : Object
                        return;
                }
                        
+        
+        #if GTK3
+               print("PNG not supported in webkit2\n");
+               return;
+        #else
                        
             GLib.Timeout.add_seconds(webkitpdf.opt_delay, () => { 
            
@@ -211,11 +218,46 @@ public class BrowserWindow : Object
                  }, GLib.Priority.DEFAULT);
         
         
-            
+        #endif    
             
         }
         public bool printpdf () {
-                
+        
+        
+        
+                       var list = Gtk.PaperSize.get_paper_sizes(false);
+                   var psetup = new Gtk.PageSetup();
+                   for(var i = 0; i < list.length(); i++ ) {
+                       var entry = list.nth_data(i).copy();
+                       if (entry.get_name() == "iso_a2") {
+                           psetup.set_paper_size(entry);
+                       }
+                   }
+                   
+        
+        #if GTK3        
+        
+                       var  pe = new  WebKit.PrintOperation(this.el);
+                       pe.set_page_setup(psetup);
+                       pe.finished.connect( () => {
+                               print("print completed\n");
+                                Gtk.main_quit();
+                       
+                       });
+                       
+                       var ps = new Gtk.PrintSettings();
+                   ps.set_printer("Print to File");
+                   ps.set("output-file-format", "pdf");
+                   ps.set("output-uri", "file://" + webkitpdf.opt_target_pdf);
+        
+                       
+                       pe.set_print_settings(ps);
+                       
+        
+                       pe.print();
+                                 
+        
+        #else      
                        var  pe = new  Gtk.PrintOperation();
                        pe.export_filename = webkitpdf.opt_target_pdf;
                        print("got callback for print\n");
@@ -235,26 +277,23 @@ public class BrowserWindow : Object
                        //pe.run_dialog(_this.el);
                 
                        
-                   var list = Gtk.PaperSize.get_paper_sizes(false);
-                   var psetup = new Gtk.PageSetup();
-                   for(var i = 0; i < list.length(); i++ ) {
-                       var entry = list.nth_data(i).copy();
-                       if (entry.get_name() == "iso_a2") {
-                           psetup.set_paper_size(entry);
-                       }
-                   }
                        
         
         
                    pe.set_default_page_setup(psetup);
                    print("Calling Print?\n");
                    //pe.run_dialog(_this.el);
+                   
+                   
+        
+        
+        
                    try {
                            this.el.get_main_frame().print_full(pe,Gtk.PrintOperationAction.EXPORT);
                    } catch (Error e) {
                                // print failed...
                        }
-                   
+        #endif     
                    
                     
                        return false;
@@ -270,7 +309,9 @@ public class BrowserWindow : Object
         // what size is the documet.
         
              print("making screenshot\n");
-             
+        #if GTK3
+        
+        #else     
             // fix vapi - get_snapshot add '?' to all null.
             var pixmap = _this.view.el.get_snapshot( null );
         
@@ -294,7 +335,7 @@ public class BrowserWindow : Object
             //});
             Gtk.main_quit();
              
-           
+        #endif