diff options
-rw-r--r-- | !NetSurf/About/About,faf | 38 | ||||
-rw-r--r-- | !NetSurf/About/libcurl,ff9 | bin | 15300 -> 0 bytes | |||
-rw-r--r-- | !NetSurf/About/libpng,b60 | bin | 2399 -> 0 bytes | |||
-rw-r--r-- | !NetSurf/About/nslogo,b60 | bin | 13366 -> 0 bytes | |||
-rw-r--r-- | !NetSurf/About/openssl,695 | bin | 2063 -> 0 bytes | |||
-rw-r--r-- | !NetSurf/Docs/about,faf | 52 | ||||
-rw-r--r-- | !NetSurf/Docs/libcurl,b60 | bin | 0 -> 4295 bytes | |||
-rw-r--r-- | !NetSurf/Docs/libxml2,b60 (renamed from !NetSurf/About/libxml,b60) | bin | 4899 -> 4899 bytes | |||
-rw-r--r-- | !NetSurf/Resources/en/Messages | 4 | ||||
-rw-r--r-- | !NetSurf/Resources/fr/Messages | 1 | ||||
-rw-r--r-- | riscos/gui.c | 4 | ||||
-rw-r--r-- | riscos/menus.c | 13 |
12 files changed, 67 insertions, 45 deletions
diff --git a/!NetSurf/About/About,faf b/!NetSurf/About/About,faf deleted file mode 100644 index 501f78bb0..000000000 --- a/!NetSurf/About/About,faf +++ /dev/null @@ -1,38 +0,0 @@ -<!-- Browser specific information --> -<div style="float: left; width: 15%; background-color: #ddddee"> -<h4>Quick Links</h4> -<ul> -<li><a href="about:cookies">List Cookies</a></li> -<li><a href="help:">User Manual</a></li> -</ul> -</div> -<div style="float: right"> -<strong><i>NetSurf makes use of the following libraries:</i></strong><br> <br> -<table border="0" cellspacing="2" width="100%"> -<tr valign="top"> - <td width="30%"><font size="2"><strong><a href="http://www.zlib.org/">zlib</a></strong></font></td> - <td width="70%"><font size="2">Copyright © 1995-2002 Jean-loup Gailly and Mark Adler.</font></td> -</tr> -<tr><td colspan="2" bgcolor="#dddddd" height="1"></td></tr> -<tr valign="top"> - <td width="30%"><font size="2"><strong><a href="http://www.libpng.org/">libpng</a></strong></font><br><img src="file:///%3CNetsurf$Dir%3E/About/libpng" alt="libpng logo"></td> - <td width="70%"><font size="2">Copyright © 1995, 1996 Guy Eric Schalnat, Group 42, Inc.;<br>Copyright © 1996, 1997 Andreas Dilger;<br>Copyright © 1998-2002 Glenn Randers-Pehrson.</font></td> -</tr> -<tr><td colspan="2" bgcolor="#dddddd" height="1"></td></tr> -<tr valign="top"> - <td width="30%"><font size="2"><strong><a href="http://curl.haxx.se/libcurl/">libcurl</a></strong></font><br><img src="file:///%3CNetsurf$Dir%3E/About/libcurl" alt="libcurl logo"></td> - <td width="70%"><font size="2">Copyright © 1998-2003 Daniel Stenberg.</font></td> -</tr> -<tr><td colspan="2" bgcolor="#dddddd" height="1"></td></tr> -<tr valign="top"> - <td width="30%"><font size="2"><strong><a href="http://www.xmlsoft.org/">libxml</a></strong></font><br><img src="file:///%3CNetsurf$Dir%3E/About/libxml" alt="libxml logo"></td> - <td width="70%"><font size="2">Copyright © 1998-2002 Daniel Veillard.</font></td> -</tr> -<tr><td colspan="2" bgcolor="#dddddd" height="1"></td></tr> -<tr valign="top"> - <td width="30%"><font size="2"><strong><a href="http://www.openssl.org/">OpenSSL</a></strong></font><br><img src="file:///%3CNetsurf$Dir%3E/About/openssl" alt="openssl logo"></td> - <td width="70%"><font size="2">This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (<a href="http://www.openssl.org/">http://www.openssl.org/</a>). - <br>This product includes cryptographic software written by Eric Young (eay@cryptsoft.com).</font></td> -</tr> -</table> -<hr>
\ No newline at end of file diff --git a/!NetSurf/About/libcurl,ff9 b/!NetSurf/About/libcurl,ff9 Binary files differdeleted file mode 100644 index 4e9c44775..000000000 --- a/!NetSurf/About/libcurl,ff9 +++ /dev/null diff --git a/!NetSurf/About/libpng,b60 b/!NetSurf/About/libpng,b60 Binary files differdeleted file mode 100644 index 49798c8ed..000000000 --- a/!NetSurf/About/libpng,b60 +++ /dev/null diff --git a/!NetSurf/About/nslogo,b60 b/!NetSurf/About/nslogo,b60 Binary files differdeleted file mode 100644 index 9dc185593..000000000 --- a/!NetSurf/About/nslogo,b60 +++ /dev/null diff --git a/!NetSurf/About/openssl,695 b/!NetSurf/About/openssl,695 Binary files differdeleted file mode 100644 index 3d3c90c9f..000000000 --- a/!NetSurf/About/openssl,695 +++ /dev/null diff --git a/!NetSurf/Docs/about,faf b/!NetSurf/Docs/about,faf new file mode 100644 index 000000000..db535f1cd --- /dev/null +++ b/!NetSurf/Docs/about,faf @@ -0,0 +1,52 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" + "http://www.w3.org/TR/html4/strict.dtd"> +<html> +<head> +<title>NetSurf | About NetSurf</title> +<link rel="stylesheet" type="text/css" href="netsurf"> +</head> + +<body> +<p class="banner"><a href="intro_en"><img src="netsurf_png" alt="NetSurf"></a></p> + +<h1>NetSurf <em>VERSION</em></h1> + +<p>Authors and contributors: +<em>(code)</em> John M Bell, James Bursa, Matthew Hambley, Rob Jackson, +Phil Mellor, Philip Pemberton, John Tytgat, Richard Wilson; +<em>(graphics, documentation & translations)</em> Bruno D'Arcangeli, +Michael Drake, Andrew Duffell, Jérôme Mathevet.</p> + +<h2>Libraries</h2> + +<table> +<tr><th><a href="http://curl.haxx.se/libcurl/"><img src="libcurl" alt="libcurl"></a></th> +<td>© 1996–2004, Daniel Stenberg</td></tr> + +<tr><th>IJG JPEG library</th> +<td>This software is based in part on the work of the Independent JPEG Group<br> +© 1991–1998, Thomas G. Lane</td></tr> + +<tr><th><a href="http://www.openssl.org/">OpenSSL</a></th> +<td>© 1998–2004 The OpenSSL Project<br> +© 1995–1998 Eric A. Young, Tim J. Hudson</td></tr> + +<tr><th><a href="http://ro-oslib.sourceforge.net/">OSLib</a></th> +<td>© 1994–2002 Jonathan Coxhead and OSLib maintainers</td></tr> + +<tr><th><a href="http://www.libpng.org/">libpng</a></th> +<td>© 1998–2002 Glenn Randers-Pehrson<br> +© 1996, 1997 Andreas Dilger<br> +© 1995, 1996 Guy Eric Schalnat, Group 42, Inc.</td></tr> + +<tr><th><a href="http://www.xmlsoft.org/"><img src="libxml2" alt="libxml2"></a></th> +<td>© 1998–2003 Daniel Veillard</td></tr> + +<tr><th><a href="http://www.gzip.org/zlib/">zlib</a></th> +<td>© 1995–2002 Jean-loup Gailly and Mark Adler</td></tr> +</table> + +<p class="breadcrumbs"><a href="intro_en">NetSurf</a> » About NetSurf</p> + +</body> +</html> diff --git a/!NetSurf/Docs/libcurl,b60 b/!NetSurf/Docs/libcurl,b60 Binary files differnew file mode 100644 index 000000000..bd82d845b --- /dev/null +++ b/!NetSurf/Docs/libcurl,b60 diff --git a/!NetSurf/About/libxml,b60 b/!NetSurf/Docs/libxml2,b60 Binary files differindex f7605f6a6..f7605f6a6 100644 --- a/!NetSurf/About/libxml,b60 +++ b/!NetSurf/Docs/libxml2,b60 diff --git a/!NetSurf/Resources/en/Messages b/!NetSurf/Resources/en/Messages index 3e4432959..50ff58584 100644 --- a/!NetSurf/Resources/en/Messages +++ b/!NetSurf/Resources/en/Messages @@ -57,6 +57,7 @@ HelpContent:Contents F1 HelpGuide:User guide HelpInfo:User information HelpInter:Interactive help +HelpAbout:About NetSurf Themes:Themes @@ -200,7 +201,8 @@ HelpBrowserMenu4:\Rsee the help resources available. HelpBrowserMenu4-0:\Sopen the documentation contents page in a new \w. HelpBrowserMenu4-1:\Sopen the user guide in a new \w. HelpBrowserMenu4-2:\Sopen the user information page in a new \w. -HelpBrowserMenu4-3:\Srun Help. +HelpBrowserMenu4-3:\Sopen the NetSurf about page in a new \w. +HelpBrowserMenu4-4:\Srun Help. HelpBrowser-1:Click \s on a link to follow it.|MClick \a on a link to open it in a new \w. diff --git a/!NetSurf/Resources/fr/Messages b/!NetSurf/Resources/fr/Messages index 5077b78c9..9c18ef8dc 100644 --- a/!NetSurf/Resources/fr/Messages +++ b/!NetSurf/Resources/fr/Messages @@ -57,6 +57,7 @@ HelpContent:Contenus F1 HelpGuide:Guide de l'utilisateur HelpInfo:Information utilisateur HelpInter:Aide interactive +HelpAbout:About NetSurf Themes:Thèmes diff --git a/riscos/gui.c b/riscos/gui.c index 333e28ee9..37e4f1bd3 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -723,7 +723,7 @@ void ro_gui_icon_bar_click(wimp_pointer *pointer) int length; if ((length = snprintf(url, sizeof(url), - "file:///%%3CNetSurf$Dir%%3E/Docs/intro_%s", + "file:/<NetSurf$Dir>/Docs/intro_%s", option_language)) >= 0 && length < (int)sizeof(url)) browser_window_create(url, NULL); } else if (pointer->buttons == wimp_CLICK_ADJUST) { @@ -1286,7 +1286,7 @@ void ro_gui_open_help_page(const char *page) int length; if ((length = snprintf(url, sizeof url, - "file:///%%3CNetSurf$Dir%%3E/Docs/%s_%s", + "file:/<NetSurf$Dir>/Docs/%s_%s", page, option_language)) >= 0 && length < (int)sizeof(url)) browser_window_create(url, NULL); } diff --git a/riscos/menus.c b/riscos/menus.c index 576dfbb9b..f80ed673d 100644 --- a/riscos/menus.c +++ b/riscos/menus.c @@ -237,12 +237,13 @@ static wimp_MENU(4) utilities_menu = { /* Help submenu */ -static wimp_MENU(4) help_menu = { +static wimp_MENU(5) help_menu = { { "Help" }, 7,2,7,0, 300, 44, 0, { { 0, wimp_NO_SUB_MENU, DEFAULT_FLAGS, { "HelpContent" } }, { 0, wimp_NO_SUB_MENU, DEFAULT_FLAGS, { "HelpGuide" } }, { wimp_MENU_SEPARATE, wimp_NO_SUB_MENU, DEFAULT_FLAGS, { "HelpInfo" } }, + { wimp_MENU_SEPARATE, wimp_NO_SUB_MENU, DEFAULT_FLAGS, { "HelpAbout" } }, { wimp_MENU_LAST, wimp_NO_SUB_MENU, DEFAULT_FLAGS, { "HelpInter" } } } }; @@ -566,7 +567,11 @@ void ro_gui_menu_selection(wimp_selection *selection) case 2: /* User information */ ro_gui_open_help_page("info"); break; - case 3: /* Interactive help */ + case 3: /* About NetSurf */ + browser_window_create("file:/" + "<NetSurf$Dir>/Docs/about", 0); + break; + case 4: /* Interactive help */ xos_cli("Filer_Run Resources:$.Apps.!Help"); ro_gui_menu_prepare_help(true); break; @@ -850,9 +855,9 @@ void ro_gui_menu_prepare_scale(void) { */ void ro_gui_menu_prepare_help(int forced) { if (ro_gui_interactive_help_available() || (forced)) { - browser_help_menu->entries[3].icon_flags |= wimp_ICON_SHADED; + browser_help_menu->entries[4].icon_flags |= wimp_ICON_SHADED; } else { - browser_help_menu->entries[3].icon_flags &= ~wimp_ICON_SHADED; + browser_help_menu->entries[4].icon_flags &= ~wimp_ICON_SHADED; } } |