A Pile of pending patches

3 files changed, 54 insertions, 13 deletions

diff --git a/capplets/accessibility/keyboard/ChangeLog b/capplets/accessibility/keyboard/ChangeLog
index 0321ca913..d60d35314 100644
--- a/capplets/accessibility/keyboard/ChangeLog
+++ b/capplets/accessibility/keyboard/ChangeLog
@@ -1,3 +1,11 @@
+2002-08-05  Jody Goldberg <jody@gnome.org>
+
+	* gnome-accessibility-keyboard-properties.glade : Restore the master
+	  toggle.
+
+	* accessibility-keyboard.c (setup_dialog) : support the master toggle.
+	(cb_master_enable_toggle) : new.
+
 2002-08-01  jacob berkman  <jacob@ximian.com>
 
 	* accessibility-keyboard.c (setup_accessX_dialog): fix widget name
diff --git a/capplets/accessibility/keyboard/accessibility-keyboard.c b/capplets/accessibility/keyboard/accessibility-keyboard.c
index c6d5fbdcc..286ba7bdb 100644
--- a/capplets/accessibility/keyboard/accessibility-keyboard.c
+++ b/capplets/accessibility/keyboard/accessibility-keyboard.c
@@ -227,8 +227,26 @@ cb_launch_keyboard_capplet (GtkButton *button, GtkWidget *dialog)
 }
 
 static void
+cb_master_enable_toggle (GtkToggleButton *btn, GladeXML *dialog)
+{
+	int i = G_N_ELEMENTS (features);
+	gboolean flag = gtk_toggle_button_get_active (btn);
+
+	while (i-- > 0)
+		gtk_widget_set_sensitive (WID (features [i].checkbox), flag);
+}
+
+static void
 setup_dialog (GladeXML *dialog, GConfChangeSet *changeset)
 {
+	GtkWidget *master_enable = WID ("master_enable");
+	g_signal_connect (master_enable,
+		"toggled",
+		G_CALLBACK (cb_master_enable_toggle), dialog);
+	gconf_peditor_new_boolean (changeset,
+		CONFIG_ROOT "/enable",
+		GTK_WIDGET (master_enable), NULL);
+
 	setup_images (dialog);
 	setup_ranges (dialog, changeset);
 	setup_toggles (dialog, changeset);
diff --git a/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade b/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade
index f80b7c03b..dc393bea7 100644
--- a/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade
+++ b/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.glade
@@ -15,16 +15,13 @@
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox1">
-      <property name="border_width">2</property>
       <property name="homogeneous">False</property>
       <property name="spacing">0</property>
 
       <child internal-child="action_area">
 	<widget class="GtkHButtonBox" id="dialog-action_area1">
-	  <property name="border_width">5</property>
 	  <property name="visible">True</property>
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-	  <property name="spacing">10</property>
 
 	  <child>
 	    <widget class="GtkButton" id="help_button">
@@ -507,9 +504,9 @@ two keys pressed simultaneously</property>
 			  <property name="wrap">False</property>
 			  <property name="adjustment">1 0 100 1 10 10</property>
 			  <accessibility>
-			    <atkrelation target="slowkeys_title" type="labelled-by"/>
-			    <atkrelation target="slowkeys_label" type="labelled-by"/>
 			    <atkrelation target="slowkeys_delay_slide" type="controlled-by"/>
+			    <atkrelation target="slowkeys_label" type="labelled-by"/>
+			    <atkrelation target="slowkeys_title" type="labelled-by"/>
 			  </accessibility>
 			</widget>
 			<packing>
@@ -786,9 +783,9 @@ two keys pressed simultaneously</property>
 			  <property name="wrap">False</property>
 			  <property name="adjustment">1 0 100 1 10 10</property>
 			  <accessibility>
-			    <atkrelation target="bouncekeys_title" type="labelled-by"/>
-			    <atkrelation target="bouncekeys_label" type="labelled-by"/>
 			    <atkrelation target="bouncekeys_delay_slide" type="controlled-by"/>
+			    <atkrelation target="bouncekeys_label" type="labelled-by"/>
+			    <atkrelation target="bouncekeys_title" type="labelled-by"/>
 			  </accessibility>
 			</widget>
 			<packing>
@@ -1018,9 +1015,9 @@ two keys pressed simultaneously</property>
 		      <property name="wrap">False</property>
 		      <property name="adjustment">1 0 100 1 10 10</property>
 		      <accessibility>
-			<atkrelation target="mousekeys_accel_time_slide" type="controlled-by"/>
-			<atkrelation target="mousekeys_max_speed_title" type="labelled-by"/>
 			<atkrelation target="mousekeys_max_speed_label" type="labelled-by"/>
+			<atkrelation target="mousekeys_max_speed_title" type="labelled-by"/>
+			<atkrelation target="mousekeys_accel_time_slide" type="controlled-by"/>
 		      </accessibility>
 		    </widget>
 		    <packing>
@@ -1095,9 +1092,9 @@ two keys pressed simultaneously</property>
 		      <property name="wrap">False</property>
 		      <property name="adjustment">1 0 100 1 10 10</property>
 		      <accessibility>
-			<atkrelation target="mousekeys_init_delay_slide" type="controlled-by"/>
-			<atkrelation target="mousekeys_init_delay_title" type="labelled-by"/>
 			<atkrelation target="mousekeys_init_delay_label" type="labelled-by"/>
+			<atkrelation target="mousekeys_init_delay_title" type="labelled-by"/>
+			<atkrelation target="mousekeys_init_delay_slide" type="controlled-by"/>
 		      </accessibility>
 		    </widget>
 		    <packing>
@@ -1121,9 +1118,9 @@ two keys pressed simultaneously</property>
 		      <property name="wrap">False</property>
 		      <property name="adjustment">1 0 100 1 10 10</property>
 		      <accessibility>
-			<atkrelation target="mousekeys_max_speed_slide" type="controlled-by"/>
-			<atkrelation target="mousekeys_accel_time_title" type="labelled-by"/>
 			<atkrelation target="mousekeys_accel_time_label" type="labelled-by"/>
+			<atkrelation target="mousekeys_accel_time_title" type="labelled-by"/>
+			<atkrelation target="mousekeys_max_speed_slide" type="controlled-by"/>
 		      </accessibility>
 		    </widget>
 		    <packing>
@@ -1271,6 +1268,24 @@ two keys pressed simultaneously</property>
 		  <property name="spacing">10</property>
 
 		  <child>
+		    <widget class="GtkCheckButton" id="master_enable">
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="label" translatable="yes">_Enable keyboard accessibility</property>
+		      <property name="use_underline">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="active">True</property>
+		      <property name="inconsistent">False</property>
+		      <property name="draw_indicator">True</property>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
 		    <widget class="GtkAlignment" id="alignment3">
 		      <property name="visible">True</property>
 		      <property name="xalign">0</property>