X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Foption_editor.cc;h=1768bff1a78e0307cfd3653dd32c9e29cb3cda3b;hb=741f9de3f7dda286181419c33cfe361a4f75c775;hp=da4594e6da953fb9787387cc06205c1b765c8f2d;hpb=e1581242ca8554660ea68290688e573a9acfca06;p=ardour.git

diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
index da4594e6da..1768bff1a7 100644
--- a/gtk2_ardour/option_editor.cc
+++ b/gtk2_ardour/option_editor.cc
@@ -113,7 +113,10 @@ BoolOption::BoolOption (string const & i, string const & n, sigc::slot<bool> g,
 	  _get (g),
 	  _set (s)
 {
-	_button = manage (new CheckButton (n));
+	_button = manage (new CheckButton);
+	_label = manage (new Label);
+	_label->set_markup (n);
+	_button->add (*_label);
 	_button->set_active (_get ());
 	_button->signal_toggled().connect (sigc::mem_fun (*this, &BoolOption::toggled));
 }
@@ -224,21 +227,7 @@ FaderOption::FaderOption (string const & i, string const & n, sigc::slot<gain_t>
 	, _get (g)
 	, _set (s)
 {
-	_pix = ::get_icon (X_("fader_belt_h"));
-	if (_pix == 0) {
-		throw failed_constructor ();
-	}
-
-	_pix_desensitised = ::get_icon (X_("fader_belt_h_desensitised"));
-	if (_pix_desensitised == 0) {
-		throw failed_constructor ();
-	}
-	
-	_db_slider = manage (new HSliderController (_pix,
-						    _pix_desensitised,
-						    &_db_adjustment,
-						    115,
-						    false));
+	_db_slider = manage (new HSliderController (&_db_adjustment, 115, 18, false));
 
 	_label.set_text (n + ":");
 	_label.set_name (X_("OptionsLabel"));
@@ -353,7 +342,7 @@ OptionEditor::OptionEditor (Configuration* c, std::string const & t)
 	using namespace Notebook_Helpers;
 
 	set_default_size (300, 300);
-	set_wmclass (X_("ardour_preferences"), PROGRAM_NAME);
+	// set_wmclass (X_("ardour_preferences"), PROGRAM_NAME);
 
 	set_name ("Preferences");
 	add_events (Gdk::KEY_PRESS_MASK | Gdk::KEY_RELEASE_MASK);