From 0efd285302797848b7bec0f5dad95aa043e9aa1b Mon Sep 17 00:00:00 2001 From: James Bursa Date: Fri, 11 Jun 2004 12:19:57 +0000 Subject: [project @ 2004-06-11 12:19:56 by bursa] New "About NetSurf" page, and menu item to open it. svn path=/import/netsurf/; revision=960 --- !NetSurf/About/About,faf | 38 ------------------------------ !NetSurf/About/libcurl,ff9 | Bin 15300 -> 0 bytes !NetSurf/About/libpng,b60 | Bin 2399 -> 0 bytes !NetSurf/About/libxml,b60 | Bin 4899 -> 0 bytes !NetSurf/About/nslogo,b60 | Bin 13366 -> 0 bytes !NetSurf/About/openssl,695 | Bin 2063 -> 0 bytes !NetSurf/Docs/about,faf | 52 +++++++++++++++++++++++++++++++++++++++++ !NetSurf/Docs/libcurl,b60 | Bin 0 -> 4295 bytes !NetSurf/Docs/libxml2,b60 | Bin 0 -> 4899 bytes !NetSurf/Resources/en/Messages | 4 +++- !NetSurf/Resources/fr/Messages | 1 + riscos/gui.c | 4 ++-- riscos/menus.c | 13 +++++++---- 13 files changed, 67 insertions(+), 45 deletions(-) delete mode 100644 !NetSurf/About/About,faf delete mode 100644 !NetSurf/About/libcurl,ff9 delete mode 100644 !NetSurf/About/libpng,b60 delete mode 100644 !NetSurf/About/libxml,b60 delete mode 100644 !NetSurf/About/nslogo,b60 delete mode 100644 !NetSurf/About/openssl,695 create mode 100644 !NetSurf/Docs/about,faf create mode 100644 !NetSurf/Docs/libcurl,b60 create mode 100644 !NetSurf/Docs/libxml2,b60 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 @@ - -
-

Quick Links

- -
-
-NetSurf makes use of the following libraries:
 
- - - - - - - - - - - - - - - - - - - - - - - - - -
zlibCopyright © 1995-2002 Jean-loup Gailly and Mark Adler.
libpng
libpng logo
Copyright © 1995, 1996 Guy Eric Schalnat, Group 42, Inc.;
Copyright © 1996, 1997 Andreas Dilger;
Copyright © 1998-2002 Glenn Randers-Pehrson.
libcurl
libcurl logo
Copyright © 1998-2003 Daniel Stenberg.
libxml
libxml logo
Copyright © 1998-2002 Daniel Veillard.
OpenSSL
openssl logo
This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/). -
This product includes cryptographic software written by Eric Young (eay@cryptsoft.com).
-
\ No newline at end of file diff --git a/!NetSurf/About/libcurl,ff9 b/!NetSurf/About/libcurl,ff9 deleted file mode 100644 index 4e9c44775..000000000 Binary files a/!NetSurf/About/libcurl,ff9 and /dev/null differ diff --git a/!NetSurf/About/libpng,b60 b/!NetSurf/About/libpng,b60 deleted file mode 100644 index 49798c8ed..000000000 Binary files a/!NetSurf/About/libpng,b60 and /dev/null differ diff --git a/!NetSurf/About/libxml,b60 b/!NetSurf/About/libxml,b60 deleted file mode 100644 index f7605f6a6..000000000 Binary files a/!NetSurf/About/libxml,b60 and /dev/null differ diff --git a/!NetSurf/About/nslogo,b60 b/!NetSurf/About/nslogo,b60 deleted file mode 100644 index 9dc185593..000000000 Binary files a/!NetSurf/About/nslogo,b60 and /dev/null differ diff --git a/!NetSurf/About/openssl,695 b/!NetSurf/About/openssl,695 deleted file mode 100644 index 3d3c90c9f..000000000 Binary files a/!NetSurf/About/openssl,695 and /dev/null differ 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 @@ + + + +NetSurf | About NetSurf + + + + + + +

NetSurf VERSION

+ +

Authors and contributors: +(code) John M Bell, James Bursa, Matthew Hambley, Rob Jackson, +Phil Mellor, Philip Pemberton, John Tytgat, Richard Wilson; +(graphics, documentation & translations) Bruno D'Arcangeli, +Michael Drake, Andrew Duffell, Jérôme Mathevet.

+ +

Libraries

+ + + + + + + + + + + + + + + + + + + + + + +
libcurl© 1996–2004, Daniel Stenberg
IJG JPEG libraryThis software is based in part on the work of the Independent JPEG Group
+© 1991–1998, Thomas G. Lane
OpenSSL© 1998–2004 The OpenSSL Project
+© 1995–1998 Eric A. Young, Tim J. Hudson
OSLib© 1994–2002 Jonathan Coxhead and OSLib maintainers
libpng© 1998–2002 Glenn Randers-Pehrson
+© 1996, 1997 Andreas Dilger
+© 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
libxml2© 1998–2003 Daniel Veillard
zlib© 1995–2002 Jean-loup Gailly and Mark Adler
+ + + + + diff --git a/!NetSurf/Docs/libcurl,b60 b/!NetSurf/Docs/libcurl,b60 new file mode 100644 index 000000000..bd82d845b Binary files /dev/null and b/!NetSurf/Docs/libcurl,b60 differ diff --git a/!NetSurf/Docs/libxml2,b60 b/!NetSurf/Docs/libxml2,b60 new file mode 100644 index 000000000..f7605f6a6 Binary files /dev/null and b/!NetSurf/Docs/libxml2,b60 differ 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://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://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:/" + "/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; } } -- cgit v1.2.3