X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fkeyeditor.cc;h=88c4682c558c46664f414193bf9bc282b7d76ec8;hb=79c918fd6aace3f5d94fe61973819574489ca755;hp=cdac398a30db958bcadf5d58e8fd111064152662;hpb=8aa9508c82f32efcf9c7c00e2c9e76268d4dddce;p=ardour.git diff --git a/gtk2_ardour/keyeditor.cc b/gtk2_ardour/keyeditor.cc index cdac398a30..88c4682c55 100644 --- a/gtk2_ardour/keyeditor.cc +++ b/gtk2_ardour/keyeditor.cc @@ -1,6 +1,29 @@ +/* + Copyright (C) 2002 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 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 "ardour/profile.h" #include #include @@ -8,14 +31,17 @@ #include #include -#include -#include +#include "gtkmm2ext/utils.h" -#include +#include "pbd/strsplit.h" +#include "pbd/replace_all.h" + +#include "ardour/profile.h" #include "actions.h" #include "keyboard.h" #include "keyeditor.h" +#include "utils.h" #include "i18n.h" @@ -24,11 +50,13 @@ using namespace Gtk; using namespace Gdk; using namespace PBD; +using Gtkmm2ext::Keyboard; + KeyEditor::KeyEditor () - : ArdourDialog (_("Shortcut Editor"), false) + : ArdourDialog (_("Key Bindings"), false) , unbind_button (_("Remove shortcut")) , unbind_box (BUTTONBOX_END) - + { can_bind = false; last_state = 0; @@ -45,9 +73,9 @@ KeyEditor::KeyEditor () view.set_enable_search (false); view.set_rules_hint (true); view.set_name (X_("KeyEditorTree")); - - view.get_selection()->signal_changed().connect (mem_fun (*this, &KeyEditor::action_selected)); - + + view.get_selection()->signal_changed().connect (sigc::mem_fun (*this, &KeyEditor::action_selected)); + scroller.add (view); scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); @@ -62,12 +90,12 @@ KeyEditor::KeyEditor () unbind_box.set_spacing (6); unbind_box.pack_start (*hint, false, true); unbind_box.pack_start (unbind_button, false, false); - unbind_button.signal_clicked().connect (mem_fun (*this, &KeyEditor::unbind)); + unbind_button.signal_clicked().connect (sigc::mem_fun (*this, &KeyEditor::unbind)); get_vbox()->pack_start (unbind_box, false, false); unbind_box.show (); unbind_button.show (); - + } get_vbox()->set_border_width (12); @@ -82,15 +110,17 @@ void KeyEditor::unbind () { TreeModel::iterator i = view.get_selection()->get_selected(); - + unbind_button.set_sensitive (false); + cerr << "trying to unbind\n"; + if (i != model->children().end()) { string path = (*i)[columns.path]; - + if (!(*i)[columns.bindable]) { return; - } + } bool result = AccelMap::change_entry (path, 0, @@ -124,16 +154,16 @@ KeyEditor::action_selected () } TreeModel::iterator i = view.get_selection()->get_selected(); - + unbind_button.set_sensitive (false); if (i != model->children().end()) { string path = (*i)[columns.path]; - + if (!(*i)[columns.bindable]) { return; - } + } string binding = (*i)[columns.binding]; @@ -162,27 +192,26 @@ KeyEditor::on_key_release_event (GdkEventKey* ev) if (i != model->children().end()) { string path = (*i)[columns.path]; - + if (!(*i)[columns.bindable]) { goto out; - } + } + + cerr << "real lkeyval: " << ev->keyval << endl; + Gtkmm2ext::possibly_translate_keyval_to_make_legal_accelerator (ev->keyval); + cerr << "using keyval = " << ev->keyval << endl; + bool result = AccelMap::change_entry (path, ev->keyval, - (ModifierType) ev->state, + ModifierType (Keyboard::RelevantModifierKeyMask & ev->state), true); + cerr << "New binding to " << ev->keyval << " worked: " << result << endl; + if (result) { - bool known; AccelKey key; - - known = ActionManager::lookup_entry (path, key); - - if (known) { - (*i)[columns.binding] = ActionManager::ui_manager->get_accel_group()->name (key.get_key(), Gdk::ModifierType (key.get_mod())); - } else { - (*i)[columns.binding] = string(); - } + (*i)[columns.binding] = ActionManager::get_key_representation (path, key); } } @@ -196,29 +225,31 @@ 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; - + parts.clear (); split (*p, parts, '/'); - + if (parts.empty()) { continue; } @@ -238,17 +269,21 @@ KeyEditor::populate () row = *(model->append (parent.children())); } else { - + row = *(model->append ((*r->second)->children())); } - + /* 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 { @@ -258,7 +293,7 @@ KeyEditor::populate () /* Gtk/Quartz maps: NSAlternate/NSOption key to Mod1 - NSCommand key to Meta + NSCommand key to Meta */ replace_all (label, "", _("Command-")); @@ -266,7 +301,7 @@ KeyEditor::populate () replace_all (label, "", _("Shift-")); replace_all (label, "", _("Control-")); row[columns.binding] = label; -#else +#else row[columns.binding] = (*k); #endif }