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/SearchEngines | 20 + gtk/res/default.ico | Bin 0 -> 1406 bytes gtk/res/html.png | Bin 0 -> 3625 bytes gtk/res/login.glade | 222 +++++ gtk/res/netsurf.glade | 1661 +++------------------------------- gtk/res/options.glade | 772 ++++++++++------ gtk/res/password.glade | 274 ++++++ gtk/res/ssl.glade | 197 ++++ gtk/res/themelist | 2 + gtk/res/themes/Alpha.png | Bin 0 -> 156 bytes gtk/res/themes/gtk+/back.png | Bin 0 -> 915 bytes gtk/res/themes/gtk+/closetab.png | Bin 0 -> 1453 bytes gtk/res/themes/gtk+/closewindow.png | Bin 0 -> 1453 bytes gtk/res/themes/gtk+/copy.png | Bin 0 -> 697 bytes gtk/res/themes/gtk+/cut.png | Bin 0 -> 1032 bytes gtk/res/themes/gtk+/delete.png | Bin 0 -> 1449 bytes gtk/res/themes/gtk+/forward.png | Bin 0 -> 906 bytes gtk/res/themes/gtk+/fullscreen.png | Bin 0 -> 606 bytes gtk/res/themes/gtk+/helpabout.png | Bin 0 -> 982 bytes gtk/res/themes/gtk+/helpcontents.png | Bin 0 -> 1728 bytes gtk/res/themes/gtk+/history.png | Bin 0 -> 285 bytes gtk/res/themes/gtk+/home.png | Bin 0 -> 1050 bytes gtk/res/themes/gtk+/info | 81 ++ gtk/res/themes/gtk+/newtab.png | Bin 0 -> 736 bytes gtk/res/themes/gtk+/newwindow.png | Bin 0 -> 736 bytes gtk/res/themes/gtk+/openfile.png | Bin 0 -> 612 bytes gtk/res/themes/gtk+/paste.png | Bin 0 -> 893 bytes gtk/res/themes/gtk+/preferences.png | Bin 0 -> 1691 bytes gtk/res/themes/gtk+/print.png | Bin 0 -> 818 bytes gtk/res/themes/gtk+/printpreview.png | Bin 0 -> 1244 bytes gtk/res/themes/gtk+/quit.png | Bin 0 -> 967 bytes gtk/res/themes/gtk+/reload.png | Bin 0 -> 1466 bytes gtk/res/themes/gtk+/savepage.png | Bin 0 -> 1206 bytes gtk/res/themes/gtk+/selectall.png | Bin 0 -> 717 bytes gtk/res/themes/gtk+/stop.png | Bin 0 -> 1043 bytes gtk/res/themes/gtk+/viewsource.png | Bin 0 -> 960 bytes gtk/res/themes/gtk+/zoomminus.png | Bin 0 -> 941 bytes gtk/res/themes/gtk+/zoomnormal.png | Bin 0 -> 962 bytes gtk/res/themes/gtk+/zoomplus.png | Bin 0 -> 993 bytes gtk/res/toolbar.glade | 126 +++ gtk/res/warning.glade | 79 ++ 41 files changed, 1598 insertions(+), 1836 deletions(-) create mode 100644 gtk/res/SearchEngines create mode 100644 gtk/res/default.ico create mode 100644 gtk/res/html.png create mode 100644 gtk/res/login.glade create mode 100644 gtk/res/password.glade create mode 100644 gtk/res/ssl.glade create mode 100644 gtk/res/themelist create mode 100644 gtk/res/themes/Alpha.png create mode 100644 gtk/res/themes/gtk+/back.png create mode 100644 gtk/res/themes/gtk+/closetab.png create mode 100644 gtk/res/themes/gtk+/closewindow.png create mode 100644 gtk/res/themes/gtk+/copy.png create mode 100644 gtk/res/themes/gtk+/cut.png create mode 100644 gtk/res/themes/gtk+/delete.png create mode 100644 gtk/res/themes/gtk+/forward.png create mode 100644 gtk/res/themes/gtk+/fullscreen.png create mode 100644 gtk/res/themes/gtk+/helpabout.png create mode 100644 gtk/res/themes/gtk+/helpcontents.png create mode 100644 gtk/res/themes/gtk+/history.png create mode 100644 gtk/res/themes/gtk+/home.png create mode 100644 gtk/res/themes/gtk+/info create mode 100644 gtk/res/themes/gtk+/newtab.png create mode 100644 gtk/res/themes/gtk+/newwindow.png create mode 100644 gtk/res/themes/gtk+/openfile.png create mode 100644 gtk/res/themes/gtk+/paste.png create mode 100644 gtk/res/themes/gtk+/preferences.png create mode 100644 gtk/res/themes/gtk+/print.png create mode 100644 gtk/res/themes/gtk+/printpreview.png create mode 100644 gtk/res/themes/gtk+/quit.png create mode 100644 gtk/res/themes/gtk+/reload.png create mode 100644 gtk/res/themes/gtk+/savepage.png create mode 100644 gtk/res/themes/gtk+/selectall.png create mode 100644 gtk/res/themes/gtk+/stop.png create mode 100644 gtk/res/themes/gtk+/viewsource.png create mode 100644 gtk/res/themes/gtk+/zoomminus.png create mode 100644 gtk/res/themes/gtk+/zoomnormal.png create mode 100644 gtk/res/themes/gtk+/zoomplus.png create mode 100644 gtk/res/toolbar.glade create mode 100644 gtk/res/warning.glade (limited to 'gtk/res') diff --git a/gtk/res/SearchEngines b/gtk/res/SearchEngines new file mode 100644 index 000000000..e9eb466c2 --- /dev/null +++ b/gtk/res/SearchEngines @@ -0,0 +1,20 @@ +Google|www.google.com|http://www.google.com/search?q=%s|http://www.google.com/favicon.ico| +Yahoo|search.yahoo.com|http://search.yahoo.com/search?p=%s|http://www.yahoo.com/favicon.ico| +Bing|www.bing.com|http://www.bing.com/search?q=%s|http://www.bing.com/favicon.ico| +Business.com|www.business.com|http://www.business.com/search/rslt_default.asp?query=%s|http://www.business.com/favicon.ico| +Omgili|www.omgili.com|http://www.omgili.com/AAAAA/%s.html|http://www.omgili.com/favicon.ico| +BBC News|search.bbc.co.uk|http://search.bbc.co.uk/search?q=%s&tab=ns|http://news.bbc.co.uk/favicon.ico| +Ubuntu Packages|packages.ubuntu.com|http://packages.ubuntu.com/search?keywords=%s|http://packages.ubuntu.com/favicon.ico| +Creative Commons|creativecommons.org|http://creativecommons.org/?s=%s|http://creativecommons.org/favicon.ico| +Ask.com|www.ask.com|http://www.ask.com/web?q=%s|http://www.ask.com/favicon.ico| +Answers.com|www.answers.com|http://www.answers.com/%s|http://www.answers.com/favicon.ico| +Dictionary.com|dictionary.reference.com|http://dictionary.reference.com/browse/%s?jss=0|http://dictionary.reference.com/favicon.ico| +Youtube|www.youtube.com|http://www.youtube.com/results?search_query=%s|http://www.youtube.com/favicon.ico| +AeroMp3|www.aeromp3.com|http://www.aeromp3.com/search?q=%s|http://www.aeromp3.com/favicon.ico| +AOL|search.aol.com|http://search.aol.com/aol/search?query=%s|http://www.aol.com/favicon.ico| +Baidu|www.baidu.com|http://www.baidu.com/s?wd=%s|http://www.baidu.com/favicon.ico| +Amazon|www.amazon.com|http://www.amazon.com/s/ref=nb_ss_gw?field-keywords=%s|http://www.amazon.com/favicon.ico| +Ebay|shop.ebay.com|http://shop.ebay.com/items/%s|http://www.ebay.com/favicon.ico| +IMDB|www.imdb.com|http://www.imdb.com/find?q=%s|http://www.imdb.com/favicon.ico| +ESPN|search.espn.go.com|http://search.espn.go.com/%s/|http://www.espn.go.com/favicon.ico| +Wikipedia|en.wikipedia.org|http://en.wikipedia.org/w/index.php?title=Special%%3ASearch&search=%s|http://en.wikipedia.org/favicon.ico| diff --git a/gtk/res/default.ico b/gtk/res/default.ico new file mode 100644 index 000000000..1cb432828 Binary files /dev/null and b/gtk/res/default.ico differ diff --git a/gtk/res/html.png b/gtk/res/html.png new file mode 100644 index 000000000..d44dcadce Binary files /dev/null and b/gtk/res/html.png differ diff --git a/gtk/res/login.glade b/gtk/res/login.glade new file mode 100644 index 000000000..c46740591 --- /dev/null +++ b/gtk/res/login.glade @@ -0,0 +1,222 @@ + + + + + + Site Authentication + GTK_WIN_POS_CENTER_ALWAYS + GDK_WINDOW_TYPE_HINT_DIALOG + + + True + + + True + 3 + + + True + 0.10000000149011612 + 12 + 6 + gtk-dialog-authentication + + + False + False + + + + + True + 1 + 4 + 2 + 11 + 10 + + + True + 0 + moo.yoo.com + + + 1 + 2 + + + + + + True + 0 + Password + + + 3 + 4 + + + + + + True + 0 + Username + + + 2 + 3 + + + + + + True + 0 + Host + + + + + + + + True + 0 + Realm + + + 1 + 2 + + + + + + True + 0 + my sekr3t area + + + 1 + 2 + 1 + 2 + + + + + + True + True + False + True + opensesame + + + 1 + 2 + 3 + 4 + + + + + + True + True + True + sesame + + + 1 + 2 + 2 + 3 + + + + + + 1 + 1 + + + + + 2 + + + + + True + GTK_BUTTONBOX_END + + + True + True + gtk-cancel + True + -6 + + + + + True + True + True + True + -5 + + + True + True + True + 0 + 0 + + + True + 2 + + + True + gtk-ok + + + False + False + + + + + True + Login + True + + + False + False + 1 + + + + + + + + + 1 + + + + + False + GTK_PACK_END + + + + + + diff --git a/gtk/res/netsurf.glade b/gtk/res/netsurf.glade index 13d5e716c..3fef4315d 100644 --- a/gtk/res/netsurf.glade +++ b/gtk/res/netsurf.glade @@ -12,197 +12,10 @@ True - + True _File True - - - - - True - Opens a new browser window. - _New Window - True - - - - True - gtk-new - 1 - - - - - - - True - Opens a new browser tab. - New _Tab - True - - - - True - gtk-new - 1 - - - - - - - True - Open a file on your computer into this browser window. - _Open File... - True - - - - True - gtk-open - 1 - - - - - - - True - Close this browser window. - _Close Window - True - - - - True - gtk-close - 1 - - - - - - - True - - - - - True - False - Save this page to disc, optionally including images, etc. - Save page... - True - - - True - gtk-save-as - 1 - - - - - - - True - Export the page to a different format. - Export - True - - - - - True - False - Plain ASCII text, readable in text editors and views. - Plain text... - True - - - - - True - False - RISC OS Drawfile vector graphic. - Drawfile... - True - - - - - True - False - PostScript for printing and converting to PDFs. - PostScript... - True - - - - - True - Portable Document Format. - PDF... - True - - - - - - - - - True - - - - - True - False - Show how a print out might look like. - Print preview... - True - - - - True - gtk-print-preview - 1 - - - - - - - True - Produce a hardcopy on your printer. - Print... - True - - - - True - gtk-print - 1 - - - - - - - True - - - - - True - gtk-quit - True - True - - - - @@ -210,93 +23,6 @@ True _Edit True - - - - - True - gtk-cut - True - True - - - - - True - gtk-copy - True - True - - - - - True - gtk-paste - True - True - - - - - True - False - gtk-delete - True - True - - - - - True - - - - - True - Selects all text in the current browser window. - gtk-select-all - True - True - - - - - - True - - - - - True - False - Find specific text in the current browser window. - _Find... - True - - - - - - True - - - - - True - Change how NetSurf functions. - P_references... - True - - - True - gtk-preferences - 1 - - - - - - @@ -304,375 +30,13 @@ True _View True - - - - - True - _Stop - True - - - - True - gtk-stop - 1 - - - - - - - True - _Reload - True - - - - True - gtk-refresh - 1 - - - - - - - True - - - - - True - Scale the page in the current browser window to be smaller or larger. - _Scale View... - True - - - - - True - Zoom _in - True - - - True - gtk-zoom-in - 1 - - - - - - - True - _Normal size - True - - - True - gtk-zoom-100 - 1 - - - - - - - True - Zoom _out - True - - - True - gtk-zoom-out - 1 - - - - - - - - - True - gtk-zoom-in - 1 - - - - - - - True - _Fullscreen - True - - - - True - gtk-fullscreen - 1 - - - - - - - True - View S_ource - True - - - True - gtk-index - - - - - - - True - - - - - True - False - _Images... - True - - - - - True - False - Toggle the display of images in the foreground. - _Foreground Images - True - - - - - True - False - Toggle the display of images in the background. - _Background Images - True - - - - - - - - - True - _Toolbars... - True - - - - - True - _Menu Bar - True - True - - - - - True - _Button Bar - True - True - - - - - True - _Status Bar - True - True - - - - - - - - - True - - - - - True - Shows the downloads window - _Downloads... - True - - - - - - True - Save this window's size and position for use with new windows. - S_ave Window Size - True - - - - - True - De_bugging - True - - - - - True - T_oggle debug rendering - True - - - - - True - _Save box tree - True - - - - - True - Save DOM tree - True - - - - - - - - - + True _Navigate True - - - - - True - _Back - True - - - - True - gtk-go-back - 1 - - - - - - - True - _Forward - True - - - - True - gtk-go-forward - 1 - - - - - - - True - _Home - True - - - - True - gtk-home - 1 - - - - - - - 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 Bookmarks... - True - - - - - - True - - - - - True - Open an address into this browser window. - _Open location... - True - - - - - @@ -680,41 +44,6 @@ True _Tabs True - - - - - True - _Next Tab - True - - - - - - True - _Previous Tab - True - - - - - - True - _Close tab - True - - - - True - gtk-close - 1 - - - - - - @@ -722,56 +51,6 @@ True _Help True - - - - - True - False - Shows the contents of the NetSurf manual. - _Contents... - True - - - True - gtk-help - 1 - - - - - - - True - False - Shows a guide and tutorial. - User _guide... - True - - - - - True - False - User _information... - True - - - - - True - - - - - True - gtk-about - True - True - - - - @@ -784,92 +63,123 @@ True GTK_TOOLBAR_BOTH_HORIZ + + + False + False + 1 + + + + - - True - gtk-go-back - - - True - - - - + True - False - False - True - arrow_down_8x32.png + gtk-close - True + False + False - + True - gtk-go-forward + + + True + Match + + - True + False + False - + True - gtk-stop + + + True + True + + - True + False + False - + True - gtk-refresh + search _Back + True + gtk-go-back - True + False + False - + True - gtk-home + search _Forward + True + gtk-go-forward - True + False + False - + True - + True True - True + show all matches + all + 0 + True + + False + False + - + True - + True - 2 - gtk-yes + True + Match case when searching + case + GTK_RELIEF_NONE + 0 + True + + False + False + False False - 1 + 2 @@ -907,7 +217,7 @@ - 2 + 3 @@ -917,496 +227,60 @@ False False - 3 + 4 - - Site Authentication - GTK_WIN_POS_CENTER_ALWAYS - GDK_WINDOW_TYPE_HINT_DIALOG - - + + + True - - - True - 3 - - - True - 0.10000000149011612 - 12 - 6 - gtk-dialog-authentication - - - False - False - - - - - True - 1 - 4 - 2 - 11 - 10 - - - True - 0 - moo.yoo.com - - - 1 - 2 - - - - - - True - 0 - Password - - - 3 - 4 - - - - - - True - 0 - Username - - - 2 - 3 - - - - - - True - 0 - Host - - - - - - - - True - 0 - Realm - - - 1 - 2 - - - - - - True - 0 - my sekr3t area - - - 1 - 2 - 1 - 2 - - - - - - True - True - False - True - opensesame - - - 1 - 2 - 3 - 4 - - - - - - True - True - True - sesame - - - 1 - 2 - 2 - 3 - - - - - - 1 - 1 - - - - - 2 - - - - - True - GTK_BUTTONBOX_END - - - True - True - gtk-cancel - True - -6 - - - - - True - True - True - True - -5 - - - True - True - True - 0 - 0 - - - True - 2 - - - True - gtk-ok - - - False - False - - - - - True - Login - True - - - False - False - 1 - - - - - - - - - 1 - - - - - False - GTK_PACK_END - - + File + True - - - 1 - SSL certificate problem - True - GDK_WINDOW_TYPE_HINT_DIALOG - - + + True - - - True - - - True - 0 - 6 - gtk-dialog-warning - - - False - False - - - - - True - - - True - NetSurf failed to verify the authenticity of an SSL certificate. Please verify the details presented below. - GTK_JUSTIFY_CENTER - True - - - False - False - - - - - True - 5 - 0 - - - True - 12 - - - True - True - GTK_SHADOW_IN - - - 200 - True - True - False - (not implemented) - - - - - - - - - True - <b>Certificate chain</b> - True - - - label_item - - - - - 1 - - - - - 1 - - - - - 2 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - -6 - - - True - 0 - 0 - - - True - 2 - - - True - gtk-cancel - - - False - False - - - - - True - Reject - True - - - False - False - 1 - - - - - - - - - - - True - True - True - -5 - - - True - 0 - 0 - - - True - 2 - - - True - gtk-apply - - - False - False - - - - - True - Accept - True - - - False - False - 1 - - - - - - - - - 1 - - - - - False - GTK_PACK_END - - + Edit + True - - - Warning from NetSurf - GTK_WIN_POS_CENTER - gtk-dialog-warning - GDK_WINDOW_TYPE_HINT_DIALOG - True - + + True + View + True + + + + + True + Navigate + True + + + + + True + Tabs + True + + + + + True + Help + True + + + + True - 2 - - - True - 3 - - - True - 12 - 6 - gtk-dialog-warning - - - False - False - - - - - True - Help help help! I'm being held prisoner by a bunch of RISC OS zealots! - True - - - 1 - 1 - - - - - - - True - - - False - 3 - 1 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - gtk-ok - True - 0 - - - - - - False - False - 2 - - - - True @@ -1422,12 +296,12 @@ - + True - + True _Back True @@ -1441,7 +315,7 @@ - + True _Forward True @@ -1455,12 +329,12 @@ - + True - + True _Reload True @@ -1530,316 +404,11 @@ - - True - File - True - - - - - True - Edit - True - - - - - True - View - True - - - - - True - Navigate - True - - - - - True - False - Object - True - - - - + True - Help + Customize.. True - - PDF Password - True - GTK_WIN_POS_CENTER - - - True - - - True - 0.10000000149011612 - 12 - 6 - gtk-dialog-authentication - - - False - False - - - - - True - 5 - - - True - 0 - Write and confirm passwords: - - - False - - - - - True - 5 - - - True - Owner password: - 15 - - - False - False - - - - - True - True - 20 - False - 20 - - - False - False - 1 - - - - - False - False - 1 - - - - - True - 5 - - - True - Repeat password: - 15 - - - False - False - - - - - True - True - 20 - False - 20 - - - False - False - 1 - - - - - False - False - 2 - - - - - True - 5 - - - True - User password: - 15 - - - False - False - - - - - True - True - 20 - False - 20 - - - False - False - 1 - - - - - False - False - 3 - - - - - True - 5 - - - True - Repeat password: - 15 - - - False - False - - - - - True - True - 20 - False - 20 - - - False - False - 1 - - - - - False - False - 4 - - - - - True - 5 - 10 - GTK_BUTTONBOX_END - - - True - True - 0 - - - True - - - True - gtk-ok - - - False - False - - - - - True - Set password - - - 1 - - - - - - - - - True - True - 0 - - - True - - - True - - - True - gtk-cancel - - - False - False - - - - - True - No password - - - 1 - - - - - - - - - 1 - - - - - False - False - 5 - - - - - 1 - - - - - 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 diff --git a/gtk/res/password.glade b/gtk/res/password.glade new file mode 100644 index 000000000..0d00d65ed --- /dev/null +++ b/gtk/res/password.glade @@ -0,0 +1,274 @@ + + + + + + PDF Password + True + GTK_WIN_POS_CENTER + + + True + + + True + 0.10000000149011612 + 12 + 6 + gtk-dialog-authentication + + + False + False + + + + + True + 5 + + + True + 0 + Write and confirm passwords: + + + False + + + + + True + 5 + + + True + Owner password: + 15 + + + False + False + + + + + True + True + 20 + False + 20 + + + False + False + 1 + + + + + False + False + 1 + + + + + True + 5 + + + True + Repeat password: + 15 + + + False + False + + + + + True + True + 20 + False + 20 + + + False + False + 1 + + + + + False + False + 2 + + + + + True + 5 + + + True + User password: + 15 + + + False + False + + + + + True + True + 20 + False + 20 + + + False + False + 1 + + + + + False + False + 3 + + + + + True + 5 + + + True + Repeat password: + 15 + + + False + False + + + + + True + True + 20 + False + 20 + + + False + False + 1 + + + + + False + False + 4 + + + + + True + 5 + 10 + GTK_BUTTONBOX_END + + + True + True + 0 + + + True + + + True + gtk-ok + + + False + False + + + + + True + Set password + + + 1 + + + + + + + + + True + True + 0 + + + True + + + True + + + True + gtk-cancel + + + False + False + + + + + True + No password + + + 1 + + + + + + + + + 1 + + + + + False + False + 5 + + + + + 1 + + + + + + diff --git a/gtk/res/ssl.glade b/gtk/res/ssl.glade new file mode 100644 index 000000000..98d9f9bf3 --- /dev/null +++ b/gtk/res/ssl.glade @@ -0,0 +1,197 @@ + + + + + + 1 + SSL certificate problem + True + GDK_WINDOW_TYPE_HINT_DIALOG + + + True + + + True + + + True + 0 + 6 + gtk-dialog-warning + + + False + False + + + + + True + + + True + NetSurf failed to verify the authenticity of an SSL certificate. Please verify the details presented below. + GTK_JUSTIFY_CENTER + True + + + False + False + + + + + True + 5 + 0 + + + True + 12 + + + True + True + GTK_SHADOW_IN + + + 200 + True + True + False + (not implemented) + + + + + + + + + True + <b>Certificate chain</b> + True + + + label_item + + + + + 1 + + + + + 1 + + + + + 2 + + + + + True + GTK_BUTTONBOX_END + + + True + True + True + -6 + + + True + 0 + 0 + + + True + 2 + + + True + gtk-cancel + + + False + False + + + + + True + Reject + True + + + False + False + 1 + + + + + + + + + + + True + True + True + -5 + + + True + 0 + 0 + + + True + 2 + + + True + gtk-apply + + + False + False + + + + + True + Accept + True + + + False + False + 1 + + + + + + + + + 1 + + + + + False + GTK_PACK_END + + + + + + diff --git a/gtk/res/themelist b/gtk/res/themelist new file mode 100644 index 000000000..4a70e25d6 --- /dev/null +++ b/gtk/res/themelist @@ -0,0 +1,2 @@ +gtk default theme +gtk+ diff --git a/gtk/res/themes/Alpha.png b/gtk/res/themes/Alpha.png new file mode 100644 index 000000000..f76e51dad Binary files /dev/null and b/gtk/res/themes/Alpha.png differ diff --git a/gtk/res/themes/gtk+/back.png b/gtk/res/themes/gtk+/back.png new file mode 100644 index 000000000..23b89b761 Binary files /dev/null and b/gtk/res/themes/gtk+/back.png differ diff --git a/gtk/res/themes/gtk+/closetab.png b/gtk/res/themes/gtk+/closetab.png new file mode 100644 index 000000000..312b84dae Binary files /dev/null and b/gtk/res/themes/gtk+/closetab.png differ diff --git a/gtk/res/themes/gtk+/closewindow.png b/gtk/res/themes/gtk+/closewindow.png new file mode 100644 index 000000000..312b84dae Binary files /dev/null and b/gtk/res/themes/gtk+/closewindow.png differ diff --git a/gtk/res/themes/gtk+/copy.png b/gtk/res/themes/gtk+/copy.png new file mode 100644 index 000000000..a1178e64f Binary files /dev/null and b/gtk/res/themes/gtk+/copy.png differ diff --git a/gtk/res/themes/gtk+/cut.png b/gtk/res/themes/gtk+/cut.png new file mode 100644 index 000000000..82b105f80 Binary files /dev/null and b/gtk/res/themes/gtk+/cut.png differ diff --git a/gtk/res/themes/gtk+/delete.png b/gtk/res/themes/gtk+/delete.png new file mode 100644 index 000000000..e375b894e Binary files /dev/null and b/gtk/res/themes/gtk+/delete.png differ diff --git a/gtk/res/themes/gtk+/forward.png b/gtk/res/themes/gtk+/forward.png new file mode 100644 index 000000000..727ff37f2 Binary files /dev/null and b/gtk/res/themes/gtk+/forward.png differ diff --git a/gtk/res/themes/gtk+/fullscreen.png b/gtk/res/themes/gtk+/fullscreen.png new file mode 100644 index 000000000..21462fe0e Binary files /dev/null and b/gtk/res/themes/gtk+/fullscreen.png differ diff --git a/gtk/res/themes/gtk+/helpabout.png b/gtk/res/themes/gtk+/helpabout.png new file mode 100644 index 000000000..063d0df43 Binary files /dev/null and b/gtk/res/themes/gtk+/helpabout.png differ diff --git a/gtk/res/themes/gtk+/helpcontents.png b/gtk/res/themes/gtk+/helpcontents.png new file mode 100644 index 000000000..b00fbd8c1 Binary files /dev/null and b/gtk/res/themes/gtk+/helpcontents.png differ diff --git a/gtk/res/themes/gtk+/history.png b/gtk/res/themes/gtk+/history.png new file mode 100644 index 000000000..0d445027f Binary files /dev/null and b/gtk/res/themes/gtk+/history.png differ diff --git a/gtk/res/themes/gtk+/home.png b/gtk/res/themes/gtk+/home.png new file mode 100644 index 000000000..a2e0b3c96 Binary files /dev/null and b/gtk/res/themes/gtk+/home.png differ diff --git a/gtk/res/themes/gtk+/info b/gtk/res/themes/gtk+/info new file mode 100644 index 000000000..36e4f09df --- /dev/null +++ b/gtk/res/themes/gtk+/info @@ -0,0 +1,81 @@ +This file is part of NetSurf, http://www.netsurf-browser.org/ + +The images in this theme folder 'gtk+' are from the gtk stock image set +http://library.gnome.org/devel/gtk/unstable/gtk-Stock-Items.html + +the image history.png is [for what it's worth!] Copyright 2009 Mark Benjamin + + +NetSurf is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; version 2 of the License. + +NetSurf is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . + +*** Instructions for theming *** + +to create a theme, make a folder, whose name is the name of the theme; +put in the folder, a set of png images for the toolbuttons; +the names of the images should be a subset of the list + + back.png, + history.png, + forward.png, + stop.png, + reload.png, + home.png, + newwindow.png, + newtab.png, + openfile.png, + closetab.png, + closewindow.png, + savepage.png, + pdf.png, + plaintext.png, + drawfile.png, + postscript.png, + printpreview.png, + print.png, + quit.png, + cut.png, + copy.png, + paste.png, + delete.png, + selectall.png, + find.png, + preferences.png, + zoomplus.png, + zoomminus.png, + zoomnormal.png, + fullscreen.png, + viewsource.png, + downloads.png, + savewindowsize.png, + toggledebugging.png, + saveboxtree.png, + savedomtree.png, + localhistory.png, + globalhistory.png, + addbookmarks.png, + showbookmarks.png, + openlocation.png, + nexttab.png, + prevtab.png, + contents.png, + guide.png, + info.png, + about.png, + searchback.png, + searchforward.png, + searchclose.png + +for local theming, the folder may be placed directly [as a subfolder] into the netsurf/gtk/res/themes folder; then 'add theme' from the preferences->advanced tab; + +for downloadable themes, compile netsurf/utils/container.c according to the instructions in the header of that file; make a netsurf container of the folder, serve it as content-type "application/x-netsurf-theme"; browse to it in NetSurf, then NetSurf should automatically install it + diff --git a/gtk/res/themes/gtk+/newtab.png b/gtk/res/themes/gtk+/newtab.png new file mode 100644 index 000000000..c89e797b7 Binary files /dev/null and b/gtk/res/themes/gtk+/newtab.png differ diff --git a/gtk/res/themes/gtk+/newwindow.png b/gtk/res/themes/gtk+/newwindow.png new file mode 100644 index 000000000..c89e797b7 Binary files /dev/null and b/gtk/res/themes/gtk+/newwindow.png differ diff --git a/gtk/res/themes/gtk+/openfile.png b/gtk/res/themes/gtk+/openfile.png new file mode 100644 index 000000000..312e1187f Binary files /dev/null and b/gtk/res/themes/gtk+/openfile.png differ diff --git a/gtk/res/themes/gtk+/paste.png b/gtk/res/themes/gtk+/paste.png new file mode 100644 index 000000000..e938c3e99 Binary files /dev/null and b/gtk/res/themes/gtk+/paste.png differ diff --git a/gtk/res/themes/gtk+/preferences.png b/gtk/res/themes/gtk+/preferences.png new file mode 100644 index 000000000..2596f3cc5 Binary files /dev/null and b/gtk/res/themes/gtk+/preferences.png differ diff --git a/gtk/res/themes/gtk+/print.png b/gtk/res/themes/gtk+/print.png new file mode 100644 index 000000000..05d22d7a8 Binary files /dev/null and b/gtk/res/themes/gtk+/print.png differ diff --git a/gtk/res/themes/gtk+/printpreview.png b/gtk/res/themes/gtk+/printpreview.png new file mode 100644 index 000000000..7f405de58 Binary files /dev/null and b/gtk/res/themes/gtk+/printpreview.png differ diff --git a/gtk/res/themes/gtk+/quit.png b/gtk/res/themes/gtk+/quit.png new file mode 100644 index 000000000..0c9de64ba Binary files /dev/null and b/gtk/res/themes/gtk+/quit.png differ diff --git a/gtk/res/themes/gtk+/reload.png b/gtk/res/themes/gtk+/reload.png new file mode 100644 index 000000000..09b5df1d1 Binary files /dev/null and b/gtk/res/themes/gtk+/reload.png differ diff --git a/gtk/res/themes/gtk+/savepage.png b/gtk/res/themes/gtk+/savepage.png new file mode 100644 index 000000000..5da8a02dc Binary files /dev/null and b/gtk/res/themes/gtk+/savepage.png differ diff --git a/gtk/res/themes/gtk+/selectall.png b/gtk/res/themes/gtk+/selectall.png new file mode 100644 index 000000000..1fc5b8282 Binary files /dev/null and b/gtk/res/themes/gtk+/selectall.png differ diff --git a/gtk/res/themes/gtk+/stop.png b/gtk/res/themes/gtk+/stop.png new file mode 100644 index 000000000..54e1cb3e9 Binary files /dev/null and b/gtk/res/themes/gtk+/stop.png differ diff --git a/gtk/res/themes/gtk+/viewsource.png b/gtk/res/themes/gtk+/viewsource.png new file mode 100644 index 000000000..9ddbe9b8e Binary files /dev/null and b/gtk/res/themes/gtk+/viewsource.png differ diff --git a/gtk/res/themes/gtk+/zoomminus.png b/gtk/res/themes/gtk+/zoomminus.png new file mode 100644 index 000000000..22afd1951 Binary files /dev/null and b/gtk/res/themes/gtk+/zoomminus.png differ diff --git a/gtk/res/themes/gtk+/zoomnormal.png b/gtk/res/themes/gtk+/zoomnormal.png new file mode 100644 index 000000000..499cbd6c6 Binary files /dev/null and b/gtk/res/themes/gtk+/zoomnormal.png differ diff --git a/gtk/res/themes/gtk+/zoomplus.png b/gtk/res/themes/gtk+/zoomplus.png new file mode 100644 index 000000000..3a386fae7 Binary files /dev/null and b/gtk/res/themes/gtk+/zoomplus.png differ diff --git a/gtk/res/toolbar.glade b/gtk/res/toolbar.glade new file mode 100644 index 000000000..7e5ff0fb5 --- /dev/null +++ b/gtk/res/toolbar.glade @@ -0,0 +1,126 @@ + + + + + + 700 + 450 + + + True + + + True + move items from store to toolbar rearrange items in toolbar move items from toolbar to store + + + False + + + + + True + False + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + True + GTK_RESIZE_QUEUE + + + True + + + + + + + + + + 1 + + + + + True + True + + + True + True + True + 0 + + + True + + + True + gtk-refresh + + + False + + + + + True + reset default + + + 1 + + + + + + + False + 10 + + + + + + + + True + True + True + True + gtk-apply + True + 0 + + + False + 10 + 2 + + + + + True + True + True + gtk-cancel + True + 0 + + + False + 3 + + + + + False + 2 + + + + + + diff --git a/gtk/res/warning.glade b/gtk/res/warning.glade new file mode 100644 index 000000000..edfa18076 --- /dev/null +++ b/gtk/res/warning.glade @@ -0,0 +1,79 @@ + + + + + + Warning from NetSurf + GTK_WIN_POS_CENTER + gtk-dialog-warning + GDK_WINDOW_TYPE_HINT_DIALOG + True + + + True + 2 + + + True + 3 + + + True + 12 + 6 + gtk-dialog-warning + + + False + False + + + + + True + Help help help! I'm being held prisoner by a bunch of RISC OS zealots! + True + + + 1 + 1 + + + + + + + True + + + False + 3 + 1 + + + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-ok + True + 0 + + + + + + False + False + 2 + + + + + + -- cgit v1.2.3