diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-02-17 16:43:30 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-02-17 16:43:30 +0000 |
| commit | 97e2aedc2d8f9ba8b6100e9ddafa08fc9762c8f7 (patch) | |
| tree | 3059e0cd20f14d7e1e6aaa2281f9b44ba381c4e1 /gtk2_ardour | |
| parent | 469b390e52eaea810b366eede2f9821a7ca238d1 (diff) | |
Make controller menu items look the same whether for one channel or many (#3779).
git-svn-id: svn://localhost/ardour2/branches/3.0@8886 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/midi_time_axis.cc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index 2df561da3d..91bc3157f1 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -442,6 +442,7 @@ MidiTimeAxisView::build_automation_action_menu () automation_items.push_back (MenuElem (_("Controllers"), *controller_menu)); } else { automation_items.push_back (MenuElem (string_compose ("<i>%1</i>", _("No MIDI Channels selected")))); + dynamic_cast<Label*> (automation_items.back().get_child())->set_use_markup (true); } } @@ -664,9 +665,14 @@ MidiTimeAxisView::build_controller_menu () if (selected_channels & (0x0001 << chn)) { Evoral::Parameter fully_qualified_param (MidiCCAutomation, chn, ctl); - ctl_items.push_back (CheckMenuElem (_route->describe_parameter (fully_qualified_param), - sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::toggle_automation_track), - fully_qualified_param))); + ctl_items.push_back ( + CheckMenuElem ( + string_compose ("<b>%1</b>: %2 [%3]", ctl, midi_name (ctl), int (chn)), + sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::toggle_automation_track), + fully_qualified_param) + ) + ); + dynamic_cast<Label*> (ctl_items.back().get_child())->set_use_markup (true); boost::shared_ptr<AutomationTimeAxisView> track = automation_child (fully_qualified_param); bool visible = false; @@ -998,7 +1004,7 @@ MidiTimeAxisView::set_channel_mode (ChannelMode, uint16_t) /* TODO: Bender, Pressure */ - /* invalidate the controller menu, so that we rebuilt it next time */ + /* invalidate the controller menu, so that we rebuild it next time */ _controller_menu_map.clear (); delete controller_menu; controller_menu = 0; |