Preference Dropdown to limit Automatable Parameters

[ardour.git] / gtk2_ardour / patch_change.cc

diff --git a/gtk2_ardour/patch_change.cc b/gtk2_ardour/patch_change.cc
index ee4165df4a50e3fc88c409a6194809f698b63177..739cda4702d431d5275c3c2801d870f4aae0403f 100644 (file)
--- a/gtk2_ardour/patch_change.cc
+++ b/gtk2_ardour/patch_change.cc
@@ -24,6 +24,7 @@
 #include <glibmm/regex.h>
 
 #include "gtkmm2ext/keyboard.h"
+#include "gtkmm2ext/menu_elems.h"
 #include "gtkmm2ext/utils.h"
 
 #include "midi++/midnam_patch.h"
@@ -49,7 +50,9 @@ PatchChange::PatchChange(MidiRegionView&                   region,
                          double                            x,
                          double                            y,
                          ARDOUR::InstrumentInfo&           info,
-                         ARDOUR::MidiModel::PatchChangePtr patch)
+                         ARDOUR::MidiModel::PatchChangePtr patch,
+                        Gtkmm2ext::Color               outline_color,
+                        Gtkmm2ext::Color               fill_color)
        : _region (region)
        , _info (info)
        , _patch (patch)
@@ -58,8 +61,8 @@ PatchChange::PatchChange(MidiRegionView&                   region,
        _flag = new ArdourCanvas::Flag (
                parent,
                height,
-               UIConfiguration::instance().color ("midi patch change outline"),
-               UIConfiguration::instance().color_mod ("midi patch change fill", "midi patch change fill"),
+               outline_color,
+               fill_color,
                ArdourCanvas::Duple (x, y),
                true);
 
@@ -135,14 +138,8 @@ PatchChange::initialize_popup_menus()
                for (PatchNameList::const_iterator patch = patches.begin();
                     patch != patches.end();
                     ++patch) {
-                       std::string name = (*patch)->name();
-                       boost::replace_all (name, "_", " ");
-
-                       patch_menus.push_back (
-                               Gtk::Menu_Helpers::MenuElem (
-                                       name,
-                                       sigc::bind (sigc::mem_fun(*this, &PatchChange::on_patch_menu_selected),
-                                                   (*patch)->patch_primary_key())));
+                       patch_menus.push_back (Gtkmm2ext::MenuElemNoMnemonic ((*patch)->name(),
+                                               sigc::bind (sigc::mem_fun(*this, &PatchChange::on_patch_menu_selected), (*patch)->patch_primary_key())));
                }
        }
 }