Index: gok.glade2
===================================================================
RCS file: /cvs/gnome/gok/gok.glade2,v
retrieving revision 1.7
diff -u -r1.7 gok.glade2
--- gok.glade2	9 Apr 2003 14:26:28 -0000	1.7
+++ gok.glade2	12 May 2003 17:57:41 -0000
@@ -2,6 +2,7 @@
 <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 
 <glade-interface>
+<requires lib="gnome"/>
 
 <widget class="GtkWindow" id="dialogSettings">
   <property name="visible">True</property>
@@ -601,8 +602,8 @@
 		      <property name="xpad">7</property>
 		      <property name="ypad">0</property>
 		      <accessibility>
-			<atkrelation target="radiobuttonTypeSwitch" type="label-for"/>
 			<atkrelation target="radiobuttonTypeValuator" type="label-for"/>
+			<atkrelation target="radiobuttonTypeSwitch" type="label-for"/>
 		      </accessibility>
 		    </widget>
 		    <packing>
@@ -680,405 +681,6 @@
 	      <child>
 		<widget class="GtkHSeparator" id="hseparator6">
 		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox5">
-		      <property name="border_width">5</property>
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox8">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">5</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label18">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Switch Number:</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkRadioButton" id="radiobuttonSwitch1">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Switch _1</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			      <signal name="toggled" handler="on_radiobuttonSwitch1_toggled" last_modification_time="Wed, 02 Oct 2002 16:12:53 GMT"/>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkRadioButton" id="radiobuttonSwitch2">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Switch _2</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			      <property name="group">radiobuttonSwitch1</property>
-			      <signal name="toggled" handler="on_radiobuttonSwitch2_toggled" last_modification_time="Wed, 02 Oct 2002 16:12:46 GMT"/>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkRadioButton" id="radiobuttonSwitch3">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Switch _3</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			      <property name="group">radiobuttonSwitch1</property>
-			      <signal name="toggled" handler="on_radiobuttonSwitch3_toggled" last_modification_time="Wed, 02 Oct 2002 16:12:39 GMT"/>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkRadioButton" id="radiobuttonSwitch4">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Switch _4</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			      <property name="group">radiobuttonSwitch1</property>
-			      <signal name="toggled" handler="on_radiobuttonSwitch4_toggled" last_modification_time="Wed, 02 Oct 2002 16:12:32 GMT"/>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkRadioButton" id="radiobuttonSwitch5">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Switch _5</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			      <property name="group">radiobuttonSwitch1</property>
-			      <signal name="toggled" handler="on_radiobuttonSwitch5_toggled" last_modification_time="Wed, 02 Oct 2002 16:12:16 GMT"/>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox9">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">5</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label19">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Activate When:</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkRadioButton" id="radiobuttonSwitchPress">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Sw_itch Pressed</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			      <signal name="toggled" handler="on_radiobuttonSwitchPress_toggled" last_modification_time="Wed, 02 Oct 2002 19:45:44 GMT"/>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkRadioButton" id="radiobuttonSwitchRelease">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Swi_tch Released</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			      <property name="group">radiobuttonSwitchPress</property>
-			      <signal name="toggled" handler="on_radiobuttonSwitchRelease_toggled" last_modification_time="Wed, 02 Oct 2002 19:51:10 GMT"/>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox10">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">5</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label20">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Switch Dela_y:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">spinSwitchDelay</property>
-			      <accessibility>
-				<atkrelation target="spinSwitchDelay" type="label-for"/>
-			      </accessibility>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkSpinButton" id="spinSwitchDelay">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="climb_rate">1</property>
-			      <property name="digits">0</property>
-			      <property name="numeric">True</property>
-			      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-			      <property name="snap_to_ticks">False</property>
-			      <property name="wrap">False</property>
-			      <property name="adjustment">0 0 3000 10 100 100</property>
-			      <signal name="changed" handler="on_spinSwitchDelay_changed" last_modification_time="Wed, 02 Oct 2002 16:09:47 GMT"/>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label61">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">(100s of a second)</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkVSeparator" id="vseparator3">
-			      <property name="visible">True</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">5</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="labelInputDeviceName">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Input Device Name:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">6</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">comboInputDeviceName</property>
-			      <accessibility>
-				<atkrelation target="comboInputDevice" type="label-for"/>
-			      </accessibility>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkCombo" id="comboInputDevice">
-			      <property name="visible">True</property>
-			      <property name="value_in_list">False</property>
-			      <property name="allow_empty">True</property>
-			      <property name="case_sensitive">False</property>
-			      <property name="enable_arrow_keys">True</property>
-			      <property name="enable_arrows_always">False</property>
-			      <accessibility>
-				<atkproperty name="AtkObject::accessible_name" translatable="yes">ComboInputDevice</atkproperty>
-				<atkproperty name="AtkObject::accessible_description" translatable="yes">Select the input device from this list</atkproperty>
-				<atkrelation target="labelInputDeviceName" type="labelled-by"/>
-			      </accessibility>
-
-			      <child internal-child="entry">
-				<widget class="GtkEntry" id="comboInputDeviceName">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="editable">True</property>
-				  <property name="visibility">True</property>
-				  <property name="max_length">0</property>
-				  <property name="text" translatable="yes"></property>
-				  <property name="has_frame">True</property>
-				  <property name="invisible_char" translatable="yes">*</property>
-				  <property name="activates_default">False</property>
-				  <accessibility>
-				    <atkproperty name="AtkObject::accessible_name" translatable="yes">input device entry</atkproperty>
-				    <atkproperty name="AtkObject::accessible_description" translatable="yes">Text entry field for input device name.</atkproperty>
-				  </accessibility>
-				  <signal name="changed" handler="on_entry_input_device_changed" last_modification_time="Tue, 10 Dec 2002 13:42:37 GMT"/>
-				</widget>
-			      </child>
-
-			      <child internal-child="list">
-				<widget class="GtkList" id="combo-list11">
-				  <property name="visible">True</property>
-				  <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-				</widget>
-			      </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">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label14">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Switch</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="type">label_item</property>
-		    </packing>
-		  </child>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
@@ -2914,15 +2516,10 @@
       </child>
 
       <child>
