diff options
author | John Tytgat <joty@netsurf-browser.org> | 2008-08-14 20:32:10 +0000 |
---|---|---|
committer | John Tytgat <joty@netsurf-browser.org> | 2008-08-14 20:32:10 +0000 |
commit | e063a2a59d698dd96123b68a44b09f0623f80cab (patch) | |
tree | 1bd06130de988cb0f6da239800229387f189d21c /gtk/gtk_gui.c | |
parent | 44856d86d4efb12e08c8ef7560f39233107dfa8a (diff) | |
download | netsurf-e063a2a59d698dd96123b68a44b09f0623f80cab.tar.gz netsurf-e063a2a59d698dd96123b68a44b09f0623f80cab.tar.bz2 |
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
Diffstat (limited to 'gtk/gtk_gui.c')
-rw-r--r-- | gtk/gtk_gui.c | 112 |
1 files changed, 111 insertions, 1 deletions
diff --git a/gtk/gtk_gui.c b/gtk/gtk_gui.c index 2efa5fa15..359f1d7dd 100644 --- a/gtk/gtk_gui.c +++ b/gtk/gtk_gui.c @@ -44,6 +44,7 @@ #include "desktop/gui.h" #include "desktop/netsurf.h" #include "desktop/options.h" +#include "desktop/save_pdf/pdf_plotters.h" #include "gtk/gtk_gui.h" #include "gtk/dialogs/gtk_options.h" #include "gtk/gtk_completion.h" @@ -69,6 +70,7 @@ char *adblock_stylesheet_url; char *options_file_location; char *glade_file_location; char *res_dir_location; +char *print_options_file_location; struct gui_window *search_current_window = 0; @@ -89,6 +91,8 @@ static void nsgtk_ssl_accept(GtkButton *w, gpointer data); static void nsgtk_ssl_reject(GtkButton *w, gpointer data); static void nsgtk_select_menu_clicked(GtkCheckMenuItem *checkmenuitem, gpointer user_data); +static void nsgtk_PDF_set_pass(GtkButton *w, gpointer data); +static void nsgtk_PDF_no_pass(GtkButton *w, gpointer data); /** * Locate a shared resource file by searching known places in order. @@ -287,7 +291,7 @@ void gui_init(int argc, char** argv) LOG(("Using '%s' as download directory", home)); option_downloads_directory = home; } - + find_resource(buf, "messages", "./gtk/res/messages"); LOG(("Using '%s' as Messages file", buf)); messages_load(buf); @@ -304,6 +308,10 @@ void gui_init(int argc, char** argv) adblock_stylesheet_url = path_to_url(buf); LOG(("Using '%s' as AdBlock CSS URL", adblock_stylesheet_url)); + find_resource(buf, "Print", "~/.netsurf/Print"); + LOG(("Using '%s' as Print Settings file", buf)); + print_options_file_location = strdup(buf); + urldb_load(option_url_file); urldb_load_cookies(option_cookie_file); @@ -409,6 +417,7 @@ void gui_quit(void) free(adblock_stylesheet_url); free(option_cookie_file); free(option_cookie_jar); + free(print_options_file_location); gtk_fetch_filetype_fin(); #ifdef WITH_HUBBUB /* We don't care if this fails as we're about to die, anyway */ @@ -618,3 +627,104 @@ bool cookies_update(const char *domain, const struct cookie_data *data) { return true; } + +void PDF_Password(char **owner_pass, char **user_pass, char *path) +{ + GladeXML *x = glade_xml_new(glade_file_location, NULL, NULL); + GtkWindow *wnd = GTK_WINDOW(glade_xml_get_widget(x, "wndPDFPassword")); + GtkButton *ok, *no; + void **data = malloc(5 * sizeof(void *)); + + *owner_pass = NULL; + *user_pass = NULL; + + data[0] = owner_pass; + data[1] = user_pass; + data[2] = wnd; + data[3] = x; + data[4] = path; + + ok = GTK_BUTTON(glade_xml_get_widget(x, "buttonPDFSetPassword")); + no = GTK_BUTTON(glade_xml_get_widget(x, "buttonPDFNoPassword")); + + g_signal_connect(G_OBJECT(ok), "clicked", + G_CALLBACK(nsgtk_PDF_set_pass), (gpointer)data); + g_signal_connect(G_OBJECT(no), "clicked", + G_CALLBACK(nsgtk_PDF_no_pass), (gpointer)data); + + gtk_widget_show(GTK_WIDGET(wnd)); +} + +static void nsgtk_PDF_set_pass(GtkButton *w, gpointer data) +{ + char **owner_pass = ((void **)data)[0]; + char **user_pass = ((void **)data)[1]; + GtkWindow *wnd = ((void **)data)[2]; + GladeXML *x = ((void **)data)[3]; + char *path = ((void **)data)[4]; + + char *op, *op1; + char *up, *up1; + + op = strdup(gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(x, + "entryPDFOwnerPassword")))); + op1 = strdup(gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(x, + "entryPDFOwnerPassword1")))); + up = strdup(gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(x, + "entryPDFUserPassword")))); + up1 = strdup(gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(x, + "entryPDFUserPassword1")))); + + + if (op[0] == '\0') { + gtk_label_set_text(GTK_LABEL(glade_xml_get_widget(x, + "labelInfo")), + "Owner password must be at least 1 character long:"); + free(op); + free(up); + } + else if (!strcmp(op, up)) { + gtk_label_set_text(GTK_LABEL(glade_xml_get_widget(x, + "labelInfo")), + "User and owner passwords must be different:"); + free(op); + free(up); + } + else if (!strcmp(op, op1) && !strcmp(up, up1)) { + + *owner_pass = op; + if (up[0] == '\0') + free(up); + else + *user_pass = up; + + free(data); + gtk_widget_destroy(GTK_WIDGET(wnd)); + g_object_unref(G_OBJECT(x)); + + save_pdf(path); + } + else { + gtk_label_set_text(GTK_LABEL(glade_xml_get_widget(x, + "labelInfo")), "Passwords not confirmed:"); + free(op); + free(up); + } + + free(op1); + free(up1); +} + +static void nsgtk_PDF_no_pass(GtkButton *w, gpointer data) +{ + GtkWindow *wnd = ((void **)data)[2]; + GladeXML *x = ((void **)data)[3]; + char *path = ((void **)data)[4]; + + free(data); + + gtk_widget_destroy(GTK_WIDGET(wnd)); + g_object_unref(G_OBJECT(x)); + + save_pdf(path); +} |