improved spacing for sections

Here is a patch that moves the spacing in and around sections closer to HIG

http://bugzilla.gnome.org/show_bug.cgi?id=576350

Signed-off-by: David Zeuthen <davidz@redhat.com>

6 files changed, 22 insertions, 14 deletions

diff --git a/src/palimpsest/gdu-section-create-partition-table.c b/src/palimpsest/gdu-section-create-partition-table.c
index bbabc7f..932a5a8 100644
--- a/src/palimpsest/gdu-section-create-partition-table.c
+++ b/src/palimpsest/gdu-section-create-partition-table.c
@@ -237,6 +237,8 @@ gdu_section_create_partition_table_init (GduSectionCreatePartitionTable *section
         gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, TRUE, 0);
 
         table = gtk_table_new (4, 2, FALSE);
+        gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+
         gtk_box_pack_start (GTK_BOX (vbox2), table, FALSE, FALSE, 0);
 
         row = 0;
diff --git a/src/palimpsest/gdu-section-filesystem.c b/src/palimpsest/gdu-section-filesystem.c
index ebe5ae2..f15fb22 100644
--- a/src/palimpsest/gdu-section-filesystem.c
+++ b/src/palimpsest/gdu-section-filesystem.c
@@ -254,6 +254,8 @@ gdu_section_filesystem_init (GduSectionFilesystem *section)
         gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, TRUE, 0);
 
         table = gtk_table_new (1, 3, FALSE);
+        gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+
         gtk_box_pack_start (GTK_BOX (vbox2), table, FALSE, FALSE, 0);
 
         row = 0;
diff --git a/src/palimpsest/gdu-section-health.c b/src/palimpsest/gdu-section-health.c
index db54235..f84aafc 100644
--- a/src/palimpsest/gdu-section-health.c
+++ b/src/palimpsest/gdu-section-health.c
@@ -1459,6 +1459,8 @@ gdu_section_health_init (GduSectionHealth *section)
         gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, TRUE, 0);
 
         table = gtk_table_new (4, 2, FALSE);
+        gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+
         gtk_box_pack_start (GTK_BOX (vbox2), table, FALSE, FALSE, 0);
 
         row = 0;
diff --git a/src/palimpsest/gdu-section-partition.c b/src/palimpsest/gdu-section-partition.c
index 5be1549..119484b 100644
--- a/src/palimpsest/gdu-section-partition.c
+++ b/src/palimpsest/gdu-section-partition.c
@@ -532,16 +532,15 @@ gdu_section_partition_init (GduSectionPartition *section)
         gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, TRUE, 0);
 
         table = gtk_table_new (6, 2, FALSE);
+        gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+
         gtk_box_pack_start (GTK_BOX (vbox2), table, FALSE, FALSE, 0);
 
         row = 0;
 
-        table = gtk_table_new (2, 2, FALSE);
-        gtk_box_pack_start (GTK_BOX (vbox2), table, FALSE, FALSE, 0);
-
         /* partition label */
         label = gtk_label_new (NULL);
-        gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+        gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
         gtk_label_set_markup_with_mnemonic (GTK_LABEL (label), _("_Label:"));
         gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1,
                           GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2);
@@ -555,7 +554,7 @@ gdu_section_partition_init (GduSectionPartition *section)
 
         /* partition type */
         label = gtk_label_new (NULL);
-        gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+        gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
         gtk_label_set_markup_with_mnemonic (GTK_LABEL (label), _("Ty_pe:"));
         gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1,
                           GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2);
@@ -571,7 +570,7 @@ gdu_section_partition_init (GduSectionPartition *section)
 
         /* used by mbr, apm */
         check_button = gtk_check_button_new_with_mnemonic (_("_Bootable"));
