From f4da0b414b969a5a7f94beec5ff2c04af969fb16 Mon Sep 17 00:00:00 2001 From: Rob Kendrick Date: Thu, 24 Aug 2006 17:24:36 +0000 Subject: Improve resource finding, and start groundwork on making it installable - you must now run the "netsurf" shellscript to run nsgtk, and not nsgtk directly. svn path=/trunk/netsurf/; revision=2888 --- gtk/gtk_gui.c | 64 +- gtk/gtk_window.c | 2 +- gtk/res/b.png | 1 + gtk/res/messages | 1 + gtk/res/messages.txt | 1 - gtk/res/netsurf.glade | 4676 +++++++++++++++++++++++++++++++++++++++++++++++++ gtk/res/throbber.gif | Bin 0 -> 5175 bytes 7 files changed, 4730 insertions(+), 15 deletions(-) create mode 120000 gtk/res/b.png create mode 120000 gtk/res/messages delete mode 120000 gtk/res/messages.txt create mode 100644 gtk/res/netsurf.glade create mode 100644 gtk/res/throbber.gif (limited to 'gtk') diff --git a/gtk/gtk_gui.c b/gtk/gtk_gui.c index 4780d0dfe..05799e160 100644 --- a/gtk/gtk_gui.c +++ b/gtk/gtk_gui.c @@ -13,6 +13,8 @@ #include #include #include +#include +#include #include #include #include @@ -71,11 +73,13 @@ GladeXML *gladeWindows; static char *find_resource(char *buf, const char *filename, const char *def) { char *cdir = getenv("HOME"); + char t[PATH_MAX]; if (cdir != NULL) { - strcpy(buf, cdir); - strcat(buf, "/.netsurf/"); - strcat(buf, filename); + strcpy(t, cdir); + strcat(t, "/.netsurf/"); + strcat(t, filename); + realpath(t, buf); if (access(buf, R_OK) == 0) return buf; } @@ -83,28 +87,62 @@ static char *find_resource(char *buf, const char *filename, const char *def) cdir = getenv("NETSURFRES"); if (cdir != NULL) { - strcpy(buf, cdir); + realpath(cdir, buf); strcat(buf, "/"); strcat(buf, filename); if (access(buf, R_OK) == 0) return buf; } - strcpy(buf, RESPATH); - strcat(buf, filename); + strcpy(t, RESPATH); + strcat(t, filename); + realpath(t, buf); if (access(buf, R_OK) == 0) return buf; - strcpy(buf, def); + if (def[0] == '~') { + snprintf(t, PATH_MAX, "%s%s", getenv("HOME"), def + 1); + realpath(t, buf); + } else { + realpath(def, buf); + } + return buf; } +/** + * Check that ~/.netsurf/ exists, and if it doesn't, create it. + */ +static void check_homedir(void) +{ + char *hdir = getenv("HOME"); + char buf[BUFSIZ]; + + if (hdir == NULL) { + /* we really can't continue without a home directory. */ + LOG(("HOME is not set - nowhere to store state!")); + die("NetSurf requires HOME to be set in order to run.\n"); + + } + + snprintf(buf, BUFSIZ, "%s/.netsurf", hdir); + if (access(buf, F_OK) != 0) { + LOG(("You don't have a ~/.netsurf - creating one for you.")); + if (mkdir(buf, 0777) == -1) { + LOG(("Unable to create ~/.netsurf!")); + die("NetSurf requires ~/.netsurf to exist, but it cannot be created.\n"); + } + } +} + void gui_init(int argc, char** argv) { char buf[PATH_MAX]; gtk_init(&argc, &argv); + check_homedir(); + find_resource(buf, "netsurf.glade", "./gtk/netsurf.glade"); LOG(("Using '%s' as Glade template file", buf)); glade_file_location = strdup(buf); @@ -122,7 +160,7 @@ void gui_init(int argc, char** argv) if (nsgtk_throbber == NULL) die("Unable to load throbber image.\n"); - find_resource(buf, "Choices", "Choices"); + find_resource(buf, "Choices", "~/.netsurf/Choices"); LOG(("Using '%s' as Choices file", buf)); options_file_location = strdup(buf); options_read(buf); @@ -130,12 +168,12 @@ void gui_init(int argc, char** argv) nsgtk_options_init(); if (!option_cookie_file) { - find_resource(buf, "Cookies", "Cookies"); + find_resource(buf, "Cookies", "~/.netsurf/Cookies"); LOG(("Using '%s' as Cookies file", buf)); option_cookie_file = strdup(buf); } if (!option_cookie_jar) { - find_resource(buf, "Cookies", "Cookies"); + find_resource(buf, "Cookies", "~/.netsurf/Cookies"); LOG(("Using '%s' as Cookie Jar file", buf)); option_cookie_jar = strdup(buf); } @@ -143,7 +181,7 @@ void gui_init(int argc, char** argv) die("Failed initialising cookie options"); if (!option_url_file) { - find_resource(buf, "URLs", "URLs"); + find_resource(buf, "URLs", "~/.netsurf/URLs"); LOG(("Using '%s' as URL file", buf)); option_url_file = strdup(buf); } @@ -153,11 +191,11 @@ void gui_init(int argc, char** argv) messages_load(buf); /* set up stylesheet urls */ - find_resource(buf, "Default.css", "Default.css"); + find_resource(buf, "default.css", "default.css"); default_stylesheet_url = path_to_url(buf); LOG(("Using '%s' as Default CSS URL", default_stylesheet_url)); - find_resource(buf, "AdBlock.css", "AdBlock.css"); + find_resource(buf, "adblock.css", "adblock.css"); adblock_stylesheet_url = path_to_url(buf); LOG(("Using '%s' as AdBlock CSS URL", adblock_stylesheet_url)); diff --git a/gtk/gtk_window.c b/gtk/gtk_window.c index 183497bd7..e8cafa7f1 100644 --- a/gtk/gtk_window.c +++ b/gtk/gtk_window.c @@ -697,7 +697,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, /* load the window template from the glade xml file, and extract * widget references from it for later use. */ - g->xml = glade_xml_new("./gtk/netsurf.glade", "wndBrowser", NULL); + g->xml = glade_xml_new(glade_file_location, "wndBrowser", NULL); glade_xml_signal_autoconnect(g->xml); g->window = GTK_WINDOW(GET_WIDGET("wndBrowser")); g->url_bar = GTK_ENTRY(GET_WIDGET("URLBar")); diff --git a/gtk/res/b.png b/gtk/res/b.png new file mode 120000 index 000000000..f2fde4dca --- /dev/null +++ b/gtk/res/b.png @@ -0,0 +1 @@ +../../!NetSurf/Resources/b,b60 \ No newline at end of file diff --git a/gtk/res/messages b/gtk/res/messages new file mode 120000 index 000000000..f4a4d2bba --- /dev/null +++ b/gtk/res/messages @@ -0,0 +1 @@ +../../!NetSurf/Resources/en/Messages \ No newline at end of file diff --git a/gtk/res/messages.txt b/gtk/res/messages.txt deleted file mode 120000 index f4a4d2bba..000000000 --- a/gtk/res/messages.txt +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/en/Messages \ No newline at end of file diff --git a/gtk/res/netsurf.glade b/gtk/res/netsurf.glade new file mode 100644 index 000000000..839d2350f --- /dev/null +++ b/gtk/res/netsurf.glade @@ -0,0 +1,4676 @@ + + + + + + + NetSurf + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER + False + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + True + False + + + + True + False + 0 + + + + True + GTK_PACK_DIRECTION_LTR + GTK_PACK_DIRECTION_LTR + + + + True + _File + True + + + + + + + True + Opens a new browser window. + New window + True + + + + + True + gtk-new + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + False + Open an address into this browser window. + Open _location... + True + + + + + + + True + False + Open a file on your computer into this browser window. + Open _file... + True + + + + + True + gtk-open + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + Close this browser window. + _Close window + True + + + + + True + gtk-close + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + + + + + + True + False + Save this page to disc, optionally including images, etc. + Save page... + True + + + + + True + gtk-save-as + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + False + Export the page to a different format. + Export + True + + + + + + + True + Plain ASCII text, readable in text editors and views. + Plain text... + True + + + + + + True + RISC OS Drawfile vector graphic. + Drawfile... + True + + + + + + True + PostScript for printing and converting to PDFs. + PostScript... + True + + + + + + + + + + True + + + + + + True + False + Show how a print out might look like. + Print preview... + True + + + + True + gtk-print-preview + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + False + Produce a hardcopy on your printer. + Print... + True + + + + + True + gtk-print + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + + + + + + True + gtk-quit + True + + + + + + + + + + True + _Edit + True + + + + + + + True + False + gtk-cut + True + + + + + + True + False + gtk-copy + True + + + + + + True + False + gtk-paste + True + + + + + + True + False + gtk-delete + True + + + + + + True + + + + + + True + False + Selects all text in the current browser window. + Select _all + True + + + + + + + True + + + + + + True + False + Find specific text in the current browser window. + _Find... + True + + + + + + + True + + + + + + True + Change how NetSurf functions. + _Choices... + True + + + + True + gtk-preferences + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + + + + + True + _View + True + + + + + + + True + _Stop + True + + + + + True + gtk-stop + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + Reload + True + + + + + True + gtk-refresh + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + + + + + + True + Scale the page in the current browser window to be smaller or larger. + Scale View... + True + + + + + True + gtk-zoom-in + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + + True + Zoom _in + True + + + + + True + gtk-zoom-in + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + _Normal size + True + + + + + True + gtk-zoom-100 + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + Zoom _out + True + + + + + True + gtk-zoom-out + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + + + + + True + False + Images + True + + + + + + + True + False + Toggle the display of images in the foreground. + Foreground images + True + False + + + + + + True + False + Toggle the display of images in the background. + Background images + True + False + + + + + + + + + + True + False + Toolbars + True + + + + + + + True + False + Menu bar + True + False + + + + + + True + False + Buttons + True + True + + + + + + True + False + Address bar + True + True + + + + + + True + False + Throbber + True + True + + + + + + True + False + Status bar + True + True + + + + + + + + + + + + + + True + _Navigate + True + + + + + + + True + _Back + True + + + + + True + gtk-go-back + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + _Forward + True + + + + + True + gtk-go-forward + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + _Home + True + + + + + True + gtk-home + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + + + + + + True + Show the history tree for this browser window. + _Local history... + True + + + + + + + True + Show the history tree for all windows. + _Global history... + True + + + + + + + True + + + + + + True + False + Add the current page to your bookmarks. + _Add to bookmarks + True + + + + + + True + False + Open a window showing all your bookmarks. + Show book_marks... + True + + + + + + + + + + + True + _Help + True + + + + + + + True + False + Shows the contents of the NetSurf manual. + _Contents... + True + + + + + True + gtk-help + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + True + False + Shows a guide and tutorial. + User _guide... + True + + + + + + True + False + User _information... + True + + + + + + True + + + + + + True + gtk-about + True + + + + + + + + + 0 + False + False + + + + + + True + GTK_ORIENTATION_HORIZONTAL + GTK_TOOLBAR_BOTH_HORIZ + True + True + + + + True + gtk-go-back + True + True + False + + + False + True + + + + + + True + gtk-go-forward + True + True + False + + + False + True + + + + + + True + gtk-stop + True + True + False + + + False + True + + + + + + True + gtk-refresh + True + True + False + + + False + True + + + + + + True + gtk-home + True + True + False + + + False + True + + + + + + True + True + True + False + + + + True + True + True + True + 0 + + True + ● + False + + + + + True + False + + + + + + True + True + True + False + + + + True + 4 + gtk-yes + 0.5 + 0.5 + 2 + 0 + + + + + False + False + + + + + 0 + False + False + + + + + + True + 2 + 2 + False + 0 + 0 + + + + True + GTK_UPDATE_CONTINUOUS + False + 0 0 100 1 10 0 + + + 1 + 2 + 0 + 1 + fill + + + + + + True + GTK_SHADOW_IN + + + + True + True + True + + + + + 0 + 1 + 0 + 1 + fill + fill + + + + + + True + True + + + + True + Status bar text goes here + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.490000009537 + 0 + 0 + PANGO_ELLIPSIZE_MIDDLE + 50 + False + 0 + + + True + False + + + + + + True + GTK_UPDATE_CONTINUOUS + False + 0 0 100 1 10 0 + + + True + True + + + + + 0 + 1 + 1 + 2 + shrink + + + + + + 1 + True + True + + + 1 + 2 + 1 + 2 + fill + shrink|fill + + + + + 0 + True + True + + + + + + + + Site Authentication + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER_ALWAYS + False + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + False + True + + + + True + False + 0 + + + + True + GTK_BUTTONBOX_END + + + + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + True + -6 + + + + + + True + True + True + True + GTK_RELIEF_NORMAL + True + -5 + + + + True + True + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-ok + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Login + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + + + + + + 0 + False + True + GTK_PACK_END + + + + + + 3 + True + False + 0 + + + + True + 6 + gtk-dialog-authentication + 0.5 + 0.10000000149 + 12 + 0 + + + 0 + False + False + + + + + + 1 + True + 4 + 2 + False + 10 + 11 + + + + True + True + True + True + True + 0 + sesame + True + ● + False + + + 1 + 2 + 2 + 3 + + + + + + + True + True + True + False + 0 + opensesame + True + * + True + + + 1 + 2 + 3 + 4 + + + + + + + True + my sekr3t area + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 1 + 2 + fill + + + + + + True + Realm + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + True + Host + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + True + Username + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 2 + 3 + fill + + + + + + True + Password + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 3 + 4 + fill + + + + + + True + moo.yoo.com + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 0 + 1 + fill + + + + + 1 + True + True + + + + + 0 + True + True + + + + + + + + 1 + SSL certificate problem + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + False + True + + + + True + False + 0 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + GTK_RELIEF_NORMAL + True + -6 + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-cancel + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Reject + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + + + + + + + True + True + True + GTK_RELIEF_NORMAL + True + -5 + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-apply + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Accept + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + + + + + + 0 + False + True + GTK_PACK_END + + + + + + True + False + 0 + + + + True + 6 + gtk-dialog-warning + 0.5 + 0 + 0 + 0 + + + 0 + False + False + + + + + + True + False + 0 + + + + True + NetSurf failed to verify the authenticity of an SSL certificate. Please verify the details presented below. + False + False + GTK_JUSTIFY_CENTER + True + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + 5 + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + True + GTK_POLICY_ALWAYS + GTK_POLICY_ALWAYS + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + 200 + True + True + False + False + True + GTK_JUSTIFY_LEFT + GTK_WRAP_NONE + True + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + + + + + + True + <b>Certificate chain</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + + + True + NetSurf Choices + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER + False + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + True + True + + + + + 6 + True + False + 0 + + + + 4 + True + True + True + True + GTK_POS_LEFT + False + False + + + + True + False + 0 + + + + 5 + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + 5 + True + False + 5 + + + + True + URL + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + The page to visit when the Home button is pressed, or a new window is opened. + True + True + True + 0 + http://netsurf.sourceforge.net/ + True + ● + False + + + 0 + True + True + + + + + + + + + + True + <b>Home page</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + False + True + + + + + + 5 + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + True + 0 + + + + True + Attempt to hide images from known advertisement servers. + True + Hide advertisements + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + False + Stop pop-up windows normally containing adverts appearing. + True + Disable pop-up windows + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + False + Do not allow the embedded of applets and plugins. + True + Disable plug-ins + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + + + + + True + <b>Content blocking</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + False + True + + + + + + 5 + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + 1 + True + False + 2 + + + + 4 + True + False + 4 + + + + True + Keep history for + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + False + Visited pages are forgotten after this many days + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 14 0 100 1 10 10 + + + 0 + False + False + + + + + + True + days + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + 0 + True + True + + + + + + True + False + Show a tooltip showing the URL of a page in the local history tree. + True + Hover URLs by pointer in local history + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + + + + + True + <b>History</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + False + False + + + + + + 5 + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + True + 0 + + + + True + False + Ask before overwriting files when downloading. + True + Request confirmation before overwriting files + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + Show a drop-down list of recent addresses when typing into the address bar. + True + Display recently visited URLs as you type + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + When requesting items or pages, tell the server what linked to them. + True + Send site referral information + True + GTK_RELIEF_NORMAL + True + True + False + True + + + 0 + False + False + + + + + + + + + + True + <b>Misc</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + False + True + + + + + False + True + + + + + + True + General + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + tab + + + + + + True + False + 0 + + + + 5 + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + 4 + 2 + False + 3 + 3 + + + + True + If your proxy server requires authentication, enter your username here. + True + True + True + 0 + + True + ● + False + + + 1 + 2 + 2 + 3 + + + + + + + True + No proxy +Simple proxy +Basic authentication +NTLM authentication + False + True + + + 1 + 2 + 0 + 1 + + + + + + + True + False + 0 + + + + True + Host name of your proxy server. + True + True + True + 0 + + True + ● + False + + + 0 + True + True + + + + + + True + : + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + 64 + True + Port number to connect to on proxy server. + True + True + True + 0 + + True + ● + False + + + 0 + True + True + + + + + 1 + 2 + 1 + 2 + fill + fill + + + + + + True + Password + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 3 + 4 + + expand + + + + + + True + Username + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 2 + 3 + + expand + + + + + + True + Host + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + + expand + + + + + + True + Proxy type + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + + expand + + + + + + True + If your proxy server requires authentication, enter your password here. + True + True + False + 0 + + True + * + False + + + 1 + 2 + 3 + 4 + + + + + + + + + + + True + <b>HTTP Proxy</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + False + True + + + + + + 5 + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + 3 + True + 3 + 2 + False + 3 + 3 + + + + True + Maximum fetchers + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + expand + + + + + + True + Fetches per host + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + expand + + + + + + True + Cached connections + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 2 + 3 + expand + + + + + + True + Number of connections to keep incase they are needed again. + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 1 0 100 1 10 10 + + + 1 + 2 + 2 + 3 + + + + + + + True + Maximum number of item fetches per web server. + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 1 0 100 1 10 10 + + + 1 + 2 + 1 + 2 + + + + + + + True + Maximum number of concurrent items to fetch at once. + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 1 0 100 1 10 10 + + + 1 + 2 + 0 + 1 + + + + + + + + + + + True + <b>Fetching</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + False + True + + + + + False + True + + + + + + True + Network + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + tab + + + + + + True + False + 0 + + + + 5 + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + False + 0 + + + + True + Enable the use of Cairo, which provides better looking results at the cost of speed. + True + Use Cairo for anti-aliased drawing + True + GTK_RELIEF_NORMAL + True + True + False + True + + + 0 + False + False + + + + + + True + Smoothly resize images when zooming in and out. + True + Resample images when not at natural size + True + GTK_RELIEF_NORMAL + True + True + False + True + + + 0 + False + False + + + + + + + + + + True + <b>Quality</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + False + True + + + + + + 5 + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + False + 0 + + + + True + False + 5 + + + + True + Limit speed to + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + Do not update animations any more often than this. + True + 1 + 1 + True + GTK_UPDATE_IF_VALID + False + False + 0 0 100 0.10000000149 1 1 + + + 0 + True + False + + + + + + True + seconds between frames + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + True + True + + + + + 0 + True + True + + + + + + True + Display only the first frame of animated images. + True + Disable animations + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + + + + + True + <b>Animations</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + False + False + + + + + False + True + + + + + + True + Rendering + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + tab + + + + + + True + False + 0 + + + + 5 + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + 2 + True + 6 + 2 + False + 3 + 3 + + + + True + Sans-serif + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + Serif + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + Monospace + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 2 + 3 + fill + + + + + + + True + Cursive + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 3 + 4 + fill + + + + + + + True + Fantasy + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 4 + 5 + fill + + + + + + + True + Default + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 5 + 6 + fill + + + + + + + True + True + False + False + False + False + True + + + 1 + 2 + 1 + 2 + fill + + + + + + + True + True + False + False + False + False + True + + + 1 + 2 + 2 + 3 + fill + + + + + + + True + True + False + False + False + False + True + + + 1 + 2 + 3 + 4 + fill + + + + + + + True + True + False + False + False + False + True + + + 1 + 2 + 4 + 5 + fill + + + + + + + True + Sans-serif +Serif +Monospace +Cursive +Fantasy + False + True + + + 1 + 2 + 5 + 6 + fill + fill + + + + + + True + True + False + False + False + False + True + + + 1 + 2 + 0 + 1 + + + + + + + + + + + True + <b>Font faces</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + False + True + + + + + + 5 + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + 2 + 3 + False + 3 + 3 + + + + True + Default + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + Minimum + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + The base-line font size to use. + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 1 0 100 1 10 10 + + + 1 + 2 + 0 + 1 + + + + + + + + True + Do not allow text to be displayed any smaller than this. + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 1 0 100 1 10 10 + + + 1 + 2 + 1 + 2 + + + + + + + + True + pt + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 2 + 3 + 0 + 1 + + + + + + + True + pt + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 2 + 3 + 1 + 2 + + + + + + + + + + + True + <b>Font size</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + False + True + + + + + False + True + + + + + + True + Fonts + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + tab + + + + + + True + False + 0 + + + + 5 + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + 2 + True + False + 6 + + + + True + Size + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + How much memory to use for caching recently viewed objects in memory. + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 1 0 100 1 10 10 + + + 0 + False + False + + + + + + True + MB + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + + + + + True + <b>Memory cache</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + False + False + + + + + + 5 + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + False + 5 + + + + True + False + 3 + + + + True + Duration + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + How long to keep cached items around on disc. + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 1 0 100 1 10 10 + + + 0 + False + False + + + + + + True + days + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + 0 + True + True + + + + + + 4 + True + False + 4 + + + + + + + + True + Flush cached items that are older than the maximum permitted age. + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-delete + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + False + Perform maintainance + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + + + + + 0 + False + False + + + + + + + + + + True + <b>Disc cache</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + False + True + + + + + False + True + + + + + + True + Cache + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + tab + + + + + 0 + True + True + + + + + + True + + + 3 + False + False + + + + + + True + False + 8 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + True + False + + + + + + True + Revert any made changes. + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + True + + + + + 0 + False + False + + + + + + True + Apply and save these changes now. + True + True + gtk-apply + True + GTK_RELIEF_NORMAL + True + + + + + 0 + False + False + + + + + 0 + False + False + + + + + + + + 400 + 500 + NetSurf Global History + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER + False + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_UTILITY + GDK_GRAVITY_NORTH_WEST + True + False + + + + + True + False + 0 + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + False + True + False + True + False + False + False + + + + + + 0 + True + True + + + + + + True + True + True + 0 + + + + True + False + 0 + + + + True + 0.5 + 0 + 5 + 5 + + + 0 + False + True + + + + + + 2 + True + 3 + 2 + False + 0 + 4 + + + + True + Address + False + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + Last visited + False + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + Number of visits + False + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 2 + 3 + fill + + + + + + + True + 2 + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_END + -1 + False + 0 + + + 1 + 2 + 2 + 3 + + + + + + + True + Fri Aug 09 00:00:00 2006 + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_END + -1 + False + 0 + + + 1 + 2 + 1 + 2 + + + + + + + True + http://netsurf.sf.net/ + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_MIDDLE + -1 + False + 0 + + + 1 + 2 + 0 + 1 + + + + + + 0 + True + True + + + + + + + + True + Details + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + False + True + + + + + + + diff --git a/gtk/res/throbber.gif b/gtk/res/throbber.gif new file mode 100644 index 000000000..f9d0c152d Binary files /dev/null and b/gtk/res/throbber.gif differ -- cgit v1.2.3