X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Foption_editor.cc;h=36ff825c1b90c7c52b6f57391bd2fdaa0c8ec196;hb=4d5782781939126a41702cb27453553d0041aa54;hp=770df4d37dc8db1853105b833a61d156b61eab0c;hpb=b02673adb47e578284d91445b108ee256149ce1f;p=ardour.git

diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
index 770df4d37d..36ff825c1b 100644
--- a/gtk2_ardour/option_editor.cc
+++ b/gtk2_ardour/option_editor.cc
@@ -16,6 +16,7 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
+#include <algorithm>
 
 #include <gtkmm/box.h>
 #include <gtkmm/alignment.h>
@@ -25,10 +26,10 @@
 #include "ardour/rc_configuration.h"
 #include "ardour/utils.h"
 #include "ardour/dB.h"
+#include "ardour/session.h"
 
 #include "option_editor.h"
 #include "gui_thread.h"
-#include "utils.h"
 #include "i18n.h"
 
 using namespace std;
@@ -40,25 +41,54 @@ void
 OptionEditorComponent::add_widget_to_page (OptionEditorPage* p, Gtk::Widget* w)
 {
 	int const n = p->table.property_n_rows();
-	p->table.resize (n + 1, 3);
+	int m = n + 1;
+	if (!_note.empty ()) {
+		++m;
+	}
+
+	p->table.resize (m, 3);
 	p->table.attach (*w, 1, 3, n, n + 1, FILL | EXPAND);
+
+	maybe_add_note (p, n + 1);
 }
 
 void
 OptionEditorComponent::add_widgets_to_page (OptionEditorPage* p, Gtk::Widget* wa, Gtk::Widget* wb)
 {
 	int const n = p->table.property_n_rows();
-	p->table.resize (n + 1, 3);
+	int m = n + 1;
+	if (!_note.empty ()) {
+		++m;
+	}
+	
+	p->table.resize (m, 3);
 	p->table.attach (*wa, 1, 2, n, n + 1, FILL);
 	p->table.attach (*wb, 2, 3, n, n + 1, FILL | EXPAND);
+	
+	maybe_add_note (p, n + 1);
+}
+
+void
+OptionEditorComponent::maybe_add_note (OptionEditorPage* p, int n)
+{
+	if (!_note.empty ()) {
+		Gtk::Label* l = manage (new Gtk::Label (string_compose (X_("<i>%1</i>"), _note)));
+		l->set_use_markup (true);
+		p->table.attach (*l, 1, 3, n, n + 1, FILL | EXPAND);
+	}
+}
+
+void
+OptionEditorComponent::set_note (string const & n)
+{
+	_note = n;
 }
 
 OptionEditorHeading::OptionEditorHeading (string const & h)
 {
 	std::stringstream s;
 	s << "<b>" << h << "</b>";
-	_label = manage (new Label (s.str()));
-	_label->set_alignment (0, 0.5);
+	_label = manage (left_aligned_label (s.str()));
 	_label->set_use_markup (true);
 }
 
@@ -83,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));
 }
@@ -111,10 +144,11 @@ EntryOption::EntryOption (string const & i, string const & n, sigc::slot<string>
 	  _get (g),
 	  _set (s)
 {
-	_label = manage (new Label (n + ":"));
-	_label->set_alignment (0, 0.5);
+	_label = manage (left_aligned_label (n + ":"));
 	_entry = manage (new Entry);
 	_entry->signal_activate().connect (sigc::mem_fun (*this, &EntryOption::activated));
+	_entry->signal_focus_out_event().connect (sigc::mem_fun (*this, &EntryOption::focus_out));
+	_entry->signal_insert_text().connect (sigc::mem_fun (*this, &EntryOption::filter_text));
 }
 
 void
@@ -129,37 +163,112 @@ EntryOption::set_state_from_config ()
 	_entry->set_text (_get ());
 }
 
+void
+EntryOption::set_sensitive (bool s)
+{
+	_entry->set_sensitive (s);
+}
+
+void
+EntryOption::filter_text (const Glib::ustring&, int*)
+{
+	std::string text = _entry->get_text ();
+	for (size_t i = 0; i < _invalid.length(); ++i) {
+		text.erase (std::remove(text.begin(), text.end(), _invalid.at(i)), text.end());
+	}
+	if (text != _entry->get_text ()) {
+		_entry->set_text (text);
+	}
+}
+
 void
 EntryOption::activated ()
 {
 	_set (_entry->get_text ());
 }
 
