More HelpHints, these will work on OS4.1u1 and higher only.

svn path=/trunk/netsurf/; revision=10136

6 files changed, 49 insertions, 7 deletions

diff --git a/!NetSurf/Resources/de/Messages b/!NetSurf/Resources/de/Messages
index 43dbae282..1574e5fbe 100644
--- a/!NetSurf/Resources/de/Messages
+++ b/!NetSurf/Resources/de/Messages
@@ -1261,6 +1261,11 @@ HelpThemeConfig4:Klicken mit AUSWAHL speichert die Einstellungen und schließt d
                                                                                                                                                                                
 HelpThemePConfig:Dieser Dialog zeigt die verfügbaren Themen.|MDas ausgewählte Thema wird bei der Anzeige von Browserfenster, Cookieverwaltung, Hotlist und History eingesetzt.
 
+# HelpHint (tooltip) text
+#
+HelpWebSearch:Web search bar.|MType text and press Return to search using your default search provider.
+HelpAddTab:Tab add button.|MAdds a new blank tab.
+
 
 # Configuration tokens
 # ====================
diff --git a/!NetSurf/Resources/en/Messages b/!NetSurf/Resources/en/Messages
index e645ce149..231926cbc 100644
--- a/!NetSurf/Resources/en/Messages
+++ b/!NetSurf/Resources/en/Messages
@@ -1265,6 +1265,11 @@ HelpThemeConfig4:\Ssave these settings and close the \w.|M\Asave these settings
 
 HelpThemePConfig:This pane shows the available themes.|MThe selected icon theme is used for NetSurf browser \ws, the hotlist, global history and cookie management.
 
+# HelpHint (tooltip) text
+#
+HelpWebSearch:Web search bar.|MType text and press Return to search using your default search provider.
+HelpAddTab:Tab add button.|MAdds a new blank tab.
+
 
 # Configuration tokens
 # ====================
diff --git a/!NetSurf/Resources/fr/Messages b/!NetSurf/Resources/fr/Messages
index 86d6f8b21..6ddbf9d94 100644
--- a/!NetSurf/Resources/fr/Messages
+++ b/!NetSurf/Resources/fr/Messages
@@ -1267,6 +1267,11 @@ HelpThemeConfig4:\Ssauver ces réglages et fermer la fenêtre.|M\Asauver ces ré
 
 HelpThemePConfig:Cette fenêtre indique les thèmes disponibles.|MLe thème de l'icône sélectionnée est utilisée pour les fenêtres de navigation de Netsurf, la liste des favoris et l'historique global.
 
+# HelpHint (tooltip) text
+#
+HelpWebSearch:Web search bar.|MType text and press Return to search using your default search provider.
+HelpAddTab:Tab add button.|MAdds a new blank tab.
+
 
 # Configuration tokens
 # ====================
diff --git a/!NetSurf/Resources/it/Messages b/!NetSurf/Resources/it/Messages
index eac1dd776..3f662a2e0 100755
--- a/!NetSurf/Resources/it/Messages
+++ b/!NetSurf/Resources/it/Messages
@@ -1269,6 +1269,11 @@ HelpThemeConfig4:\Ssave these settings and close the \w.|M\Asave these settings
 
 HelpThemePConfig:This pane shows the available themes.|MThe selected icon theme is used for NetSurf browser \ws, the hotlist, global history and cookie management.
 
+# HelpHint (tooltip) text
+#
+HelpWebSearch:Web search bar.|MType text and press Return to search using your default search provider.
+HelpAddTab:Tab add button.|MAdds a new blank tab.
+
 
 # Configuration tokens
 # ====================
diff --git a/!NetSurf/Resources/nl/Messages b/!NetSurf/Resources/nl/Messages
index e7768d287..da47c0163 100644
--- a/!NetSurf/Resources/nl/Messages
+++ b/!NetSurf/Resources/nl/Messages
@@ -1262,6 +1262,11 @@ HelpThemeConfig4:\Ssave these settings and close the \w.|M\Asave these settings
 
 HelpThemePConfig:This pane shows the available themes.|MThe selected icon theme is used for NetSurf browser \ws, the hotlist and global history.
 
