Tidy up a couple of bits in the session option editor.

git-svn-id: svn://localhost/ardour2/branches/3.0@7992 d708f5d6-7413-0410-9779-e7cbd77b26cf

4 files changed, 10 insertions, 9 deletions

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index c4bd8780a3..fb8ec25496 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -20,11 +20,9 @@
            <separator/>
            <menuitem action='addExistingAudioFiles'/>
            <menuitem action='importFromSession'/>
-           <separator/>
            <menu name='Export' action='Export'>
                <menuitem action='ExportAudio'/>
            </menu>
-           <separator/>
            <menu name='Cleanup' action='Cleanup'>
                <menuitem action='CleanupUnused'/>
                <menuitem action='FlushWastebasket'/>
@@ -37,6 +35,7 @@
            <menuitem action='ToggleRCOptionsEditor'/>
            <menuitem action='About'/>
 #endif
+           <separator/>
            <menuitem action='Quit'/>
         </menu>
 
diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
index 82c544c50c..af85d879cc 100644
--- a/gtk2_ardour/option_editor.cc
+++ b/gtk2_ardour/option_editor.cc
@@ -109,7 +109,7 @@ EntryOption::EntryOption (string const & i, string const & n, sigc::slot<string>
 	  _set (s)
 {
 	_label = manage (new Label (n + ":"));
-	_label->set_alignment (1, 0.5);
+	_label->set_alignment (0, 0.5);
 	_entry = manage (new Entry);
 	_entry->signal_activate().connect (sigc::mem_fun (*this, &EntryOption::activated));
 }
diff --git a/gtk2_ardour/search_path_option.cc b/gtk2_ardour/search_path_option.cc
index eff991081b..8104de3801 100644
--- a/gtk2_ardour/search_path_option.cc
+++ b/gtk2_ardour/search_path_option.cc
@@ -35,7 +35,7 @@ SearchPathOption::SearchPathOption (const string& pathname, const string& label,
 
         hbox->set_border_width (12);
         hbox->set_spacing (6);
-        hbox->pack_end (add_chooser, false, false);
+        hbox->pack_end (add_chooser, true, true);
         hbox->pack_end (*manage (new Label ("Click to add a new location")), false, false);
         hbox->show_all ();
         
@@ -68,14 +68,14 @@ void
 SearchPathOption::add_to_page (OptionEditorPage* p)
 {
 	int const n = p->table.property_n_rows();
-	p->table.resize (n + 2, 3);
+	p->table.resize (n + 1, 3);
 
         Label* label = manage (new Label);
-        label->set_alignment (0.0, 0.5);
-        label->set_markup (string_compose ("<b>%1</b>", _name));
+        label->set_alignment (0.0, 0.0);
+        label->set_markup (string_compose ("%1", _name));
 
-	p->table.attach (*label, 0, 1, n, n + 1, FILL | EXPAND);
-	p->table.attach (vbox, 0, 3, n + 1, n + 2, FILL | EXPAND);
+	p->table.attach (*label, 1, 2, n, n + 1, FILL | EXPAND);
+	p->table.attach (vbox, 2, 3, n, n + 1, FILL | EXPAND);
 }
 
 void
diff --git a/gtk2_ardour/session_option_editor.cc b/gtk2_ardour/session_option_editor.cc
index bef5c70433..2558729c54 100644
--- a/gtk2_ardour/session_option_editor.cc
+++ b/gtk2_ardour/session_option_editor.cc
@@ -209,6 +209,8 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
 
 	add_option (_("Media"), hf);
         
+	add_option (_("Media"), new OptionEditorHeading (_("File locations")));
+
         SearchPathOption* spo = new SearchPathOption ("audio-search-path", _("Search for audio files in:"),
                                                       sigc::mem_fun (*_session_config, &SessionConfiguration::get_audio_search_path),
                                                       sigc::mem_fun (*_session_config, &SessionConfiguration::set_audio_search_path));