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

2 files changed, 79 insertions, 6 deletions

diff --git a/gtk/dialogs/gtk_about.c b/gtk/dialogs/gtk_about.c
index e39af1cc2..81d22cea8 100644
--- a/gtk/dialogs/gtk_about.c
+++ b/gtk/dialogs/gtk_about.c
@@ -52,9 +52,10 @@ void nsgtk_about_dialog_init(GtkWindow *parent, struct browser_window *bw, const
 	gtk_about_dialog_set_url_hook (launch_url, (gpointer) bw, NULL);
 
 	gtk_show_about_dialog(parent, "artists", artists, "authors", authors,
-	"comments", description,"copyright", copyright, 
-	"documenters", documenters, "license", licence, "program-name", name,
-	"translator-credits", translators, "version", version, "website", url,
+	"comments", description,"copyright", copyright, "documenters", documenters,
+	"license", licence,
+	"program-name", name, "translator-credits", translators,
+	"version", version, "website", url, "website-label", url_label,
 	"wrap-license", FALSE, NULL);
 }
 
diff --git a/gtk/dialogs/gtk_options.c b/gtk/dialogs/gtk_options.c
index b205d2d87..29ea54b1b 100644
--- a/gtk/dialogs/gtk_options.c
+++ b/gtk/dialogs/gtk_options.c
@@ -20,7 +20,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <math.h>
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 #include "utils/log.h"
@@ -31,6 +30,8 @@
 #include "gtk/dialogs/gtk_options.h"
 #include "gtk/gtk_window.h"
 
+#include "desktop/print.h"
+
 GtkDialog *wndPreferences;
 GladeXML *gladeFile;
 gboolean is_initialized = FALSE;
@@ -86,6 +87,18 @@ DECLARE(checkClearDownloads);
 DECLARE(checkRequestOverwrite);
 DECLARE(fileChooserDownloads);
 
+DECLARE(spinMarginTop);
+DECLARE(spinMarginBottom);
+DECLARE(spinMarginLeft);
+DECLARE(spinMarginRight);
+DECLARE(spinExportScale);
+DECLARE(checkSuppressImages);
+DECLARE(checkRemoveBackgrounds);
+DECLARE(checkFitPage);
+DECLARE(checkCompressPDF);
+DECLARE(checkPasswordPDF);
+DECLARE(setDefaultExportOptions);
+
 /* Used when the feature is not implemented yet */
 #define FIND_WIDGET(x) (x) = glade_xml_get_widget(gladeFile, #x); \
 	if ((x) == NULL) LOG(("Unable to find widget '%s'!", #x))
@@ -149,6 +162,19 @@ GtkDialog* nsgtk_options_init(struct browser_window *bw, GtkWindow *parent) {
 	CONNECT(checkRequestOverwrite, "toggled");
 	CONNECT(fileChooserDownloads, "current-folder-changed");
 	
+	CONNECT(spinMarginTop, "value-changed");
+	CONNECT(spinMarginBottom, "value-changed");
+	CONNECT(spinMarginLeft, "value-changed");
+	CONNECT(spinMarginRight, "value-changed");
+	CONNECT(spinExportScale, "value-changed");
+	CONNECT(checkSuppressImages, "toggled");
+	CONNECT(checkRemoveBackgrounds, "toggled");
+	CONNECT(checkFitPage, "toggled");
+	CONNECT(checkCompressPDF, "toggled");
+	CONNECT(checkPasswordPDF, "toggled");
+	CONNECT(setDefaultExportOptions, "clicked");
+	
+	
 	g_signal_connect(G_OBJECT(wndPreferences), "response",
 		G_CALLBACK (dialog_response_handler), NULL);
 	
@@ -233,6 +259,18 @@ void nsgtk_options_load(void) {
 	SET_CHECK(checkClearDownloads, option_downloads_clear);
 	SET_CHECK(checkRequestOverwrite, option_request_overwrite);
 	SET_FILE_CHOOSER(fileChooserDownloads, option_downloads_directory);
+	
+	SET_SPIN(spinMarginTop, option_margin_top);
+	SET_SPIN(spinMarginBottom, option_margin_bottom);
+	SET_SPIN(spinMarginLeft, option_margin_left);
+	SET_SPIN(spinMarginRight, option_margin_right);
+	SET_SPIN(spinExportScale, option_export_scale);
+	SET_CHECK(checkSuppressImages, option_suppress_images);
+	SET_CHECK(checkRemoveBackgrounds, option_remove_backgrounds);
+	SET_CHECK(checkFitPage, option_enable_loosening);
+	SET_CHECK(checkCompressPDF, option_enable_PDF_compression);
+	SET_CHECK(checkPasswordPDF, option_enable_PDF_password);
+	SET_BUTTON(setDefaultExportOptions);
 }
 
 static void dialog_response_handler (GtkDialog *dlg, gint res_id){
@@ -280,7 +318,6 @@ static gboolean on_dialog_close (GtkDialog *dlg, gboolean stay_alive){
 	(y) = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER((x)));
 #define BUTTON_CLICKED(x) gboolean on_##x##_changed(GtkWidget *widget, gpointer data) { \
 	LOG(("Signal emitted on '%s'", #x));
-
 ENTRY_CHANGED(entryHomePageURL, option_homepage_url)}
 	return FALSE;}
 BUTTON_CLICKED(setCurrentPage)
@@ -318,7 +355,7 @@ COMBO_CHANGED(comboProxyType, proxy_type)
 			option_http_proxy_auth = OPTION_HTTP_PROXY_AUTH_NTLM;
 			break;
 	}
-	gboolean sensitive = (option_http_proxy_auth);
+	gboolean sensitive = (!proxy_type == 0);
 	gtk_widget_set_sensitive (entryProxyHost, sensitive);
 	gtk_widget_set_sensitive (entryProxyPort, sensitive);
 	gtk_widget_set_sensitive (entryProxyUser, sensitive);
@@ -383,3 +420,38 @@ SPIN_CHANGED(spinDiscCacheAge, option_disc_cache_age)}
 CHECK_CHANGED(checkClearDownloads, option_downloads_clear)}
 CHECK_CHANGED(checkRequestOverwrite, option_request_overwrite)}
 FILE_CHOOSER_CHANGED(fileChooserDownloads, option_downloads_directory)}
