[gnome-control-center] wacom: Add padding around the widgets

[Bastien Nocera <hadess src gnome org>]

commit 4ce3d9f9abc9b1994f04c168614ee510cf42aa8c
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Aug 26 11:18:52 2011 +0100

    wacom: Add padding around the widgets

 panels/wacom/cc-wacom-panel.c          |   23 ++++++++++++++++-------
 panels/wacom/gnome-wacom-properties.ui |    2 --
 2 files changed, 16 insertions(+), 9 deletions(-)
---
diff --git a/panels/wacom/cc-wacom-panel.c b/panels/wacom/cc-wacom-panel.c
index 107db42..3a8601e 100644
--- a/panels/wacom/cc-wacom-panel.c
+++ b/panels/wacom/cc-wacom-panel.c
@@ -382,14 +382,23 @@ cc_wacom_panel_init (CcWacomPanel *self)
 	GtkWidget *grid;
 	GError *error = NULL;
 	GtkComboBox *combo;
+	char *objects[] = {
+		"main-grid",
+		"liststore-tabletmode",
+		"liststore-buttons",
+		"adjustment-tip-feel",
+		"adjustment-eraser-feel",
+		NULL
+	};
 
 	priv = self->priv = WACOM_PANEL_PRIVATE (self);
 
 	priv->builder = gtk_builder_new ();
 
-	gtk_builder_add_from_file (priv->builder,
-			GNOMECC_UI_DIR "/gnome-wacom-properties.ui",
-			&error);
+	gtk_builder_add_objects_from_file (priv->builder,
+					   GNOMECC_UI_DIR "/gnome-wacom-properties.ui",
+					   objects,
+					   &error);
 	if (error != NULL)
 	{
 		g_warning ("Error loading UI file: %s", error->message);
@@ -398,6 +407,10 @@ cc_wacom_panel_init (CcWacomPanel *self)
 		return;
 	}
 
+	grid = WID ("main-grid");
+	gtk_container_add (GTK_CONTAINER (self), grid);
+	gtk_container_set_border_width (GTK_CONTAINER (self), 24);
+
 	priv->wacom_settings  = g_settings_new (WACOM_SCHEMA);
 	priv->stylus_settings = g_settings_new (WACOM_STYLUS_SCHEMA);
 	priv->eraser_settings = g_settings_new (WACOM_ERASER_SCHEMA);
@@ -430,10 +443,6 @@ cc_wacom_panel_init (CcWacomPanel *self)
 
 	gtk_image_set_from_file (GTK_IMAGE (WID ("image-tablet")), PIXMAP_DIR "/wacom-tablet.png");
 	gtk_image_set_from_file (GTK_IMAGE (WID ("image-stylus")), PIXMAP_DIR "/wacom-stylus.png");
-
-	grid = WID ("main-grid");
-
-	gtk_widget_reparent (grid, GTK_WIDGET (self));
 }
 
 void
diff --git a/panels/wacom/gnome-wacom-properties.ui b/panels/wacom/gnome-wacom-properties.ui
index 66b41c2..8f143dd 100644
--- a/panels/wacom/gnome-wacom-properties.ui
+++ b/panels/wacom/gnome-wacom-properties.ui
@@ -80,8 +80,6 @@
     </data>
   </object>
   <object class="GtkDialog" id="wacom_properties_dialog">
-    <property name="width_request">675</property>
-    <property name="height_request">465</property>
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Tablet Preferences</property>