Improve behavior of overwrite_file_dialog.

[ardour.git] / gtk2_ardour / time_axis_view.cc

diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index e7d43f4ae9f80052e92d7e6252141fcdac838f0b..4ad476b73442c775e6018862c8f7adb60664aed6 100644 (file)
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -41,7 +41,6 @@
 
 #include "ardour/profile.h"
 
-#include "ardour_ui.h"
 #include "ardour_dialog.h"
 #include "gui_thread.h"
 #include "public_editor.h"
@@ -55,6 +54,7 @@
 #include "streamview.h"
 #include "editor_drag.h"
 #include "editor.h"
+#include "tooltips.h"
 #include "ui_config.h"
 
 #include "i18n.h"
@@ -138,7 +138,7 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie
        CANVAS_DEBUG_NAME (selection_group, "selection for TAV");
        selection_group->set_data (X_("timeselection"), (void *) 1);
        selection_group->hide();
-       
+
        _ghost_group = new ArdourCanvas::Container (_canvas_display);
        CANVAS_DEBUG_NAME (_ghost_group, "ghost for TAV");
        _ghost_group->lower_to_bottom();
@@ -147,7 +147,7 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie
        name_label.set_name ("TrackLabel");
        name_label.set_alignment (0.0, 0.5);
        name_label.set_width_chars (12);
-       ARDOUR_UI::instance()->set_tip (name_label, _("Track/Bus name (double click to edit)"));
+       set_tooltip (name_label, _("Track/Bus name (double click to edit)"));
 
        Gtk::Entry* an_entry = new Gtkmm2ext::FocusEntry;
        an_entry->set_name ("EditorTrackNameDisplay");
@@ -221,8 +221,6 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie
        top_hbox.pack_start (scroomer_placeholder, false, false); // OR pack_end to move after meters ?
 
        UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &TimeAxisView::color_handler));
-
-       GhostRegion::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&TimeAxisView::erase_ghost, this, _1), gui_context());
 }
 
 TimeAxisView::~TimeAxisView()
@@ -319,7 +317,7 @@ TimeAxisView::show_at (double y, int& nth, VBox *parent)
 
        _canvas_display->raise_to_top ();
        _canvas_display->show ();
-       
+
        _hidden = false;
 
        _effective_height = current_height ();
@@ -357,7 +355,7 @@ TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev)
                        }
                        e.stepping_axis_view()->step_height (false);
                        return true;
-               } 
+               }
                break;
 
        case GDK_SCROLL_DOWN:
@@ -369,7 +367,7 @@ TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev)
                        }
                        e.stepping_axis_view()->step_height (true);
                        return true;
-               } 
+               }
                break;
 
        default:
@@ -407,7 +405,7 @@ TimeAxisView::controls_ebox_button_press (GdkEventButton* event)
        }
 
        _ebox_release_can_act = true;
-                       
+
        if (maybe_set_cursor (event->y) > 0) {
                _resize_drag_start = event->y_root;
        }
@@ -668,7 +666,7 @@ TimeAxisView::begin_name_edit ()
        if (can_edit_name()) {
 
                name_entry = manage (new Gtkmm2ext::FocusEntry);
-               
+
                name_entry->set_width_chars(8); // min width, entry expands
 
                name_entry->set_name ("EditorTrackNameDisplay");
@@ -681,7 +679,7 @@ TimeAxisView::begin_name_edit ()
                if (name_label.is_ancestor (name_hbox)) {
                        name_hbox.remove (name_label);
                }
-               
+
                name_hbox.pack_end (*name_entry, true, true);
                name_entry->show ();
 
@@ -700,14 +698,14 @@ TimeAxisView::end_name_edit (int response)
        }
 
        if (ending_name_edit) {
-               /* already doing this, and focus out or other event has caused 
+               /* already doing this, and focus out or other event has caused
                   us to re-enter this code.
                */
                return;
        }
