Decreased region opacity, smoothed out canvas/tempo line colours.

[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 3dbdf10898002e5f62b8380257041197b67c2546..20fe13603e742a8bb188edd6f0a057d7a2f9f045 100644 (file)
--- a/gtk2_ardour/visual_time_axis.cc
+++ b/gtk2_ardour/visual_time_axis.cc
@@ -55,26 +55,9 @@
 #include "i18n.h"
 
 using namespace ARDOUR;
+using namespace PBD;
 using namespace sigc;
 using namespace Gtk;
-
-//XXX should really have a common home...
-static const gchar* small_x_xpm[] = {
-       "11 11 2 1",
-       "       c None",
-       ".      c #000000",
-       "           ",
-       "           ",
-       "  .     .  ",
-       "   .   .   ",
-       "    . .    ",
-       "     .     ",
-       "    . .    ",
-       "   .   .   ",
-       "  .     .  ",
-       "           ",
-       "           "};
-
        
 /**
  * Abstract Constructor for base visual time axis classes
@@ -102,8 +85,7 @@ VisualTimeAxis::VisualTimeAxis(const string & name, PublicEditor& ed, ARDOUR::Se
        size_button.set_name("TrackSizeButton") ;
        visual_button.set_name("TrackVisualButton") ;
        hide_button.set_name("TrackRemoveButton") ;
-       Glib::RefPtr<Gdk::Pixbuf> small_x_pixbuf = Gdk::Pixbuf::create_from_xpm_data(small_x_xpm);
-       hide_button.add(*(Gtk::manage(new Gtk::Image(small_x_pixbuf)))) ;
+       hide_button.add(*(Gtk::manage(new Gtk::Image(get_xpm("small_x.xpm")))));
        size_button.signal_button_release_event().connect (mem_fun (*this, &VisualTimeAxis::size_click)) ;
        visual_button.signal_clicked().connect (mem_fun (*this, &VisualTimeAxis::visual_click)) ;
        hide_button.signal_clicked().connect (mem_fun (*this, &VisualTimeAxis::hide_click)) ;
@@ -177,22 +159,22 @@ VisualTimeAxis::set_height(TrackHeight h)
                case Larger:
                case Normal:
                {
-                       name_label.hide() ;
-                       name_entry.show() ;
+                       hide_name_label ();
+                       show_name_entry ();
                        other_button_hbox.show_all() ;
                        break;
                }
                case Smaller:
                {
-                       name_label.hide() ;
-                       name_entry.show() ;
+                       hide_name_label ();
+                       show_name_entry ();
                        other_button_hbox.hide_all() ;
                        break;
                }
                case Small:
                {
-                       name_label.show() ;
-                       name_entry.hide() ;
+                       hide_name_entry ();
+                       show_name_label ();
                        other_button_hbox.hide_all() ;
                }
                break;
@@ -217,7 +199,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);
 }
 
 
@@ -273,7 +260,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
 }
@@ -293,23 +280,17 @@ 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);
 
-       prompter.chosen.connect(sigc::ptr_fun(Gtk::Main::quit));
-       prompter.show_all ();
-
-       Gtk::Main::run ();
-
-       if (prompter.get_choice() == 0)
-       {
+       if (prompter.run () == 1) {
                /*
-                  defer to idle loop, otherwise we'll delete this object
-                  while we're still inside this function ...
+                 defer to idle loop, otherwise we'll delete this object
+                 while we're still inside this function ...
                */
-         Glib::signal_idle().connect(bind(sigc::ptr_fun(&VisualTimeAxis::idle_remove_this_time_axis), this, src));
+               Glib::signal_idle().connect(bind(sigc::ptr_fun(&VisualTimeAxis::idle_remove_this_time_axis), this, src));
        }
 }
 
@@ -347,6 +328,8 @@ VisualTimeAxis::start_time_axis_rename()
        ArdourPrompter name_prompter;
 
        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 ()) {
@@ -392,17 +375,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);
        }
 }
@@ -442,7 +425,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
 }