Second merge of Adam Blokus' GSoC work from his branch 'branches/adamblokus/netsurf'.

Merged revisions 4195-4211,4216,4219-4220,4222-4234,4236-4250,4252-4262,4264-4266,4268-4326,4329-4335,4338-4342,4344-4411,4413-4420,4422-4436,4438-4491,4494-4506,4508-4514,4516,4518-4552,4554,4556-4564,4567-4568,4570-4574,4576-4686,4689-4692,4694,4698-4709,4715-4723,4725-4755,4757-4769,4771-4919,4921-4996,4998-5110,5112-5117 via svnmerge from 
svn://svn.netsurf-browser.org/branches/adamblokus/netsurf

........
  r4736 | adamblokus | 2008-07-26 13:46:54 +0200 (Sat, 26 Jul 2008) | 2 lines
  
  Sorting out some problems with svn.
........
  r4737 | adamblokus | 2008-07-26 13:54:36 +0200 (Sat, 26 Jul 2008) | 4 lines
  
  Added export tab to the options dialog.
  Added the possibility of changing some print options.
........
  r4897 | adamblokus | 2008-08-04 17:59:05 +0200 (Mon, 04 Aug 2008) | 5 lines
  
  Added checking of horizontal clipping.
  Added better table loosening.
  Changed some minor bugs.
  Applied changes in the Export options tab according to the review from tlsa.
........
  r4905 | adamblokus | 2008-08-05 01:53:34 +0200 (Tue, 05 Aug 2008) | 2 lines
  
  Fixed bug which made it impossible to export pdf's.
........
  r4919 | adamblokus | 2008-08-05 16:39:33 +0200 (Tue, 05 Aug 2008) | 2 lines
  
  Fixed some memory leaks which caused Netsurf to break.
........
  r4927 | adamblokus | 2008-08-06 02:26:30 +0200 (Wed, 06 Aug 2008) | 4 lines
  
  Fixed bug with filenames which crashed Netsurf.
  Turned anti aliasing off for printing.
  Fixed some scaling issues.
........
  r4928 | adamblokus | 2008-08-06 17:52:44 +0200 (Wed, 06 Aug 2008) | 5 lines
  
  Added new export/print options:
  - suppressing images
  - turning off backgrounds
  - toggled loosening
........
  r4950 | adamblokus | 2008-08-07 21:15:21 +0200 (Thu, 07 Aug 2008) | 5 lines
  
  Added new options to PDF export:
  - document compression
  - document encryption
  Added PDF password dialog
........
  r4954 | adamblokus | 2008-08-07 22:11:31 +0200 (Thu, 07 Aug 2008) | 2 lines
  
  Added saving print settings.
........
  r4956 | adamblokus | 2008-08-07 22:44:48 +0200 (Thu, 07 Aug 2008) | 2 lines
  
  Fixes to PDF encryption
........
  r4970 | adamblokus | 2008-08-09 15:26:24 +0200 (Sat, 09 Aug 2008) | 3 lines
  
  Fixed bug in plotting tiled bitmaps.
  Fixed bug with too long text decorations.
........
  r4977 | adamblokus | 2008-08-09 19:18:56 +0200 (Sat, 09 Aug 2008) | 2 lines
  
  Fixed JPG embedding bug.
........
  r4988 | adamblokus | 2008-08-10 16:59:51 +0200 (Sun, 10 Aug 2008) | 3 lines
  
  Added clip checking to pdf plotters. No more "blank" clips.
  Made PDF compression a default setting.
........
  r4995 | adamblokus | 2008-08-10 20:03:00 +0200 (Sun, 10 Aug 2008) | 2 lines
  
  Fixed Haru crash on font-size==0.
........
  r4996 | adamblokus | 2008-08-10 21:04:43 +0200 (Sun, 10 Aug 2008) | 2 lines
  
  Added changing text mode only if necessary.
........
  r5045 | adamblokus | 2008-08-11 21:26:26 +0200 (Mon, 11 Aug 2008) | 3 lines
  
  Removing gtk stuff from core code.
  Little fix in options. 
........
  r5048 | adamblokus | 2008-08-11 21:57:45 +0200 (Mon, 11 Aug 2008) | 2 lines
  
  Better font size checking in PDF export.
