[easytag/wip/preferences-frames: 4/9] Remove extra frame in file settings preferences

[David King <davidk src gnome org>]

commit 014ddf73047da4aff75bb6cd57b9d372e44e78b6
Author: David King <amigadave amigadave com>
Date:   Mon Apr 29 20:20:11 2013 +0100

    Remove extra frame in file settings preferences

 src/prefs.c |   27 ++++++++-------------------
 1 files changed, 8 insertions(+), 19 deletions(-)
---
diff --git a/src/prefs.c b/src/prefs.c
index 58b0040..5d044ea 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -414,21 +414,16 @@ void Open_OptionsWindow (void)
      * File Settings
      */
     Label = gtk_label_new (_("File Settings"));
-    Frame = gtk_frame_new (_("File Settings"));
-    gtk_notebook_append_page (GTK_NOTEBOOK(OptionsNoteBook),Frame,Label);
-    gtk_container_set_border_width(GTK_CONTAINER(Frame),5);
-
-    VBox = gtk_box_new(GTK_ORIENTATION_VERTICAL,2);
-    gtk_container_add(GTK_CONTAINER(Frame),VBox);
-    gtk_container_set_border_width(GTK_CONTAINER(VBox),4);
-
+    VBox = gtk_box_new (GTK_ORIENTATION_VERTICAL, BOX_SPACING);
+    gtk_notebook_append_page (GTK_NOTEBOOK (OptionsNoteBook), VBox, Label);
+    gtk_container_set_border_width (GTK_CONTAINER (VBox), BOX_SPACING);
 
     /* File (name) Options */
     Frame = gtk_frame_new (_("File Options"));
     gtk_box_pack_start(GTK_BOX(VBox),Frame,FALSE,FALSE,0);
-    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL,2);
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, BOX_SPACING);
     gtk_container_add(GTK_CONTAINER(Frame),vbox);
-    gtk_container_set_border_width(GTK_CONTAINER(vbox), 2);
+    gtk_container_set_border_width (GTK_CONTAINER(vbox), BOX_SPACING);
 
     ReplaceIllegalCharactersInFilename = gtk_check_button_new_with_label(_("Replace illegal characters in 
filename (for Windows and CD-Rom)"));
     gtk_box_pack_start(GTK_BOX(vbox),ReplaceIllegalCharactersInFilename,FALSE,FALSE,0);
@@ -438,7 +433,7 @@ void Open_OptionsWindow (void)
         "of the filename to avoid problem when renaming the file. This is useful when renaming the "
         "file from the tag with the scanner."));
 
-    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,2);
+    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, BOX_SPACING);
     gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE,0);
     gtk_container_set_border_width(GTK_CONTAINER(hbox), 2);
     /* Extension case (lower/upper?) */
@@ -484,18 +479,14 @@ void Open_OptionsWindow (void)
     /* Character Set for Filename */
     Frame = gtk_frame_new (_("Character Set for Filename"));
     gtk_box_pack_start(GTK_BOX(VBox),Frame,FALSE,FALSE,0);
-    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL,2);
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, BOX_SPACING);
     gtk_container_add(GTK_CONTAINER(Frame),vbox);
     gtk_container_set_border_width(GTK_CONTAINER(vbox), 2);
 
-    /****hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,2);
-    gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE,0);
-    gtk_container_set_border_width(GTK_CONTAINER(hbox), 2);***/
-
     Table = et_grid_new (4, 2);
     gtk_box_pack_start(GTK_BOX(vbox),Table,FALSE,FALSE,0);
     /*gtk_grid_set_row_spacing (GTK_GRID (Table), 2);*/
-    gtk_grid_set_column_spacing (GTK_GRID (Table), 2);
+    gtk_grid_set_column_spacing (GTK_GRID (Table), 2 * BOX_SPACING);
 
     /* Rules for character set */
     Label = gtk_label_new(_("Rules to apply if some characters can't be converted to "
@@ -503,8 +494,6 @@ void Open_OptionsWindow (void)
     gtk_grid_attach (GTK_GRID (Table), Label, 0, 0, 2, 1);
     gtk_misc_set_alignment(GTK_MISC(Label),0,0.5);
 
-    Label = gtk_label_new("    ");
-    gtk_grid_attach (GTK_GRID (Table), Label, 0, 1, 1, 1);
 
     FilenameCharacterSetOther = gtk_radio_button_new_with_label(NULL,_("Try another "
         "character encoding"));