fix various string and layout issues (bug #521826)

2008-03-27  Jens Granseuer  <jensgr@gmx.net>

	* gnome-keyboard-properties-a11y.c: (setup_a11y_tabs):
	* gnome-keyboard-properties.c: (create_dialog), (setup_dialog):
	* gnome-keyboard-properties.glade: fix various string and layout
	issues (bug #521826)

svn path=/trunk/; revision=8600

4 files changed, 20 insertions, 45 deletions

diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog
index e5c7a238d..aec9a1198 100644
--- a/capplets/keyboard/ChangeLog
+++ b/capplets/keyboard/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-27  Jens Granseuer  <jensgr@gmx.net>
+
+	* gnome-keyboard-properties-a11y.c: (setup_a11y_tabs):
+	* gnome-keyboard-properties.c: (create_dialog), (setup_dialog):
+	* gnome-keyboard-properties.glade: fix various string and layout
+	issues (bug #521826)
+
 2008-03-24  Jens Granseuer  <jensgr@gmx.net>
 
 	* gnome-keyboard-properties.c: (setup_dialog): don't show the typing
diff --git a/capplets/keyboard/gnome-keyboard-properties-a11y.c b/capplets/keyboard/gnome-keyboard-properties-a11y.c
index 6658015b1..3c4fbae86 100644
--- a/capplets/keyboard/gnome-keyboard-properties-a11y.c
+++ b/capplets/keyboard/gnome-keyboard-properties-a11y.c
@@ -183,8 +183,6 @@ setup_a11y_tabs (GladeXML *dialog, GConfChangeSet *changeset)
 {
 	GConfClient *client;
 	GtkWidget *w;
-	GtkLabel *mousekeys_label;
-	gchar *label;
 
 	client = gconf_client_get_default ();
 	gconf_client_add_dir (client, CONFIG_ROOT, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
@@ -242,12 +240,6 @@ setup_a11y_tabs (GladeXML *dialog, GConfChangeSet *changeset)
 			  G_CALLBACK (mousekeys_enable_toggled_cb), dialog);
 	mousekeys_enable_toggled_cb (w, dialog);
 
-	mousekeys_label = GTK_LABEL (GTK_BIN (w)->child);
-	label = g_strconcat ("<b>", gtk_label_get_label (mousekeys_label), "</b>", NULL);
-	gtk_label_set_label (mousekeys_label, label);
-	gtk_label_set_use_markup (mousekeys_label, TRUE);
-	g_free (label);
-
 	gconf_peditor_new_numeric_range (changeset,
 					 CONFIG_ROOT "/mousekeys_accel_time",
 					 WID ("mousekeys_accel_time_slide"),
diff --git a/capplets/keyboard/gnome-keyboard-properties.c b/capplets/keyboard/gnome-keyboard-properties.c
index 31ec91dbf..0bde6c1ce 100644
--- a/capplets/keyboard/gnome-keyboard-properties.c
+++ b/capplets/keyboard/gnome-keyboard-properties.c
@@ -72,19 +72,17 @@ create_dialog (void)
 	size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
 	gtk_size_group_add_widget (size_group, WID ("repeat_delay_scale"));
 	gtk_size_group_add_widget (size_group, WID ("repeat_speed_scale"));
-	gtk_size_group_add_widget (size_group,
-				   WID ("cursor_blink_time_scale"));
+	gtk_size_group_add_widget (size_group, WID ("cursor_blink_time_scale"));
 	g_object_unref (G_OBJECT (size_group));
 
-	image =
-	    gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON);
+	image = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON);
 	gtk_button_set_image (GTK_BUTTON (WID ("xkb_layouts_add")), image);
 
-	image =
-	    gtk_image_new_from_stock (GTK_STOCK_REFRESH,
-				      GTK_ICON_SIZE_BUTTON);
-	gtk_button_set_image (GTK_BUTTON (WID ("xkb_reset_to_defaults")),
-			      image);
+	image = gtk_image_new_from_stock (GTK_STOCK_REFRESH, GTK_ICON_SIZE_BUTTON);
+	gtk_button_set_image (GTK_BUTTON (WID ("xkb_reset_to_defaults")), image);
+
+	image = gtk_image_new_from_icon_name ("gnome-settings-sound", GTK_ICON_SIZE_BUTTON);
+	gtk_button_set_image (GTK_BUTTON (WID ("notifications_button")), image);
 
 	return dialog;
 }
@@ -181,9 +179,6 @@ setup_dialog (GladeXML * dialog, GConfChangeSet * changeset)
 					   WID ("break_postponement_toggle"),
 					   NULL);
 
-		gtk_label_set_use_markup (GTK_LABEL (GTK_BIN (WID ("break_enabled_toggle"))->child),
-					  TRUE);
-
 	} else {
 		/* don't show the typing break tab if the daemon is not available */
 		GtkNotebook *nb = GTK_NOTEBOOK (WID ("keyboard_notebook"));
diff --git a/capplets/keyboard/gnome-keyboard-properties.glade b/capplets/keyboard/gnome-keyboard-properties.glade
index c459e4b18..d85493684 100644
--- a/capplets/keyboard/gnome-keyboard-properties.glade
+++ b/capplets/keyboard/gnome-keyboard-properties.glade
@@ -609,29 +609,10 @@
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="spacing">6</property>
                         <child>
-                          <widget class="GtkLabel" id="label71">
-                            <property name="visible">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">&lt;b&gt;General&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
-                          </widget>
-                        </child>
-                        <child>
                           <widget class="GtkHBox" id="hbox39">
                             <property name="visible">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <child>
-                              <widget class="GtkLabel" id="label72">
-                                <property name="visible">True</property>
-                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="label">    </property>
-                              </widget>
-                              <packing>
-                                <property name="expand">False</property>
-                              </packing>
-                            </child>
-                            <child>
                               <widget class="GtkVBox" id="vbox79">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -641,7 +622,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="label" translatable="yes">_Allow to turn accessibility features on and off from the keyboard</property>
+                                    <property name="label" translatable="yes">_Accessibility features can be toggled with keyboard shortcuts</property>
                                     <property name="use_underline">True</property>
                                     <property name="response_id">0</property>
                                     <property name="draw_indicator">True</property>
@@ -703,7 +684,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="label" translatable="yes">_Simulate simultanous keypresses</property>
+                                    <property name="label" translatable="yes">_Simulate simultaneous keypresses</property>
                                     <property name="use_underline">True</property>
                                     <property name="response_id">0</property>
                                     <property name="draw_indicator">True</property>
@@ -1019,7 +1000,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="label" translatable="yes">_Notifications...</property>
+                            <property name="label" translatable="yes">Audio _Feedback...</property>
                             <property name="use_underline">True</property>
                             <property name="response_id">0</property>
                           </widget>
@@ -1062,7 +1043,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="label" translatable="yes">_Allow to control the pointer using the keyboard</property>
+                            <property name="label" translatable="yes">_Pointer can be controlled using the keypad</property>
                             <property name="use_underline">True</property>
                             <property name="response_id">0</property>
                             <property name="draw_indicator">True</property>
@@ -1339,7 +1320,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="tooltip" translatable="yes">Lock screen after a certain duration to help prevent repetitive keyboard use injuries</property>
-                                <property name="label" translatable="yes">&lt;b&gt;_Lock screen to enforce typing break&lt;/b&gt;</property>
+                                <property name="label" translatable="yes">_Lock screen to enforce typing break</property>
                                 <property name="use_underline">True</property>
                                 <property name="response_id">0</property>
                                 <property name="draw_indicator">True</property>
@@ -1976,7 +1957,7 @@
   <widget class="GtkDialog" id="a11y_notifications_dialog">
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">Keyboard Accessibility Notifications</property>
+    <property name="title" translatable="yes">Keyboard Accessibility Audio Feedback</property>
     <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="has_separator">False</property>