+# HelpHint (tooltip) text
+#
+HelpWebSearch:Web search bar.|MType text and press Return to search using your default search provider.
+HelpAddTab:Tab add button.|MAdds a new blank tab.
+
 
 # Configuration tokens
 # ====================
diff --git a/amiga/gui.c b/amiga/gui.c
index b5e1e5ee4..34a9f8a45 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -2148,6 +2148,7 @@ void ami_toggletabbar(struct gui_window_2 *gwin, bool show)
 		gwin->objects[GID_ADDTAB] = ButtonObject,
 					GA_ID, GID_ADDTAB,
 					GA_RelVerify, TRUE,
+					GA_HintInfo, gwin->helphints[GID_ADDTAB],
 					GA_Text, "+",
 					BUTTON_Transparent, TRUE,
 					BUTTON_RenderImage, gwin->objects[GID_ADDTAB_BM],
@@ -2365,12 +2366,22 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw,
 
 				gwin->shared->svbuffer = AllocVec(2000, MEMF_CLEAR);
 
-				gwin->shared->helphints[GID_BACK] = remove_escape_chars(messages_get("HelpToolbar0"), true);
-				gwin->shared->helphints[GID_FORWARD] = remove_escape_chars(messages_get("HelpToolbar1"), true);
-				gwin->shared->helphints[GID_STOP] = remove_escape_chars(messages_get("HelpToolbar2"), true);
-				gwin->shared->helphints[GID_RELOAD] = remove_escape_chars(messages_get("HelpToolbar3"), true);
-				gwin->shared->helphints[GID_HOME] = remove_escape_chars(messages_get("HelpToolbar4"), true);
-				gwin->shared->helphints[GID_URL] = remove_escape_chars(messages_get("HelpToolbar14"), true);
+				gwin->shared->helphints[GID_BACK] =
+					remove_escape_chars(messages_get("HelpToolbar0"), true);
+				gwin->shared->helphints[GID_FORWARD] =
+					remove_escape_chars(messages_get("HelpToolbar1"), true);
+				gwin->shared->helphints[GID_STOP] =
+					remove_escape_chars(messages_get("HelpToolbar2"), true);
+				gwin->shared->helphints[GID_RELOAD] =
+					remove_escape_chars(messages_get("HelpToolbar3"), true);
+				gwin->shared->helphints[GID_HOME] =
+					remove_escape_chars(messages_get("HelpToolbar4"), true);
+				gwin->shared->helphints[GID_URL] =
+					remove_escape_chars(messages_get("HelpToolbar14"), true);
+				gwin->shared->helphints[GID_SEARCHSTRING] =
+					remove_escape_chars(messages_get("HelpWebSearch"), true);
+				gwin->shared->helphints[GID_ADDTAB] =
+					remove_escape_chars(messages_get("HelpAddTab"), true);
 
 				ami_get_theme_filename(nav_west,"theme_nav_west");
 				ami_get_theme_filename(nav_west_s,"theme_nav_west_s");
@@ -2597,6 +2608,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw,
 									GA_ID,GID_SEARCHSTRING,
                    					STRINGA_TextVal, NULL,
 									GA_RelVerify,TRUE,
+									GA_HintInfo, gwin->shared->helphints[GID_SEARCHSTRING],
 								StringEnd,
 							LayoutEnd,
 							CHILD_WeightedWidth, 0,
@@ -3799,7 +3811,12 @@ void gui_window_set_search_ico(struct content *ico)
 		if((node->Type == AMINS_WINDOW) &&
 			(gwin->bw->browser_window_type == BROWSER_WINDOW_NORMAL))
 		{
-			GetAttr(SPACE_AreaBox, (Object *)gwin->objects[GID_SEARCH_ICON], (ULONG *)&bbox);
+			GetAttr(SPACE_AreaBox, gwin->objects[GID_SEARCH_ICON], (ULONG *)&bbox);
+
+			RefreshSetGadgetAttrs((struct Gadget *)gwin->objects[GID_SEARCH_ICON],
+				gwin->win, NULL,
+				GA_HintInfo, search_web_provider_name(),
+				TAG_DONE);
 
 			EraseRect(gwin->win->RPort, bbox->Left, bbox->Top,
 				bbox->Left+16, bbox->Top+16);