X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Foption_editor.cc;h=1768bff1a78e0307cfd3653dd32c9e29cb3cda3b;hb=848e75aaeaa04a81883ed30bcd04abd862f9d1fd;hp=f1185664055b127b49253c1205f9b932b6cf836e;hpb=e317386c5cde5741a8279bf480240293720d6788;p=ardour.git
diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
index f118566405..1768bff1a7 100644
--- a/gtk2_ardour/option_editor.cc
+++ b/gtk2_ardour/option_editor.cc
@@ -25,6 +25,7 @@
#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"
@@ -87,8 +88,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 +113,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));
}
@@ -141,8 +144,7 @@ EntryOption::EntryOption (string const & i, string const & n, sigc::slot
_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));
}
@@ -165,31 +167,80 @@ EntryOption::activated ()
_set (_entry->get_text ());
}
+/** 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)
+ , _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 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 ();
- }
-
- _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_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));
}
@@ -223,7 +274,7 @@ 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)
, _get (g)
@@ -232,12 +283,30 @@ ClockOption::ClockOption (string const & i, string const & n, sigc::slotframes_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
@@ -249,6 +318,7 @@ ClockOption::add_to_page (OptionEditorPage* p)
void
ClockOption::set_session (Session* s)
{
+ _session = s;
_clock.set_session (s);
}
@@ -272,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);
@@ -288,7 +358,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 ()