X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Foption_editor.cc;h=54424b5ca3619a96677c2dbdc7bdadc4797f8e53;hb=37ee083931c6e57e0d5611ac909294126d92ba05;hp=ef09b2289877708a98d39dabf4e976f5abe25a59;hpb=ad017365f7a73f8ba57f667cc1aa36478b48c50e;p=ardour.git

diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
index ef09b22898..54424b5ca3 100644
--- a/gtk2_ardour/option_editor.cc
+++ b/gtk2_ardour/option_editor.cc
@@ -22,11 +22,14 @@
 #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"
@@ -267,7 +270,7 @@ 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));
+	_db_slider = manage (new HSliderController (&_db_adjustment, boost::shared_ptr<PBD::Controllable>(), 115, 18));
 
 	_label.set_text (n + ":");
 	_label.set_alignment (0, 0.5);
@@ -377,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;
@@ -445,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)
 {
@@ -466,15 +484,14 @@ 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_current_folder_changed().connect (sigc::mem_fun (*this, &DirectoryOption::current_folder_set));
+	_file_chooser.signal_selection_changed().connect (sigc::mem_fun (*this, &DirectoryOption::selection_changed));
 }
 
 
 void
 DirectoryOption::set_state_from_config ()
 {
-	_file_chooser.set_current_folder (_get ());
+	_file_chooser.set_current_folder (poor_mans_glob(_get ()));
 }
 
 void
@@ -487,13 +504,7 @@ DirectoryOption::add_to_page (OptionEditorPage* p)
 }
 
 void
-DirectoryOption::file_set ()
-{
-	_set (_file_chooser.get_filename ());
-}
-
-void
-DirectoryOption::current_folder_set ()
+DirectoryOption::selection_changed ()
 {
-	_set (_file_chooser.get_current_folder ());
+	_set (poor_mans_glob(_file_chooser.get_filename ()));
 }