X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fkeyeditor.cc;h=f8b5f2da4e945062004d53f2b950dc0187d46221;hb=9cdb0e2765df8fb12817df4367f503048be6f738;hp=96a9857412754f0feaec5deca478cbebea4ab47c;hpb=64dc5427e4f5339a16a018692dd94f476c53cae9;p=ardour.git diff --git a/gtk2_ardour/keyeditor.cc b/gtk2_ardour/keyeditor.cc index 96a9857412..f8b5f2da4e 100644 --- a/gtk2_ardour/keyeditor.cc +++ b/gtk2_ardour/keyeditor.cc @@ -1,6 +1,27 @@ -#include +/* + Copyright (C) 2002 Paul Davis -#include "ardour/profile.h" + 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. + + 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. + +*/ + +#ifdef WAF_BUILD +#include "gtk2ardour-config.h" +#endif + +#include #include #include @@ -8,15 +29,16 @@ #include #include +#include "gtkmm2ext/utils.h" + #include "pbd/strsplit.h" -#include "pbd/replace_all.h" +#include "ardour/filesystem_paths.h" #include "ardour/profile.h" #include "actions.h" #include "keyboard.h" #include "keyeditor.h" -#include "utils.h" #include "i18n.h" @@ -28,13 +50,12 @@ using namespace PBD; using Gtkmm2ext::Keyboard; KeyEditor::KeyEditor () - : ArdourDialog (_("Key Bindings"), false) + : ArdourWindow (_("Key Bindings")) , unbind_button (_("Remove shortcut")) , unbind_box (BUTTONBOX_END) { - can_bind = false; - last_state = 0; + last_keyval = 0; model = TreeStore::create(columns); @@ -54,9 +75,9 @@ KeyEditor::KeyEditor () scroller.add (view); scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); - - get_vbox()->set_spacing (6); - get_vbox()->pack_start (scroller); + vpacker.set_spacing (6); + vpacker.set_border_width (12); + vpacker.pack_start (scroller); if (!ARDOUR::Profile->get_sae()) { @@ -67,16 +88,27 @@ KeyEditor::KeyEditor () unbind_box.pack_start (unbind_button, false, false); unbind_button.signal_clicked().connect (sigc::mem_fun (*this, &KeyEditor::unbind)); - get_vbox()->pack_start (unbind_box, false, false); + vpacker.pack_start (unbind_box, false, false); unbind_box.show (); unbind_button.show (); } - - get_vbox()->set_border_width (12); + + reset_button.add (reset_label); + reset_label.set_markup (string_compose ("%1", _("Reset Bindings to Defaults"))); + + reset_box.pack_start (reset_button, true, false); + reset_box.show (); + reset_button.show (); + reset_label.show (); + reset_button.signal_clicked().connect (sigc::mem_fun (*this, &KeyEditor::reset)); + vpacker.pack_start (reset_box, false, false); + + add (vpacker); view.show (); scroller.show (); + vpacker.show (); unbind_button.set_sensitive (false); } @@ -88,8 +120,6 @@ KeyEditor::unbind () unbind_button.set_sensitive (false); - cerr << "trying to unbind\n"; - if (i != model->children().end()) { string path = (*i)[columns.path]; @@ -112,13 +142,13 @@ KeyEditor::on_show () { populate (); view.get_selection()->unselect_all (); - ArdourDialog::on_show (); + ArdourWindow::on_show (); } void KeyEditor::on_unmap () { - ArdourDialog::on_unmap (); + ArdourWindow::on_unmap (); } void @@ -151,15 +181,16 @@ KeyEditor::action_selected () bool KeyEditor::on_key_press_event (GdkEventKey* ev) { - can_bind = true; - last_state = ev->state; + if (!ev->is_modifier) { + last_keyval = ev->keyval; + } return false; } bool KeyEditor::on_key_release_event (GdkEventKey* ev) { - if (ARDOUR::Profile->get_sae() || !can_bind || ev->state != last_state) { + if (ARDOUR::Profile->get_sae() || last_keyval == 0) { return false; } @@ -172,26 +203,25 @@ KeyEditor::on_key_release_event (GdkEventKey* ev) goto out; } - cerr << "real lkeyval: " << ev->keyval << endl; - possibly_translate_keyval_to_make_legal_accelerator (ev->keyval); - cerr << "using keyval = " << ev->keyval << endl; + GdkModifierType mod = (GdkModifierType)(Keyboard::RelevantModifierKeyMask & ev->state); + Gtkmm2ext::possibly_translate_keyval_to_make_legal_accelerator (ev->keyval); + Gtkmm2ext::possibly_translate_mod_to_make_legal_accelerator (mod); bool result = AccelMap::change_entry (path, - ev->keyval, - ModifierType (Keyboard::RelevantModifierKeyMask & ev->state), + last_keyval, + Gdk::ModifierType(mod), true); - cerr << "New binding to " << ev->keyval << " worked: " << result << endl; - if (result) { AccelKey key; (*i)[columns.binding] = ActionManager::get_key_representation (path, key); + unbind_button.set_sensitive (true); } } out: - can_bind = false; + last_keyval = 0; return true; } @@ -200,21 +230,23 @@ KeyEditor::populate () { vector paths; vector labels; + vector tooltips; vector keys; vector bindings; typedef std::map NodeMap; NodeMap nodes; NodeMap::iterator r; - ActionManager::get_all_actions (labels, paths, keys, bindings); + ActionManager::get_all_actions (labels, paths, tooltips, keys, bindings); vector::iterator k; vector::iterator p; + vector::iterator t; vector::iterator l; model->clear (); - for (l = labels.begin(), k = keys.begin(), p = paths.begin(); l != labels.end(); ++k, ++p, ++l) { + for (l = labels.begin(), k = keys.begin(), p = paths.begin(), t = tooltips.begin(); l != labels.end(); ++k, ++p, ++t, ++l) { TreeModel::Row row; vector parts; @@ -227,6 +259,18 @@ KeyEditor::populate () continue; } + //kinda kludgy way to avoid displaying menu items as mappable + if ( parts[1] == _("Main_menu") ) + continue; + if ( parts[1] == _("redirectmenu") ) + continue; + if ( parts[1] == _("Editor_menus") ) + continue; + if ( parts[1] == _("RegionList") ) + continue; + if ( parts[1] == _("ProcessorMenu") ) + continue; + if ((r = nodes.find (parts[1])) == nodes.end()) { /* top level is missing */ @@ -249,30 +293,27 @@ KeyEditor::populate () /* add this action */ - row[columns.action] = (*l); + if (l->empty ()) { + row[columns.action] = *t; + } else { + row[columns.action] = *l; + } row[columns.path] = (*p); row[columns.bindable] = true; if (*k == ActionManager::unbound_string) { row[columns.binding] = string(); } else { - -#ifdef GTKOSX - string label = (*k); - - /* Gtk/Quartz maps: - NSAlternate/NSOption key to Mod1 - NSCommand key to Meta - */ - - replace_all (label, "", _("Command-")); - replace_all (label, "", _("Option-")); - replace_all (label, "", _("Shift-")); - replace_all (label, "", _("Control-")); - row[columns.binding] = label; -#else row[columns.binding] = (*k); -#endif } } } + +void +KeyEditor::reset () +{ + Keyboard::the_keyboard().reset_bindings (); + populate (); + view.get_selection()->unselect_all (); + populate (); +}