-        gtk_table_attach (GTK_TABLE (table), check_button, 1, 2, row, row +1,
+        gtk_table_attach (GTK_TABLE (table), check_button, 0, 2, row, row +1,
                           GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2);
         section->priv->modify_part_flag_boot_check_button = check_button;
 
@@ -579,7 +578,7 @@ gdu_section_partition_init (GduSectionPartition *section)
 
         /* used by gpt */
         check_button = gtk_check_button_new_with_mnemonic (_("Required / Firm_ware"));
-        gtk_table_attach (GTK_TABLE (table), check_button, 1, 2, row, row +1,
+        gtk_table_attach (GTK_TABLE (table), check_button, 0, 2, row, row +1,
                           GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2);
         section->priv->modify_part_flag_required_check_button = check_button;
 
diff --git a/src/palimpsest/gdu-section-unrecognized.c b/src/palimpsest/gdu-section-unrecognized.c
index 326e4cc..f4d5975 100644
--- a/src/palimpsest/gdu-section-unrecognized.c
+++ b/src/palimpsest/gdu-section-unrecognized.c
@@ -452,13 +452,15 @@ gdu_section_unrecognized_init (GduSectionUnrecognized *section)
         gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
 
         table = gtk_table_new (2, 2, FALSE);
+        gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+
         gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
 
         row = 0;
 
         /* file system label */
         label = gtk_label_new (NULL);
-        gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+        gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
         gtk_label_set_markup_with_mnemonic (GTK_LABEL (label), _("_Name:"));
         gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1,
                           GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2);
@@ -472,7 +474,7 @@ gdu_section_unrecognized_init (GduSectionUnrecognized *section)
 
         /* type */
         label = gtk_label_new (NULL);
-        gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+        gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
         gtk_label_set_markup_with_mnemonic (GTK_LABEL (label), _("_Type:"));
         gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1,
                           GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2);
@@ -502,7 +504,7 @@ gdu_section_unrecognized_init (GduSectionUnrecognized *section)
                                      _("The selected file system has a concept of file ownership. "
                                        "If checked, the created file system be will be owned by you. "
                                        "If not checked, only the super user can access the file system."));
-        gtk_table_attach (GTK_TABLE (table), check_button, 1, 2, row, row + 1,
+        gtk_table_attach (GTK_TABLE (table), check_button, 0, 2, row, row + 1,
                           GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2);
         section->priv->take_ownership_of_fs_check_button = check_button;
 
@@ -515,7 +517,7 @@ gdu_section_unrecognized_init (GduSectionUnrecognized *section)
                                        "passphrase to be enterered before the file system can be "
                                        "used. May decrease performance and may not be compatible if "
                                        "you use the media on other operating systems."));
-        gtk_table_attach (GTK_TABLE (table), check_button, 1, 2, row, row + 1,
+        gtk_table_attach (GTK_TABLE (table), check_button, 0, 2, row, row + 1,
                           GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2);
         section->priv->encrypt_check_button = check_button;
 
diff --git a/src/palimpsest/gdu-shell.c b/src/palimpsest/gdu-shell.c
index 49e8859..642d295 100644
--- a/src/palimpsest/gdu-shell.c
+++ b/src/palimpsest/gdu-shell.c
@@ -2037,6 +2037,7 @@ create_window (GduShell *shell)
         gtk_container_add (GTK_CONTAINER (treeview_scrolled_window), shell->priv->treeview);
 
         vbox2 = gtk_vbox_new (FALSE, 0);
+        gtk_container_set_border_width (GTK_CONTAINER (vbox2), 12);
 
         /* --- */
         GtkWidget *label;
@@ -2045,7 +2046,7 @@ create_window (GduShell *shell)
         GtkWidget *hbox;
         GtkWidget *image;
 
-        hbox = gtk_hbox_new (FALSE, 10);
+        hbox = gtk_hbox_new (FALSE, 12);
         gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, TRUE, 0);
 
         image = gtk_image_new ();
@@ -2088,9 +2089,9 @@ create_window (GduShell *shell)
 
         /* --- */
 
-        shell->priv->sections_vbox = gtk_vbox_new (FALSE, 8);
+        shell->priv->sections_vbox = gtk_vbox_new (FALSE, 18);
         gtk_container_set_border_width (GTK_CONTAINER (shell->priv->sections_vbox), 8);
-        gtk_box_pack_start (GTK_BOX (vbox2), shell->priv->sections_vbox, TRUE, TRUE, 0);
+        gtk_box_pack_start (GTK_BOX (vbox2), shell->priv->sections_vbox, FALSE, TRUE, 0);
 
 
         /* setup and add horizontal pane */