change before/after cursor keybindings, attempt to clarify range/diskstream popup...

git-svn-id: svn://localhost/trunk/ardour2@333 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour.bindings b/gtk2_ardour/ardour.bindings
index 97e41baa17e85e77198459113ba365456c0b730f..7992e4db1d0727713fc673210b137aaf3aefdc83 100644 (file)
--- a/gtk2_ardour/ardour.bindings
+++ b/gtk2_ardour/ardour.bindings
@@ -61,10 +61,10 @@
 (gtk_accel_path "<Actions>/Editor/temporal-zoom-out" "equal")
 
 (gtk_accel_path "<Actions>/Editor/select-all" "<control>a")
-(gtk_accel_path "<Actions>/Editor/select-all-after-edit-cursor" "<Control>e")
-(gtk_accel_path "<Actions>/Editor/select-all-before-edit-cursor" "<shift><control>e")
-(gtk_accel_path "<Actions>/Editor/select-all-after-playhead" "<Control>p")
-(gtk_accel_path "<Actions>/Editor/select-all-before-playhead" "<shift><control>p")
+(gtk_accel_path "<Actions>/Editor/select-all-after-edit-cursor" "<shift><Control>e")
+(gtk_accel_path "<Actions>/Editor/select-all-before-edit-cursor" "<control>e")
+(gtk_accel_path "<Actions>/Editor/select-all-after-playhead" "<shift><Control>p")
+(gtk_accel_path "<Actions>/Editor/select-all-before-playhead" "<control>p")
 (gtk_accel_path "<Actions>/Editor/select-all-in-punch-range" "<Control>d")
 (gtk_accel_path "<Actions>/Editor/select-all-in-loop-range" "<Control>l")
 

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index fadd06caf9ca5332fde41f77c076083eeec8450f..066f29499e9fff3e09036490b607b7f386fd042b 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -1828,21 +1828,22 @@ Editor::add_selection_context_items (Menu_Helpers::MenuList& edit_items)
        items.push_back (MenuElem (_("Play range"), mem_fun(*this, &Editor::play_selection)));
        items.push_back (MenuElem (_("Loop range"), mem_fun(*this, &Editor::set_route_loop_selection)));
        items.push_back (SeparatorElem());
+       items.push_back (MenuElem (_("Separate range to track"), mem_fun(*this, &Editor::separate_region_from_selection)));
+       items.push_back (MenuElem (_("Separate range to region list"), mem_fun(*this, &Editor::new_region_from_selection)));
+       items.push_back (SeparatorElem());
        items.push_back (MenuElem (_("Select all in range"), mem_fun(*this, &Editor::select_all_selectables_using_time_selection)));
        items.push_back (SeparatorElem());
+       items.push_back (MenuElem (_("Set range to loop range"), mem_fun(*this, &Editor::set_selection_from_loop)));
+       items.push_back (MenuElem (_("Set range to punch range"), mem_fun(*this, &Editor::set_selection_from_punch)));
+       items.push_back (SeparatorElem());
+       items.push_back (MenuElem (_("Crop region to range"), mem_fun(*this, &Editor::crop_region_to_selection)));
+       items.push_back (MenuElem (_("Fill range with region"), mem_fun(*this, &Editor::region_fill_selection)));
+       items.push_back (MenuElem (_("Duplicate range"), bind (mem_fun(*this, &Editor::duplicate_dialog), false)));
        items.push_back (MenuElem (_("Create chunk from range"), mem_fun(*this, &Editor::name_selection)));
        items.push_back (SeparatorElem());
-       items.push_back (MenuElem (_("Create Region"), mem_fun(*this, &Editor::new_region_from_selection)));
-       items.push_back (MenuElem (_("Separate Region"), mem_fun(*this, &Editor::separate_region_from_selection)));
-       items.push_back (MenuElem (_("Crop Region to range"), mem_fun(*this, &Editor::crop_region_to_selection)));
        items.push_back (MenuElem (_("Bounce range"), mem_fun(*this, &Editor::bounce_range_selection)));
-       items.push_back (SeparatorElem());
-       items.push_back (MenuElem (_("Duplicate"), bind (mem_fun(*this, &Editor::duplicate_dialog), false)));
-       items.push_back (SeparatorElem());
-       items.push_back (MenuElem (_("Export"), mem_fun(*this, &Editor::export_selection)));
-       items.push_back (SeparatorElem());
-       items.push_back (MenuElem (_("Fill range w/Region"), mem_fun(*this, &Editor::region_fill_selection)));
-       
+       items.push_back (MenuElem (_("Export range"), mem_fun(*this, &Editor::export_selection)));
+
        edit_items.push_back (MenuElem (_("Range"), *selection_menu));
        edit_items.push_back (SeparatorElem());
 }
