From e063a2a59d698dd96123b68a44b09f0623f80cab Mon Sep 17 00:00:00 2001 From: John Tytgat Date: Thu, 14 Aug 2008 20:32:10 +0000 Subject: 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 --- gtk/res/netsurf.glade | 275 +++++++++++++++++++++++++++++++- gtk/res/options.glade | 429 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 702 insertions(+), 2 deletions(-) (limited to 'gtk/res') diff --git a/gtk/res/netsurf.glade b/gtk/res/netsurf.glade index f250be753..48084e555 100644 --- a/gtk/res/netsurf.glade +++ b/gtk/res/netsurf.glade @@ -165,14 +165,14 @@ Produce a hardcopy on your printer. Print... True - + + True gtk-print 1 - @@ -1662,4 +1662,275 @@ + + PDF Password + True + GTK_WIN_POS_CENTER + + + True + + + True + 0.10000000149011612 + 12 + 6 + gtk-dialog-authentication + + + False + False + + + + + True + 5 + + + True + 0 + Write and confirm passwords: + + + False + + + + + True + 5 + + + True + Owner password: + 15 + + + False + False + + + + + True + True + 20 + False + 20 + + + False + False + 1 + + + + + False + False + 1 + + + + + True + 5 + + + True + Repeat password: + 15 + + + False + False + + + + + True + True + 20 + False + 20 + + + False + False + 1 + + + + + False + False + 2 + + + + + True + 5 + + + True + User password: + 15 + + + False + False + + + + + True + True + 20 + False + 20 + + + False + False + 1 + + + + + False + False + 3 + + + + + True + 5 + + + True + Repeat password: + 15 + + + False + False + + + + + True + True + 20 + False + 20 + + + False + False + 1 + + + + + False + False + 4 + + + + + True + 5 + 10 + GTK_BUTTONBOX_END + + + True + True + True + 0 + + + True + + + True + gtk-ok + + + False + False + + + + + True + Set password + + + 1 + + + + + + + + + True + True + True + 0 + + + True + + + True + + + True + gtk-cancel + + + False + False + + + + + True + No password + + + 1 + + + + + + + + + 1 + + + + + False + False + 5 + + + + + 1 + + + + + diff --git a/gtk/res/options.glade b/gtk/res/options.glade index d3f5eaca8..e13d492b3 100644 --- a/gtk/res/options.glade +++ b/gtk/res/options.glade @@ -1565,6 +1565,435 @@ Fantasy False + + + True + + + True + 5 + 0 + GTK_SHADOW_NONE + + + True + 12 + + + True + True + + + True + 2 + 3 + 4 + 5 + + + True + Top: + + + + + True + Bottom: + + + 1 + 2 + + + + + True + True + Set the top margin + 0 0 100 1 10 10 + + + 1 + 2 + + + + + True + True + Set the bottom margin + 0 0 100 1 10 10 + + + 1 + 2 + 1 + 2 + + + + + True + mm + + + 2 + 3 + + + + + True + mm + + + 2 + 3 + 1 + 2 + + + + + False + False + + + + + True + 2 + 3 + 4 + 5 + + + True + Left: + + + + + True + Right: + + + 1 + 2 + + + + + True + True + Set the left margin + 0 0 100 1 10 10 + + + 1 + 2 + + + + + True + True + Set the right margin + 0 0 100 1 10 10 + + + 1 + 2 + 1 + 2 + + + + + True + mm + + + 2 + 3 + + + + + True + mm + + + 2 + 3 + 1 + 2 + + + + + False + False + 1 + + + + + + + + + True + <b>Margins</b> + True + + + label_item + + + + + False + + + + + True + 5 + 0 + GTK_SHADOW_NONE + + + True + 12 + + + True + 4 + + + True + Scale: + + + False + + + + + True + True + Set the scaling for the document - this way more content can fit in a page + 0 0 1000 1 10 10 + + + False + False + 1 + + + + + True + % + + + False + 2 + + + + + + + + + True + <b>Scaling</b> + True + + + label_item + + + + + False + False + 1 + + + + + True + 5 + 0 + GTK_SHADOW_NONE + + + True + 12 + + + True + + + True + True + True + Turn off all images + Suppress images + 0 + True + + + + + True + True + True + Remove background images and colors + Remove backgrounds + 0 + True + + + 1 + + + + + True + True + True + Try to rearrange content to fit a page + Fit page + 0 + True + + + 2 + + + + + + + + + True + <b>Appearance</b> + True + + + label_item + + + + + False + 2 + + + + + True + 5 + 0 + GTK_SHADOW_NONE + + + True + 12 + + + True + + + True + True + True + Compress the PDF document significantly decreasing it's size + Compress PDF + 0 + True + + + + + True + True + True + Set a password and encrypt the PDF document + Set a password for PDF + 0 + True + + + 1 + + + + + + + + + True + <b>Advanced</b> + True + + + label_item + + + + + False + False + 3 + + + + + True + 10 + + + True + True + Reset export settings to defaults + True + Default + 0 + + + False + False + + + + + False + 4 + + + + + 6 + + + + + True + Export + + + tab + 6 + False + + 1 -- cgit v1.2.3