change packing options within mixer window to fix #4271

[ardour.git] / gtk2_ardour / search_path_option.cc

diff --git a/gtk2_ardour/search_path_option.cc b/gtk2_ardour/search_path_option.cc
index eff991081b2a021bef7173951856efe68842ae05..92b7938eddb7771a44daa2f44f0172be8c193bd9 100644 (file)
--- a/gtk2_ardour/search_path_option.cc
+++ b/gtk2_ardour/search_path_option.cc
@@ -17,7 +17,9 @@
 */
 
 #include "pbd/strsplit.h"
+#include "pbd/compose.h"
 #include "search_path_option.h"
+#include "i18n.h"
 
 using namespace std;
 using namespace Gtk;
@@ -35,10 +37,10 @@ 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 (*manage (new Label ("Click to add a new location")), 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 ();
-        
+
         vbox.pack_start (path_box);
         vbox.pack_end (*hbox);
 
@@ -52,7 +54,7 @@ SearchPathOption::SearchPathOption (const string& pathname, const string& label,
 
 SearchPathOption::~SearchPathOption()
 {
-        
+
 
 }
 
@@ -68,14 +70,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
@@ -99,7 +101,7 @@ SearchPathOption::set_state_from_config ()
         path_box.pack_start (session_label);
 
         split (str, dirs, ':');
-        
+
         for (vector<string>::iterator d = dirs.begin(); d != dirs.end(); ++d) {
                 add_path (*d);
         }
@@ -109,7 +111,7 @@ void
 SearchPathOption::changed ()
 {
         string str;
-        
+
         for (list<PathEntry*>::iterator p = paths.begin(); p != paths.end(); ++p) {
 
                 if (!str.empty()) {
@@ -148,7 +150,7 @@ SearchPathOption::PathEntry::PathEntry (const std::string& path, bool removable)
         box.set_spacing (6);
         box.set_homogeneous (false);
         box.pack_start (entry, true, true);
-        
+
         if (removable) {
                 box.pack_start (remove_button, false, false);
                 remove_button.show ();