Use 'clicked' rather than 'activated' for the file sel.

2002-04-18  Jody Goldberg <jody@gnome.org>

	* accessibility-keyboard.c (setup_accessX_dialog) : Use 'clicked'
	  rather than 'activated' for the file sel.

2002-04-10  Jody Goldberg <jody@gnome.org>

	* gnome-accessibility-keyboard-properties.glade2 (</) : slim down the
	  tooltips.

4 files changed, 36 insertions, 13 deletions

diff --git a/capplets/accessibility/keyboard/ChangeLog b/capplets/accessibility/keyboard/ChangeLog
index a280badcd..3ce0598a1 100644
--- a/capplets/accessibility/keyboard/ChangeLog
+++ b/capplets/accessibility/keyboard/ChangeLog
@@ -1,3 +1,13 @@
+2002-04-18  Jody Goldberg <jody@gnome.org>
+
+	* accessibility-keyboard.c (setup_accessX_dialog) : Use 'clicked'
+	  rather than 'activated' for the file sel.
+
+2002-04-10  Jody Goldberg <jody@gnome.org>
+
+	* gnome-accessibility-keyboard-properties.glade2 (</) : slim down the
+	  tooltips.
+
 Wed Apr 10 18:02:29 2002  Jonathan Blandford  <jrb@gnome.org>
 
 	* accessibility-keyboard.desktop.in (Exec): s/gnome2/gnome
diff --git a/capplets/accessibility/keyboard/accessibility-keyboard.c b/capplets/accessibility/keyboard/accessibility-keyboard.c
index 4f5c31c3b..355ed0d29 100644
--- a/capplets/accessibility/keyboard/accessibility-keyboard.c
+++ b/capplets/accessibility/keyboard/accessibility-keyboard.c
@@ -488,7 +488,7 @@ setup_accessX_dialog (GConfChangeSet *changeset, gboolean as_dialog)
 	if (as_dialog) {
 		GtkWidget *load_cde = WID ("load_CDE_file");
 		g_signal_connect (G_OBJECT (load_cde),
-			"activate",
+			"clicked",
 			G_CALLBACK (cb_load_CDE_file), toplevel);
 	}
 	return toplevel;
diff --git a/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c b/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c
index 328f7d7ae..b7914dd3f 100644
--- a/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c
+++ b/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c
@@ -37,7 +37,20 @@ dialog_response (GtkWidget *widget,
 		 gint       response_id,
 		 GConfChangeSet *changeset)
 {
-	gtk_main_quit ();
+	if (response_id == GTK_RESPONSE_HELP) {
+		GError *error = NULL;
+
+		/* TODO : get this written */
+		gnome_help_display_desktop (NULL,
+			"accessibility-keyboard",
+			"accessibility-keyboard.xml",
+			"CONFIGURATION", &error);
+		if (error) {
+			g_warning ("help error: %s\n", error->message);
+			g_error_free (error);
+		}
+	} else
+		gtk_main_quit ();
 }
 
 int
diff --git a/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2 b/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2
index 7d31fdc8d..b61820d54 100644
--- a/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2
+++ b/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade2
@@ -5,7 +5,7 @@
 
 <widget class="GtkDialog" id="accessX_dialog">
   <property name="visible">True</property>
-  <property name="title" translatable="yes">Keyboard Accessibility Configuration</property>
+  <property name="title" translatable="yes">Keyboard Accessibility Configuration (AccessX)</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_MOUSE</property>
   <property name="modal">False</property>
@@ -27,7 +27,7 @@
 	  <property name="spacing">10</property>
 
 	  <child>
-	    <widget class="GtkButton" id="help_button1">
+	    <widget class="GtkButton" id="help_button">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
@@ -39,14 +39,14 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkButton" id="ok_button1">
+	    <widget class="GtkButton" id="close_button">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
+	      <property name="label">gtk-close</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">-5</property>
+	      <property name="response_id">-7</property>
 	    </widget>
 	  </child>
 	</widget>
@@ -510,7 +510,7 @@ two keys pressed simultaneously</property>
 		      <child>
 			<widget class="GtkCheckButton" id="stickykeys_enable">
 			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">StickyKeys can benefit users who type with only one finger or who might use a mouth or head mounted-stick.  StickyKeys allows users to perform multiple simultaneous key press operations by pressing the keys in sequence.  For example, if an application requires a user to simultaneously press the 'Ctrl' and 'Tab' key, a StickyKeys user can press the 'Ctrl' key, release it, and then press the 'Tab' key and release it, achieving the same result.</property>
+			  <property name="tooltip" translatable="yes">Perform multiple simultaneous key press operations by pressing modifier keys in sequence.</property>
 			  <property name="can_focus">True</property>
 			  <property name="label" translatable="yes">Enable _Sticky Keys</property>
 			  <property name="use_underline">True</property>
@@ -573,7 +573,7 @@ two keys pressed simultaneously</property>
 		      <child>
 			<widget class="GtkCheckButton" id="togglekeys_enable">
 			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">ToggleKeys can benefit the visually impaired user who has difficulty seeing the small LED keyboard indicators.  ToggleKeys provides one beep when an LED (e.g., the Caps Lock LED) is turned on and two beeps when it is turned off.</property>
+			  <property name="tooltip" translatable="yes">Beep when an LED is turned on and two beeps when one is turned off.</property>
 			  <property name="can_focus">True</property>
 			  <property name="label" translatable="yes">Enable _Toggle Keys</property>
 			  <property name="use_underline">True</property>
@@ -1066,7 +1066,7 @@ two keys pressed simultaneously</property>
 		      <child>
 			<widget class="GtkCheckButton" id="bouncekeys_enable">
 			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">BounceKeys can benefit users who sometimes tremor when they release a key.  BounceKeys instructs the system to ignore all subsequent presses of the SAME key if they happen within a user selectable period of time.</property>
+			  <property name="tooltip" translatable="yes">Ignore all subsequent presses of the SAME key if they happen within a user selectable period of time.</property>
 			  <property name="can_focus">True</property>
 			  <property name="label" translatable="yes">Enable _Bounce Keys</property>
 			  <property name="use_underline">True</property>
@@ -1112,7 +1112,7 @@ two keys pressed simultaneously</property>
 		      <child>
 			<widget class="GtkCheckButton" id="mousekeys_enable">
 			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">MouseKeys can benefit StickyKey users or anyone unable to use the pointing device or in need of 'pixel by pixel' position control of the pointer.  When activated, MouseKeys turns the numeric keypad into a mouse control pad.</property>
+			  <property name="tooltip" translatable="yes">Turn the numeric keypad into a mouse control pad.</property>
 			  <property name="can_focus">True</property>
 			  <property name="label" translatable="yes">Enable _Mouse Keys</property>
 			  <property name="use_underline">True</property>
@@ -1242,7 +1242,7 @@ two keys pressed simultaneously</property>
 		    <widget class="GtkCheckButton" id="feature_state_change_beep">
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">_Beep on state change</property>
+		      <property name="label" translatable="yes">_Beep when enabling/disabling keyboard accessibility features</property>
 		      <property name="use_underline">True</property>
 		      <property name="relief">GTK_RELIEF_NORMAL</property>
 		      <property name="active">False</property>
@@ -1435,7 +1435,7 @@ two keys pressed simultaneously</property>
 	  <child>
 	    <widget class="GtkLabel" id="label20">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_General</property>
+	      <property name="label" translatable="yes">_Misc</property>
 	      <property name="use_underline">True</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>