X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Foption_editor.cc;h=9809b0516546ac750a65294d52bb6886056a645f;hb=b6c3e5537269e53bb145300e7724e8b89dfb74d6;hp=36ff825c1b90c7c52b6f57391bd2fdaa0c8ec196;hpb=e5e12acc5698090f2c0c614385e457cc0b46fbb0;p=ardour.git diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc index 36ff825c1b..9809b05165 100644 --- a/gtk2_ardour/option_editor.cc +++ b/gtk2_ardour/option_editor.cc @@ -1,19 +1,19 @@ /* - Copyright (C) 2001-2009 Paul Davis + Copyright (C) 2001-2009 Paul Davis - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include @@ -22,15 +22,21 @@ #include #include "gtkmm2ext/utils.h" -#include "ardour/configuration.h" -#include "ardour/rc_configuration.h" -#include "ardour/utils.h" #include "ardour/dB.h" +#include "ardour/rc_configuration.h" #include "ardour/session.h" +#include "ardour/types.h" +#include "ardour/utils.h" + +#include "pbd/configuration.h" +#include "pbd/replace_all.h" +#include "pbd/strsplit.h" -#include "option_editor.h" #include "gui_thread.h" -#include "i18n.h" +#include "option_editor.h" +#include "public_editor.h" +#include "utils.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; @@ -60,11 +66,11 @@ OptionEditorComponent::add_widgets_to_page (OptionEditorPage* p, Gtk::Widget* wa 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); } @@ -108,6 +114,70 @@ OptionEditorBox::add_to_page (OptionEditorPage* p) add_widget_to_page (p, _box); } +RcActionButton::RcActionButton (std::string const & t, const Glib::SignalProxy0< void >::SlotType & slot, std::string const & l) + : _label (NULL) +{ + _button = manage (new Button (t)); + _button->signal_clicked().connect (slot); + if (!l.empty ()) { + _label = manage (right_aligned_label (l)); + } +} + +void +RcActionButton::add_to_page (OptionEditorPage *p) +{ + int const n = p->table.property_n_rows(); + int m = n + 1; + p->table.resize (m, 3); + if (_label) { + p->table.attach (*_label, 1, 2, n, n + 1, FILL | EXPAND); + p->table.attach (*_button, 2, 3, n, n + 1, FILL | EXPAND); + } else { + p->table.attach (*_button, 1, 3, n, n + 1, FILL | EXPAND); + } +} + +RcConfigDisplay::RcConfigDisplay (string const & i, string const & n, sigc::slot g, char s) + : _get (g) + , _id (i) + , _sep (s) +{ + _label = manage (right_aligned_label (n)); + _info = manage (new Label); + _info-> set_line_wrap (true); + set_state_from_config (); +} + +void +RcConfigDisplay::set_state_from_config () +{ + string p = _get(); + if (_sep) { + std::replace (p.begin(), p.end(), _sep, '\n'); + } + _info->set_text (p); +} + +void +RcConfigDisplay::parameter_changed (std::string const & p) +{ + if (p == _id) { + set_state_from_config (); + } +} + +void +RcConfigDisplay::add_to_page (OptionEditorPage *p) +{ + int const n = p->table.property_n_rows(); + int m = n + 1; + p->table.resize (m, 3); + p->table.attach (*_label, 1, 2, n, n + 1, FILL | EXPAND); + p->table.attach (*_info, 2, 3, n, n + 1, FILL | EXPAND); +} + + BoolOption::BoolOption (string const & i, string const & n, sigc::slot g, sigc::slot s) : Option (i, n), _get (g), @@ -136,7 +206,21 @@ BoolOption::set_state_from_config () void BoolOption::toggled () { - _set (_button->get_active ()); + if (!_set (_button->get_active ())) { + _button->set_active (_get ()); + } +} + +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) @@ -203,7 +287,7 @@ EntryOption::focus_out (GdkEventFocus*) * @param s Slot to set the variable's value. */ BoolComboOption::BoolComboOption ( - string const & i, string const & n, string const & t, string const & f, + string const & i, string const & n, string const & t, string const & f, sigc::slot g, sigc::slot s ) : Option (i, n) @@ -218,7 +302,7 @@ BoolComboOption::BoolComboOption ( _combo->append_text (f); /* and option 1 is the true */ _combo->append_text (t); - + _combo->signal_changed().connect (sigc::mem_fun (*this, &BoolComboOption::changed)); } @@ -245,16 +329,16 @@ 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, 115, 18, false)); + _db_slider = manage (new HSliderController (&_db_adjustment, boost::shared_ptr(), 115, 18)); _label.set_text (n + ":"); _label.set_alignment (0, 0.5); @@ -271,6 +355,8 @@ FaderOption::FaderOption (string const & i, string const & n, sigc::slot 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)); + _db_display.signal_activate().connect (sigc::mem_fun (*this, &FaderOption::on_activate)); + _db_display.signal_key_press_event().connect (sigc::mem_fun (*this, &FaderOption::on_key_press), false); } void @@ -296,6 +382,26 @@ FaderOption::db_changed () _set (slider_position_to_gain_with_max (_db_adjustment.get_value (), Config->get_max_gain())); } +void +FaderOption::on_activate () +{ + float db_val = atof (_db_display.get_text ().c_str ()); + gain_t coeff_val = dB_to_coefficient (db_val); + + _db_adjustment.set_value (gain_to_slider_position_with_max (coeff_val, Config->get_max_gain ())); +} + +bool +FaderOption::on_key_press (GdkEventKey* ev) +{ + if (ARDOUR_UI_UTILS::key_is_legal_for_numeric_entry (ev->keyval)) { + /* drop through to normal handling */ + return false; + } + /* illegal key for gain entry */ + return true; +} + void FaderOption::add_to_page (OptionEditorPage* p) { @@ -364,26 +470,25 @@ OptionEditorPage::OptionEditorPage (Gtk::Notebook& n, std::string const & t) * @param o Configuration to edit. * @param t Title for the dialog. */ -OptionEditor::OptionEditor (Configuration* c, std::string const & t) - : ArdourWindow (t), _config (c) +OptionEditor::OptionEditor (PBD::Configuration* c) + : _config (c) + , option_tree (TreeStore::create (option_columns)) + , option_treeview (option_tree) { using namespace Notebook_Helpers; - set_default_size (300, 300); - // set_wmclass (X_("ardour_preferences"), PROGRAM_NAME); - - set_name ("Preferences"); - add_events (Gdk::KEY_PRESS_MASK | Gdk::KEY_RELEASE_MASK); - - set_border_width (4); - - add (_notebook); - - _notebook.set_show_tabs (true); + _notebook.set_show_tabs (false); _notebook.set_show_border (true); _notebook.set_name ("OptionsNotebook"); - show_all_children(); + option_treeview.append_column ("", option_columns.name); + option_treeview.set_enable_search(true); + option_treeview.set_search_column(0); + option_treeview.set_name ("OptionsTreeView"); + option_treeview.set_headers_visible (false); + + option_treeview.get_selection()->set_mode (Gtk::SELECTION_SINGLE); + option_treeview.get_selection()->signal_changed().connect (sigc::mem_fun (*this, &OptionEditor::treeview_row_selected)); /* Watch out for changes to parameters */ _config->ParameterChanged.connect (config_connection, invalidator (*this), boost::bind (&OptionEditor::parameter_changed, this, _1), gui_context()); @@ -414,6 +519,82 @@ OptionEditor::parameter_changed (std::string const & p) } } +void +OptionEditor::treeview_row_selected () +{ + Glib::RefPtr selection = option_treeview.get_selection(); + TreeModel::iterator iter = selection->get_selected(); + if(iter) { + TreeModel::Row row = *iter; + Gtk::Widget* w = row[option_columns.widget]; + if (w) { + _notebook.set_current_page (_notebook.page_num (*w)); + } + } +} + +TreeModel::iterator +OptionEditor::find_path_in_treemodel (std::string const & pn, bool create_missing) +{ + /* split page name, which is actually a path, into each component */ + + std::vector components; + split (pn, components, '/'); + + /* start with top level children */ + + TreeModel::Children children = option_tree->children(); + TreeModel::iterator iter; + + /* foreach path component ... */ + + for (std::vector::const_iterator s = components.begin(); s != components.end(); ++s) { + + for (iter = children.begin(); iter != children.end(); ++iter) { + TreeModel::Row row = *iter; + const std::string row_name = row[option_columns.name]; + if (row_name == (*s)) { + break; + } + } + + if (iter == children.end()) { + /* the current component is missing; bail out or create it */ + if (!create_missing) { + return option_tree->get_iter(TreeModel::Path("")); + } else { + iter = option_tree->append (children); + TreeModel::Row row = *iter; + row[option_columns.name] = *s; + row[option_columns.widget] = 0; + } + } + + /* from now on, iter points to a valid row, either the one we found or a new one */ + /* set children to the row's children to continue searching */ + children = (*iter)->children (); + + } + + return iter; +} + +void +OptionEditor::add_path_to_treeview (std::string const & pn, Gtk::Widget& widget) +{ + option_treeview.set_model (Glib::RefPtr()); + + TreeModel::iterator row_iter = find_path_in_treemodel(pn, true); + + assert(row_iter); + + TreeModel::Row row = *row_iter; + row[option_columns.widget] = &widget; + + option_treeview.set_model (option_tree); + option_treeview.expand_all (); +} + /** Add a component to a given page. * @param pn Page name (will be created if it doesn't already exist) * @param o Component. @@ -422,7 +603,10 @@ void OptionEditor::add_option (std::string const & pn, OptionEditorComponent* o) { if (_pages.find (pn) == _pages.end()) { - _pages[pn] = new OptionEditorPage (_notebook, pn); + OptionEditorPage* oep = new OptionEditorPage (_notebook, pn); + _pages[pn] = oep; + + add_path_to_treeview (pn, oep->box); } OptionEditorPage* p = _pages[pn]; @@ -432,18 +616,32 @@ OptionEditor::add_option (std::string const & pn, OptionEditorComponent* o) o->set_state_from_config (); } +/** Add a new page + * @param pn Page name (will be created if it doesn't already exist) + * @param w widget that fills the page + */ +void +OptionEditor::add_page (std::string const & pn, Gtk::Widget& w) +{ + if (_pages.find (pn) == _pages.end()) { + OptionEditorPage* oep = new OptionEditorPage (_notebook, pn); + _pages[pn] = oep; + add_path_to_treeview (pn, oep->box); + } + + OptionEditorPage* p = _pages[pn]; + p->box.pack_start (w, true, true); +} + 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; - } + TreeModel::iterator row_iter = find_path_in_treemodel(p); - ++i; + if (row_iter) { + option_treeview.get_selection()->select(row_iter); } + } @@ -453,15 +651,14 @@ DirectoryOption::DirectoryOption (string const & i, string const & n, sigc::slot , _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)); + _file_chooser.signal_selection_changed().connect (sigc::mem_fun (*this, &DirectoryOption::selection_changed)); } void DirectoryOption::set_state_from_config () { - _file_chooser.set_current_folder (_get ()); + _file_chooser.set_current_folder (poor_mans_glob(_get ())); } void @@ -474,13 +671,37 @@ DirectoryOption::add_to_page (OptionEditorPage* p) } void -DirectoryOption::file_set () +DirectoryOption::selection_changed () { - _set (_file_chooser.get_filename ()); + _set (poor_mans_glob(_file_chooser.get_filename ())); } -void -DirectoryOption::current_folder_set () +/*--------------------------*/ + +OptionEditorContainer::OptionEditorContainer (PBD::Configuration* c, string const& str) + : OptionEditor (c) { - _set (_file_chooser.get_current_folder ()); + set_border_width (4); + hpacker.pack_start (treeview(), false, false); + hpacker.pack_start (notebook(), true, true); + pack_start (hpacker, true, true); + + hpacker.show_all (); + show (); +} + +OptionEditorWindow::OptionEditorWindow (PBD::Configuration* c, string const& str) + : OptionEditor (c) + , ArdourWindow (str) +{ + container.set_border_width (4); + hpacker.pack_start (treeview(), false, false); + hpacker.pack_start (notebook(), true, true); + + container.pack_start (hpacker, true, true); + + hpacker.show_all (); + container.show (); + + add (container); }