[frogr] Relayout of the settings dialog, following the same idea of the details dialog.

[Mario Sanchez Prada <msanchez src gnome org>]

commit abd1dc598c35bbbb4cbdb8e66f9a63e20dab4283
Author: Mario Sanchez Prada <msanchez gnome org>
Date:   Thu Aug 8 22:57:39 2013 +0100

    Relayout of the settings dialog, following the same idea of the details dialog.

 src/frogr-details-dialog.c  |   12 ++++++------
 src/frogr-settings-dialog.c |   31 ++++++++++++++-----------------
 2 files changed, 20 insertions(+), 23 deletions(-)
---
diff --git a/src/frogr-details-dialog.c b/src/frogr-details-dialog.c
index 3c5eb55..c286fe7 100644
--- a/src/frogr-details-dialog.c
+++ b/src/frogr-details-dialog.c
@@ -268,11 +268,7 @@ _create_widgets (FrogrDetailsDialog *self)
   internal_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_set_homogeneous (GTK_BOX (internal_hbox), FALSE);
 
-  widget = gtk_radio_button_new_with_mnemonic (NULL, _("_Private"));
-  gtk_box_pack_start (GTK_BOX (internal_hbox), widget, FALSE, FALSE, 0);
-  priv->private_rb = widget;
-
-  widget = gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (priv->private_rb), 
_("P_ublic"));
+  widget = gtk_radio_button_new_with_mnemonic (NULL, _("P_ublic"));
   gtk_box_pack_start (GTK_BOX (internal_hbox), widget, FALSE, FALSE, 0);
   priv->public_rb = widget;
 
@@ -281,6 +277,10 @@ _create_widgets (FrogrDetailsDialog *self)
   private_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_set_homogeneous (GTK_BOX (private_hbox), FALSE);
 
+  widget = gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (priv->public_rb), 
_("_Private"));
+  gtk_box_pack_start (GTK_BOX (private_hbox), widget, FALSE, FALSE, 0);
+  priv->private_rb = widget;
+
   widget = gtk_check_button_new_with_mnemonic (_("_Family"));
   gtk_box_pack_start (GTK_BOX (private_hbox), widget, FALSE, FALSE, 0);
   priv->family_cb = widget;
@@ -292,7 +292,7 @@ _create_widgets (FrogrDetailsDialog *self)
   internal_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_box_set_homogeneous (GTK_BOX (internal_hbox), FALSE);
 
-  gtk_box_pack_start (GTK_BOX (internal_hbox), private_hbox, FALSE, FALSE, 12);
+  gtk_box_pack_start (GTK_BOX (internal_hbox), private_hbox, FALSE, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (visibility_vbox), internal_hbox, FALSE, FALSE, 0);
 
   internal_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
diff --git a/src/frogr-settings-dialog.c b/src/frogr-settings-dialog.c
index 7b860d7..6db3833 100644
--- a/src/frogr-settings-dialog.c
+++ b/src/frogr-settings-dialog.c
@@ -169,7 +169,7 @@ _add_general_page (FrogrSettingsDialog *self, GtkNotebook *notebook)
   GtkWidget *vbox = NULL;
   GtkWidget *box1 = NULL;
   GtkWidget *box2 = NULL;
-  GtkWidget *padding_hbox = NULL;
+  GtkWidget *box3 = NULL;
   GtkWidget *align = NULL;
   GtkWidget *label = NULL;
   GtkWidget *combo = NULL;
@@ -196,28 +196,25 @@ _add_general_page (FrogrSettingsDialog *self, GtkNotebook *notebook)
 
   box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_set_homogeneous (GTK_BOX (box1), FALSE);
-  box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+  box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_box_set_homogeneous (GTK_BOX (box2), FALSE);
 
-  _add_toggleable_item (self, GTK_BOX (box2), NULL, TRUE, _("_Private"), &priv->private_rb);
-  _add_toggleable_item (self, GTK_BOX (box2), GTK_RADIO_BUTTON (priv->private_rb),
-                        FALSE, _("P_ublic"), &priv->public_rb);
+  _add_toggleable_item (self, GTK_BOX (box2), NULL,
+                        TRUE, _("P_ublic"), &priv->public_rb);
 
-  gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, FALSE, 0);
-
-  box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-  gtk_box_set_homogeneous (GTK_BOX (box2), FALSE);
+  box3 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_set_homogeneous (GTK_BOX (box3), FALSE);
 
-  _add_toggleable_item (self, GTK_BOX (box2), NULL, FALSE,
-                        _("Visible to _Family"), &priv->family_cb);
-  _add_toggleable_item (self, GTK_BOX (box2), NULL, FALSE,
-                        _("Visible to F_riends"), &priv->friend_cb);
+  _add_toggleable_item (self, GTK_BOX (box3), GTK_RADIO_BUTTON (priv->public_rb),
+                        FALSE, _("_Private"), &priv->private_rb);
 
-  padding_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  gtk_box_set_homogeneous (GTK_BOX (padding_hbox), FALSE);
+  _add_toggleable_item (self, GTK_BOX (box3), NULL, FALSE,
+                        _("_Family"), &priv->family_cb);
+  _add_toggleable_item (self, GTK_BOX (box3), NULL, FALSE,
+                        _("F_riends"), &priv->friend_cb);
 
-  gtk_box_pack_start (GTK_BOX (padding_hbox), box2, FALSE, FALSE, 12);
-  gtk_box_pack_start (GTK_BOX (box1), padding_hbox, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (box2), box3, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, FALSE, 0);
 
   gtk_box_pack_start (GTK_BOX (vbox), box1, FALSE, FALSE, 0);