lots of odds and ends to do with solo isolate and its GUI

[ardour.git] / gtk2_ardour / editor.cc

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 630499a9c4645b0d6f5bb15583612e4e11179550..d55a1aaf37a870ac0929aeff4bab57370d97b90a 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -346,7 +346,7 @@ Editor::Editor ()
        session_range_marker_menu = 0;
        range_marker_menu = 0;
        marker_menu_item = 0;
-       tm_marker_menu = 0;
+       tempo_or_meter_marker_menu = 0;
        transport_marker_menu = 0;
        new_transport_marker_menu = 0;
        editor_mixer_strip_width = Wide;
@@ -360,7 +360,6 @@ Editor::Editor ()
        entered_regionview = 0;
        entered_marker = 0;
        clear_entered_track = false;
-       _new_regionviews_show_envelope = false;
        current_timefx = 0;
        playhead_cursor = 0;
        button_release_can_deselect = true;
@@ -548,7 +547,7 @@ Editor::Editor ()
        nlabel = manage (new Label (_("Regions")));
        nlabel->set_angle (-90);
        the_notebook.append_page (_regions->widget (), *nlabel);
-       nlabel = manage (new Label (_("Tracks/Busses")));
+       nlabel = manage (new Label (_("Tracks & Busses")));
        nlabel->set_angle (-90);
        the_notebook.append_page (_routes->widget (), *nlabel);
        nlabel = manage (new Label (_("Snapshots")));
@@ -1387,16 +1386,13 @@ Editor::popup_track_context_menu (int button, int32_t time, ItemType item_type,
                                        ActionManager::set_sensitive (ActionManager::edit_point_in_region_sensitive_actions, false);
                                }
                        }
-                       /*
                        if (region_edit_menu_split_multichannel_item) {
-                               if (clicked_regionview && clicked_regionview->region().n_channels() > 1) {
-                                       // GTK2FIX find the action, change its sensitivity
-                                       // region_edit_menu_split_multichannel_item->set_sensitive (true);
+                               if (clicked_regionview && clicked_regionview->region()->n_channels() > 1) {
+                                       region_edit_menu_split_multichannel_item->set_sensitive (true);
                                } else {
-                                       // GTK2FIX see above
-                                       // region_edit_menu_split_multichannel_item->set_sensitive (false);
+                                       region_edit_menu_split_multichannel_item->set_sensitive (false);
                                }
-                       }*/
+                       }
                }
                break;
 
@@ -1706,11 +1702,11 @@ Editor::add_region_context_items (StreamView* sv, boost::shared_ptr<Region> regi
        items.push_back (SeparatorElem());
 
        items.push_back (MenuElem (_("Audition"), sigc::mem_fun(*this, &Editor::play_selected_region)));
-       items.push_back (MenuElem (_("Export"), sigc::mem_fun(*this, &Editor::export_region)));
+       items.push_back (MenuElem (_("Export..."), sigc::mem_fun(*this, &Editor::export_region)));
        items.push_back (MenuElem (_("Bounce"), sigc::mem_fun(*this, &Editor::bounce_region_selection)));
 
        if (ar) {
-               items.push_back (MenuElem (_("Spectral Analysis"), sigc::mem_fun(*this, &Editor::analyze_region_selection)));
+               items.push_back (MenuElem (_("Spectral Analysis..."), sigc::mem_fun(*this, &Editor::analyze_region_selection)));
        }
 
        items.push_back (SeparatorElem());
@@ -1743,7 +1739,7 @@ Editor::add_region_context_items (StreamView* sv, boost::shared_ptr<Region> regi
                break;
        }
 
-       bbt_glue_item->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &Editor::set_region_lock_style), Region::MusicTime));
+       bbt_glue_item->signal_activate().connect (sigc::mem_fun (*this, &Editor::toggle_region_lock_style));
 
        items.push_back (CheckMenuElem (_("Mute")));
        CheckMenuItem* region_mute_item = static_cast<CheckMenuItem*>(&items.back());
@@ -1754,7 +1750,7 @@ Editor::add_region_context_items (StreamView* sv, boost::shared_ptr<Region> regi
                fooc.block (false);
        }
         
-        items.push_back (MenuElem (_("Transpose"), mem_fun(*this, &Editor::pitch_shift_regions)));
+        items.push_back (MenuElem (_("Transpose..."), mem_fun(*this, &Editor::pitch_shift_regions)));
 
        if (!Profile->get_sae()) {
                items.push_back (CheckMenuElem (_("Opaque")));
@@ -1804,7 +1800,7 @@ Editor::add_region_context_items (StreamView* sv, boost::shared_ptr<Region> regi
                        items.push_back (SeparatorElem());
                }
 
-               items.push_back (MenuElem (_("Normalize"), sigc::mem_fun(*this, &Editor::normalize_region)));
+               items.push_back (MenuElem (_("Normalize..."), sigc::mem_fun(*this, &Editor::normalize_region)));
                if (ar->scale_amplitude() != 1) {
                        items.push_back (MenuElem (_("Reset Gain"), sigc::mem_fun(*this, &Editor::reset_region_scale_amplitude)));
                }
@@ -1874,7 +1870,7 @@ Editor::add_region_context_items (StreamView* sv, boost::shared_ptr<Region> regi
        region_edit_menu_split_multichannel_item = &items.back();
 
        items.push_back (MenuElem (_("Duplicate"), (sigc::bind (sigc::mem_fun(*this, &Editor::duplicate_dialog), false))));
-       items.push_back (MenuElem (_("Multi-Duplicate"), (sigc::bind (sigc::mem_fun(*this, &Editor::duplicate_dialog), true))));
+       items.push_back (MenuElem (_("Multi-Duplicate..."), (sigc::bind (sigc::mem_fun(*this, &Editor::duplicate_dialog), true))));
        items.push_back (MenuElem (_("Fill Track"), (sigc::mem_fun(*this, &Editor::region_fill_track))));
        items.push_back (SeparatorElem());
        items.push_back (MenuElem (_("Remove"), sigc::mem_fun(*this, &Editor::remove_selected_regions)));
@@ -3276,7 +3272,7 @@ Editor::duplicate_dialog (bool with_dialog)
        if (with_dialog) {
 
                ArdourDialog win (_("Duplicate"));
-               Label label (_("Number of Duplications:"));
+               Label label (_("Number of duplications:"));
                Adjustment adjustment (1.0, 1.0, 1000000.0, 1.0, 5.0);
                SpinButton spinner (adjustment, 0.0, 1);
                HBox hbox;
@@ -3883,7 +3879,7 @@ Editor::session_range_location_changed (Location* location)
 int
 Editor::playlist_deletion_dialog (boost::shared_ptr<Playlist> pl)
 {
-       ArdourDialog dialog ("playlist deletion dialog");
+       ArdourDialog dialog (_("Playlist Deletion"));
        Label  label (string_compose (_("Playlist %1 is currently unused.\n"
                                        "If left alone, no audio files used by it will be cleaned.\n"
                                        "If deleted, audio files used by it alone by will cleaned."),
@@ -5176,6 +5172,7 @@ Editor::super_rapid_screen_update ()
         * 1.  we don't update things when there's a pending locate request, otherwise
         *     when the editor requests a locate there is a chance that this method
         *     will move the playhead before the locate request is processed, causing
+        *     a visual glitch.
         * 2.  if we're not rolling, there's nothing to do here (locates are handled elsewhere).
         * 3.  if we're still at the same frame that we were last time, there's nothing to do.
         */