-#include <map>
+/*
+ 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 <map>
#include <gtkmm/stock.h>
#include <gtkmm/label.h>
#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"
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);
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()) {
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 ("<span size=\"large\" weight=\"bold\">%1</span>", _("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);
}
unbind_button.set_sensitive (false);
- cerr << "trying to unbind\n";
-
if (i != model->children().end()) {
string path = (*i)[columns.path];
{
populate ();
view.get_selection()->unselect_all ();
- ArdourDialog::on_show ();
+ ArdourWindow::on_show ();
}
void
KeyEditor::on_unmap ()
{
- ArdourDialog::on_unmap ();
+ ArdourWindow::on_unmap ();
}
void
bool
KeyEditor::on_key_press_event (GdkEventKey* ev)
{
- can_bind = true;
- last_state = ev->state;
- return false;
+ if (!ev->is_modifier) {
+ last_keyval = ev->keyval;
+ }
+ return ArdourWindow::on_key_press_event (ev);
}
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;
}
goto out;
}
- cerr << "real lkeyval: " << ev->keyval << endl;
- Gtkmm2ext::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;
}
{
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;
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 */
/* 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, "<Meta>", _("Command-"));
- replace_all (label, "<Alt>", _("Option-"));
- replace_all (label, "<Shift>", _("Shift-"));
- replace_all (label, "<Control>", _("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 ();
+}
projects / ardour.git / blobdiff