mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-15 19:16:40 +01:00
Transfer slot_prop_box to selection_properties_box
This commit is contained in:
parent
4c5284737d
commit
fcae7c7bb5
4 changed files with 32 additions and 14 deletions
|
|
@ -152,10 +152,11 @@ TriggerPage::TriggerPage ()
|
|||
table.set_border_width (8);
|
||||
|
||||
int col = 0;
|
||||
table.attach (_slot_prop_box, col, col + 1, 0, 1, Gtk::FILL, Gtk::SHRINK | Gtk::FILL);
|
||||
table.attach (_properties_box, col, col + 1, 0, 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK | Gtk::FILL);
|
||||
++col;
|
||||
table.attach (_audio_trig_box, col, col + 1, 0, 1, Gtk::FILL, Gtk::SHRINK | Gtk::FILL);
|
||||
clip_editor_column = ++col;
|
||||
++col;
|
||||
|
||||
table.set_no_show_all ();
|
||||
|
||||
|
|
@ -194,6 +195,7 @@ TriggerPage::TriggerPage ()
|
|||
_trigger_clip_picker.show ();
|
||||
_no_strips.show ();
|
||||
_sidebar_vbox.show_all ();
|
||||
_properties_box.show();
|
||||
|
||||
/* setup keybidings */
|
||||
set_widget_bindings (contents(), *bindings, ARDOUR_BINDING_KEY);
|
||||
|
|
@ -365,7 +367,7 @@ TriggerPage::set_session (Session* s)
|
|||
|
||||
initial_track_display ();
|
||||
|
||||
_slot_prop_box.set_session (s);
|
||||
_properties_box.set_session (s);
|
||||
|
||||
_audio_trig_box.set_session (s);
|
||||
|
||||
|
|
@ -473,7 +475,6 @@ TriggerPage::trigger_arm_changed (Trigger const * trigger)
|
|||
|
||||
/* hide everything */
|
||||
|
||||
_slot_prop_box.hide ();
|
||||
_audio_trig_box.hide ();
|
||||
_midi_trig_box.hide ();
|
||||
_midi_editor->viewport().hide ();
|
||||
|
|
@ -483,9 +484,6 @@ TriggerPage::trigger_arm_changed (Trigger const * trigger)
|
|||
TriggerBox& box = trigger->box();
|
||||
TriggerReference ref (trigger->boxptr(), trigger->index());
|
||||
|
||||
_slot_prop_box.set_slot (ref);
|
||||
_slot_prop_box.show ();
|
||||
|
||||
if (box.data_type () == DataType::AUDIO) {
|
||||
if (trigger->the_region()) {
|
||||
_audio_trig_box.set_trigger (ref);
|
||||
|
|
@ -513,7 +511,6 @@ TriggerPage::selection_changed ()
|
|||
|
||||
/* hide everything */
|
||||
|
||||
_slot_prop_box.hide ();
|
||||
_audio_trig_box.hide ();
|
||||
_midi_trig_box.hide ();
|
||||
|
||||
|
|
@ -533,9 +530,6 @@ TriggerPage::selection_changed ()
|
|||
TriggerPtr trigger = entry->trigger ();
|
||||
std::shared_ptr<TriggerBox> box = ref.box();
|
||||
|
||||
_slot_prop_box.set_slot (ref);
|
||||
_slot_prop_box.show ();
|
||||
|
||||
if (box->data_type () == DataType::AUDIO) {
|
||||
|
||||
if (trigger->the_region()) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue