first compiling, mostly working version of group controls changes

[ardour.git] / gtk2_ardour / route_time_axis.cc

diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index a07e97a276f4e7de2f78b8f7b330e5e6931ee089..33baf3a5116cfb59a193bf29ce1643b334d6bf6e 100644 (file)
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -738,12 +738,12 @@ RouteTimeAxisView::build_display_menu ()
                                         break;
                                 }
 
-                                alignment_items.push_back (RadioMenuElem (align_group, _("Align With Existing Material")));
+                                alignment_items.push_back (RadioMenuElem (align_group, _("Align with Existing Material")));
                                 i = dynamic_cast<RadioMenuItem*> (&alignment_items.back());
                                 i->set_active (existing != 0 && capture == 0 && automatic == 0);
                                 i->signal_activate().connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_choice), i, UseExistingMaterial, true));
 
-                                alignment_items.push_back (RadioMenuElem (align_group, _("Align With Capture Time")));
+                                alignment_items.push_back (RadioMenuElem (align_group, _("Align with Capture Time")));
                                 i = dynamic_cast<RadioMenuItem*> (&alignment_items.back());
                                 i->set_active (existing == 0 && capture != 0 && automatic == 0);
                                 i->signal_activate().connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_choice), i, UseCaptureTime, true));
@@ -864,8 +864,12 @@ RouteTimeAxisView::build_display_menu ()
 
        items.push_back (SeparatorElem());
        items.push_back (MenuElem (_("Hide"), sigc::bind (sigc::mem_fun(_editor, &PublicEditor::hide_track_in_display), this, true)));
-       items.push_front (SeparatorElem());
-       items.push_front (MenuElem (_("Remove"), sigc::mem_fun(_editor, &PublicEditor::remove_tracks)));
+       if (_route && !_route->is_master()) {
+               items.push_back (SeparatorElem());
+               items.push_back (MenuElem (_("Duplicate..."), boost::bind (&ARDOUR_UI::start_duplicate_routes, ARDOUR_UI::instance())));
+       }
+       items.push_back (SeparatorElem());
+       items.push_back (MenuElem (_("Remove"), sigc::mem_fun(_editor, &PublicEditor::remove_tracks)));
 }
 
 void
@@ -1701,7 +1705,7 @@ RouteTimeAxisView::build_playlist_menu ()
        playlist_items.push_back (MenuElem (_("Clear Current"), sigc::bind(sigc::mem_fun(_editor, &PublicEditor::clear_playlists), this)));
        playlist_items.push_back (SeparatorElem());
 
-       playlist_items.push_back (MenuElem(_("Select From All..."), sigc::mem_fun(*this, &RouteTimeAxisView::show_playlist_selector)));
+       playlist_items.push_back (MenuElem(_("Select from All..."), sigc::mem_fun(*this, &RouteTimeAxisView::show_playlist_selector)));
 }
 
 void