X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fkeyeditor.cc;h=07042a1cdf031296c26d2678b948e9c2492c6ba2;hb=04bf9d1e9594688db4a69c3660feef2efe23945b;hp=6b1aec7f4ee7f22ca99a13dc01d3a081d1cd2829;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git diff --git a/gtk2_ardour/keyeditor.cc b/gtk2_ardour/keyeditor.cc index 6b1aec7f4e..07042a1cdf 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,8 +29,9 @@ #include #include +#include "gtkmm2ext/utils.h" + #include "pbd/strsplit.h" -#include "pbd/replace_all.h" #include "ardour/profile.h" @@ -25,8 +47,10 @@ using namespace Gtk; using namespace Gdk; using namespace PBD; +using Gtkmm2ext::Keyboard; + KeyEditor::KeyEditor () - : ArdourDialog (_("Shortcut Editor"), false) + : ArdourWindow (_("Key Bindings")) , unbind_button (_("Remove shortcut")) , unbind_box (BUTTONBOX_END) @@ -47,14 +71,15 @@ KeyEditor::KeyEditor () 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); + add (vpacker); - get_vbox()->set_spacing (6); - get_vbox()->pack_start (scroller); + vpacker.set_spacing (6); + vpacker.pack_start (scroller); if (!ARDOUR::Profile->get_sae()) { @@ -63,18 +88,19 @@ 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); + vpacker.pack_start (unbind_box, false, false); unbind_box.show (); unbind_button.show (); } - get_vbox()->set_border_width (12); + vpacker.set_border_width (12); view.show (); scroller.show (); + vpacker.show (); unbind_button.set_sensitive (false); } @@ -108,13 +134,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 @@ -168,7 +194,8 @@ KeyEditor::on_key_release_event (GdkEventKey* ev) goto out; } - possibly_translate_keyval_to_make_legal_accelerator (ev->keyval); + Gtkmm2ext::possibly_translate_keyval_to_make_legal_accelerator (ev->keyval); + bool result = AccelMap::change_entry (path, ev->keyval, @@ -176,16 +203,8 @@ KeyEditor::on_key_release_event (GdkEventKey* ev) true); 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); } } @@ -199,21 +218,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; @@ -226,6 +247,20 @@ KeyEditor::populate () continue; } + //kinda kludgy way to avoid displaying menu items as mappable + if ( parts[1] == _("Main_menu") ) + continue; + if ( parts[1] == _("JACK") ) + 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 */ @@ -248,30 +283,18 @@ 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 } } }