-	<widget class="GtkHBox" id="hboxStockButtons">
-	  <property name="border_width">5</property>
+	<widget class="GtkHButtonBox" id="hboxStockButtons">
 	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
+	  <property name="layout_style">GTK_BUTTONBOX_END</property>
 	  <property name="spacing">0</property>
-
-	  <child>
-	    <placeholder/>
-	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
Index: gok/gok-settings-dialog.c
===================================================================
RCS file: /cvs/gnome/gok/gok/gok-settings-dialog.c,v
retrieving revision 1.20
diff -u -r1.20 gok-settings-dialog.c
--- gok/gok-settings-dialog.c	15 Oct 2002 15:41:30 -0000	1.20
+++ gok/gok-settings-dialog.c	12 May 2003 17:57:41 -0000
@@ -95,6 +95,8 @@
 		return FALSE;
 	}
 
+	gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_END);
+
 #if GTK_MAJOR_VERSION < 2
 #if GTK_MINOR_VERSION < 3
 /* these calls can be used only on GTK 1.2 and below */
@@ -120,7 +122,22 @@
 	pButtonHelp = gtk_button_new_from_stock (GTK_STOCK_HELP);
 #endif
 
-	gtk_button_set_label (GTK_BUTTON(pButtonTry), "Try");
+	gtk_widget_ref (pButtonHelp);
+	gtk_object_set_data_full (GTK_OBJECT (m_pWindowSettings), "pButtonHelp", pButtonHelp,
+	                            (GtkDestroyNotify) gtk_widget_unref);
+	gtk_widget_show (pButtonHelp);
+	gtk_box_pack_start (GTK_BOX (hbuttonbox), pButtonHelp, FALSE, FALSE, 10);
+#ifndef EARLY_GTK_VERSION
+	gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (hbuttonbox), pButtonHelp, TRUE);
+#endif
+	GTK_WIDGET_SET_FLAGS (pButtonHelp, GTK_CAN_DEFAULT);
+	gtk_tooltips_set_tip (tooltips, pButtonHelp, _("display user help"), NULL);
+
+	gtk_signal_connect (GTK_OBJECT (pButtonHelp), "clicked",
+                      GTK_SIGNAL_FUNC (on_button_help),
+                      NULL);
+	
+	gtk_button_set_label (GTK_BUTTON(pButtonTry), "_Try");
 /*	gtk_button_set_use_stock (GTK_BUTTON(pButtonTry), TRUE); */
 
 	gtk_widget_ref (pButtonTry);
