X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fkeyeditor.cc;h=28cd8b8508f0edc2bbae6d82abdf6c5943927db4;hb=8505c16057a074531a99728e730408151d7aafa4;hp=f3ae77865d1db9b653b72bb4aca9adeb0307fa2a;hpb=cded4193fee83af96be59851234daf1f8f1af9f7;p=ardour.git

diff --git a/gtk2_ardour/keyeditor.cc b/gtk2_ardour/keyeditor.cc
index f3ae77865d..28cd8b8508 100644
--- a/gtk2_ardour/keyeditor.cc
+++ b/gtk2_ardour/keyeditor.cc
@@ -1,11 +1,40 @@
+/*
+    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 <gtkmm/stock.h>
+#include <gtkmm/label.h>
 #include <gtkmm/accelkey.h>
 #include <gtkmm/accelmap.h>
 #include <gtkmm/uimanager.h>
 
-#include <pbd/strsplit.h>
+#include "gtkmm2ext/utils.h"
+
+#include "pbd/strsplit.h"
+
+#include "ardour/filesystem_paths.h"
+#include "ardour/profile.h"
 
 #include "actions.h"
 #include "keyboard.h"
@@ -16,36 +45,96 @@
 using namespace std;
 using namespace Gtk;
 using namespace Gdk;
+using namespace PBD;
+
+using Gtkmm2ext::Keyboard;
 
 KeyEditor::KeyEditor ()
-	: ArdourDialog (_("Keybinding Editor"), 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);
 
 	view.set_model (model);
 	view.append_column (_("Action"), columns.action);
-	view.append_column (_("Binding"), columns.binding);
+	view.append_column (_("Shortcut"), columns.binding);
 	view.set_headers_visible (true);
 	view.get_selection()->set_mode (SELECTION_SINGLE);
 	view.set_reorderable (false);
-	view.set_size_request (300,200);
+	view.set_size_request (500,300);
 	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);
 
-	get_vbox()->pack_start (scroller);
-	get_vbox()->set_border_width (12);
+	vpacker.set_spacing (6);
+	vpacker.set_border_width (12);
+	vpacker.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));
+
+		vpacker.pack_start (unbind_box, false, false);
+		unbind_box.show ();
+		unbind_button.show ();
+
+	}
+	
+	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);
 
-	scroller.show ();
 	view.show ();
+	scroller.show ();
+	vpacker.show ();
+
+	unbind_button.set_sensitive (false);
+}
+
+void
+KeyEditor::unbind ()
+{
+	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;
+		}
+
+		bool result = AccelMap::change_entry (path,
+						      0,
+						      (ModifierType) 0,
+						      true);
+		if (result) {
+			(*i)[columns.binding] = string ();
+		}
+	}
 }
 
 void
@@ -53,32 +142,55 @@ 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
 KeyEditor::action_selected ()
 {
+	if (view.get_selection()->count_selected_rows() == 0) {
+		return;
+	}
+
+	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 (!binding.empty()) {
+			unbind_button.set_sensitive (true);
+		}
+	}
 }
 
 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 (!can_bind || ev->state != last_state) {
+	if (ARDOUR::Profile->get_sae() || last_keyval == 0) {
 		return false;
 	}
 
@@ -86,34 +198,30 @@ KeyEditor::on_key_release_event (GdkEventKey* ev)
 
 	if (i != model->children().end()) {
 		string path = (*i)[columns.path];
-		
+
 		if (!(*i)[columns.bindable]) {
 			goto out;
-		} 
+		}
+
+		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) ev->state,
+						      last_keyval,
+						      Gdk::ModifierType(mod),
 						      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);
+			unbind_button.set_sensitive (true);
 		}
-
-		
 	}
 
   out:
-	can_bind = false;
+    last_keyval = 0;
 	return true;
 }
 
@@ -122,33 +230,47 @@ KeyEditor::populate ()
 {
 	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;
 		}
 
+		//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 */
@@ -164,17 +286,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 {
@@ -182,3 +308,12 @@ KeyEditor::populate ()
 		}
 	}
 }
+
+void
+KeyEditor::reset ()
+{
+	Keyboard::the_keyboard().reset_bindings ();
+	populate ();
+	view.get_selection()->unselect_all ();
+	populate ();
+}