X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Foption_editor.cc;h=040146876b413d5bd37934dc230bdc12e64fdc34;hb=99aa8c6338e47b41143f799fdcb35d1699548076;hp=54241eb420f63133b35270190a8d9fd131308294;hpb=14b0ca31bcb62e5b7e9e77634ef9cd2e8cf65800;p=ardour.git

diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
index 54241eb420..040146876b 100644
--- a/gtk2_ardour/option_editor.cc
+++ b/gtk2_ardour/option_editor.cc
@@ -1,4 +1,4 @@
- /*
+/*
     Copyright (C) 2001-2009 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
@@ -19,13 +19,18 @@
 
 #include <gtkmm/box.h>
 #include <gtkmm/alignment.h>
+#include "gtkmm2ext/utils.h"
 #include "ardour/configuration.h"
+#include "ardour/utils.h"
+#include "ardour/dB.h"
 #include "option_editor.h"
 #include "gui_thread.h"
+#include "utils.h"
 #include "i18n.h"
 
 using namespace std;
 using namespace Gtk;
+using namespace Gtkmm2ext;
 using namespace ARDOUR;
 
 void
@@ -104,7 +109,7 @@ EntryOption::EntryOption (string const & i, string const & n, sigc::slot<string>
 	  _set (s)
 {
 	_label = manage (new Label (n + ":"));
-	_label->set_alignment (1, 0.5);
+	_label->set_alignment (0, 0.5);
 	_entry = manage (new Entry);
 	_entry->signal_activate().connect (sigc::mem_fun (*this, &EntryOption::activated));
 }
@@ -127,6 +132,94 @@ EntryOption::activated ()
 	_set (_entry->get_text ());
 }
 
+FaderOption::FaderOption (string const & i, string const & n, sigc::slot<gain_t> g, sigc::slot<bool, gain_t> s)
+	: Option (i, n)
+	// 0.781787 is the value needed for gain to be set to 0.
+	, _db_adjustment (0.781787, 0, 1, 0.01, 0.1)
+	, _get (g)
+	, _set (s)
+{
+	_pix = ::get_icon (X_("fader_belt_h"));
+	if (_pix == 0) {
+		throw failed_constructor ();
+	}
+
+	_db_slider = manage (new HSliderController (_pix,
+						    &_db_adjustment,
+						    115,
+						    false));
+
+	_label.set_text (n + ":");
+	_label.set_name (X_("OptionsLabel"));
+
+	_box.set_spacing (4);
+	_box.pack_start (*_db_slider, false, false);
+	_box.pack_start (_db_display, false, false);
+	_box.show_all ();
+	
+	set_size_request_to_display_given_text (_db_display, "-99.0", 12, 12);
+
+	_db_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &FaderOption::db_changed));
+}
+
+void
+FaderOption::set_state_from_config ()
+{
+	gain_t const val = _get ();
+	_db_adjustment.set_value (gain_to_slider_position (val));
+
+	char buf[16];
+
+	if (val == 0.0) {
+		snprintf (buf, sizeof (buf), "-inf");
+	} else {
+		snprintf (buf, sizeof (buf), "%.2f", accurate_coefficient_to_dB (val));
+	}
+	
+	_db_display.set_text (buf);
+}
+
+void
+FaderOption::db_changed ()
+{
+	_set (slider_position_to_gain (_db_adjustment.get_value ()));
+}
+
+void
+FaderOption::add_to_page (OptionEditorPage* p)
+{
+	add_widgets_to_page (p, &_label, &_box);
+}
+
+ClockOption::ClockOption (string const & i, string const & n, sigc::slot<framecnt_t> g, sigc::slot<bool, framecnt_t> s)
+	: Option (i, n)
+	, _clock (X_("timecode-offset"), false, X_("TimecodeOffset"), true, false, true, false)
+	, _get (g)
+	, _set (s)
+{
+	_label.set_text (n + ":");
+	_label.set_alignment (0, 0.5);
+	_label.set_name (X_("OptionsLabel"));
+}
+
+void
+ClockOption::set_state_from_config ()
+{
+	_clock.set (_get ());
+}
+
+void
+ClockOption::add_to_page (OptionEditorPage* p)
+{
+	add_widgets_to_page (p, &_label, &_clock);
+}
+
+void
+ClockOption::set_session (Session* s)
+{
+	_clock.set_session (s);
+}
+	   
 OptionEditorPage::OptionEditorPage (Gtk::Notebook& n, std::string const & t)
 	: table (1, 3)
 {
@@ -147,7 +240,7 @@ OptionEditor::OptionEditor (Configuration* c, std::string const & t)
 	using namespace Notebook_Helpers;
 
 	set_default_size (300, 300);
-	set_wmclass (X_("ardour_preferences"), "Ardour");
+	set_wmclass (X_("ardour_preferences"), PROGRAM_NAME);
 
 	set_name ("Preferences");
 	add_events (Gdk::KEY_PRESS_MASK | Gdk::KEY_RELEASE_MASK);
@@ -209,3 +302,20 @@ OptionEditor::add_option (std::string const & pn, OptionEditorComponent* o)
 	o->add_to_page (p);
 	o->set_state_from_config ();
 }
+
+void
+OptionEditor::set_current_page (string const & p)
+{
+	int i = 0;
+	while (i < _notebook.get_n_pages ()) {
+		if (_notebook.get_tab_label_text (*_notebook.get_nth_page (i)) == p) {
+			_notebook.set_current_page (i);
+			return;
+		}
+
+		++i;
+	}
+}
+
+
+