Move a few declarations to first use.

[ardour.git] / gtk2_ardour / option_editor.cc

diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
index ffdbdc4e95bf67ae66d481cf4c6906d890934005..2142d23faa321e2fd2aae829c9e68a6308eb8697 100644 (file)
--- a/gtk2_ardour/option_editor.cc
+++ b/gtk2_ardour/option_editor.cc
@@ -20,9 +20,12 @@
 #include <gtkmm/box.h>
 #include <gtkmm/alignment.h>
 #include "gtkmm2ext/utils.h"
+
 #include "ardour/configuration.h"
+#include "ardour/rc_configuration.h"
 #include "ardour/utils.h"
 #include "ardour/dB.h"
+
 #include "option_editor.h"
 #include "gui_thread.h"
 #include "utils.h"
@@ -37,17 +40,47 @@ 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)
@@ -134,8 +167,7 @@ EntryOption::activated ()
 
 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)
+       , _db_adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain()), 0, 1, 0.01, 0.1)
        , _get (g)
        , _set (s)
 {
@@ -152,12 +184,15 @@ FaderOption::FaderOption (string const & i, string const & n, sigc::slot<gain_t>
        _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));
 }
@@ -166,7 +201,7 @@ void
 FaderOption::set_state_from_config ()
 {
        gain_t const val = _get ();
-       _db_adjustment.set_value (gain_to_slider_position (val));
+       _db_adjustment.set_value (gain_to_slider_position_with_max (val, Config->get_max_gain ()));
 
        char buf[16];
 
@@ -182,7 +217,7 @@ FaderOption::set_state_from_config ()
 void
 FaderOption::db_changed ()
 {
-       _set (slider_position_to_gain (_db_adjustment.get_value ()));
+       _set (slider_position_to_gain_with_max (_db_adjustment.get_value (), Config->get_max_gain()));
 }
 
 void
@@ -193,7 +228,7 @@ FaderOption::add_to_page (OptionEditorPage* p)
 
 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)
+       , _clock (X_("timecode-offset"), false, X_(""), true, false, true, false)
        , _get (g)
        , _set (s)
 {
@@ -235,7 +270,7 @@ 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;
 
@@ -247,8 +282,7 @@ OptionEditor::OptionEditor (Configuration* c, std::string const & t)
 
        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);
@@ -318,4 +352,37 @@ OptionEditor::set_current_page (string const & p)
 }
 
 
+DirectoryOption::DirectoryOption (string const & i, string const & n, sigc::slot<string> g, sigc::slot<bool, string> s)
+       : Option (i, n)
+       , _get (g)
+       , _set (s)
+{
+       _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_current_folder (_get ());
+}
+
+void
+DirectoryOption::add_to_page (OptionEditorPage* p)
+{
+       add_widgets_to_page (p, manage (new Label (_name)), &_file_chooser);
+}
 
+void
+DirectoryOption::file_set ()
+{
+       _set (_file_chooser.get_filename ());
+}
+
+void
+DirectoryOption::current_folder_set ()
+{
+       _set (_file_chooser.get_current_folder ());
+}