........
  r5050 | adamblokus | 2008-08-11 22:19:56 +0200 (Mon, 11 Aug 2008) | 2 lines
  
  Fixed riscos text scale bug.
........
  r5073 | adamblokus | 2008-08-12 17:40:57 +0200 (Tue, 12 Aug 2008) | 2 lines
  
  Added missing tooltips
........
  r5092 | adamblokus | 2008-08-13 17:09:25 +0200 (Wed, 13 Aug 2008) | 2 lines
  
  Moved /pdf folder to desktop/save_pdf
........
  r5110 | adamblokus | 2008-08-13 22:44:50 +0200 (Wed, 13 Aug 2008) | 2 lines
  
  Added comments.
........
  r5113 | adamblokus | 2008-08-13 23:07:35 +0200 (Wed, 13 Aug 2008) | 2 lines
  
  Cosmetic changes
........
  r5116 | adamblokus | 2008-08-14 16:10:18 +0200 (Thu, 14 Aug 2008) | 2 lines
  
  Fixed bug with BOX_INLINE_END in tree duplication.
........
  r5117 | joty | 2008-08-14 21:47:46 +0200 (Thu, 14 Aug 2008) | 1 line
  
  Improvement for r5116: use local vars when possible; rename global last to box_duplicate_last; check on box_duplicate_main_tree failure.
........

svn path=/trunk/netsurf/; revision=5118

1 files changed, 46 insertions, 27 deletions

diff --git a/gtk/gtk_scaffolding.c b/gtk/gtk_scaffolding.c
index df1ea68b7..c2f546ec0 100644
--- a/gtk/gtk_scaffolding.c
+++ b/gtk/gtk_scaffolding.c
@@ -43,15 +43,17 @@
 #include "gtk/gtk_window.h"
 #include "gtk/gtk_schedule.h"
 #include "gtk/gtk_download.h"
+#include "gtk/options.h"
 #include "render/box.h"
 #include "render/font.h"
 #include "render/form.h"
 #include "render/html.h"
 #include "utils/messages.h"
 #include "utils/utils.h"
+#include "utils/url.h"
 
-#include "pdf/pdf_plotters.h"
 #include "desktop/print.h"
+#include "desktop/save_pdf/pdf_plotters.h"
 #ifdef WITH_PDF_EXPORT
 #include "gtk/gtk_print.h"
 #endif
@@ -146,7 +148,6 @@ MENUPROTO(open_location);
 MENUPROTO(open_file);
 MENUPROTO(export_pdf);
 MENUPROTO(print);
-MENUPROTO(print_preview);
 MENUPROTO(close_window);
 MENUPROTO(quit);
 
