HIG-ify the locations UI a bit. Should fix #3526.
[ardour.git] / gtk2_ardour / keyeditor.cc
index f3ae77865d1db9b653b72bb4aca9adeb0307fa2a..2a72adb5dd2b35119e795640a45a2f0cbb0799bd 100644 (file)
@@ -1,24 +1,39 @@
 #include <map>
 
+#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 "gtkmm2ext/utils.h"
+
+#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"
 
 using namespace std;
 using namespace Gtk;
 using namespace Gdk;
+using namespace PBD;
+
+using Gtkmm2ext::Keyboard;
 
 KeyEditor::KeyEditor ()
-       : ArdourDialog (_("Keybinding Editor"), false)
+       : ArdourDialog (_("Key Bindings"), false)
+       , unbind_button (_("Remove shortcut"))
+       , unbind_box (BUTTONBOX_END)
+
 {
        can_bind = false;
        last_state = 0;
@@ -27,25 +42,71 @@ KeyEditor::KeyEditor ()
 
        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()->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);
 
-       scroller.show ();
        view.show ();
+       scroller.show ();
+
+       unbind_button.set_sensitive (false);
+}
+
+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,
+                                                     (ModifierType) 0,
+                                                     true);
+               if (result) {
+                       (*i)[columns.binding] = string ();
+               }
+       }
 }
 
 void
@@ -65,6 +126,28 @@ KeyEditor::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
@@ -78,7 +161,7 @@ KeyEditor::on_key_press_event (GdkEventKey* ev)
 bool
 KeyEditor::on_key_release_event (GdkEventKey* ev)
 {
-       if (!can_bind || ev->state != last_state) {
+       if (ARDOUR::Profile->get_sae() || !can_bind || ev->state != last_state) {
                return false;
        }
 
@@ -86,30 +169,27 @@ 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);
                }
-
-               
        }
 
   out:
@@ -127,9 +207,9 @@ KeyEditor::populate ()
        typedef std::map<string,TreeIter> NodeMap;
        NodeMap nodes;
        NodeMap::iterator r;
-       
+
        ActionManager::get_all_actions (labels, paths, keys, bindings);
-       
+
        vector<string>::iterator k;
        vector<string>::iterator p;
        vector<string>::iterator l;
@@ -137,14 +217,14 @@ KeyEditor::populate ()
        model->clear ();
 
        for (l = labels.begin(), k = keys.begin(), p = paths.begin(); l != labels.end(); ++k, ++p, ++l) {
-               
+
                TreeModel::Row row;
                vector<string> parts;
-               
+
                parts.clear ();
 
                split (*p, parts, '/');
-               
+
                if (parts.empty()) {
                        continue;
                }
@@ -164,21 +244,37 @@ KeyEditor::populate ()
                        row = *(model->append (parent.children()));
 
                } else {
-                       
+
                        row = *(model->append ((*r->second)->children()));
 
                }
-               
+
                /* add this action */
 
                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
                }
        }
 }