X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Foption_editor.cc;h=137d6b98c8a5bf8117656476d800f79351333257;hb=23c0452e052fbfb4e2711ef70912f35805f017d5;hp=ca8fa0a2cf451848bb033bc6bd7d5c0225f03dcf;hpb=e39a8fc9681a35b95e6d0f9b4e1a9b31d932f262;p=ardour.git diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc index ca8fa0a2cf..137d6b98c8 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 #include #include @@ -25,10 +26,11 @@ #include "ardour/rc_configuration.h" #include "ardour/utils.h" #include "ardour/dB.h" +#include "ardour/session.h" +#include "public_editor.h" #include "option_editor.h" #include "gui_thread.h" -#include "utils.h" #include "i18n.h" using namespace std; @@ -87,8 +89,7 @@ OptionEditorHeading::OptionEditorHeading (string const & h) { std::stringstream s; s << "" << h << ""; - _label = manage (new Label (s.str())); - _label->set_alignment (0, 0.5); + _label = manage (left_aligned_label (s.str())); _label->set_use_markup (true); } @@ -113,7 +114,10 @@ BoolOption::BoolOption (string const & i, string const & n, sigc::slot 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)); } @@ -136,15 +140,28 @@ BoolOption::toggled () _set (_button->get_active ()); } +RouteDisplayBoolOption::RouteDisplayBoolOption (string const & i, string const & n, sigc::slot g, sigc::slot s) + : BoolOption (i, n, g, s) +{ +} + +void +RouteDisplayBoolOption::toggled () +{ + DisplaySuspender ds; + BoolOption::toggled (); +} + EntryOption::EntryOption (string const & i, string const & n, sigc::slot g, sigc::slot s) : Option (i, n), _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 @@ -159,35 +176,101 @@ 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 ()); } -FaderOption::FaderOption (string const & i, string const & n, sigc::slot g, sigc::slot s) +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 g, sigc::slot 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 (); - } + _label = manage (new Label (n + ":")); + _label->set_alignment (0, 0.5); + _combo = manage (new ComboBoxText); - _pix_desensitised = ::get_icon (X_("fader_belt_h_desensitised")); - if (_pix_desensitised == 0) { - throw failed_constructor (); - } + /* option 0 is the false option */ + _combo->append_text (f); + /* and option 1 is the true */ + _combo->append_text (t); - _db_slider = manage (new HSliderController (_pix, - _pix_desensitised, - &_db_adjustment, - 115, - false)); + _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 g, sigc::slot 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) +{ + _db_slider = manage (new HSliderController (&_db_adjustment, boost::shared_ptr(), 115, 18)); _label.set_text (n + ":"); + _label.set_alignment (0, 0.5); _label.set_name (X_("OptionsLabel")); _fader_centering_box.pack_start (*_db_slider, true, false); @@ -232,21 +315,39 @@ FaderOption::add_to_page (OptionEditorPage* p) add_widgets_to_page (p, &_label, &_box); } -ClockOption::ClockOption (string const & i, string const & n, sigc::slot g, sigc::slot s) +ClockOption::ClockOption (string const & i, string const & n, sigc::slot g, sigc::slot s) : Option (i, n) - , _clock (X_("timecode-offset"), false, X_(""), 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 @@ -258,6 +359,7 @@ ClockOption::add_to_page (OptionEditorPage* p) void ClockOption::set_session (Session* s) { + _session = s; _clock.set_session (s); } @@ -281,7 +383,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); @@ -378,7 +480,10 @@ DirectoryOption::set_state_from_config () 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