diff options
author | Richard Wilson <rjw@netsurf-browser.org> | 2004-05-12 10:23:07 +0000 |
---|---|---|
committer | Richard Wilson <rjw@netsurf-browser.org> | 2004-05-12 10:23:07 +0000 |
commit | 3f0f5d7be9da224edcb5c550492cfc658818fc15 (patch) | |
tree | b542f15ab1fc7f2894cc333888c21a33e23dde02 | |
parent | 0ee578645879df59daaeccb18b4fa34eb395be0c (diff) | |
download | netsurf-3f0f5d7be9da224edcb5c550492cfc658818fc15.tar.gz netsurf-3f0f5d7be9da224edcb5c550492cfc658818fc15.tar.bz2 |
[project @ 2004-05-12 10:23:07 by rjw]
Interactive help keys made more descriptive.
Message key length increased to 24.
svn path=/import/netsurf/; revision=856
-rw-r--r-- | riscos/help.c | 26 | ||||
-rw-r--r-- | utils/messages.c | 2 | ||||
-rw-r--r-- | utils/messages.h | 2 |
3 files changed, 15 insertions, 15 deletions
diff --git a/riscos/help.c b/riscos/help.c index b82455877..58b2cb7da 100644 --- a/riscos/help.c +++ b/riscos/help.c @@ -22,14 +22,14 @@ /* Current prefixes: - HelpB Browser window - HelpI Iconbar menu - HelpM Browser window menu - HelpT Toolbar window - HelpS Status window - - The prefixes are followed by either the icon number (eg 'HelpT7'), or a series - of numbers representing the menu structure (eg 'HelpM3-1-2'). + HelpBrowser Browser window + HelpIconMenu Iconbar menu + HelpBrowserMenu Browser window menu + HelpToolbar Toolbar window + HelpStatus Status window + + The prefixes are followed by either the icon number (eg 'HelpToolbar7'), or a series + of numbers representing the menu structure (eg 'HelpBrowserMenu3-1-2'). */ static void ro_gui_interactive_help_broadcast(wimp_message *message, char *token); @@ -69,13 +69,13 @@ void ro_gui_interactive_help_request(wimp_message *message) { g = ro_gui_window_lookup(window); if (g) { if (g->window == window) { - sprintf(message_token, "HelpB%i", (int)icon); + sprintf(message_token, "HelpBrowser%i", (int)icon); } else if ((g->data.browser.toolbar) && (g->data.browser.toolbar->toolbar_handle == window)) { - sprintf(message_token, "HelpT%i", (int)icon); + sprintf(message_token, "HelpToolbar%i", (int)icon); } else if ((g->data.browser.toolbar) && (g->data.browser.toolbar->status_handle == window)) { - sprintf(message_token, "HelpS%i", (int)icon); + sprintf(message_token, "HelpStatus%i", (int)icon); } } @@ -96,9 +96,9 @@ void ro_gui_interactive_help_request(wimp_message *message) { /* Set the prefix */ if (current_menu == iconbar_menu) { - sprintf(message_token, "HelpI"); + sprintf(message_token, "HelpIconMenu"); } else if (current_menu == browser_menu) { - sprintf(message_token, "HelpM"); + sprintf(message_token, "HelpBrowserMenu"); } else { return; } diff --git a/utils/messages.c b/utils/messages.c index ae81ad467..4d07a47ef 100644 --- a/utils/messages.c +++ b/utils/messages.c @@ -24,7 +24,7 @@ #define HASH_SIZE 77 /** Maximum length of a key. */ -#define MAX_KEY_LENGTH 16 +#define MAX_KEY_LENGTH 24 /** Entry in the messages hash table. */ struct messages_entry { diff --git a/utils/messages.h b/utils/messages.h index bef380edc..4ca079293 100644 --- a/utils/messages.h +++ b/utils/messages.h @@ -14,7 +14,7 @@ * messages_load() to read the file into memory. To lookup a key, use * messages_get("key"). * - * Only the first MAX_KEY_LENGTH (currently 16) characters of the key are + * Only the first MAX_KEY_LENGTH (currently 24) characters of the key are * significant. */ |