diff options
author | Hans Baier <hansfbaier@googlemail.com> | 2009-01-15 22:48:23 +0000 |
---|---|---|
committer | Hans Baier <hansfbaier@googlemail.com> | 2009-01-15 22:48:23 +0000 |
commit | c174fa61749e3deb54551ca37598c41aedf0a40c (patch) | |
tree | 0049ca40c55cccac953ada259e4d3983b594ff87 /gtk2_ardour | |
parent | b3c6c4a6d589760de476ec4fef4c027be1023718 (diff) |
* fixed bug: replaced underscores in patch/bank names with spaces to avoid becoming menu shortcuts
git-svn-id: svn://localhost/ardour2/branches/3.0@4413 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/canvas-program-change.cc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/gtk2_ardour/canvas-program-change.cc b/gtk2_ardour/canvas-program-change.cc index 35e4671c31..d544d9d8aa 100644 --- a/gtk2_ardour/canvas-program-change.cc +++ b/gtk2_ardour/canvas-program-change.cc @@ -1,5 +1,7 @@ #include <iostream> +#include <glibmm/regex.h> + #include "ardour/midi_patch_manager.h" #include "ardour_ui.h" #include "midi_region_view.h" @@ -64,6 +66,9 @@ CanvasProgramChange::initialize_popup_menus() for (ChannelNameSet::PatchBanks::const_iterator bank = patch_banks.begin(); bank != patch_banks.end(); ++bank) { + Glib::RefPtr<Glib::Regex> underscores = Glib::Regex::create("_"); + Glib::ustring replacement(" "); + Gtk::Menu& patch_bank_menu = *manage(new Gtk::Menu()); const PatchBank::PatchNameList& patches = (*bank)->patch_name_list(); @@ -72,17 +77,22 @@ CanvasProgramChange::initialize_popup_menus() for (PatchBank::PatchNameList::const_iterator patch = patches.begin(); patch != patches.end(); ++patch) { + Glib::ustring name = underscores->replace((*patch)->name().c_str(), -1, 0, replacement); + patch_menus.push_back( Gtk::Menu_Helpers::MenuElem( - (*patch)->name(), + name, sigc::bind( sigc::mem_fun(*this, &CanvasProgramChange::on_patch_menu_selected), (*patch)->patch_primary_key())) ); } + + + Glib::ustring name = underscores->replace((*bank)->name().c_str(), -1, 0, replacement); patch_bank_menus.push_back( Gtk::Menu_Helpers::MenuElem( - (*bank)->name(), + name, patch_bank_menu) ); } } |