Add tooltips to the zoom controls, make menu tooltips consistent with and

2008-07-21  Christian Neumair  <cneumair@gnome.org>

	* src/nautilus-window-menus.c:
	* src/nautilus-zoom-control.c
	(nautilus_zoom_control_instance_init):
	Add tooltips to the zoom controls, make menu tooltips consistent with
	and a11y description consistent with Epiphany. Related to #543935.
	Thanks to Diego Escalante Urrelo.

svn path=/trunk/; revision=14385

3 files changed, 21 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 874223c4f..433a10106 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2008-07-21  Christian Neumair  <cneumair@gnome.org>
 
+	* src/nautilus-window-menus.c:
+	* src/nautilus-zoom-control.c
+	(nautilus_zoom_control_instance_init):
+	Add tooltips to the zoom controls, make menu tooltips consistent with
+	and a11y description consistent with Epiphany. Related to #543935.
+	Thanks to Diego Escalante Urrelo.
+
+2008-07-21  Christian Neumair  <cneumair@gnome.org>
+
 	* src/file-manager/fm-icon-view.c (fm_icon_view_register),
 	(fm_compact_view_register):
 	* src/file-manager/fm-icon-view.h:
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index 28aecb19b..cca53ae94 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -827,7 +827,7 @@ static const GtkActionEntry main_entries[] = {
                                  G_CALLBACK (action_about_nautilus_callback) },
   /* name, stock id */         { "Zoom In", GTK_STOCK_ZOOM_IN,
   /* label, accelerator */       N_("Zoom _In"), "<control>plus",
-  /* tooltip */                  N_("Show the contents in more detail"),
+  /* tooltip */                  N_("Increase the view size"),
                                  G_CALLBACK (action_zoom_in_callback) },
   /* name, stock id */         { "ZoomInAccel", NULL,
   /* label, accelerator */       "ZoomInAccel", "<control>equal",
@@ -839,7 +839,7 @@ static const GtkActionEntry main_entries[] = {
                                  G_CALLBACK (action_zoom_in_callback) },
   /* name, stock id */         { "Zoom Out", GTK_STOCK_ZOOM_OUT,
   /* label, accelerator */       N_("Zoom _Out"), "<control>minus",
-  /* tooltip */                  N_("Show the contents in less detail"),
+  /* tooltip */                  N_("Decrease the view size"),
                                  G_CALLBACK (action_zoom_out_callback) },
   /* name, stock id */         { "ZoomOutAccel", NULL,
   /* label, accelerator */       "ZoomOutAccel", "<control>KP_Subtract",
@@ -847,7 +847,7 @@ static const GtkActionEntry main_entries[] = {
                                  G_CALLBACK (action_zoom_out_callback) },
   /* name, stock id */         { "Zoom Normal", GTK_STOCK_ZOOM_100,
   /* label, accelerator */       N_("Normal Si_ze"), "<control>0",
-  /* tooltip */                  N_("Show the contents at the normal size"),
+  /* tooltip */                  N_("Use the normal view size"),
                                  G_CALLBACK (action_zoom_normal_callback) },
   /* name, stock id */         { "Connect to Server", NULL, 
   /* label, accelerator */       N_("Connect to _Server..."), NULL,
diff --git a/src/nautilus-zoom-control.c b/src/nautilus-zoom-control.c
index 3e3ad389d..397c13ce4 100644
--- a/src/nautilus-zoom-control.c
+++ b/src/nautilus-zoom-control.c
@@ -89,9 +89,9 @@ static const int nautilus_zoom_control_accessible_action_signals[] = {
 };
 
 static const char * const nautilus_zoom_control_accessible_action_descriptions[] = {
-	N_("Show the contents in more detail"),
-	N_("Show the contents in less detail"),
-	N_("Show in the default detail level"),
+	N_("Increase the view size"),
+	N_("Decrease the view size"),
+	N_("Use the normal view size")
 };
 
 static GtkMenu *create_zoom_menu (NautilusZoomControl *zoom_control);
@@ -292,6 +292,8 @@ nautilus_zoom_control_instance_init (NautilusZoomControl *zoom_control)
 	gtk_button_set_focus_on_click (GTK_BUTTON (zoom_control->details->zoom_out), FALSE);
 	gtk_button_set_relief (GTK_BUTTON (zoom_control->details->zoom_out),
 			       GTK_RELIEF_NONE);
+	gtk_widget_set_tooltip_text (zoom_control->details->zoom_out,
+				     _("Decrease the view size"));
 	g_signal_connect (G_OBJECT (zoom_control->details->zoom_out),
 			  "clicked", G_CALLBACK (zoom_out_clicked),
 			  zoom_control);
@@ -303,6 +305,8 @@ nautilus_zoom_control_instance_init (NautilusZoomControl *zoom_control)
 	gtk_button_set_focus_on_click (GTK_BUTTON (zoom_control->details->zoom_button), FALSE);
 	gtk_button_set_relief (GTK_BUTTON (zoom_control->details->zoom_button),
 			       GTK_RELIEF_NONE);
+	gtk_widget_set_tooltip_text (zoom_control->details->zoom_button,
+				     _("Use the normal view size"));
 			       
 	gtk_widget_add_events (GTK_WIDGET (zoom_control->details->zoom_button),
 			       GDK_BUTTON_PRESS_MASK
@@ -339,6 +343,8 @@ nautilus_zoom_control_instance_init (NautilusZoomControl *zoom_control)
 	gtk_button_set_focus_on_click (GTK_BUTTON (zoom_control->details->zoom_in), FALSE);
 	gtk_button_set_relief (GTK_BUTTON (zoom_control->details->zoom_in),
 			       GTK_RELIEF_NONE);
+	gtk_widget_set_tooltip_text (zoom_control->details->zoom_in,
+				     _("Increase the view size"));
 	g_signal_connect (G_OBJECT (zoom_control->details->zoom_in),
 			  "clicked", G_CALLBACK (zoom_in_clicked),
 			  zoom_control);