+
+SPIN_CHANGED(spinMarginTop, option_margin_top)}
+SPIN_CHANGED(spinMarginBottom, option_margin_bottom)}
+SPIN_CHANGED(spinMarginLeft, option_margin_left)}
+SPIN_CHANGED(spinMarginRight, option_margin_right)}
+SPIN_CHANGED(spinExportScale, option_export_scale)}
+CHECK_CHANGED(checkSuppressImages, option_suppress_images)}
+CHECK_CHANGED(checkRemoveBackgrounds, option_remove_backgrounds)}
+CHECK_CHANGED(checkFitPage, option_enable_loosening)}
+CHECK_CHANGED(checkCompressPDF, option_enable_PDF_compression)}
+CHECK_CHANGED(checkPasswordPDF, option_enable_PDF_password)}
+BUTTON_CLICKED(setDefaultExportOptions)
+	option_margin_top = DEFAULT_MARGIN_TOP_MM;
+	option_margin_bottom = DEFAULT_MARGIN_BOTTOM_MM;
+	option_margin_left = DEFAULT_MARGIN_LEFT_MM;
+	option_margin_right = DEFAULT_MARGIN_RIGHT_MM;
+	option_export_scale = DEFAULT_EXPORT_SCALE * 100;		
+	option_suppress_images = false;
+	option_remove_backgrounds = false;
+	option_enable_loosening = true;
+	option_enable_PDF_compression = true;
+	option_enable_PDF_password = false;
+			
+	SET_SPIN(spinMarginTop, option_margin_top);
+	SET_SPIN(spinMarginBottom, option_margin_bottom);
+	SET_SPIN(spinMarginLeft, option_margin_left);
+	SET_SPIN(spinMarginRight, option_margin_right);
+	SET_SPIN(spinExportScale, option_export_scale);
+	SET_CHECK(checkSuppressImages, option_suppress_images);
+	SET_CHECK(checkRemoveBackgrounds, option_remove_backgrounds);
+	SET_CHECK(checkCompressPDF, option_enable_PDF_compression);
+	SET_CHECK(checkPasswordPDF, option_enable_PDF_password);
+	SET_CHECK(checkFitPage, option_enable_loosening);
+	
+}