[gnome-control-center] wacom: set margin directly on the navigation button label

[Cosimo Cecchi <cosimoc src gnome org>]

commit 5dec19e907dd5e380e4a73d01a78b834411b4302
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Jan 23 11:37:01 2012 -0500

    wacom: set margin directly on the navigation button label
    
    Instead of setting it in the main label for each UI file. This ensures
    the navigation button is automatically made bigger inside the grid.

 panels/wacom/cc-wacom-nav-button.c     |    9 +++++++--
 panels/wacom/gnome-wacom-properties.ui |    1 -
 panels/wacom/wacom-stylus-page.ui      |    2 --
 3 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/panels/wacom/cc-wacom-nav-button.c b/panels/wacom/cc-wacom-nav-button.c
index 6a634d0..abcba52 100644
--- a/panels/wacom/cc-wacom-nav-button.c
+++ b/panels/wacom/cc-wacom-nav-button.c
@@ -218,6 +218,11 @@ cc_wacom_nav_button_init (CcWacomNavButton *self)
 	/* Label */
 	priv->label = gtk_label_new (NULL);
 	gtk_style_context_add_class (gtk_widget_get_style_context (priv->label), "dim-label");
+	g_object_set (priv->label,
+		      "margin-top", 16,
+		      "margin-bottom", 16,
+		      NULL);
+
 	gtk_box_pack_start (GTK_BOX (self), priv->label,
 			    FALSE, FALSE, 8);
 
@@ -233,7 +238,7 @@ cc_wacom_nav_button_init (CcWacomNavButton *self)
 	gtk_container_add (GTK_CONTAINER (priv->prev), image);
 	g_signal_connect (G_OBJECT (priv->prev), "clicked",
 			  G_CALLBACK (prev_clicked), self);
-	gtk_widget_set_valign (priv->prev, GTK_ALIGN_START);
+	gtk_widget_set_valign (priv->prev, GTK_ALIGN_CENTER);
 
 	/* Next button */
 	priv->next = gtk_button_new ();
@@ -241,7 +246,7 @@ cc_wacom_nav_button_init (CcWacomNavButton *self)
 	gtk_container_add (GTK_CONTAINER (priv->next), image);
 	g_signal_connect (G_OBJECT (priv->next), "clicked",
 			  G_CALLBACK (next_clicked), self);
-	gtk_widget_set_valign (priv->next, GTK_ALIGN_START);
+	gtk_widget_set_valign (priv->next, GTK_ALIGN_CENTER);
 
 	gtk_box_pack_start (GTK_BOX (box), priv->prev,
 			    FALSE, FALSE, 0);
diff --git a/panels/wacom/gnome-wacom-properties.ui b/panels/wacom/gnome-wacom-properties.ui
index b4fcaa1..5d6077a 100644
--- a/panels/wacom/gnome-wacom-properties.ui
+++ b/panels/wacom/gnome-wacom-properties.ui
@@ -269,7 +269,6 @@
                     <property name="halign">start</property>
                     <property name="valign">center</property>
                     <property name="margin_left">10</property>
-                    <property name="margin_bottom">16</property>
                     <property name="label" translatable="yes">Wacom Tablet</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
diff --git a/panels/wacom/wacom-stylus-page.ui b/panels/wacom/wacom-stylus-page.ui
index 29be4fd..cf11896 100644
--- a/panels/wacom/wacom-stylus-page.ui
+++ b/panels/wacom/wacom-stylus-page.ui
@@ -303,8 +303,6 @@
         <property name="halign">start</property>
         <property name="valign">center</property>
         <property name="margin_left">10</property>
-        <property name="margin_top">16</property>
-        <property name="margin_bottom">16</property>
         <property name="label" translatable="yes">Stylus</property>
         <attributes>
           <attribute name="weight" value="bold"/>