+/*
+ 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 <map>
-#include <ardour/profile.h>
+#include "ardour/profile.h"
#include <gtkmm/stock.h>
+#include <gtkmm/label.h>
#include <gtkmm/accelkey.h>
#include <gtkmm/accelmap.h>
#include <gtkmm/uimanager.h>
-#include <pbd/strsplit.h>
-#include <pbd/replace_all.h>
+#include "gtkmm2ext/utils.h"
+
+#include "pbd/strsplit.h"
+#include "pbd/replace_all.h"
-#include <ardour/profile.h>
+#include "ardour/profile.h"
#include "actions.h"
#include "keyboard.h"
#include "keyeditor.h"
+#include "utils.h"
#include "i18n.h"
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;
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);
- unbind_box.pack_start (unbind_button, false, false);
-
- unbind_button.signal_clicked().connect (mem_fun (*this, &KeyEditor::unbind));
get_vbox()->set_spacing (6);
get_vbox()->pack_start (scroller);
if (!ARDOUR::Profile->get_sae()) {
+
+ Label* hint = manage (new Label (_("Select an action, then press the key(s) to (re)set its shortcut")));
+ hint->show ();
+ 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 (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);
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,
}
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];
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);
}
}
{
vector<string> paths;
vector<string> labels;
+ vector<string> tooltips;
vector<string> keys;
vector<AccelKey> bindings;
typedef std::map<string,TreeIter> NodeMap;
NodeMap nodes;
NodeMap::iterator r;
-
- ActionManager::get_all_actions (labels, paths, keys, bindings);
-
+
+ ActionManager::get_all_actions (labels, paths, tooltips, keys, bindings);
+
vector<string>::iterator k;
vector<string>::iterator p;
+ vector<string>::iterator t;
vector<string>::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<string> parts;
-
+
parts.clear ();
split (*p, parts, '/');
-
+
if (parts.empty()) {
continue;
}
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 {
#ifdef GTKOSX
string label = (*k);
- replace_all (label, "<Mod5>", _("Command-"));
+
+ /* Gtk/Quartz maps:
+ NSAlternate/NSOption key to Mod1
+ NSCommand key to Meta
+ */
+
+ replace_all (label, "<Meta>", _("Command-"));
replace_all (label, "<Alt>", _("Option-"));
replace_all (label, "<Shift>", _("Shift-"));
+ replace_all (label, "<Control>", _("Control-"));
row[columns.binding] = label;
-#else
+#else
row[columns.binding] = (*k);
#endif
}
projects / ardour.git / blobdiff