@@ -147,19 +164,6 @@
                       GTK_SIGNAL_FUNC (on_button_revert),
                       NULL);
 
-	gtk_widget_ref (pButtonOK);
-	gtk_object_set_data_full (GTK_OBJECT (m_pWindowSettings), "pButtonOK", pButtonOK,
-	                            (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (pButtonOK);
-
-	gtk_box_pack_start (GTK_BOX (hbuttonbox), pButtonOK, FALSE, FALSE, 10);
-	GTK_WIDGET_SET_FLAGS (pButtonOK, GTK_CAN_DEFAULT);
-	gtk_tooltips_set_tip (tooltips, pButtonOK, _("use these settings"), NULL);
-
-	gtk_signal_connect (GTK_OBJECT (pButtonOK), "clicked",
-                      GTK_SIGNAL_FUNC (on_button_ok),
-                      NULL);
-
 	gtk_widget_ref (pButtonCancel);
 	gtk_object_set_data_full (GTK_OBJECT (m_pWindowSettings), "pButtonCancel", pButtonCancel,
 	                            (GtkDestroyNotify) gtk_widget_unref);
@@ -172,19 +176,20 @@
 	gtk_signal_connect (GTK_OBJECT (pButtonCancel), "clicked",
                       GTK_SIGNAL_FUNC (on_button_cancel),
                       NULL);
-	
-	gtk_widget_ref (pButtonHelp);
-	gtk_object_set_data_full (GTK_OBJECT (m_pWindowSettings), "pButtonHelp", pButtonHelp,
+
+	gtk_widget_ref (pButtonOK);
+	gtk_object_set_data_full (GTK_OBJECT (m_pWindowSettings), "pButtonOK", pButtonOK,
 	                            (GtkDestroyNotify) gtk_widget_unref);
-	gtk_widget_show (pButtonHelp);
-	gtk_box_pack_start (GTK_BOX (hbuttonbox), pButtonHelp, FALSE, FALSE, 10);
+	gtk_widget_show (pButtonOK);
 
-	GTK_WIDGET_SET_FLAGS (pButtonHelp, GTK_CAN_DEFAULT);
-	gtk_tooltips_set_tip (tooltips, pButtonHelp, _("display user help"), NULL);
+	gtk_box_pack_start (GTK_BOX (hbuttonbox), pButtonOK, FALSE, FALSE, 10);
+	GTK_WIDGET_SET_FLAGS (pButtonOK, GTK_CAN_DEFAULT);
+	gtk_tooltips_set_tip (tooltips, pButtonOK, _("use these settings"), NULL);
 
-	gtk_signal_connect (GTK_OBJECT (pButtonHelp), "clicked",
-                      GTK_SIGNAL_FUNC (on_button_help),
+	gtk_signal_connect (GTK_OBJECT (pButtonOK), "clicked",
+                      GTK_SIGNAL_FUNC (on_button_ok),
                       NULL);
+
 	
 	/* show/hide the settings dialog */
 	if (bShow == TRUE)