@@ -193,7 +194,6 @@ static struct menu_events menu_events[] = {
 #ifdef WITH_PDF_EXPORT
 	MENUEVENT(export_pdf),
 	MENUEVENT(print),
-	MENUEVENT(print_preview),
 #endif
 	MENUEVENT(close_window),
 	MENUEVENT(quit),
@@ -489,10 +489,25 @@ MENUHANDLER(export_pdf){
         struct gtk_scaffolding *gw = (struct gtk_scaffolding *)g;
         struct browser_window *bw = nsgtk_get_browser_for_gui(gw->top_level);
 	struct print_settings* settings;
+	char filename[PATH_MAX];
+	char dirname[PATH_MAX];
+	char *url_name;
 	
 	LOG(("Print preview (generating PDF)  started."));
 
-	settings = print_make_settings(DEFAULT);
+	url_nice(bw->current_content->url, &url_name, true);
+	strcat(filename, url_name);
+	strcat(filename, ".pdf");
+	
+	free(url_name);	
+	
+	strcpy(dirname, option_downloads_directory);
+	strcat(dirname, "/");
+	
+	settings = print_make_settings(OPTIONS, NULL);
+	/*this way the scale used by PDF functions is synchronized with that
+	used by the all-purpose print interface*/
+	pdf_set_scale((float)option_export_scale / 100);
 
 	save_dialog = gtk_file_chooser_dialog_new("Export to PDF", gw->window,
 		GTK_FILE_CHOOSER_ACTION_SAVE,
@@ -501,10 +516,10 @@ MENUHANDLER(export_pdf){
 		NULL);
 	
 	gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(save_dialog),
-		getenv("HOME") ? getenv("HOME") : "/");
-	
+			dirname);
+
 	gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(save_dialog),
-		"out.pdf");
+			filename);
 	
 	if (gtk_dialog_run(GTK_DIALOG(save_dialog)) == GTK_RESPONSE_ACCEPT) {
 		settings->output = gtk_file_chooser_get_filename(
@@ -512,7 +527,7 @@ MENUHANDLER(export_pdf){
 	}
 	
 	gtk_widget_destroy(save_dialog);
-
+	
 	print_basic_run(bw->current_content, &pdf_printer, settings);
 
 	return TRUE;
@@ -525,44 +540,49 @@ MENUHANDLER(print){
 	
 	GtkPrintOperation* print_op;
 	GtkPageSetup* page_setup;
-	struct print_settings* settings;
-	
-	settings = print_make_settings(DEFAULT);
+	GtkPrintSettings*  gtk_print_settings;
+	GtkPrintOperationResult res;
+	struct print_settings *settings;
 	
 	print_op = gtk_print_operation_new();
 	page_setup = gtk_page_setup_new();
 	
+	/*use previously saved settings if any*/
+	gtk_print_settings = gtk_print_settings_new_from_file(print_options_file_location, NULL);
+	if (gtk_print_settings != NULL)
+		gtk_print_operation_set_print_settings(print_op,
+				gtk_print_settings);
+
 	content_to_print = bw->current_content;
 	
 	page_setup = gtk_print_run_page_setup_dialog(gw->window, page_setup, NULL);
 	gtk_print_operation_set_default_page_setup (print_op, page_setup);
 	
-	g_signal_connect(print_op, "begin_print", G_CALLBACK (gtk_print_signal_begin_print), NULL);
+	settings = print_make_settings(DEFAULT, NULL);
+	
+	g_signal_connect(print_op, "begin_print", G_CALLBACK (gtk_print_signal_begin_print), settings);
 	g_signal_connect(print_op, "draw_page", G_CALLBACK (gtk_print_signal_draw_page), NULL);
-	g_signal_connect(print_op, "end_print", G_CALLBACK (gtk_print_signal_end_print), NULL);
+	g_signal_connect(print_op, "end_print", G_CALLBACK (gtk_print_signal_end_print), settings);
 
 	
-	gtk_print_operation_run(print_op,
+	res = gtk_print_operation_run(print_op,
 				GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG,
     				gw->window,
 				NULL);
 	
+	/*if the settings were used save them for future use*/	
+	if (res == GTK_PRINT_OPERATION_RESULT_APPLY) {
+		if (gtk_print_settings != NULL)
+			g_object_unref(gtk_print_settings);
+		gtk_print_settings = g_object_ref(
+				gtk_print_operation_get_print_settings(print_op));
+		gtk_print_settings_to_file(gtk_print_settings,
+				print_options_file_location ,NULL);
+	}
 	
 	return TRUE;
 }
 
-MENUHANDLER(print_preview){
-
-        struct gtk_scaffolding *gw = (struct gtk_scaffolding *)g;
-        struct browser_window *bw = nsgtk_get_browser_for_gui(gw->top_level);
-	
-	LOG(("Print preview (generating PDF)  started."));
-
-	print_basic_run(bw->current_content, &pdf_printer, NULL);
-
-	return TRUE;
-}
-
 #endif /* WITH_PDF_EXPORT */
 
 MENUHANDLER(close_window)
@@ -1142,7 +1162,6 @@ nsgtk_scaffolding *nsgtk_new_scaffolding(struct gui_window *toplevel)
 #ifndef WITH_PDF_EXPORT
 	gtk_widget_set_sensitive(GET_WIDGET("export_pdf"), FALSE);
 	gtk_widget_set_sensitive(GET_WIDGET("print"), FALSE);
-	gtk_widget_set_sensitive(GET_WIDGET("print_preview"), FALSE);
 #endif
 
 	/* finally, show the window. */