mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-16 19:56:31 +01:00
use icon for cue editor sound selected MIDI notes button and make it sensitive to the UIConfig parameter, and active
This commit is contained in:
parent
ed54b8ee1f
commit
9139b0731b
2 changed files with 13 additions and 2 deletions
|
|
@ -132,7 +132,7 @@ EditingContext::EditingContext (std::string const & name)
|
||||||
, _grid_type (GridTypeBeat)
|
, _grid_type (GridTypeBeat)
|
||||||
, _snap_mode (SnapOff)
|
, _snap_mode (SnapOff)
|
||||||
, _timeline_origin (0.)
|
, _timeline_origin (0.)
|
||||||
, play_note_selection_button (_("Ear"), ArdourButton::Text, true)
|
, play_note_selection_button (ArdourButton::default_elements)
|
||||||
, follow_playhead_button (_("F"), ArdourButton::Text, true)
|
, follow_playhead_button (_("F"), ArdourButton::Text, true)
|
||||||
, full_zoom_button (_("<->"), ArdourButton::Text)
|
, full_zoom_button (_("<->"), ArdourButton::Text)
|
||||||
, visible_channel_label (_("MIDI|Channel"))
|
, visible_channel_label (_("MIDI|Channel"))
|
||||||
|
|
@ -233,6 +233,9 @@ EditingContext::EditingContext (std::string const & name)
|
||||||
|
|
||||||
Config->ParameterChanged.connect (parameter_connections, MISSING_INVALIDATOR, std::bind (&EditingContext::parameter_changed, this, _1), gui_context());
|
Config->ParameterChanged.connect (parameter_connections, MISSING_INVALIDATOR, std::bind (&EditingContext::parameter_changed, this, _1), gui_context());
|
||||||
UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &EditingContext::ui_parameter_changed));
|
UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &EditingContext::ui_parameter_changed));
|
||||||
|
|
||||||
|
std::function<void (string)> pc (std::bind (&EditingContext::ui_parameter_changed, this, _1));
|
||||||
|
UIConfiguration::instance().map_parameters (pc);
|
||||||
}
|
}
|
||||||
|
|
||||||
EditingContext::~EditingContext()
|
EditingContext::~EditingContext()
|
||||||
|
|
@ -242,7 +245,12 @@ EditingContext::~EditingContext()
|
||||||
void
|
void
|
||||||
EditingContext::ui_parameter_changed (string parameter)
|
EditingContext::ui_parameter_changed (string parameter)
|
||||||
{
|
{
|
||||||
if (parameter == "sound-midi-note") {
|
if (parameter == "sound-midi-notes") {
|
||||||
|
if (UIConfiguration::instance().get_sound_midi_notes()) {
|
||||||
|
play_note_selection_button.set_active_state (Gtkmm2ext::ExplicitActive);
|
||||||
|
} else {
|
||||||
|
play_note_selection_button.set_active_state (Gtkmm2ext::Off);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -2777,6 +2785,7 @@ EditingContext::choose_canvas_cursor_on_entry (ItemType type)
|
||||||
void
|
void
|
||||||
EditingContext::play_note_selection_clicked ()
|
EditingContext::play_note_selection_clicked ()
|
||||||
{
|
{
|
||||||
|
UIConfiguration::instance().set_sound_midi_notes (!UIConfiguration::instance().get_sound_midi_notes());
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
|
||||||
|
|
@ -237,6 +237,8 @@ MidiCueEditor::build_upper_toolbar ()
|
||||||
set_tooltip (note_mode_button, _("Toggle between drum and regular note drawing"));
|
set_tooltip (note_mode_button, _("Toggle between drum and regular note drawing"));
|
||||||
note_mode_button.set_icon (ArdourIcon::Drum);
|
note_mode_button.set_icon (ArdourIcon::Drum);
|
||||||
|
|
||||||
|
play_note_selection_button.set_icon (ArdourIcon::ToolAudition);
|
||||||
|
|
||||||
#define PX_SCALE(px) std::max((float)px, rintf((float)px * UIConfiguration::instance().get_ui_scale()))
|
#define PX_SCALE(px) std::max((float)px, rintf((float)px * UIConfiguration::instance().get_ui_scale()))
|
||||||
note_mode_button.set_size_request (PX_SCALE(50), -1);
|
note_mode_button.set_size_request (PX_SCALE(50), -1);
|
||||||
note_mode_button.set_active_color (UIConfiguration::instance().color ("alert:yellow"));
|
note_mode_button.set_active_color (UIConfiguration::instance().color ("alert:yellow"));
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue