Fixes #154769

2006-01-28  Anilkumar Bacheli <anilkumar.bacheli@wipro.com>

	Fixes #154769

	* gnome-mouse-properties.glade: Modified the glade file so that
	context information for the slider is available to screen reader.
	Also, modified the Slider value label to "microseconds" instead of
	seconds.

	* gnome-mouse-properties.c: Changed the slider label to be in sync with
	speech.

capplets/mouse/ChangeLog

@@ -1,3 +1,15 @@
+2006-01-28  Anilkumar Bacheli <anilkumar.bacheli@wipro.com>
+
+	Fixes #154769
+
+	* gnome-mouse-properties.glade: Modified the glade file so that
+	context information for the slider is available to screen reader.
+	Also, modified the Slider value label to "microseconds" instead of
+	seconds.
+
+	* gnome-mouse-properties.c: Changed the slider label to be in sync with
+	speech.
+	
 2006-01-28  Scott Bronson <bronson@rinspin.com>
 
 	Fixes #318056

capplets/mouse/gnome-mouse-properties.c

@@ -135,7 +135,7 @@ delay_value_changed_cb (GtkWidget *range, GtkScrollType scroll, gdouble value,
 	else if (value > 1000)
 		value = 1000;
 
-	message = g_strdup_printf ("%.1f %s", value / 1000.0, _("seconds"));
+	message = g_strdup_printf ("%d %s", CLAMP ((int) floor ((value+50)/100.0) * 100, 100, 1000), _("microseconds"));
 	gtk_label_set_label ((GtkLabel*) WID ("delay_label"), message);
 	g_free (message);
 
@@ -877,7 +877,7 @@ setup_dialog (GladeXML *dialog, GConfChangeSet *changeset)
 			  G_CALLBACK (event_box_button_press_event), changeset);
 	
 	/* set the timeout value  label with correct value of timeout */
-	message = g_strdup_printf ("%.1f %s", gtk_range_get_value (GTK_RANGE (WID ("delay_scale"))) / 1000.0, _("seconds"));
+	message = g_strdup_printf ("%d %s", (int) gtk_range_get_value (GTK_RANGE (WID ("delay_scale"))), _("microseconds"));
 	gtk_label_set_label ((GtkLabel*) WID ("delay_label"), message);
 	g_free (message); 
 	

capplets/mouse/gnome-mouse-properties.glade

@@ -329,6 +329,9 @@
 				      <property name="width_chars">-1</property>
 				      <property name="single_line_mode">False</property>
 				      <property name="angle">0</property>
+				      <accessibility>
+					    <atkrelation target="delay_scale" type="label-for"/>
+				      </accessibility>
 				    </widget>
 				    <packing>
 				      <property name="padding">0</property>
@@ -337,12 +340,6 @@
 				    </packing>
 				  </child>
 
-				  <child>
-				    <widget class="GtkHBox" id="hbox10">
-				      <property name="visible">True</property>
-				      <property name="homogeneous">False</property>
-				      <property name="spacing">6</property>
-
 				  <child>
 				    <widget class="GtkHScale" id="delay_scale">
 				      <property name="visible">True</property>
@@ -353,6 +350,10 @@
 				      <property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property>
 				      <property name="inverted">False</property>
 				      <property name="adjustment">400 100 1000 100 100 0</property>
+				      <accessibility>
+					    <atkrelation target="label5" type="labelled-by"/>
+					    <atkrelation target="delay_label" type="labelled-by"/>
+				      </accessibility>
 				    </widget>
 				    <packing>
 				      <property name="padding">0</property>
@@ -364,7 +365,7 @@
 				  <child>
 				    <widget class="GtkLabel" id="delay_label">
 				      <property name="visible">True</property>
-					  <property name="label" translatable="yes">seconds</property>
+				      <property name="label" translatable="yes">microseconds</property>
 				      <property name="use_underline">False</property>
 				      <property name="use_markup">False</property>
 				      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -378,6 +379,9 @@
 				      <property name="width_chars">-1</property>
 				      <property name="single_line_mode">False</property>
 				      <property name="angle">0</property>
+				      <accessibility>
+					    <atkrelation target="delay_scale" type="label-for"/>
+				      </accessibility>
 				    </widget>
 				    <packing>
 				      <property name="padding">0</property>
@@ -386,13 +390,6 @@
 				    </packing>
 				  </child>
 				</widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">True</property>
-				      <property name="fill">True</property>
-				    </packing>
-				  </child>
-				</widget>
 				<packing>
 				  <property name="padding">0</property>
 				  <property name="expand">False</property>