-       
+
        PBD::Unwinder<bool> uw (ending_name_edit, true);
-       
+
        bool edit_next = false;
        bool edit_prev = false;
 
@@ -743,62 +741,62 @@ TimeAxisView::end_name_edit (int response)
 
                TrackViewList const & allviews = _editor.get_track_views ();
                TrackViewList::const_iterator i = find (allviews.begin(), allviews.end(), this);
-               
+
                if (i != allviews.end()) {
-                       
+
                        do {
                                if (++i == allviews.end()) {
                                        return;
                                }
-                               
+
                                RouteTimeAxisView* rtav = dynamic_cast<RouteTimeAxisView*>(*i);
-                       
+
                                if (rtav && rtav->route()->record_enabled()) {
                                        continue;
                                }
-                               
+
                                if (!(*i)->hidden()) {
                                        break;
                                }
-                               
+
                        } while (true);
                }
 
                if ((i != allviews.end()) && (*i != this) && !(*i)->hidden()) {
                        _editor.ensure_time_axis_view_is_visible (**i, false);
                        (*i)->begin_name_edit ();
-               } 
+               }
 
        } else if (edit_prev) {
 
                TrackViewList const & allviews = _editor.get_track_views ();
                TrackViewList::const_iterator i = find (allviews.begin(), allviews.end(), this);
-               
+
                if (i != allviews.begin()) {
                        do {
                                if (i == allviews.begin()) {
                                        return;
                                }
-                               
+
                                --i;
-                               
+
                                RouteTimeAxisView* rtav = dynamic_cast<RouteTimeAxisView*>(*i);
-                               
+
                                if (rtav && rtav->route()->record_enabled()) {
                                        continue;
                                }
-                               
+
                                if (!(*i)->hidden()) {
                                        break;
                                }
-                               
+
                        } while (true);
                }
-               
+
                if ((i != allviews.end()) && (*i != this) && !(*i)->hidden()) {
                        _editor.ensure_time_axis_view_is_visible (**i, false);
                        (*i)->begin_name_edit ();
-               } 
+               }
        }
 }
 
@@ -1226,19 +1224,19 @@ TimeAxisView::color_handler ()
 
                (*i)->start_trim->set_fill_color (UIConfiguration::instance().color ("selection"));
                (*i)->start_trim->set_outline_color (UIConfiguration::instance().color ("selection"));
-               
+
                (*i)->end_trim->set_fill_color (UIConfiguration::instance().color ("selection"));
                (*i)->end_trim->set_outline_color (UIConfiguration::instance().color ("selection"));
        }
-       
+
        for (list<SelectionRect*>::iterator i = free_selection_rects.begin(); i != free_selection_rects.end(); ++i) {
-               
+
                (*i)->rect->set_fill_color (UIConfiguration::instance().color_mod ("selection rect", "selection rect"));
                (*i)->rect->set_outline_color (UIConfiguration::instance().color ("selection"));
-               
+
                (*i)->start_trim->set_fill_color (UIConfiguration::instance().color ("selection"));
                (*i)->start_trim->set_outline_color (UIConfiguration::instance().color ("selection"));
-               
+
                (*i)->end_trim->set_fill_color (UIConfiguration::instance().color ("selection"));
                (*i)->end_trim->set_outline_color (UIConfiguration::instance().color ("selection"));
        }
@@ -1314,7 +1312,7 @@ TimeAxisView::covered_by_y_range (double y0, double y1) const
        /* if either the top or bottom of the axisview is in the vertical
         * range, we cover it.
         */
-       
+
        if ((y0 < _y_position && y1 < _y_position) ||
            (y0 >= _y_position + height && y1 >= _y_position + height)) {
                return false;
@@ -1392,7 +1390,7 @@ TimeAxisView::reset_visual_state ()
        /* this method is not required to trigger a global redraw */
 
        string str = gui_property ("height");
-       
+
        if (!str.empty()) {
                set_height (atoi (str));
        } else {