X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Foption_editor.cc;h=d49f8a3be0372864ab8d52691baa7205956cb4a3;hb=b637c2223f0d2bbe5eff1f10ad7b1ba0c5ccc86a;hp=39817e464f9ce77382a52b9cc73ce269f845988b;hpb=7658183a84791166747c698aca9c88ad2cfe5986;p=ardour.git

diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
index 39817e464f..d49f8a3be0 100644
--- a/gtk2_ardour/option_editor.cc
+++ b/gtk2_ardour/option_editor.cc
@@ -22,12 +22,16 @@
 #include <gtkmm/alignment.h>
 #include "gtkmm2ext/utils.h"
 
-#include "ardour/configuration.h"
-#include "ardour/rc_configuration.h"
-#include "ardour/utils.h"
 #include "ardour/dB.h"
+#include "ardour/rc_configuration.h"
 #include "ardour/session.h"
+#include "ardour/types.h"
+#include "ardour/utils.h"
+
+#include "pbd/configuration.h"
+#include "pbd/replace_all.h"
 
+#include "public_editor.h"
 #include "option_editor.h"
 #include "gui_thread.h"
 #include "i18n.h"
@@ -139,6 +143,18 @@ BoolOption::toggled ()
 	_set (_button->get_active ());
 }
 
+RouteDisplayBoolOption::RouteDisplayBoolOption (string const & i, string const & n, sigc::slot<bool> g, sigc::slot<bool, bool> s)
+	: BoolOption (i, n, g, s)
+{
+}
+
+void
+RouteDisplayBoolOption::toggled ()
+{
+	DisplaySuspender ds;
+	BoolOption::toggled ();
+}
+
 EntryOption::EntryOption (string const & i, string const & n, sigc::slot<string> g, sigc::slot<bool, string> s)
 	: Option (i, n),
 	  _get (g),
@@ -254,9 +270,10 @@ FaderOption::FaderOption (string const & i, string const & n, sigc::slot<gain_t>
 	, _get (g)
 	, _set (s)
 {
-	_db_slider = manage (new HSliderController (&_db_adjustment, 115, 18, false));
+	_db_slider = manage (new HSliderController (&_db_adjustment, boost::shared_ptr<PBD::Controllable>(), 115, 18));
 
 	_label.set_text (n + ":");
+	_label.set_alignment (0, 0.5);
 	_label.set_name (X_("OptionsLabel"));
 
 	_fader_centering_box.pack_start (*_db_slider, true, false);
@@ -363,7 +380,7 @@ OptionEditorPage::OptionEditorPage (Gtk::Notebook& n, std::string const & t)
  *  @param o Configuration to edit.
  *  @param t Title for the dialog.
  */
-OptionEditor::OptionEditor (Configuration* c, std::string const & t)
+OptionEditor::OptionEditor (PBD::Configuration* c, std::string const & t)
 	: ArdourWindow (t), _config (c)
 {
 	using namespace Notebook_Helpers;
@@ -431,6 +448,21 @@ OptionEditor::add_option (std::string const & pn, OptionEditorComponent* o)
 	o->set_state_from_config ();
 }
 
+/** Add a new page 
+ *  @param pn Page name (will be created if it doesn't already exist)
+ *  @param w widget that fills the page
+ */
+void
+OptionEditor::add_page (std::string const & pn, Gtk::Widget& w)
+{
+	if (_pages.find (pn) == _pages.end()) {
+		_pages[pn] = new OptionEditorPage (_notebook, pn);
+	}
+
+	OptionEditorPage* p = _pages[pn];
+	p->box.pack_start (w, true, true);
+}
+
 void
 OptionEditor::set_current_page (string const & p)
 {
@@ -452,7 +484,7 @@ DirectoryOption::DirectoryOption (string const & i, string const & n, sigc::slot
 	, _set (s)
 {
 	_file_chooser.set_action (Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER);
-	_file_chooser.signal_file_set().connect (sigc::mem_fun (*this, &DirectoryOption::file_set));
+	_file_chooser.signal_selection_changed().connect (sigc::mem_fun (*this, &DirectoryOption::selection_changed));
 	_file_chooser.signal_current_folder_changed().connect (sigc::mem_fun (*this, &DirectoryOption::current_folder_set));
 }
 
@@ -460,23 +492,26 @@ DirectoryOption::DirectoryOption (string const & i, string const & n, sigc::slot
 void
 DirectoryOption::set_state_from_config ()
 {
-	_file_chooser.set_current_folder (_get ());
+	_file_chooser.set_current_folder (poor_mans_glob(_get ()));
 }
 
 void
 DirectoryOption::add_to_page (OptionEditorPage* p)
 {
-	add_widgets_to_page (p, manage (new Label (_name)), &_file_chooser);
+	Gtk::Label *label = manage (new Label (_name));
+	label->set_alignment (0, 0.5);
+	label->set_name (X_("OptionsLabel"));
+	add_widgets_to_page (p, label, &_file_chooser);
 }
 
 void
-DirectoryOption::file_set ()
+DirectoryOption::selection_changed ()
 {
-	_set (_file_chooser.get_filename ());
+	_set (poor_mans_glob(_file_chooser.get_filename ()));
 }
 
 void
 DirectoryOption::current_folder_set ()
 {
-	_set (_file_chooser.get_current_folder ());
+	_set (poor_mans_glob(_file_chooser.get_current_folder ()));
 }