changeset 2724:2e28d949789d

Swapped OK and Cancel button positions to conform bit more to "Gtk+2 style" and Gnome HIG (eww).

--- a/src/sid/xmms-sid.glade	Sat Jun 21 08:28:35 2008 +0300
+++ b/src/sid/xmms-sid.glade	Sat Jun 21 13:57:01 2008 +0300
@@ -3252,6 +3252,20 @@
 	  <property name="spacing">8</property>
 
 	  <child>
+	    <widget class="GtkButton" id="cfg_cancel">
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Cancel any changes</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-cancel</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <signal name="clicked" handler="xs_cfg_cancel"/>
+	    </widget>
+	  </child>
+
+	  <child>
 	    <widget class="GtkButton" id="cfg_ok">
 	      <property name="visible">True</property>
 	      <property name="tooltip" translatable="yes">Accept and update changes</property>
@@ -3264,20 +3278,6 @@
 	      <signal name="clicked" handler="xs_cfg_ok"/>
 	    </widget>
 	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="cfg_cancel">
-	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Cancel any changes</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <signal name="clicked" handler="xs_cfg_cancel"/>
-	    </widget>
-	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>

--- a/src/sid/xs_interface.c	Sat Jun 21 08:28:35 2008 +0300
+++ b/src/sid/xs_interface.c	Sat Jun 21 13:57:01 2008 +0300
@@ -222,8 +222,8 @@
   GtkWidget *label18;
   GtkWidget *w_label3;
   GtkWidget *hbuttonbox1;
+  GtkWidget *cfg_cancel;
   GtkWidget *cfg_ok;
-  GtkWidget *cfg_cancel;
   GtkTooltips *tooltips;
 
   tooltips = gtk_tooltips_new ();
@@ -1312,6 +1312,13 @@
   gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox1), GTK_BUTTONBOX_END);
   gtk_box_set_spacing (GTK_BOX (hbuttonbox1), 8);
 
+  cfg_cancel = gtk_button_new_from_stock ("gtk-cancel");
+  gtk_widget_set_name (cfg_cancel, "cfg_cancel");
+  gtk_widget_show (cfg_cancel);
+  gtk_container_add (GTK_CONTAINER (hbuttonbox1), cfg_cancel);
+  GTK_WIDGET_SET_FLAGS (cfg_cancel, GTK_CAN_DEFAULT);
+  gtk_tooltips_set_tip (tooltips, cfg_cancel, _("Cancel any changes"), NULL);
+
   cfg_ok = gtk_button_new_from_stock ("gtk-ok");
   gtk_widget_set_name (cfg_ok, "cfg_ok");
   gtk_widget_show (cfg_ok);
@@ -1319,13 +1326,6 @@
   GTK_WIDGET_SET_FLAGS (cfg_ok, GTK_CAN_DEFAULT);
   gtk_tooltips_set_tip (tooltips, cfg_ok, _("Accept and update changes"), NULL);
 
-  cfg_cancel = gtk_button_new_from_stock ("gtk-cancel");
-  gtk_widget_set_name (cfg_cancel, "cfg_cancel");
-  gtk_widget_show (cfg_cancel);
-  gtk_container_add (GTK_CONTAINER (hbuttonbox1), cfg_cancel);
-  GTK_WIDGET_SET_FLAGS (cfg_cancel, GTK_CAN_DEFAULT);
-  gtk_tooltips_set_tip (tooltips, cfg_cancel, _("Cancel any changes"), NULL);
-
   g_signal_connect ((gpointer) xs_configwin, "delete_event",
                     G_CALLBACK (xs_configwin_delete),
                     NULL);
@@ -1395,12 +1395,12 @@
   g_signal_connect ((gpointer) cfg_hvsc_browse, "clicked",
                     G_CALLBACK (xs_cfg_hvsc_browse),
                     NULL);
+  g_signal_connect ((gpointer) cfg_cancel, "clicked",
+                    G_CALLBACK (xs_cfg_cancel),
+                    NULL);
   g_signal_connect ((gpointer) cfg_ok, "clicked",
                     G_CALLBACK (xs_cfg_ok),
                     NULL);
-  g_signal_connect ((gpointer) cfg_cancel, "clicked",
-                    G_CALLBACK (xs_cfg_cancel),
-                    NULL);
 
   /* Store pointers to all widgets, for use by lookup_widget(). */
   GLADE_HOOKUP_OBJECT_NO_REF (xs_configwin, xs_configwin, "xs_configwin");
@@ -1582,8 +1582,8 @@
   GLADE_HOOKUP_OBJECT (xs_configwin, label18, "label18");
   GLADE_HOOKUP_OBJECT (xs_configwin, w_label3, "w_label3");
   GLADE_HOOKUP_OBJECT (xs_configwin, hbuttonbox1, "hbuttonbox1");
+  GLADE_HOOKUP_OBJECT (xs_configwin, cfg_cancel, "cfg_cancel");
   GLADE_HOOKUP_OBJECT (xs_configwin, cfg_ok, "cfg_ok");
-  GLADE_HOOKUP_OBJECT (xs_configwin, cfg_cancel, "cfg_cancel");
   GLADE_HOOKUP_OBJECT_NO_REF (xs_configwin, tooltips, "tooltips");
 
   return xs_configwin;