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

BrowserWindow.bjs
BrowserWindow.vala
---

diff --git a/BrowserWindow.bjs b/BrowserWindow.bjs
index e87f369..d7f803e 100644
--- a/BrowserWindow.bjs
+++ b/BrowserWindow.bjs
@@ -10,7 +10,7 @@
   {
    "listeners" : {
     "destroy" : "() => {\n    Gtk.main_quit();\n}",
-    "show" : "() => {\n\t\n\tprint(\"resizing window\\n\");\n\tvar w = webkitpdf.opt_width > 0 ?  webkitpdf.opt_width  : 1200;\n\tvar h = webkitpdf.opt_height > 0 ?  webkitpdf.opt_height  :  500;\n\t\t\t\n\t\n\tthis.el.resize(w,h);\n\tprint(\"loading url\\n\");\n\tthis.view.el.load_uri(webkitpdf.opt_url);\n\t\n\t// if we have not finished in 25 seconds\n\t// call printit...\n\t  GLib.Timeout.add_seconds(25, () => { \n\t\tprint(\"Calling printit - timeout 25 seconds\");\n\t\t\t_this.view.printit();\n\t\t\treturn true;\n\t});\n\t\n\n}"
+    "show" : "() => {\n\t\n\tprint(\"resizing window\\n\");\n\tvar w = webkitpdf.opt_width > 0 ?  webkitpdf.opt_width  : 1200;\n\tvar h = webkitpdf.opt_height > 0 ?  webkitpdf.opt_height  :  500;\n\t\t\t\n\t\n\tthis.el.resize(w,h);\n\tprint(\"loading url\\n\");\n\tthis.view.el.load_uri(webkitpdf.opt_url);\n\t\n\t// if we have not finished in 25 seconds\n\t// call printit...\n\tvar cd = 25;\n\t  GLib.Timeout.add_seconds(1, () => { \n\t\tcd--;\n\t\tprint(\"timeout 25 seconds :%d\", cd);\n\t\tif (cd < 1) {\n\t\t\tprint(\"calling printit - timed out\", cd);\n\t\t\t_this.view.printit();\n\t\t\treturn true;\t\t\t\n\t\t}\n\t\treturn false;\n\n\t});\n\t\n\n}"
    },
    "xtype" : "Window",
    "$ xns" : "Gtk",
diff --git a/BrowserWindow.vala b/BrowserWindow.vala
index 6efbbd4..45734ee 100644
--- a/BrowserWindow.vala
+++ b/BrowserWindow.vala
@@ -47,10 +47,17 @@ 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");
+        	var cd = 25;
+        	  GLib.Timeout.add_seconds(1, () => { 
+        		cd--;
+        		print("timeout 25 seconds :%d", cd);
+        		if (cd < 1) {
+        			print("calling printit - timed out", cd);
         			_this.view.printit();
-        			return true;
+        			return true;			
+        		}
+        		return false;
+        
         	});