Attempt to fix some confusions caused by bundles containing

[ardour.git] / gtk2_ardour / visual_time_axis.cc

diff --git a/gtk2_ardour/visual_time_axis.cc b/gtk2_ardour/visual_time_axis.cc
index 71dc70df50e8e551c78162f371397d6237242846..10c8513ec8741753c4601e3a4e9f0b15038dd5a5 100644 (file)
--- a/gtk2_ardour/visual_time_axis.cc
+++ b/gtk2_ardour/visual_time_axis.cc
@@ -30,7 +30,6 @@
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/selector.h>
 #include <gtkmm2ext/gtk_ui.h>
-#include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/choice.h>
 
 #include "ardour/session.h"
@@ -222,7 +221,7 @@ VisualTimeAxis::choose_time_axis_color()
        current[3] = 1.0 ;
 
        current_color.set_rgb_p (current[0],current[1],current[2]);
-       color = Gtkmm2ext::UI::instance()->get_color(_("ardour: color selection"),picked, &current_color) ;
+       color = Gtkmm2ext::UI::instance()->get_color(_("Color Selection"),picked, &current_color) ;
 
        if (picked)
        {
@@ -261,7 +260,7 @@ VisualTimeAxis::remove_this_time_axis(void* src)
 {
        vector<string> choices;
 
-       std::string prompt  = string_compose (_("Do you really want to remove track \"%1\" ?\n(cannot be undone)"), time_axis_name);
+       std::string prompt  = string_compose (_("Do you really want to remove track \"%1\" ?\n\nYou may also lose the playlist used by this track.\n\n(This action cannot be undone, and the session file will be overwritten)"), time_axis_name);
 
        choices.push_back (_("No, do nothing."));
        choices.push_back (_("Yes, remove it."));
@@ -373,22 +372,22 @@ VisualTimeAxis::name_entry_changed()
        }
 }
 
-gint
+bool
 VisualTimeAxis::name_entry_button_press_handler(GdkEventButton *ev)
 {
        if (ev->button == 3) {
-               return stop_signal (name_entry, "button_press_event");
+                return true;
        }
-       return FALSE;
+       return false
 }
 
-gint
+bool
 VisualTimeAxis::name_entry_button_release_handler(GdkEventButton *ev)
 {
-       return FALSE;
+       return false;
 }
 
-gint
+bool
 VisualTimeAxis::name_entry_key_release_handler(GdkEventKey* ev)
 {
        switch (ev->keyval) {
@@ -396,11 +395,13 @@ VisualTimeAxis::name_entry_key_release_handler(GdkEventKey* ev)
        case GDK_Up:
        case GDK_Down:
                name_entry_changed ();
-               return TRUE;
+               return true;
 
        default:
-               return FALSE;
+               break;
        }
+
+        return false;
 }
 
 
@@ -408,15 +409,15 @@ VisualTimeAxis::name_entry_key_release_handler(GdkEventKey* ev)
 // Super class methods not handled by VisualTimeAxis
 
 void
-VisualTimeAxis::show_timestretch (nframes_t start, nframes_t end)
+VisualTimeAxis::show_timestretch (framepos_t start, framepos_t end)
 {
-  // Not handled by purely visual TimeAxis
+       // Not handled by purely visual TimeAxis
 }
 
 void
 VisualTimeAxis::hide_timestretch()
 {
-  // Not handled by purely visual TimeAxis
+       // Not handled by purely visual TimeAxis
 }