some adjustments to the spacing in the import/interthread progress window, and preparation for more uniform HiG-style spacing everywhere; fix multiply-packed boxes in sfdb_ui.cc

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3340 d708f5d6-7413-0410-9779-e7cbd77b26cf

5 files changed, 23 insertions, 12 deletions

diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
index 6a650a500c..35d5dcd2ca 100644
--- a/gtk2_ardour/editor_audio_import.cc
+++ b/gtk2_ardour/editor_audio_import.cc
@@ -885,7 +885,7 @@ Editor::import_progress_timeout (void *arg)
 		interthread_progress_window->show_all ();
 		reset = true;
 	}
-
+	
 	interthread_progress_label.set_text (import_status.doing_what);
 
 	if (import_status.freeze) {
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 6874059aef..e990f603f5 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -2603,6 +2603,11 @@ Editor::build_interthread_progress_window ()
 
 	interthread_progress_bar.set_orientation (Gtk::PROGRESS_LEFT_TO_RIGHT);
 	
+	interthread_progress_window->set_border_width (12);
+	interthread_progress_window->get_vbox()->set_spacing (6);
+
+	interthread_progress_label.set_alignment (0.5, 0.5);
+
 	interthread_progress_window->get_vbox()->pack_start (interthread_progress_label, false, false);
 	interthread_progress_window->get_vbox()->pack_start (interthread_progress_bar,false, false);
 
diff --git a/gtk2_ardour/public_editor.cc b/gtk2_ardour/public_editor.cc
index d4cfa1fb1f..035209522e 100644
--- a/gtk2_ardour/public_editor.cc
+++ b/gtk2_ardour/public_editor.cc
@@ -22,6 +22,12 @@
 
 PublicEditor* PublicEditor::_instance = 0;
 
+const int PublicEditor::window_border_width = 12;
+const int PublicEditor::container_border_width = 12;
+const int PublicEditor::vertical_spacing = 6;
+const int PublicEditor::horizontal_spacing = 6;
+
+
 PublicEditor::PublicEditor ()
   	: Window (Gtk::WINDOW_TOPLEVEL)
 {
diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h
index ed4c5be789..d7d854ae51 100644
--- a/gtk2_ardour/public_editor.h
+++ b/gtk2_ardour/public_editor.h
@@ -209,6 +209,11 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulThingWithGoingAway
 	virtual bool canvas_markerview_start_handle_event(GdkEvent* event, ArdourCanvas::Item*,MarkerView*) = 0;
 	virtual bool canvas_markerview_end_handle_event(GdkEvent* event, ArdourCanvas::Item*,MarkerView*) = 0;
 
+	static const int window_border_width;
+	static const int container_border_width;
+	static const int vertical_spacing;
+	static const int horizontal_spacing;
+	
 	static PublicEditor* _instance;
 
 	friend class PluginUIWindow;
diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
index 5aeaa4841d..97d74d479c 100644
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -429,16 +429,17 @@ SoundFileBrowser::SoundFileBrowser (Gtk::Window& parent, string title, ARDOUR::S
 		notebook.append_page (chooser, _("Browse Files"));
 	}
 	
+	hpacker.set_spacing (6);
+	hpacker.pack_start (notebook, true, true);
+	hpacker.pack_start (preview, false, false);
+	
+	get_vbox()->pack_start (hpacker, true, true);
+
 	//add tag search
 	{
 		VBox* vbox;
 		HBox* hbox;
 
-		hpacker.set_spacing (6);
-		hpacker.pack_start (notebook, true, true);
-		hpacker.pack_start (preview, false, false);
-
-		get_vbox()->pack_start (hpacker, true, true);
 
 		hbox = manage(new HBox);
 		hbox->pack_start (found_entry);
@@ -471,12 +472,6 @@ SoundFileBrowser::SoundFileBrowser (Gtk::Window& parent, string title, ARDOUR::S
 		HBox* passbox;
 		Label* label;
 
-		hpacker.set_spacing (6);
-		hpacker.pack_start (notebook, true, true);
-		hpacker.pack_start (preview, false, false);
-
-		get_vbox()->pack_start (hpacker, true, true);
-
 		passbox = manage(new HBox);
 		passbox->set_border_width (12);
 		passbox->set_spacing (6);