diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-01-22 16:59:09 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-01-22 16:59:09 +0000 |
| commit | 753076d75ec900146f5fbba6c78cf94376e8be75 (patch) | |
| tree | a480321b1480408ec9ed94d7c0469789dadfaa0c | |
| parent | 33130cd40bc3caf153e96568bf8b542bc7d1498f (diff) | |
include BOTH loop-region and set-loop-from-region on main Region menu, and add a border to a plugin DnD reconf error dialog
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@6543 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/ardour.menus.in | 1 | ||||
| -rw-r--r-- | gtk2_ardour/editor_actions.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/evtest.cc | 8 | ||||
| -rw-r--r-- | gtk2_ardour/redirect_box.cc | 5 |
4 files changed, 14 insertions, 2 deletions
diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in index c4d8d4fbb7..af6489ca69 100644 --- a/gtk2_ardour/ardour.menus.in +++ b/gtk2_ardour/ardour.menus.in @@ -280,6 +280,7 @@ <menuitem action='region-fill-track'/> <separator/> <menuitem action='loop-region'/> + <menuitem action='set-loop-from-region'/> <menuitem action='set-punch-from-region'/> <menuitem action='add-range-marker-from-region'/> <menuitem action='add-range-markers-from-region'/> diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index f50934fe3e..87912d84f0 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -394,11 +394,13 @@ Editor::register_actions () ActionManager::region_selection_sensitive_actions.push_back (act); act = ActionManager::register_action (editor_actions, "set-punch-from-edit-range", _("Set Punch From Edit Range"), mem_fun(*this, &Editor::set_punch_from_edit_range)); ActionManager::session_sensitive_actions.push_back (act); + ActionManager::region_selection_sensitive_actions.push_back (act); act = ActionManager::register_action (editor_actions, "set-punch-from-region", _("Set Punch From Region"), mem_fun(*this, &Editor::set_punch_from_region)); ActionManager::session_sensitive_actions.push_back (act); ActionManager::region_selection_sensitive_actions.push_back (act); act = ActionManager::register_action (editor_actions, "pitch-shift-region", _("Transpose"), mem_fun(*this, &Editor::pitch_shift_regions)); ActionManager::session_sensitive_actions.push_back (act); + ActionManager::region_selection_sensitive_actions.push_back (act); act = ActionManager::register_action (editor_actions, "toggle-opaque-region", _("Toggle Opaque"), mem_fun(*this, &Editor::toggle_region_opaque)); ActionManager::session_sensitive_actions.push_back (act); ActionManager::region_selection_sensitive_actions.push_back (act); diff --git a/gtk2_ardour/evtest.cc b/gtk2_ardour/evtest.cc index 1dc1c037f4..b986e030cc 100644 --- a/gtk2_ardour/evtest.cc +++ b/gtk2_ardour/evtest.cc @@ -12,6 +12,14 @@ print_event (GdkEvent* event) cerr << "Event: type = " << event->type << ' '; switch (event->type) { + case GDK_2BUTTON_PRESS: + cerr << "2-Button press, button = " + << event->button.button + << " state " + << event->button.state + << endl; + break; + case GDK_BUTTON_PRESS: cerr << "Button press, button = " << event->button.button diff --git a/gtk2_ardour/redirect_box.cc b/gtk2_ardour/redirect_box.cc index 222cbb4d22..1b7f868926 100644 --- a/gtk2_ardour/redirect_box.cc +++ b/gtk2_ardour/redirect_box.cc @@ -743,10 +743,11 @@ RedirectBox::compute_redirect_sort_keys () Label label; label.set_text (_("\ -You cannot reorder this set of redirects\n\ +You cannot reorder the plugins/sends/inserts\n\ in that way because the inputs and\n\ -outputs do not work correctly.")); +outputs will not work correctly.")); + dialog.get_vbox()->set_border_width (12); dialog.get_vbox()->pack_start (label); dialog.add_button (Stock::OK, RESPONSE_ACCEPT); |