X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Foption_editor.cc;h=b685e789472c35f5e3e0455c7bf67509500dde34;hb=57d7b5de65b399fc7d1d61a3a9212c0fa7f1e95c;hp=f786496050dfcc77750b06ec0cbd5cfcbdd3bbb5;hpb=1d431bf6c4259ec6ee6a1b445c635fe89733e7f9;p=ardour.git

diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
index f786496050..b685e78947 100644
--- a/gtk2_ardour/option_editor.cc
+++ b/gtk2_ardour/option_editor.cc
@@ -485,7 +485,7 @@ FaderOption::FaderOption (string const & i, string const & n, sigc::slot<gain_t>
 	, _get (g)
 	, _set (s)
 {
-	_db_slider = manage (new HSliderController (&_db_adjustment, boost::shared_ptr<PBD::Controllable>(), 220, 18));
+	_db_slider = manage (new ArdourWidgets::HSliderController (&_db_adjustment, boost::shared_ptr<PBD::Controllable>(), 220, 18));
 
 	_label.set_text (n + ":");
 	_label.set_alignment (0, 0.5);
@@ -574,7 +574,7 @@ void
 ClockOption::set_state_from_config ()
 {
 	Timecode::Time TC;
-	framepos_t when;
+	samplepos_t when;
 	if (!Timecode::parse_timecode_format(_get(), TC)) {
 		_clock.set (0, true);
 	}
@@ -608,6 +608,20 @@ ClockOption::set_session (Session* s)
 
 /*--------------------------*/
 
+WidgetOption::WidgetOption (string const & i, string const & n, Gtk::Widget& w)
+	: Option (i, n)
+	, _widget (&w)
+{
+}
+
+void
+WidgetOption::add_to_page (OptionEditorPage* p)
+{
+	add_widget_to_page (p, _widget);
+}
+
+/*--------------------------*/
+
 OptionEditorPage::OptionEditorPage ()
 	: table (1, 3)
 {
@@ -864,7 +878,11 @@ OptionEditorContainer::OptionEditorContainer (PBD::Configuration* c, string cons
 	: OptionEditor (c)
 {
 	set_border_width (4);
-	hpacker.pack_start (treeview(), false, false);
+	Frame* f = manage (new Frame ());
+	f->add (treeview());
+	f->set_shadow_type (Gtk::SHADOW_OUT);
+	f->set_border_width (0);
+	hpacker.pack_start (*f, false, false, 4);
 	hpacker.pack_start (notebook(), false, false);
 	pack_start (hpacker, true, true);
 
@@ -876,8 +894,12 @@ OptionEditorWindow::OptionEditorWindow (PBD::Configuration* c, string const& str
 	, ArdourWindow (str)
 {
 	container.set_border_width (4);
-	hpacker.pack_start (treeview(), false, false);
-	hpacker.pack_start (notebook(), true, true);
+	Frame* f = manage (new Frame ());
+	f->add (treeview());
+	f->set_shadow_type (Gtk::SHADOW_OUT);
+	f->set_border_width (0);
+	hpacker.pack_start (*f, false, false);
+	hpacker.pack_start (notebook(), true, true, 4);
 
 	container.pack_start (hpacker, true, true);