+bool
+EntryOption::focus_out (GdkEventFocus*)
+{
+	_set (_entry->get_text ());
+	return true;
+}
+
+/** Construct a BoolComboOption.
+ *  @param i id
+ *  @param n User-visible name.
+ *  @param t Text to give for the variable being true.
+ *  @param f Text to give for the variable being false.
+ *  @param g Slot to get the variable's value.
+ *  @param s Slot to set the variable's value.
+ */
+BoolComboOption::BoolComboOption (
+	string const & i, string const & n, string const & t, string const & f, 
+	sigc::slot<bool> g, sigc::slot<bool, bool> s
+	)
+	: Option (i, n)
+	, _get (g)
+	, _set (s)
+{
+	_label = manage (new Label (n + ":"));
+	_label->set_alignment (0, 0.5);
+	_combo = manage (new ComboBoxText);
+
+	/* option 0 is the false option */
+	_combo->append_text (f);
+	/* and option 1 is the true */
+	_combo->append_text (t);
+	
+	_combo->signal_changed().connect (sigc::mem_fun (*this, &BoolComboOption::changed));
+}
+
+void
+BoolComboOption::set_state_from_config ()
+{
+	_combo->set_active (_get() ? 1 : 0);
+}
+
+void
+BoolComboOption::add_to_page (OptionEditorPage* p)
+{
+	add_widgets_to_page (p, _label, _combo);
+}
+
+void
+BoolComboOption::changed ()
+{
+	_set (_combo->get_active_row_number () == 0 ? false : true);
+}
+
+void
+BoolComboOption::set_sensitive (bool yn)
+{
+	_combo->set_sensitive (yn);
+}
+	
+
+	  
 FaderOption::FaderOption (string const & i, string const & n, sigc::slot<gain_t> g, sigc::slot<bool, gain_t> s)
 	: Option (i, n)
 	, _db_adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain()), 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));
+	_db_slider = manage (new HSliderController (&_db_adjustment, 115, 18, false));
 
 	_label.set_text (n + ":");
+	_label.set_alignment (0, 0.5);
 	_label.set_name (X_("OptionsLabel"));
 
+	_fader_centering_box.pack_start (*_db_slider, true, false);
+
 	_box.set_spacing (4);
-	_box.pack_start (*_db_slider, false, false);
+	_box.set_homogeneous (false);
+	_box.pack_start (_fader_centering_box, 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);
+	set_size_request_to_display_given_text (_db_display, "-99.00", 12, 12);
 
 	_db_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &FaderOption::db_changed));
 }
@@ -193,21 +302,39 @@ 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)
+ClockOption::ClockOption (string const & i, string const & n, sigc::slot<std::string> g, sigc::slot<bool, std::string> s)
 	: Option (i, n)
-	, _clock (X_("timecode-offset"), false, X_("TimecodeOffset"), true, false, true, false)
+	, _clock (X_("timecode-offset"), true, X_(""), true, false, true, false)
 	, _get (g)
 	, _set (s)
 {
 	_label.set_text (n + ":");
 	_label.set_alignment (0, 0.5);
 	_label.set_name (X_("OptionsLabel"));
+	_clock.ValueChanged.connect (sigc::mem_fun (*this, &ClockOption::save_clock_time));
 }
 
 void
 ClockOption::set_state_from_config ()
 {
-	_clock.set (_get ());
+	Timecode::Time TC;
+	framepos_t when;
+	if (!Timecode::parse_timecode_format(_get(), TC)) {
+		_clock.set (0, true);
+	}
+	TC.rate = _session->frames_per_timecode_frame();
+	TC.drop = _session->timecode_drop_frames();
+	_session->timecode_to_sample(TC, when, false, false);
+	if (TC.negative) { when=-when; }
+	_clock.set (when, true);
+}
+
+void
+ClockOption::save_clock_time ()
+{
+	Timecode::Time TC;
+	_session->sample_to_timecode(_clock.current_time(), TC, false, false);
+	_set (Timecode::timecode_format_time(TC));
 }
 
 void
@@ -219,6 +346,7 @@ ClockOption::add_to_page (OptionEditorPage* p)
 void
 ClockOption::set_session (Session* s)
 {
+	_session = s;
 	_clock.set_session (s);
 }
 
@@ -237,20 +365,19 @@ OptionEditorPage::OptionEditorPage (Gtk::Notebook& n, std::string const & t)
  *  @param t Title for the dialog.
  */
 OptionEditor::OptionEditor (Configuration* c, std::string const & t)
-	: ArdourDialog (t, false), _config (c)
+	: ArdourWindow (t), _config (c)
 {
 	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);
 
 	set_border_width (4);
 
-	get_vbox()->set_spacing (4);
-	get_vbox()->pack_start (_notebook);
+	add (_notebook);
 
 	_notebook.set_show_tabs (true);
 	_notebook.set_show_border (true);
@@ -259,7 +386,7 @@ OptionEditor::OptionEditor (Configuration* c, std::string const & t)
 	show_all_children();
 
 	/* Watch out for changes to parameters */
-	_config->ParameterChanged.connect (config_connection, invalidator (*this), ui_bind (&OptionEditor::parameter_changed, this, _1), gui_context());
+	_config->ParameterChanged.connect (config_connection, invalidator (*this), boost::bind (&OptionEditor::parameter_changed, this, _1), gui_context());
 }
 
 OptionEditor::~OptionEditor ()
@@ -327,19 +454,23 @@ DirectoryOption::DirectoryOption (string const & i, string const & n, sigc::slot
 {
 	_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));
 }
 
 
 void
 DirectoryOption::set_state_from_config ()
 {
-	_file_chooser.set_filename (_get ());
+	_file_chooser.set_current_folder (_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
@@ -347,3 +478,9 @@ DirectoryOption::file_set ()
 {
 	_set (_file_chooser.get_filename ());
 }
+
+void
+DirectoryOption::current_folder_set ()
+{
+	_set (_file_chooser.get_current_folder ());
+}