From 355799ce0bbb078237dfc1ae9874bbc5342acbc4 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Thu, 17 Dec 2009 23:55:02 +0000 Subject: Merge branches/MarkieB/gtkmain to trunk. svn path=/trunk/netsurf/; revision=9729 --- gtk/res/options.glade | 772 +++++++++++++++++++++++++++++++------------------- 1 file changed, 482 insertions(+), 290 deletions(-) (limited to 'gtk/res/options.glade') diff --git a/gtk/res/options.glade b/gtk/res/options.glade index 6bc5cc41e..a1b0414f8 100644 --- a/gtk/res/options.glade +++ b/gtk/res/options.glade @@ -298,7 +298,7 @@ True True Visited pages are kept in memory for this many days - 14 0 100 1 10 10 + 14 0 100 1 10 0 1 @@ -471,67 +471,30 @@ 3 3 - + True True - If your proxy server requires authentication, enter your password here. - False + If your proxy server requires authentication, enter your username here. 1 2 - 3 - 4 - - - - - - True - 0 - Proxy type - - - - - - - - - True - 0 - Host - - - 1 - 2 - - - - - - - True - 0 - Username - - 2 3 - - + True - 0 - Password + No proxy +Simple proxy +Basic authentication +NTLM authentication - 3 - 4 - + 1 + 2 @@ -578,30 +541,67 @@ - + True - No proxy -Simple proxy -Basic authentication -NTLM authentication + 0 + Password - 1 - 2 + 3 + 4 + - + + True + 0 + Username + + + 2 + 3 + + + + + + + True + 0 + Host + + + 1 + 2 + + + + + + + True + 0 + Proxy type + + + + + + + + True True - If your proxy server requires authentication, enter your username here. + If your proxy server requires authentication, enter your password here. + False 1 2 - 2 - 3 + 3 + 4 @@ -643,82 +643,82 @@ NTLM authentication 3 3 - + True - True - Maximum number of concurrent items to fetch at once. - 1 0 100 1 10 10 - 1 + 0 + Maximum fetchers - 1 - 2 - + True - True - Maximum number of item fetches per web server. - 1 0 100 1 10 10 - 1 + 0 + Fetches per host - 1 - 2 1 2 - + True - True - Number of connections to keep incase they are needed again. - 1 0 100 1 10 10 - 1 + 0 + Cached connections - 1 - 2 2 3 - + True - 0 - Cached connections + True + Number of connections to keep incase they are needed again. + 1 0 100 1 10 0 + 1 + 1 + 2 2 3 - + True - 0 - Fetches per host + True + Maximum number of item fetches per web server. + 1 0 100 1 10 0 + 1 + 1 + 2 1 2 - + True - 0 - Maximum fetchers + True + Maximum number of concurrent items to fetch at once. + 1 0 100 1 10 0 + 1 + 1 + 2 @@ -837,7 +837,7 @@ NTLM authentication True True Do not update animations any more often than this. - 0 0 100 0.10000000149 1 1 + 0 0 100 0.10000000149 1 0 1 1 True @@ -934,85 +934,78 @@ NTLM authentication 3 3 - + True - True - 0 - False - False + 0 + Sans-serif - 1 - 2 + - + True - Sans-serif -Serif -Monospace -Cursive -Fantasy + 0 + Serif - 1 - 2 - 5 - 6 - GTK_FILL + 1 + 2 + - + True - True - 0 - False - False + 0 + Monospace - 1 - 2 - 4 - 5 - GTK_FILL + 2 + 3 + - + True - True - 0 - False - False + 0 + Cursive - 1 - 2 3 4 - GTK_FILL + - + True - True - 0 - False - False + 0 + Fantasy - 1 - 2 - 2 - 3 - GTK_FILL + 4 + 5 + + + + + + + True + 0 + Default + + + 5 + 6 + @@ -1034,78 +1027,85 @@ Fantasy - - True - 0 - Default - - - 5 - 6 - - - - - - + True - 0 - Fantasy + True + 0 + False + False - 4 - 5 - + 1 + 2 + 2 + 3 + GTK_FILL - + True - 0 - Cursive + True + 0 + False + False + 1 + 2 3 4 - + GTK_FILL - + True - 0 - Monospace + True + 0 + False + False - 2 - 3 - + 1 + 2 + 4 + 5 + GTK_FILL - + True - 0 - Serif + Sans-serif +Serif +Monospace +Cursive +Fantasy - 1 - 2 - + 1 + 2 + 5 + 6 + GTK_FILL - + True - 0 - Sans-serif + True + 0 + False + False - + 1 + 2 @@ -1146,42 +1146,61 @@ Fantasy 3 3 - + True - 0 - pt + True + View the changes in the browser window immediately. + 0 + + + True + 2 + + + True + gtk-apply + + + + + True + _Preview + True + + + 1 + + + + - 2 - 3 - 1 + 3 + 4 2 + + 2 - + True 0 - pt + Default - 2 - 3 + - + True - True - Do not allow text to be displayed any smaller than this. - 1 0 100 1 10 10 - 1 + 0 + Minimum - 1 - 2 1 2 @@ -1193,7 +1212,7 @@ Fantasy True True The base-line font size to use. - 1 0 100 1 10 10 + 1 0 100 1 10 0 1 @@ -1204,12 +1223,16 @@ Fantasy - + True - 0 - Minimum + True + Do not allow text to be displayed any smaller than this. + 1 0 100 1 10 0 + 1 + 1 + 2 1 2 @@ -1217,52 +1240,29 @@ Fantasy - + True 0 - Default + pt - + 2 + 3 - + True - True - View the changes in the browser window immediately. - 0 - - - True - 2 - - - True - gtk-apply - - - - - True - _Preview - True - - - 1 - - - - + 0 + pt - 3 - 4 + 2 + 3 + 1 2 - - 2 @@ -1300,16 +1300,6 @@ Fantasy 2 10 3 - - - True - Toolbar buttons - GTK_JUSTIFY_RIGHT - - - - - True @@ -1325,6 +1315,16 @@ Text only + + + True + Toolbar buttons + GTK_JUSTIFY_RIGHT + + + + + @@ -1394,7 +1394,7 @@ Text only True True How much memory to use for caching recently viewed objects in memory. - 1 0 100 1 10 10 + 1 0 100 1 10 0 1 @@ -1467,7 +1467,7 @@ Text only True True How long to keep cached items around on disc. - 1 0 100 1 10 10 + 1 0 100 1 10 0 1 @@ -1742,7 +1742,199 @@ Text only - + + True + 0 + GTK_SHADOW_NONE + + + True + 12 + + + True + + + True + True + in own window + 0 + True + True + + + False + False + + + + + True + True + in new tab + 0 + True + + + False + False + 1 + + + + + + + + + True + <b>View Source</b> + True + + + label_item + + + + + False + False + 2 + + + + + True + 0 + GTK_SHADOW_NONE + + + True + 12 + + + True + + + True + True + search from url bar + 0 + True + + + False + + + + + True + default provider + GTK_JUSTIFY_RIGHT + + + False + 1 + + + + + True + Google +Yahoo! +Microsoft live +Business.com +Omgili +BBC News +Ubuntu packages +Creative commons +Ask +Answers +Dictionary.com +Youtube +AeroMp3 +AOL +Baidu +Amazon +Ebay +IMDB +Espn +Wikipedia + + + 2 + + + + + + + + + True + <b>Search</b> + True + + + label_item + + + + + False + False + 3 + + + + + True + 0 + GTK_SHADOW_NONE + + + True + 12 + + + True + + + + + + True + True + True + add theme.. + 0 + + + False + False + GTK_PACK_END + 1 + + + + + + + + + True + <b>Select themes</b> + True + + + label_item + + + + + False + 4 + @@ -1785,32 +1977,25 @@ Text only 4 5 - - True - Top: - - - - + True - Bottom: + mm + 2 + 3 1 2 - + True - True - Set the top margin - 0 0 100 1 10 10 - 1 + mm - 1 - 2 + 2 + 3 @@ -1818,7 +2003,7 @@ Text only True True Set the bottom margin - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -1829,27 +2014,34 @@ Text only - + True - mm + True + Set the top margin + 0 0 100 1 10 0 + 1 - 2 - 3 + 1 + 2 - + True - mm + Bottom: - 2 - 3 1 2 + + + True + Top: + + False @@ -1864,32 +2056,25 @@ Text only 4 5 - - True - Left: - - - - + True - Right: + mm + 2 + 3 1 2 - + True - True - Set the left margin - 0 0 100 1 10 10 - 1 + mm - 1 - 2 + 2 + 3 @@ -1897,7 +2082,7 @@ Text only True True Set the right margin - 0 0 100 1 10 10 + 0 0 100 1 10 0 1 @@ -1908,27 +2093,34 @@ Text only - + True - mm + True + Set the left margin + 0 0 100 1 10 0 + 1 - 2 - 3 + 1 + 2 - + True - mm + Right: - 2 - 3 1 2 + + + True + Left: + + False @@ -1983,7 +2175,7 @@ Text only True True Set the scaling for the document - this way more content can fit in a page - 0 0 1000 1 10 10 + 0 0 1000 1 10 0 1 -- cgit v1.2.3