X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fvisual_time_axis.cc;h=b68597114488e8e95a2992d22476b0f15186e1a6;hb=185be4e841e182bbe7cb7820f9cb6371ebebe15d;hp=bcbbf64c59cf905d38a361067a515a7e87867a3c;hpb=8ca561f8d322d237d7aaa74ebf82f6892064da94;p=ardour.git

diff --git a/gtk2_ardour/visual_time_axis.cc b/gtk2_ardour/visual_time_axis.cc
index bcbbf64c59..b685971144 100644
--- a/gtk2_ardour/visual_time_axis.cc
+++ b/gtk2_ardour/visual_time_axis.cc
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <cstdlib>
@@ -55,6 +54,7 @@
 #include "i18n.h"
 
 using namespace ARDOUR;
+using namespace PBD;
 using namespace sigc;
 using namespace Gtk;
 	
@@ -198,7 +198,12 @@ VisualTimeAxis::visual_click()
 void
 VisualTimeAxis::hide_click()
 {
+	// LAME fix for hide_button display refresh
+	hide_button.set_sensitive(false);
+	
 	editor.hide_track_in_display (*this);
+	
+	hide_button.set_sensitive(true);
 }
 
 
@@ -254,7 +259,7 @@ VisualTimeAxis::set_time_axis_color(Gdk::Color c)
 }
 
 void
-VisualTimeAxis::set_selected_regionviews (AudioRegionSelection& regions)
+VisualTimeAxis::set_selected_regionviews (RegionSelection& regions)
 {
 	// Not handled by purely visual TimeAxis
 }
@@ -274,12 +279,12 @@ VisualTimeAxis::remove_this_time_axis(void* src)
 
 	std::string prompt  = string_compose (_("Do you really want to remove track \"%1\" ?\n(cannot be undone)"), time_axis_name);
 
-	choices.push_back (_("Yes, remove it."));
 	choices.push_back (_("No, do nothing."));
+	choices.push_back (_("Yes, remove it."));
 
 	Gtkmm2ext::Choice prompter (prompt, choices);
 
-	if (prompter.run () == 0) {
+	if (prompter.run () == 1) {
 		/*
 		  defer to idle loop, otherwise we'll delete this object
 		  while we're still inside this function ...
@@ -323,6 +328,7 @@ VisualTimeAxis::start_time_axis_rename()
 
 	name_prompter.set_prompt (_("new name: ")) ;
 	name_prompter.add_button (_("Rename"), Gtk::RESPONSE_ACCEPT);
+	name_prompter.set_response_sensitive (Gtk::RESPONSE_ACCEPT, false);
 	name_prompter.show_all() ;
 
 	switch (name_prompter.run ()) {
@@ -368,17 +374,17 @@ VisualTimeAxis::name_entry_changed()
 		return;
 	}
 
+	strip_whitespace_edges(x);
+
 	if (x.length() == 0) {
 		name_entry.set_text (time_axis_name);
 		return;
 	}
 
-	strip_whitespace_edges(x);
-
 	if (!editor.get_named_time_axis(x)) {
 		set_time_axis_name(x, this);
 	} else {
-		ARDOUR_UI::instance()->popup_error (_("a track already exists with that name"));
+		ARDOUR_UI::instance()->popup_error (_("A track already exists with that name"));
 		name_entry.set_text(time_axis_name);
 	}
 }
@@ -418,7 +424,7 @@ VisualTimeAxis::name_entry_key_release_handler(GdkEventKey* ev)
 // Super class methods not handled by VisualTimeAxis
 		
 void
-VisualTimeAxis::show_timestretch (jack_nframes_t start, jack_nframes_t end)
+VisualTimeAxis::show_timestretch (nframes_t start, nframes_t end)
 {
   // Not handled by purely visual TimeAxis
 }