diff options
| -rw-r--r-- | !NetSurf/Resources/en/Messages | 7 | ||||
| -rw-r--r-- | !NetSurf/Resources/fr/Messages | 7 | ||||
| -rw-r--r-- | riscos/menus.c | 21 |
3 files changed, 23 insertions, 12 deletions
diff --git a/!NetSurf/Resources/en/Messages b/!NetSurf/Resources/en/Messages index a55c65748..fc9dbbfe6 100644 --- a/!NetSurf/Resources/en/Messages +++ b/!NetSurf/Resources/en/Messages @@ -38,7 +38,7 @@ Forward:Forward one page Reload:Reload this page ^R Stop:Stop loading this page View:Display -ScaleView:Scale view +ScaleView:Scale view F11 Images:Images ForeImg:Foreground images BackImg:Background images @@ -63,6 +63,7 @@ WindowReset:Reset default position Utilities:Utilities HotlistAdd:Add to hotlist HotlistShow:Show hotlist F6 +FindText:Find text F4 Help:Help HelpContent:Contents F1 HelpGuide:User guide @@ -210,13 +211,13 @@ HelpToolbar0:\Tback button.|M\Straverse back one page in the history tree.|MDoes HelpToolbar1:\Tforward button.|M\Straverse forward one page in the history tree.|MDoes not resubmit form information. HelpToolbar2:\Tstop button.|M\Sstop loading this page. HelpToolbar3:\Treload button.|M\Sreload this page.|M\Areload this page and any objects it contains. -#HelpToolbar4:\Thome button.|M\Sgo to your home page. +HelpToolbar4:\Thome button.|M\Sgo to your home page. HelpToolbar5:\Thistory button.|M\Sopen the local history \w. HelpToolbar6:\Tsave button.|M\Ssave the current document. #HelpToolbar7:\Tprint button.|M\Sprint this page.|MOpens a print dialogue box. HelpToolbar8:\Thotlist button.|M\Sopen the hotlist management \w.|M\Aadd this address to the hotlist. HelpToolbar9:\Tscale view button.|M\Sscale the page, affecting both text and images. -#HelpToolbar10:\Tsearch button. +HelpToolbar10:\Tsearch button. #HelpToolbar11:\Tup button.|M\Smove up the directory structure. HelpToolbar12:\TURL bar.|MType in the address of a site to visit and press Return to go there. HelpToolbar13:\Tthrobber.|MIt animates while this \w is active. diff --git a/!NetSurf/Resources/fr/Messages b/!NetSurf/Resources/fr/Messages index 901663edc..c46d4a2ca 100644 --- a/!NetSurf/Resources/fr/Messages +++ b/!NetSurf/Resources/fr/Messages @@ -38,7 +38,7 @@ Forward:Avancer Reload:Recharger cette page ^R Stop:Arrêter le chargement de la page View:Affichage -ScaleView:Ajuster la vue +ScaleView:Ajuster la vue F11 Images:Images ForeImg:Images d'avant-plan BackImg:Images de fond @@ -63,6 +63,7 @@ WindowReset:RAZ de la position par défaut Utilities:Utilitaires HotlistAdd:Ajouter aux favoris HotlistShow:Montrer les favoris F6 +FindText:Find text F4 Help:Aide HelpContent:Contenus F1 HelpGuide:Guide de l'utilisateur @@ -210,13 +211,13 @@ HelpToolbar0:\Tback button.|M\Straverse back one page in the history tree.|MDoes HelpToolbar1:\Tforward button.|M\Straverse forward one page in the history tree.|MDoes not resubmit form information. HelpToolbar2:\Tstop button.|M\Sstop loading this page. HelpToolbar3:\Treload button.|M\Sreload this page.|M\Areload this page and any objects it contains. -#HelpToolbar4:\Thome button.|M\Sgo to your home page. +HelpToolbar4:\Thome button.|M\Sgo to your home page. HelpToolbar5:\Thistory button.|M\Sopen the local history \w. HelpToolbar6:\Tsave button.|M\Ssave the current document. #HelpToolbar7:\Tprint button.|M\Sprint this page.|MOpens a print dialogue box. HelpToolbar8:\Thotlist button.|M\Sopen the hotlist management \w.|M\Aadd this address to the hotlist. HelpToolbar9:\Tscale view button.|M\Sscale the page, affecting both text and images. -#HelpToolbar10:\Tsearch button. +HelpToolbar10:\Tsearch button. #HelpToolbar11:\Tup button.|M\Smove up the directory structure. HelpToolbar12:\TURL bar.|MType in the address of a site to visit and press Return to go there. HelpToolbar13:\Tthrobber.|MIt animates while this \w is active. diff --git a/riscos/menus.c b/riscos/menus.c index aa45e9d45..8a5002b3d 100644 --- a/riscos/menus.c +++ b/riscos/menus.c @@ -256,13 +256,13 @@ static wimp_MENU(2) hotlist_util_menu = { /* Utilities submenu */ -static wimp_MENU(2) utilities_menu = { +static wimp_MENU(3) utilities_menu = { { "Utilities" }, 7,2,7,0, 300, 44, 0, { - { 0, (wimp_menu *)&hotlist_util_menu, DEFAULT_FLAGS, { "Hotlist" } }, - { wimp_MENU_GIVE_WARNING | wimp_MENU_LAST, (wimp_menu *)&window_menu, DEFAULT_FLAGS, { "Window" } }, -/* { 0, wimp_NO_SUB_MENU, DEFAULT_FLAGS, { "FindText" } }, - { 0, wimp_NO_SUB_MENU, DEFAULT_FLAGS, { "HistLocal" } }, + { 0, (wimp_menu *)&hotlist_util_menu, DEFAULT_FLAGS, { "Hotlist" } }, + { wimp_MENU_GIVE_WARNING, (wimp_menu *)&window_menu, DEFAULT_FLAGS, { "Window" } }, + { wimp_MENU_GIVE_WARNING | wimp_MENU_LAST, (wimp_menu*)1, DEFAULT_FLAGS, { "FindText" } }, +/* { 0, wimp_NO_SUB_MENU, DEFAULT_FLAGS, { "HistLocal" } }, { wimp_MENU_LAST, wimp_NO_SUB_MENU, DEFAULT_FLAGS, { "HistGlobal" } } */ } }; @@ -938,6 +938,8 @@ void ro_gui_menu_selection(wimp_selection *selection) ro_gui_save_options(); ro_gui_menu_prepare_window(); break; + case 2: /* Find Text -> */ + break; } break; case MENU_HELP: @@ -1170,7 +1172,14 @@ void ro_gui_menu_browser_warning(wimp_message_menu_warning *warning) ro_gui_menu_prepare_window(); error = xwimp_create_sub_menu(browser_window_menu, warning->pos.x, warning->pos.y); - break; + break; + case 2: /* Find text -> */ + ro_gui_search_open(current_gui, + warning->pos.x, + warning->pos.y, + true, + false); + break; } break; case MENU_HELP: /* Help -> */ |