From f12be4ed854d9dd44fa6e3117fe8bd9525deae51 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Fri, 28 Dec 2012 01:08:23 +0000 Subject: restructure GTK frontend options dialog to be compiant with the gnome HIG and actually work --- gtk/res/options.gtk2.ui | 2911 +++++++++++++++++++++++------------------------ gtk/res/options.gtk3.ui | 2 +- 2 files changed, 1456 insertions(+), 1457 deletions(-) (limited to 'gtk/res') diff --git a/gtk/res/options.gtk2.ui b/gtk/res/options.gtk2.ui index 1a17cc104..5dd793062 100644 --- a/gtk/res/options.gtk2.ui +++ b/gtk/res/options.gtk2.ui @@ -1,8 +1,8 @@ - - + + 5 Netsurf Preferences center-on-parent @@ -10,42 +10,43 @@ dialog False - + True vertical 2 - + True True - 4 - + True vertical + 6 - + True - 5 0 none - + True + 6 12 + 12 - + True vertical + 6 - + True - 5 - 5 + 12 - + True - URL + Page: False @@ -60,6 +61,7 @@ ● + end 1 @@ -69,38 +71,42 @@ - + True - 5 + 6 + + + - Current Page + Use Current Page True True - False - True + True - 5 - 0 + False + False + 1 - Default Page + Use Default Page True True - False - True + True - 5 - end - 1 + False + False + 2 + False + end 1 @@ -109,44 +115,55 @@ - + True - <b>Home page</b> + <b>Startup</b> True False + 6 0 - + True + 0 + none - + True - 5 - 0 - none + 6 + 12 + 12 - + True - 12 + vertical + 6 + + + Search from URL bar + True + True + False + True + + + 0 + + - + True - vertical - True + 12 - - Hide advertisements + True - True - False - True - True + Provider: False @@ -155,185 +172,112 @@ - - Disable pop-up windows + True - True - False - True - True + liststore_search_provider + + + + 0 + + - False - False 1 - - - Disable plug-ins - True - False - True - True - - - False - False - 2 - - + + 1 + - - - True - <b>Content blocking</b> - True - - - - False - 0 - - - + + True - 0 - none - - - True - 12 - - - True - vertical - - - - - - True - vertical - - - - - - - - - - - - False - False - 1 - - - - - - - - - - - - True - <b>Content Language</b> - True - - + <b>Search</b> + True - - 1 - False + 6 1 - + True - 5 0 none - + True + 6 12 + 12 - + True - 1 vertical - 2 + 6 - + + Remove download from list when complete + True + True + False + True + + + False + 0 + + + + + Confirm before overwriting files + True + True + False + True + + + False + 1 + + + + True - 4 - 4 + 12 - + True - Keep history for + Location: False - False 0 - + True - True - 1 + select-folder - False - False 1 - - - True - days - - - False - False - 2 - - - - - 0 - - - - - Hover URLs by pointer in local history - True - True - False - True - True False - False - 1 + 2 @@ -341,62 +285,63 @@ - + True - <b>History</b> + <b>Downloads</b> True False - False + 6 2 + + + + + True + Main + + + False + + + + + True + vertical + 6 - + True - 5 0 none - + True + 6 12 + 12 - + True - vertical - True + 12 - - Display recently visited URLs as you type - True - True - False - True - True - - - False - False - 0 - + - - Send site referral information + + Add Theme... True True - False - True - True - True + True False - False + end 1 @@ -405,189 +350,104 @@ - + True - <b>Misc</b> + <b>Themes</b> True False - 3 + 6 + 0 - - - - - True - General - - - False - - - - - True - vertical - + True - 5 0 none - + True + 6 12 + 12 - + True - 4 - 2 - 3 - 3 + vertical + 6 - + + Always show tab bar True True - ● + False + True - 1 - 2 - 2 - 3 - + 0 - + + Switch to newly opened tabs immediately True - liststore_proxytype - - - - 0 - - + True + False + True - 1 - 2 - + 1 - + + Newly opened tabs are blank True + True + False + True + + + 2 + + + + + True + 12 - - True - True - ● - - - 0 - - - - + True - : + Position: False False - 1 + 0 - - 64 + True - True - ● + liststore_tab_position + + + + 0 + + - False - 2 + 1 - 1 - 2 - 1 - 2 - - - - - - True - True - False - ● - - - 1 - 2 - 3 - 4 - - - - - - True - 0.89999997615814209 - Host - - - 1 - 2 - GTK_FILL - - - - - - True - 0.89999997615814209 - Proxy type - - - GTK_FILL - - - - - - True - 0.89999997615814209 - Username - - - 2 - 3 - GTK_FILL - - - - - - True - 0.89999997615814209 - Password - - - 3 - 4 - GTK_FILL - + 3 @@ -595,176 +455,121 @@ - + True - <b>HTTP Proxy</b> + <b>Tabs</b> True False - 0 + 6 + 1 - + True - 5 0 none - + True + 6 12 + 12 - + True - 3 - 3 - 3 - 3 - 3 - - - True - True - 1 - - - 1 - 2 - - - - - - True - True - 1 - - - 1 - 2 - 1 - 2 - - - - - - True - True - 1 - - - 1 - 2 - 2 - 3 - - - - - - True - 0.89999997615814209 - Maximum fetchers - - - - - + vertical + 6 - + True - 0.89999997615814209 - Fetches per host + 0 + Open source view in new: - 1 - 2 - + 0 - + True - 0.89999997615814209 - Cached connections + + + window + True + True + False + 0.54000002145767212 + True + True + sourceButtonTab + + + 0 + + + + + tab + True + True + False + True + True + + + 1 + + - 2 - 3 - + 1 - - - - - - - - - - + True - <b>Fetching</b> + <b>Source</b> True False - 1 + 6 + 2 - - - 1 - - - - - True - Network - - - 1 - False - - - - - True - vertical - + True - 5 0 none - + True + 6 12 + 12 - + True + vertical + 6 - - Resample images when not at natural size + + Display recently visited URLs as you type True True False - True - True True @@ -776,319 +581,223 @@ - + True - <b>Quality</b> + <b>URLbar</b> True False - 0 + 7 + 3 - + True - 5 0 none - + True + 6 12 + 12 - + True + vertical + 6 - + True + 6 - + True - 0.89999997615814209 - Limit speed to + Buttons: + False 0 - + True - True - 1 - 1 - True - if-valid + liststore_toolbar_buttontype + + + + 0 + + - False 1 - - - True - 0 - seconds between frames - - - 2 - - 0 - - - Disable animations - True - True - False - True - True - - - False - False - 1 - - - + True - <b>Animations</b> + <b>Toolbar</b> True False - False - 1 + 6 + 4 - 2 + 1 - + True - Rendering + Appearance - 2 + 1 False - + True vertical + 6 - + True - 5 0 none - + True + 6 12 + 12 - + True - 2 - 6 - 2 - 3 - 3 + vertical + 6 - + + Prevent pop-up windows True True False - False - False - - - 1 - 2 - - - - - - True - 0.89999997615814209 - Sans-serif - - - GTK_FILL - - - - - - True - 0.89999997615814209 - Serif - - - 1 - 2 - GTK_FILL - - - - - - True - 0.89999997615814209 - Monospace - - - 2 - 3 - GTK_FILL - - - - - - True - 0.89999997615814209 - Cursive - - - 3 - 4 - GTK_FILL - - - - - - True - 0.89999997615814209 - Fantasy - - - 4 - 5 - GTK_FILL - - - - - - True - 0.89999997615814209 - Default + True - 5 - 6 - GTK_FILL - + False + False + 0 - + + Hide Adverts True True False - False - False + True - 1 - 2 - 1 - 2 - GTK_FILL - + False + False + 1 - + + Enable JavaScript True True False - False - False + True - 1 - 2 - 2 - 3 - GTK_FILL - + False + False + 2 - + + Disable plug-ins True True False - False - False + True - 1 - 2 - 3 - 4 - GTK_FILL - + False + False + 3 - + + High quality image scaling True True False - False - False + True - 1 - 2 - 4 - 5 - GTK_FILL - + 4 - + True - liststore_defaultfont + 6 - - - 0 - + + True + Load and display + + + False + 0 + + + + + True + liststore_image_loading + + + + 0 + + + + + 1 + - 1 - 2 - 5 - 6 - GTK_FILL - + 5 @@ -1096,152 +805,82 @@ - + True - <b>Font faces</b> + <b>Control</b> True False + 6 0 - + True - 5 0 none - + True + 6 12 + 12 - + True - 2 - 4 - 3 - 3 + vertical + 6 - + + Enable True True False - - - True - 2 - - - True - gtk-apply - - - 0 - - - - - True - _Preview - True - - - 1 - - - - - - - 3 - 4 - 2 - - - 2 - - - - - True - True - 1 - True - - - 1 - 2 - - - - - - - True - True - 1 - - - 1 - 2 - 1 - 2 - - - - - - - True - 0 - pt - - - 2 - 3 - - - - - - True - 0 - pt - - - 2 - 3 - 1 - 2 - - - - - - True - 0.89999997615814209 - Minimum + True - 1 - 2 - GTK_FILL - + 0 - + True - 0.89999997615814209 - Default + 12 + + + True + Minimum time between frames: + + + False + 0 + + + + + True + True + True + Do not update animations any more often than this. + ● + adjustment_animation_time + 1 + 1 + True + if-valid + + + False + 1 + + - GTK_FILL - + 1 @@ -1249,137 +888,117 @@ - + True - <b>Font size</b> + <b>Animation</b> True False + 6 1 - + True 0 none - + True + 6 12 + 12 - + True - 2 - 10 - 3 + 12 - + True + 6 + + + True + Default + + + False + 0 + + + + + True + liststore_defaultfont + + + + 0 + + + + + 1 + + - 1 - 2 - - + 0 - + True - Toolbar buttons - right - - - - GTK_FILL - - - - - - - - - True - 5 - <b>Icons</b> - True - - - - - 2 - - - - - 3 - - - - - True - Style - - - 3 - False - - - - - True - vertical - - - True - 5 - 0 - none - - - True - 12 - - - True - 2 - 6 - - - True - Size - - - False - False - 0 - - - - - True - True - 1 + 6 + + + True + Size + + + False + 0 + + + + + True + True + True + The base-line font size to use. + 3 + ● + 3 + adjustment_font_default_size + 1 + True + + + False + 1 + + False - False 1 - + + _Preview True - MB + True + True + image1 + True False - False 2 @@ -1388,142 +1007,78 @@ - + True - <b>Memory cache</b> + <b>Fonts</b> True False - False - 0 + 2 - + True - 5 0 none - + True + 6 12 + 12 - + True vertical - 5 + 6 - + True - 3 + 12 - + True - Duration + Preferred language: False - False 0 - - True - True - 1 - - - False - False - 1 - - - - - True - days - - - False - False - 2 - - - - - 0 - - - - - True - 4 - 4 - - - - - + True - True - False + True + set preferred language for web pages + liststore_content_language - - True - 0 - 0 - - - True - 2 - - - True - gtk-delete - - - False - False - 0 - - - - - True - False - Perform maintainance - True - - - False - False - 1 - - - - + + 0 + + + 1 + + + + + 1 + + 0 + - False - False 1 - - - - False - False - 1 + 0 @@ -1531,59 +1086,60 @@ - + True - <b>Disc cache</b> + <b>Language</b> True False - 1 + 3 - 4 + 2 - + True - Cache + Content - 4 + 2 False - + True vertical + 6 - + True - 5 0 none - + True + 6 12 + 12 - + True vertical + 6 - - Automatically clear downloads when completed + + Local history shows URL in tooltip True True False - True - True True @@ -1591,50 +1147,48 @@ - - Request confirmation before overwriting files - True - True - False - True - True - - - False - False - 1 - - - - + True + 6 - + True - 2 - Download directory + Remember browsing history for up to False - False - 2 0 - + True - True - select-folder - 23 + True + 4 + ● + 4 + adjustment_history_age + 1 + True + False 1 + + + True + days + + + False + 2 + + - 2 + 1 @@ -1642,166 +1196,251 @@ - + True - <b>Downloads</b> + <b>History</b> True False + 6 0 - + True 0 none - + True + 6 12 + 12 - + True vertical + 6 - - Show tab bar with only one tab - True - True - False - True - True - - - False - False - 0 - - - - - Shift focus to new tab - True - True - False - True - True - - - 1 - - - - - Open blank window - True - True - False - True - True - - - 2 - - - - + True + 3 + 3 + 6 + 6 - + True - 0.4699999988079071 - 2 - Tabs position + 0 + Memory cache size - False - False - 2 - 0 + GTK_FILL - + True - liststore_tabpositions - - - - 0 - - + 0 + Disc cache size - 1 + 1 + 2 + GTK_FILL - - - 3 - - - - - - - - - True - <b>Tabs</b> - True - - - - + + + True + 0 + Expire cache entries after + + + 2 + 3 + GTK_FILL + + + + + True + True + ● + 5 + adjustment_cache_memory_size + 1 + True + + + 1 + 2 + GTK_FILL + + + + + True + True + ● + 5 + adjustment_cache_disc_size + 1 + True + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + True + True + ● + 3 + adjustment_disc_cache_age + 1 + True + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + True + 0 + MB + + + 2 + 3 + GTK_FILL + + + + + True + 0 + MB + + + 2 + 3 + 1 + 2 + GTK_FILL + + + + + True + 0 + days + + + 2 + 3 + 2 + 3 + GTK_FILL + + + + + 0 + + + + + True + + + + + + Maintinance + True + True + True + + + False + 1 + + + + + 1 + + + + + + + + + True + <b>Cache</b> + True + + + + False + 6 1 - + True 0 none - + True + 6 12 + 12 - + True + vertical + 6 - - in own window + + Enable referral submission True True False - True - True True - False - False 0 - - in new tab + + Enable sending "Do Not Track" request True True False - True True - False - False 1 @@ -1810,117 +1449,329 @@ - + True - <b>View Source</b> + <b>General</b> True False - False 2 + + + 3 + + + + + True + Privacy + + + 3 + False + + + + + True + vertical + 6 - + True 0 none - + True + 6 12 + 12 - + True + 4 + 2 + 6 + 6 - - Search from URL bar + + True + 0 + Proxy type + + + GTK_FILL + + + + + True + 0 + Host + + + 1 + 2 + GTK_FILL + + + + + True + 0 + Username + + + 2 + 3 + GTK_FILL + + + + + True + 0 + Password + + + 3 + 4 + GTK_FILL + + + + + True + True + The type of HTTP proxy server. + liststore_proxy_type + + + + 0 + + + + + 1 + 2 + + + + + True + 6 + + + True + True + True + Host name of your proxy server. + ● + + + 0 + + + + + True + : + + + False + 1 + + + + + True + True + True + Port number to connect to on proxy server. + 5 + ● + 5 + adjustment_proxy_port + 1 + True + if-valid + + + False + 2 + + + + + 1 + 2 + 1 + 2 + + + + True True - False - True - True + True + Username to access the proxy + ● - False - 0 + 1 + 2 + 2 + 3 - + True - Default provider - right + True + True + Password to access the proxy + ● - False - 1 + 1 + 2 + 3 + 4 + + + + + + + + + True + <b>HTTP Proxy</b> + True + + + + + False + 6 + 0 + + + + + True + 0 + none + + + True + 6 + 12 + 12 + + + True + 3 + 2 + 6 + 6 + + + True + 0 + Maximum fetchers + + + GTK_FILL + + + + + True + 0 + Fetches per host + + + 1 + 2 + GTK_FILL + + + + + True + 0 + Cached connections + + + 2 + 3 + GTK_FILL - + + True + True + True + Maximum number of concurrent items to fetch at once. + ● + 3 + adjustment_fetching_max + 1 + True + + + 1 + 2 + GTK_FILL + + + + True - liststore_searchproviders - - - - 0 - - + True + True + Maximum number of item fetches per web server. + ● + 3 + adjustment_fetching_perhost + 1 + True - 2 + 1 + 2 + 1 + 2 + GTK_FILL - - - - - - - True - <b>Search</b> - True - - - - - False - False - 3 - - - - - True - 0 - none - - - True - 12 - - - True - - - - - Add theme… + True True - False - True + True + Number of connections to keep in case they are needed again. + ● + 3 + adjustment_fetching_cached + 1 + True - False - False - end - 1 + 1 + 2 + 2 + 3 + GTK_FILL @@ -1928,204 +1779,371 @@ - + True - <b>Select themes</b> + <b>Fetching</b> True False - 4 + 6 + 1 - 5 + 4 - + True - Advanced + Network - 5 + 4 False - + True vertical + 6 - + True - 5 0 none - + True + 6 12 + 12 - + True - True + vertical + 6 - + + No images in output True - 2 - 3 - 4 - 5 - - - True - mm - - - 2 - 3 - 1 - 2 - - + True + False + True + + + 0 + + + + + No background images in output + True + True + False + True + + + 1 + + + + + Scale output to fit page + True + True + False + True + + + 2 + + + + + True + 6 - + True - mm + Scale output - 2 - 3 + False + 0 - + True True + 4 + ● + 4 + 1 + adjustment_pdf_scale 1 + True - 1 - 2 - 1 - 2 + False + 1 - + True - True - 1 + % - 1 - 2 + False + 2 + + + 3 + + + + + + + + + True + <b>Appearance</b> + True + + + + + False + 6 + 0 + + + + + True + 0 + none + + + True + 6 + 12 + 12 + + + True + vertical + 6 + + + True - + True - 0.89999997615814209 - Bottom + measurements in mm - 1 - 2 + False + 0 - - True - 0.89999997615814209 - Top - + - False - False 0 - + True - 2 + 3 3 - 4 - 5 - + + True + 6 + + + True + Top + + + False + 0 + + + + + True + True + 4 + ● + 5 + 1 + 1 + 1 + True + + + False + 1 + + + + + 1 + 2 + GTK_EXPAND + + + + True - mm + 6 + + + True + Left + + + False + 0 + + + + + True + True + 4 + ● + 5 + 1 + adjustment_pdf_lmargin + 1 + 1 + True + + + False + 1 + + - 2 - 3 1 2 + GTK_EXPAND - + True - mm + 6 + + + True + Bottom + + + False + 0 + + + + + True + True + 4 + ● + 5 + 1 + 1 + 1 + True + + + False + 1 + + - 2 - 3 + 1 + 2 + 2 + 3 + GTK_EXPAND - + True - True - 1 + 6 + + + True + Right + + + False + 0 + + + + + True + True + 4 + ● + 5 + 1 + 1 + 1 + True + + + False + 1 + + - 1 - 2 + 2 + 3 1 2 + GTK_EXPAND - - True - True - 1 - - - 1 - 2 - + - - True - 0.89999997615814209 - Right - - - 1 - 2 - + - - True - 0.89999997615814209 - Left - + + + + + + + - False - False 1 @@ -2134,7 +2152,7 @@ - + True <b>Margins</b> True @@ -2143,164 +2161,32 @@ False - 0 - - - - - True - 5 - 0 - none - - - True - 12 - - - True - 4 - - - True - Scale - - - False - 0 - - - - - True - True - 1 - - - False - False - 1 - - - - - True - % - - - False - 2 - - - - - - - - - True - <b>Scaling</b> - True - - - - - False - False + 6 1 - - True - 5 - 0 - none - - - True - 12 - - - True - vertical - - - Suppress images - True - True - False - True - True - - - 0 - - - - - Remove backgrounds - True - True - False - True - True - - - 1 - - - - - Fit page - True - True - False - True - True - - - 2 - - - - - - - - - True - <b>Appearance</b> - True - - - - - False - 2 - - - - + True - 5 0 none - + True + 6 12 + 12 - + True vertical + 7 - Compress PDF + Output is compressed True True False - True True @@ -2309,11 +2195,10 @@ - Set a password for PDF + Output has a password True True False - True True @@ -2325,55 +2210,31 @@ - + True - <b>Advanced</b> + <b>Generation</b> True False - False - 3 - - - - - True - 10 - - - Default - True - True - False - True - - - False - False - 0 - - - - - False - 4 + 6 + 2 - 6 + 5 - + True - Export + PDF - 6 + 5 False @@ -2383,14 +2244,13 @@ - + True edge gtk-help True - False True False True @@ -2429,29 +2289,9 @@ close - - - - - - - - Top - - - Left - - - Right - - - Bottom - - - - + - + @@ -2465,7 +2305,7 @@ Microsoft Live - Buisness.com + Buisiness.com Omgili @@ -2489,10 +2329,10 @@ Dictionary.com - Youtube + YouTube - AeroMp3 + AeroMP3 AOL @@ -2507,7 +2347,7 @@ Ebay - IMDB + IMBD ESPN @@ -2520,6 +2360,66 @@ + + + + + + + + Top + + + Left + + + Right + + + Bottom + + + + + + + + + + + Small Icons + + + Large Icons + + + Large Icons and Text + + + Text only + + + + + + + + + + + foreground and background images + + + foreground images + + + background images + + + no images + + + @@ -2543,23 +2443,122 @@ - + + True + 3 + gtk-apply + + - No proxy + Direct connection + + + Manual with no authentication + + + Manual with basic authentication - Simple proxy + Manual with NTLM authentication - Basic authentication + System settings + + + + 0.10000000000000001 + 0.10000000000000001 + 10 + 0.10000000000000001 + 1 + + + 16 + 1 + 100 + 1 + 10 + + + 28 + 999 + 1 + 28 + + + 16 + 2048 + 4 + 16 + + + 16 + 2048 + 4 + 16 + + + 28 + 999 + 1 + 10 + + + 3128 + 1 + 65535 + 1 + 10 + + + 10 + 1 + 100 + 1 + 10 + + + 1 + 1 + 100 + 1 + 10 + + + 1 + 100 + 1 + 10 + + + 100 + 1 + 1000 + 1 + 10 + + + 999 + 1 + 10 + + + + + + + + + - NTLM authentication + en + English diff --git a/gtk/res/options.gtk3.ui b/gtk/res/options.gtk3.ui index b6254a34d..7fb513ef5 100644 --- a/gtk/res/options.gtk3.ui +++ b/gtk/res/options.gtk3.ui @@ -263,7 +263,7 @@ - + 5 Netsurf Preferences center-on-parent -- cgit v1.2.3