@@ -1874,11 +1875,11 @@ Editor::add_dstream_context_items (Menu_Helpers::MenuList& edit_items)
        
        select_items.push_back (MenuElem (_("Select All in track"), bind (mem_fun(*this, &Editor::select_all_in_track), false)));
        select_items.push_back (MenuElem (_("Select All"), bind (mem_fun(*this, &Editor::select_all), false)));
-       select_items.push_back (MenuElem (_("Invert in track"), mem_fun(*this, &Editor::invert_selection_in_track)));
-       select_items.push_back (MenuElem (_("Invert"), mem_fun(*this, &Editor::invert_selection)));
+       select_items.push_back (MenuElem (_("Invert selection in track"), mem_fun(*this, &Editor::invert_selection_in_track)));
+       select_items.push_back (MenuElem (_("Invert selection"), mem_fun(*this, &Editor::invert_selection)));
        select_items.push_back (SeparatorElem());
-       select_items.push_back (MenuElem (_("Select loop range"), mem_fun(*this, &Editor::set_selection_from_loop)));
-       select_items.push_back (MenuElem (_("Select punch range"), mem_fun(*this, &Editor::set_selection_from_punch)));
+       select_items.push_back (MenuElem (_("Set range to loop range"), mem_fun(*this, &Editor::set_selection_from_loop)));
+       select_items.push_back (MenuElem (_("Set range to punch range"), mem_fun(*this, &Editor::set_selection_from_punch)));
        select_items.push_back (SeparatorElem());
        select_items.push_back (MenuElem (_("Select all after edit cursor"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), edit_cursor, true)));
        select_items.push_back (MenuElem (_("Select all before edit cursor"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), edit_cursor, false)));
@@ -1908,11 +1909,6 @@ Editor::add_dstream_context_items (Menu_Helpers::MenuList& edit_items)
 
        cutnpaste_items.push_back (MenuElem (_("Insert chunk"), bind (mem_fun(*this, &Editor::paste_named_selection), 1.0f)));
 
-       cutnpaste_items.push_back (SeparatorElem());
-
-       cutnpaste_items.push_back (MenuElem (_("New Region from range"), mem_fun(*this, &Editor::new_region_from_selection)));
-       cutnpaste_items.push_back (MenuElem (_("Separate Range"), mem_fun(*this, &Editor::separate_region_from_selection)));
-
        edit_items.push_back (MenuElem (_("Edit"), *cutnpaste_menu));
 
        /* Adding new material */
@@ -1964,17 +1960,13 @@ Editor::add_bus_context_items (Menu_Helpers::MenuList& edit_items)
        
        select_items.push_back (MenuElem (_("Select All in track"), bind (mem_fun(*this, &Editor::select_all_in_track), false)));
        select_items.push_back (MenuElem (_("Select All"), bind (mem_fun(*this, &Editor::select_all), false)));
-       select_items.push_back (MenuElem (_("Invert in track"), mem_fun(*this, &Editor::invert_selection_in_track)));
-       select_items.push_back (MenuElem (_("Invert"), mem_fun(*this, &Editor::invert_selection)));
-       select_items.push_back (SeparatorElem());
-       select_items.push_back (MenuElem (_("Select loop range"), mem_fun(*this, &Editor::set_selection_from_loop)));
-       select_items.push_back (MenuElem (_("Select punch range"), mem_fun(*this, &Editor::set_selection_from_punch)));
+       select_items.push_back (MenuElem (_("Invert selection in track"), mem_fun(*this, &Editor::invert_selection_in_track)));
+       select_items.push_back (MenuElem (_("Invert selection"), mem_fun(*this, &Editor::invert_selection)));
        select_items.push_back (SeparatorElem());
        select_items.push_back (MenuElem (_("Select all after edit cursor"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), edit_cursor, true)));
        select_items.push_back (MenuElem (_("Select all before edit cursor"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), edit_cursor, false)));
        select_items.push_back (MenuElem (_("Select all after playhead"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, true)));
        select_items.push_back (MenuElem (_("Select all before playhead"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, false)));
-       select_items.push_back (SeparatorElem());
 
        edit_items.push_back (MenuElem (_("Select"), *select_menu));
 

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index d9bbe73648aa9d655f538921322daa1a351e98ca..7a7101d831c0ad7059ef9147a1744a490d7f6c38 100644 (file)
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -1380,7 +1380,7 @@ Editor::select_all_selectables_using_punch()
 void
 Editor::select_all_selectables_using_loop()
 {
-       Location* location = session->locations()->auto_punch_location();
+       Location* location = session->locations()->auto_loop_location();
        list<Selectable *> touched;
 
        if (location == 0 || (location->end() - location->start() <= 1))  {