From af6a2cd2e032db417bb0423be5aaf73b94ff17c2 Mon Sep 17 00:00:00 2001 From: Rob Kendrick Date: Thu, 17 Aug 2006 19:20:13 +0000 Subject: Fix nsgtk choices window. I have no idea why it worked before. svn path=/trunk/netsurf/; revision=2858 --- gtk/gtk_gui.c | 3 - gtk/gtk_options.c | 8 +- gtk/gtk_window.c | 1 - gtk/netsurf.glade | 4199 +++++++++++++++++++++++++++-------------------------- 4 files changed, 2127 insertions(+), 2084 deletions(-) diff --git a/gtk/gtk_gui.c b/gtk/gtk_gui.c index c6ade174f..1abdba87f 100644 --- a/gtk/gtk_gui.c +++ b/gtk/gtk_gui.c @@ -116,9 +116,6 @@ void gui_init(int argc, char** argv) nsgtk_throbber_initialise("./gtk/throbber.gif"); - gladeWindows = glade_xml_new("./gtk/netsurf.glade", NULL, NULL); - wndChoices = glade_xml_get_widget(gladeWindows, "wndChoices"); - find_resource(buf, "Choices", "Choices"); LOG(("Using '%s' as Choices file", buf)); options_file_location = strdup(buf); diff --git a/gtk/gtk_options.c b/gtk/gtk_options.c index 33e876896..b893b38ee 100644 --- a/gtk/gtk_options.c +++ b/gtk/gtk_options.c @@ -103,11 +103,11 @@ void nsgtk_options_init(void) { #define SET_ENTRY(x, y) gtk_entry_set_text(GTK_ENTRY((x)), (y)) #define SET_SPIN(x, y) gtk_spin_button_set_value(GTK_SPIN_BUTTON((x)), (y)) -#define SET_CHECK(x, y) gtk_toggle_button_set_active(GTK_CHECK_BUTTON((x)), (y)) +#define SET_CHECK(x, y) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON((x)), (y)) void nsgtk_options_load(void) { - char *b[20]; - + char b[20]; + SET_ENTRY(entryHomePageURL, option_homepage_url); SET_CHECK(checkHideAdverts, option_block_ads); /* TODO: rest of "General" tab here */ @@ -138,7 +138,7 @@ void nsgtk_options_load(void) { #define GET_ENTRY(x, y) if ((y)) free((y)); \ (y) = strdup(gtk_entry_get_text(GTK_ENTRY((x)))) -#define GET_CHECK(x, y) (y) = gtk_toggle_button_get_active(GTK_CHECK_BUTTON((x))) +#define GET_CHECK(x, y) (y) = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON((x))) void nsgtk_options_save(void) { GET_ENTRY(entryHomePageURL, option_homepage_url); diff --git a/gtk/gtk_window.c b/gtk/gtk_window.c index b10757b64..b0c58e1c7 100644 --- a/gtk/gtk_window.c +++ b/gtk/gtk_window.c @@ -522,7 +522,6 @@ MENUHANDLER(quit) MENUHANDLER(choices) { gtk_widget_show(GTK_WIDGET(wndChoices)); - gdk_window_raise(GDK_WINDOW(wndChoices)); return TRUE; } diff --git a/gtk/netsurf.glade b/gtk/netsurf.glade index 038acffe2..295d5d214 100644 --- a/gtk/netsurf.glade +++ b/gtk/netsurf.glade @@ -1086,10 +1086,10 @@ - - NetSurf Choices + + Site Authentication GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER + GTK_WIN_POS_CENTER_ALWAYS False True False @@ -1103,45 +1103,103 @@ True - + True False 0 - + True GTK_BUTTONBOX_END - + True - Revert any made changes. - True True gtk-cancel True GTK_RELIEF_NORMAL True -6 - - - + True - Apply and save these changes now. True + True True - gtk-apply - True GTK_RELIEF_NORMAL True - -10 - - + -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 + + + + + + @@ -1154,575 +1212,503 @@ - - 4 + + 3 True - True - True - True - GTK_POS_LEFT - False - False + False + 0 + + + + True + 6 + gtk-dialog-authentication + 0.5 + 0.10000000149 + 12 + 0 + + + 0 + False + False + + - + + 1 True + 4 + 2 False - 0 + 10 + 11 - - 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 - - + True + True + True + True + 0 + sesame + True + ● + False - 0 - False - True + 1 + 2 + 2 + 3 + - - 5 + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + True + True + False + 0 + opensesame + True + * + True + + + 1 + 2 + 3 + 4 + + + - - - 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 - - + + + True + my sekr3t area + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - 0 - False - True + 1 + 2 + 1 + 2 + fill - - 5 + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + 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 - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 + + + 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 + + - - - 1 - True - False - 2 + + + 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 + + - - - 4 - True - False - 4 + + + 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 - 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 - - + + + True + moo.yoo.com + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - 0 - False - False + 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 - - 5 + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 - + True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 + False + 2 - + 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 - - + gtk-cancel + 4 + 0.5 + 0.5 + 0 + 0 + + + 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 + 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 - <b>Misc</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + 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 + + - - label_item - - - 0 - False - True - - - False - True - + + + 0 + False + True + GTK_PACK_END + + + + + + True + False + 0 - + True - General - False - False - GTK_JUSTIFY_LEFT - False - False + 6 + gtk-dialog-warning 0.5 - 0.5 + 0 0 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - tab + 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 @@ -1730,7 +1716,7 @@ GTK_SHADOW_ETCHED_IN - + True 0.5 0.5 @@ -1742,270 +1728,33 @@ 0 - + True - 4 - 2 - False - 3 - 3 + True + GTK_POLICY_ALWAYS + GTK_POLICY_ALWAYS + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT - + + 200 True - If your proxy server requires authentication, enter your username here. True - True - True - 0 + False + False + True + GTK_JUSTIFY_LEFT + GTK_WRAP_NONE + True + 0 + 0 + 0 + 0 + 0 + 0 - True - ● - False - - 1 - 2 - 2 - 3 - - - - - - - True - False - None -Simple proxy -Basic authentication -NTML 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 - True - 0 - - True - ● - False - - - 1 - 2 - 3 - 4 - - @@ -2013,9 +1762,9 @@ NTML authentication - + True - <b>HTTP Proxy</b> + <b>Certificate chain</b> False True GTK_JUSTIFY_LEFT @@ -2037,21 +1786,79 @@ NTML authentication 0 - False + True True + + + 0 + True + True + + + + + 0 + True + True + + + + + - - - 5 + + 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 @@ -2063,79 +1870,22 @@ NTML authentication 0 - - 3 + + 5 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 - - + 5 - + True - Cached connections + URL False False GTK_JUSTIFY_LEFT False False - 0 + 0.5 0.5 0 0 @@ -2145,77 +1895,29 @@ NTML authentication 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 - + 0 + False + False - + True - Maximum number of concurrent items to fetch at once. + The page to visit when the Home button is pressed, or a new window is opened. True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 0 100 1 10 10 + True + True + 0 + http://netsurf.sourceforge.net/ + True + ● + False - 1 - 2 - 0 - 1 - + 0 + True + True @@ -2224,9 +1926,9 @@ NTML authentication - + True - <b>Fetching</b> + <b>Home page</b> False True GTK_JUSTIFY_LEFT @@ -2252,44 +1954,9 @@ NTML authentication 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 @@ -2297,7 +1964,7 @@ NTML authentication GTK_SHADOW_ETCHED_IN - + True 0.5 0.5 @@ -2309,21 +1976,21 @@ NTML authentication 0 - + True - False + True 0 - + True - Enable the use of Cairo, which provides better looking results at the cost of speed. + Attempt to hide images from known advertisement servers. True - Use Cairo for anti-aliased drawing + Hide advertisements True GTK_RELIEF_NORMAL True - True + False False True @@ -2335,15 +2002,37 @@ NTML authentication - + True - Smoothly resize images when zooming in and out. + False + Stop pop-up windows normally containing adverts appearing. True - Resample images when not at natural size + Disable pop-up windows True GTK_RELIEF_NORMAL True - 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 @@ -2359,9 +2048,9 @@ NTML authentication - + True - <b>Quality</b> + <b>Content blocking</b> False True GTK_JUSTIFY_LEFT @@ -2389,7 +2078,7 @@ NTML authentication - + 5 True 0 @@ -2397,7 +2086,7 @@ NTML authentication GTK_SHADOW_ETCHED_IN - + True 0.5 0.5 @@ -2409,21 +2098,23 @@ NTML authentication 0 - + + 1 True False - 0 + 2 - + + 4 True False - 5 + 4 - + True - Limit speed to + Keep history for False False GTK_JUSTIFY_LEFT @@ -2446,29 +2137,30 @@ NTML authentication - + True - Do not update animations any more often than this. + False + Visited pages are forgotten after this many days True 1 0 - True + False GTK_UPDATE_ALWAYS False False - 0.10000000149 0 100 0.10000000149 10 10 + 14 0 100 1 10 10 0 - True + False False - + True - seconds between frames + days False False GTK_JUSTIFY_LEFT @@ -2485,8 +2177,8 @@ NTML authentication 0 - True - True + False + False @@ -2498,11 +2190,12 @@ NTML authentication - + True - Display only the first frame of animated images. + False + Show a tooltip showing the URL of a page in the local history tree. True - Disable animations + Hover URLs by pointer in local history True GTK_RELIEF_NORMAL True @@ -2522,9 +2215,9 @@ NTML authentication - + True - <b>Animations</b> + <b>History</b> False True GTK_JUSTIFY_LEFT @@ -2550,6 +2243,127 @@ NTML authentication 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 @@ -2558,9 +2372,9 @@ NTML authentication - + True - Rendering + General False False GTK_JUSTIFY_LEFT @@ -2581,13 +2395,13 @@ NTML authentication - + True False 0 - + 5 True 0 @@ -2595,7 +2409,7 @@ NTML authentication GTK_SHADOW_ETCHED_IN - + True 0.5 0.5 @@ -2607,131 +2421,142 @@ NTML authentication 0 - - 2 + True - 6 + 4 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 + If your proxy server requires authentication, enter your username here. + True + True + True + 0 + + True + ● + False - 0 - 1 - 0 - 1 - fill + 1 + 2 + 2 + 3 - + True - Serif - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + False + None +Simple proxy +Basic authentication +NTML authentication + False + True - 0 - 1 - 1 - 2 - fill + 1 + 2 + 0 + 1 - + 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 - - - + False + 0 - - - True - Cursive - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - 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 + + - 0 - 1 - 3 - 4 + 1 + 2 + 1 + 2 fill - + fill - + True - Fantasy + Password False False GTK_JUSTIFY_LEFT @@ -2749,17 +2574,17 @@ NTML authentication 0 1 - 4 - 5 - fill - + 3 + 4 + + expand - + True - Default + Username False False GTK_JUSTIFY_LEFT @@ -2777,135 +2602,87 @@ NTML authentication 0 1 - 5 - 6 - fill - + 2 + 3 + + expand - + True - False - True - False - False - False - False - True + Host + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - 1 - 2 + 0 + 1 1 2 - fill - + + expand - + True - False - True - False - False - False - False - True + Proxy type + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 - 1 - 2 - 2 - 3 - fill - + 0 + 1 + 0 + 1 + + expand - + True - False + If your proxy server requires authentication, enter your password here. True - False - False - False - False - True + True + True + 0 + + True + ● + False 1 2 3 4 - fill - - - - - - - True - False - True - False - False - False - False - True - - - 1 - 2 - 4 - 5 - fill - - - - - - - True - False - Sans-serif -Sans -Monospace -Cursive -Fantasy - False - True - - - 1 - 2 - 5 - 6 - fill - fill - - - - - - True - False - True - False - False - False - False - True - - - 1 - 2 - 0 - 1 @@ -2915,9 +2692,9 @@ Fantasy - + True - <b>Font faces</b> + <b>HTTP Proxy</b> False True GTK_JUSTIFY_LEFT @@ -2945,7 +2722,7 @@ Fantasy - + 5 True 0 @@ -2953,7 +2730,7 @@ Fantasy GTK_SHADOW_ETCHED_IN - + True 0.5 0.5 @@ -2965,18 +2742,19 @@ Fantasy 0 - + + 3 True - 2 - 3 + 3 + 2 False 3 3 - + True - Default + Maximum fetchers False False GTK_JUSTIFY_LEFT @@ -2996,15 +2774,14 @@ Fantasy 1 0 1 - fill - + expand - + True - Minimum + Fetches per host False False GTK_JUSTIFY_LEFT @@ -3024,15 +2801,41 @@ Fantasy 1 1 2 - fill - + expand - + True - The base-line font size to use. + 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 @@ -3045,17 +2848,16 @@ Fantasy 1 2 - 0 - 1 - + 2 + 3 - + True - Do not allow text to be displayed any smaller than this. + Maximum number of item fetches per web server. True 1 0 @@ -3070,73 +2872,40 @@ Fantasy 2 1 2 - - + True - pt - False - False - GTK_JUSTIFY_LEFT + Maximum number of concurrent items to fetch at once. + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + 1 0 100 1 10 10 - 2 - 3 + 1 + 2 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> + <b>Fetching</b> False True GTK_JUSTIFY_LEFT @@ -3170,9 +2939,9 @@ Fantasy - + True - Fonts + Network False False GTK_JUSTIFY_LEFT @@ -3193,13 +2962,13 @@ Fantasy - + True False 0 - + 5 True 0 @@ -3207,7 +2976,7 @@ Fantasy GTK_SHADOW_ETCHED_IN - + True 0.5 0.5 @@ -3219,48 +2988,23 @@ Fantasy 0 - + 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 - - + 0 - + True - How much memory to use for caching recently viewed objects in memory. + Enable the use of Cairo, which provides better looking results at the cost of speed. True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 1 0 100 1 10 10 + Use Cairo for anti-aliased drawing + True + GTK_RELIEF_NORMAL + True + True + False + True 0 @@ -3270,22 +3014,17 @@ Fantasy - + True - MB - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + 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 @@ -3299,9 +3038,9 @@ Fantasy - + True - <b>Memory cache</b> + <b>Quality</b> False True GTK_JUSTIFY_LEFT @@ -3324,12 +3063,12 @@ Fantasy 0 False - False + True - + 5 True 0 @@ -3337,7 +3076,7 @@ Fantasy GTK_SHADOW_ETCHED_IN - + True 0.5 0.5 @@ -3349,21 +3088,21 @@ Fantasy 0 - + True False - 5 + 0 - + True False - 3 + 5 - + True - Duration + Limit speed to False False GTK_JUSTIFY_LEFT @@ -3386,29 +3125,29 @@ Fantasy - + True - How long to keep cached items around on disc. + Do not update animations any more often than this. True 1 0 - False + True GTK_UPDATE_ALWAYS False False - 1 0 100 1 10 10 + 0.10000000149 0 100 0.10000000149 10 10 0 - False + True False - + True - days + seconds between frames False False GTK_JUSTIFY_LEFT @@ -3425,8 +3164,8 @@ Fantasy 0 - False - False + True + True @@ -3438,151 +3177,69 @@ Fantasy - - 4 + True - False - 4 + Display only the first frame of animated images. + True + Disable animations + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + - - - - - - - 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 + <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 - Cache + Rendering False False GTK_JUSTIFY_LEFT @@ -3601,686 +3258,965 @@ Fantasy tab - - - 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 + False + 0 - + + 5 True - True - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 + 0 + 0.5 + GTK_SHADOW_ETCHED_IN - + True - False - 2 + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 - + + 2 True - gtk-ok - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - + 6 + 2 + False + 3 + 3 - - - 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 - - + + + 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 + + + - - - 3 - True - False - 0 + + + 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 - 6 - gtk-dialog-authentication - 0.5 - 0.10000000149 - 12 - 0 - - - 0 - False - False - - + + + 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 + + + - - - 1 - True - 4 - 2 - False - 10 - 11 + + + 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 - True - True - True - True - 0 - sesame - True - ● - False - - - 1 - 2 - 2 - 3 - - - + + + 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 - True - True - False - 0 - opensesame - True - * - True - - - 1 - 2 - 3 - 4 - - - + + + 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 - my sekr3t area - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + + + True + False + True + False + False + False + False + True + + + 1 + 2 + 1 + 2 + fill + + + + + + + True + False + True + False + False + False + False + True + + + 1 + 2 + 2 + 3 + fill + + + + + + + True + False + True + False + False + False + False + True + + + 1 + 2 + 3 + 4 + fill + + + + + + + True + False + True + False + False + False + False + True + + + 1 + 2 + 4 + 5 + fill + + + + + + + True + False + Sans-serif +Sans +Monospace +Cursive +Fantasy + False + True + + + 1 + 2 + 5 + 6 + fill + fill + + + + + + True + False + 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 + + - 1 - 2 - 1 - 2 - fill + 0 + False + True - + + 5 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 - - + 0 + 0.5 + GTK_SHADOW_ETCHED_IN - - - 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 + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 - - - 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 + 2 + 3 + False + 3 + 3 - - - 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 + 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 - moo.yoo.com - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + + + 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 + + - 1 - 2 - 0 - 1 - fill + 0 + False + True - 1 - True - True + False + 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 + Fonts + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + tab + + - + True - True - True - GTK_RELIEF_NORMAL - True - -6 + False + 0 - + + 5 True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 + 0 + 0.5 + GTK_SHADOW_ETCHED_IN - + True - False - 2 + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 - + + 2 True - gtk-cancel - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - + False + 6 - - - True - Reject - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + + + 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 + + - - 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 + - - - - - - True - True - True - GTK_RELIEF_NORMAL - True - -5 - + + 5 True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 + 0 + 0.5 + GTK_SHADOW_ETCHED_IN - + True - False - 2 + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 - + True - gtk-apply - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - + False + 5 - - - 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 + 3 - - - True - False - 0 + + + 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 - 6 - gtk-dialog-warning - 0.5 - 0 - 0 - 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 - False - 0 + + + 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 - 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 - - + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 - - - 5 - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + + + True + False + 2 - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 + + + True + gtk-delete + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + - - - True - True - GTK_POLICY_ALWAYS - GTK_POLICY_ALWAYS - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT + + + 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 + + - - - 200 - True - True - False - False - True - GTK_JUSTIFY_LEFT - GTK_WRAP_NONE - True - 0 - 0 - 0 - 0 - 0 - 0 - + + + + + 0 + False + False + @@ -4288,9 +4224,9 @@ Fantasy - + True - <b>Certificate chain</b> + <b>Disc cache</b> False True GTK_JUSTIFY_LEFT @@ -4312,15 +4248,37 @@ Fantasy 0 - True + False True - 0 - True - 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 @@ -4330,6 +4288,95 @@ Fantasy 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 + + -- cgit v1.2.3