fix Window->Common move for show-mixer

[ardour.git] / libs / surfaces / faderport / gui.cc

diff --git a/libs/surfaces/faderport/gui.cc b/libs/surfaces/faderport/gui.cc
index f56512e52697039d0e8e2a2eaa40cfb68d461c67..5b0921e9ac051f351ac57647b4e4cd9b4b3695bb 100644 (file)
--- a/libs/surfaces/faderport/gui.cc
+++ b/libs/surfaces/faderport/gui.cc
@@ -26,6 +26,7 @@
 #include "pbd/file_utils.h"
 
 #include "gtkmm2ext/actions.h"
+#include "gtkmm2ext/bindings.h"
 #include "gtkmm2ext/gtk_ui.h"
 #include "gtkmm2ext/gui_thread.h"
 #include "gtkmm2ext/utils.h"
@@ -36,7 +37,7 @@
 #include "faderport.h"
 #include "gui.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace PBD;
 using namespace ARDOUR;
@@ -357,12 +358,14 @@ FPGUI::build_available_action_menu ()
        vector<string> labels;
        vector<string> tooltips;
        vector<string> keys;
-       vector<AccelKey> bindings;
+       vector<Glib::RefPtr<Gtk::Action> > actions;
+
+       ActionManager::get_all_actions (paths, labels, tooltips, keys, actions);
+
        typedef std::map<string,TreeIter> NodeMap;
        NodeMap nodes;
        NodeMap::iterator r;
 
-       ActionManager::get_all_actions (labels, paths, tooltips, keys, bindings);
 
        vector<string>::iterator k;
        vector<string>::iterator p;
@@ -517,7 +520,7 @@ FPGUI::build_mix_action_combo (Gtk::ComboBox& cb, FaderPort::ButtonState bs)
 {
        vector<pair<string,string> > actions;
 
-       actions.push_back (make_pair (string (_("Toggle Editor & Mixer Windows")), string (X_("Common/toggle-editor-mixer"))));
+       actions.push_back (make_pair (string (_("Show Mixer Window")), string (X_("Common/show-mixer"))));
        actions.push_back (make_pair (string (_("Show/Hide Mixer list")), string (X_("Common/ToggleMixerList"))));
        actions.push_back (make_pair (string("Toggle Meterbridge"), string(X_("Common/toggle-meterbridge"))));
        actions.push_back (make_pair (string (_("Show/Hide Editor mixer strip")), string (X_("Editor/show-editor-mixer"))));
@@ -530,6 +533,7 @@ FPGUI::build_proj_action_combo (Gtk::ComboBox& cb, FaderPort::ButtonState bs)
 {
        vector<pair<string,string> > actions;
 
+       actions.push_back (make_pair (string (_("Show Editor Window")), string (X_("Mixer/show-editor"))));
        actions.push_back (make_pair (string("Toggle Editor Lists"), string(X_("Editor/show-editor-list"))));
        actions.push_back (make_pair (string("Toggle Summary"), string(X_("Editor/ToggleSummary"))));
        actions.push_back (make_pair (string("Toggle Meterbridge"), string(X_("Common/toggle-meterbridge"))));
@@ -568,6 +572,8 @@ FPGUI::build_foot_action_combo (Gtk::ComboBox& cb, FaderPort::ButtonState bs)
        actions.push_back (make_pair (string("Toggle Roll+Rec"), string(X_("Transport/record-roll"))));
        actions.push_back (make_pair (string("Toggle Loop"), string(X_("Transport/Loop"))));
        actions.push_back (make_pair (string("Toggle Click"), string(X_("Transport/ToggleClick"))));
+       actions.push_back (make_pair (string("Record with Pre-Roll"), string(X_("Transport/RecordPreroll"))));
+       actions.push_back (make_pair (string("Record with Count-In"), string(X_("Transport/RecordCountIn"))));
 
        build_action_combo (cb, actions, FaderPort::Footswitch, bs);
 }