smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 16:24:57 +01:00
Code Issues Projects Releases Wiki Activity

Add strip dialog to blank Trigger Page

Browse source
This commit is contained in:
Robin Gareus 2021-12-14 21:03:48 +01:00
parent 36e995b2e4
commit 509c247bfe
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

27
gtk2_ardour/trigger_page.cc
View file

@ -103,8 +103,12 @@ TriggerPage::TriggerPage ()
/* last item of strip packer */ /* last item of strip packer */
_strip_packer.pack_end (_no_strips, true, true); _strip_packer.pack_end (_no_strips, true, true);
_no_strips.set_size_request (PX_SCALE (60), -1); _no_strips.set_flags (Gtk::CAN_FOCUS);
_no_strips.signal_expose_event ().connect (sigc::bind (sigc::ptr_fun (&ArdourWidgets::ArdourIcon::expose), &_no_strips, ArdourWidgets::ArdourIcon::CloseCross)); _no_strips.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
_no_strips.set_size_request (PX_SCALE (20), -1);
_no_strips.signal_expose_event ().connect (sigc::bind (sigc::ptr_fun (&ArdourWidgets::ArdourIcon::expose), &_no_strips, ArdourWidgets::ArdourIcon::ShadedPlusSign));
_no_strips.signal_button_press_event().connect (sigc::mem_fun(*this, &TriggerPage::no_strip_button_event));
_no_strips.signal_button_release_event().connect (sigc::mem_fun(*this, &TriggerPage::no_strip_button_event));
_strip_group_box.pack_start (_slot_area_box, false, false); _strip_group_box.pack_start (_slot_area_box, false, false);
_strip_group_box.pack_start (_strip_scroller, true, true); _strip_group_box.pack_start (_strip_scroller, true, true);
@ -127,6 +131,7 @@ TriggerPage::TriggerPage ()
_strip_packer.show (); _strip_packer.show ();
_slot_area_box.show_all (); _slot_area_box.show_all ();
_trigger_clip_picker.show (); _trigger_clip_picker.show ();
_no_strips.show ();
/* setup keybidings */ /* setup keybidings */
_content.set_data ("ardour-bindings", bindings); _content.set_data ("ardour-bindings", bindings);
@ -405,7 +410,6 @@ TriggerPage::remove_route (TriggerStrip* ra)
void void
TriggerPage::redisplay_track_list () TriggerPage::redisplay_track_list ()
{ {
bool visible_triggers = false;
for (list<TriggerStrip*>::iterator i = _strips.begin (); i != _strips.end (); ++i) { for (list<TriggerStrip*>::iterator i = _strips.begin (); i != _strips.end (); ++i) {
TriggerStrip* strip = *i; TriggerStrip* strip = *i;
boost::shared_ptr<Stripable> s = strip->stripable (); boost::shared_ptr<Stripable> s = strip->stripable ();
@ -427,17 +431,10 @@ TriggerPage::redisplay_track_list ()
} else if (!hidden && strip->get_parent ()) { } else if (!hidden && strip->get_parent ()) {
/* already packed, put it at the end */ /* already packed, put it at the end */
_strip_packer.reorder_child (*strip, -1); /* put at end */ _strip_packer.reorder_child (*strip, -1); /* put at end */
visible_triggers = true;
} else if (!hidden) { } else if (!hidden) {
_strip_packer.pack_start (*strip, false, false); _strip_packer.pack_start (*strip, false, false);
visible_triggers = true;
} }
} }
if (visible_triggers) {
_no_strips.hide ();
} else {
_no_strips.show ();
}
} }
void void
@ -469,6 +466,16 @@ TriggerPage::stripable_property_changed (PBD::PropertyChange const& what_changed
} }
} }
bool
TriggerPage::no_strip_button_event (GdkEventButton* ev)
{
if ((ev->type == GDK_2BUTTON_PRESS && ev->button == 1) || (ev->type == GDK_BUTTON_RELEASE && Keyboard::is_context_menu_event (ev))) {
ARDOUR_UI::instance()->add_route ();
return true;
}
return false;
}
gint gint
TriggerPage::start_updating () TriggerPage::start_updating ()
{ {

2
gtk2_ardour/trigger_page.h
View file

@ -69,6 +69,8 @@ private:
void pi_property_changed (PBD::PropertyChange const&); void pi_property_changed (PBD::PropertyChange const&);
void stripable_property_changed (PBD::PropertyChange const&, boost::weak_ptr<ARDOUR::Stripable>); void stripable_property_changed (PBD::PropertyChange const&, boost::weak_ptr<ARDOUR::Stripable>);
bool no_strip_button_event (GdkEventButton*);
void selection_changed (); void selection_changed ();
PBD::ScopedConnectionList editor_connections; PBD::ScopedConnectionList editor_connections;