X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fvisual_time_axis.cc;h=9574a83c26436caad4dddcf243bbf2b7852997aa;hb=911fdb576e15283897cb7648d07f4ba14ec8f78e;hp=f9408fae608d4201136e89cc80023af1e4878b04;hpb=fe49c8de182d40528a27b84d5530698f438de51d;p=ardour.git diff --git a/gtk2_ardour/visual_time_axis.cc b/gtk2_ardour/visual_time_axis.cc index f9408fae60..9574a83c26 100644 --- a/gtk2_ardour/visual_time_axis.cc +++ b/gtk2_ardour/visual_time_axis.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2003 Paul Davis + Copyright (C) 2003 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -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 @@ -24,9 +23,9 @@ #include #include -#include -#include -#include +#include "pbd/error.h" +#include "pbd/stl_delete.h" +#include "pbd/whitespace.h" #include #include @@ -34,10 +33,10 @@ #include #include -#include -#include -#include -#include +#include "ardour/session.h" +#include "ardour/utils.h" +#include "ardour/processor.h" +#include "ardour/location.h" #include "ardour_ui.h" #include "public_editor.h" @@ -55,27 +54,10 @@ #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 * @@ -92,25 +74,23 @@ VisualTimeAxis::VisualTimeAxis(const string & name, PublicEditor& ed, ARDOUR::Se { time_axis_name = name ; _color = unique_random_color() ; - _marked_for_display = true; - + name_entry.signal_activate().connect(mem_fun(*this, &VisualTimeAxis::name_entry_changed)) ; name_entry.signal_button_press_event().connect(mem_fun(*this, &VisualTimeAxis::name_entry_button_press_handler)) ; name_entry.signal_button_release_event().connect(mem_fun(*this, &VisualTimeAxis::name_entry_button_release_handler)) ; name_entry.signal_key_release_event().connect(mem_fun(*this, &VisualTimeAxis::name_entry_key_release_handler)) ; - + size_button.set_name("TrackSizeButton") ; visual_button.set_name("TrackVisualButton") ; hide_button.set_name("TrackRemoveButton") ; - Glib::RefPtr 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)) ; ARDOUR_UI::instance()->tooltips().set_tip(size_button,_("Display Height")) ; ARDOUR_UI::instance()->tooltips().set_tip(visual_button, _("Visual options")) ; ARDOUR_UI::instance()->tooltips().set_tip(hide_button, _("Hide this track")) ; - + controls_table.attach (hide_button, 0, 1, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); controls_table.attach (visual_button, 1, 2, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); controls_table.attach (size_button, 2, 3, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); @@ -119,8 +99,8 @@ VisualTimeAxis::VisualTimeAxis(const string & name, PublicEditor& ed, ARDOUR::Se size_button.unset_flags(Gtk::CAN_FOCUS) ; hide_button.unset_flags(Gtk::CAN_FOCUS) ; visual_button.unset_flags(Gtk::CAN_FOCUS) ; - - set_height(Normal) ; + + set_height (hNormal) ; } /** @@ -139,13 +119,13 @@ void VisualTimeAxis::set_time_axis_name(const string & name, void* src) { std::string old_name = time_axis_name ; - + if(name != time_axis_name) { time_axis_name = name ; label_view() ; editor.route_name_changed(this) ; - + NameChanged(time_axis_name, old_name, src) ; /* EMIT_SIGNAL */ } } @@ -163,39 +143,25 @@ VisualTimeAxis::name() const /** * Sets the height of this TrackView to one of the defined TrackHeghts * - * @param h the TrackHeight value to set + * @param h */ void -VisualTimeAxis::set_height(TrackHeight h) +VisualTimeAxis::set_height(uint32_t h) { - TimeAxisView::set_height(h) ; - - switch (height) - { - case Largest: - case Large: - case Larger: - case Normal: - { - hide_name_label (); - show_name_entry (); - other_button_hbox.show_all() ; - break; - } - case Smaller: - { - hide_name_label (); - show_name_entry (); - other_button_hbox.hide_all() ; - break; - } - case Small: - { - hide_name_entry (); - show_name_label (); - other_button_hbox.hide_all() ; - } - break; + TimeAxisView::set_height(h); + + if (h >= hNormal) { + hide_name_label (); + show_name_entry (); + other_button_hbox.show_all() ; + } else if (h >= hSmaller) { + hide_name_label (); + show_name_entry (); + other_button_hbox.hide_all() ; + } else if (h >= hSmall) { + hide_name_entry (); + show_name_label (); + other_button_hbox.hide_all() ; } } @@ -217,7 +183,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); } @@ -245,7 +216,7 @@ VisualTimeAxis::choose_time_axis_color() Gdk::Color color ; gdouble current[4] ; Gdk::Color current_color ; - + current[0] = _color.get_red() / 65535.0 ; current[1] = _color.get_green() / 65535.0 ; current[2] = _color.get_blue() / 65535.0 ; @@ -253,7 +224,7 @@ VisualTimeAxis::choose_time_axis_color() current_color.set_rgb_p (current[0],current[1],current[2]); color = Gtkmm2ext::UI::instance()->get_color(_("ardour: color selection"),picked, ¤t_color) ; - + if (picked) { set_time_axis_color(color) ; @@ -273,7 +244,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 +264,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)); } } @@ -335,7 +300,7 @@ VisualTimeAxis::idle_remove_this_time_axis(VisualTimeAxis* ta, void* src) //---------------------------------------------------------------------------------------// // Handle TimeAxis rename - + /** * Construct a new prompt to receive a new name for this TimeAxis * @@ -347,6 +312,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 ()) { @@ -358,7 +325,7 @@ VisualTimeAxis::start_time_axis_rename() ARDOUR_UI::instance()->popup_error (_("A track already exists with that name")); return ; } - + set_time_axis_name(result, this) ; } } @@ -381,33 +348,33 @@ VisualTimeAxis::label_view() //---------------------------------------------------------------------------------------// -// Handle name entry signals +// Handle name entry signals void VisualTimeAxis::name_entry_changed() { string x = name_entry.get_text (); - + if (x == time_axis_name) { 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); } } -gint +gint VisualTimeAxis::name_entry_button_press_handler(GdkEventButton *ev) { if (ev->button == 3) { @@ -416,7 +383,7 @@ VisualTimeAxis::name_entry_button_press_handler(GdkEventButton *ev) return FALSE; } -gint +gint VisualTimeAxis::name_entry_button_release_handler(GdkEventButton *ev) { return FALSE; @@ -440,9 +407,9 @@ 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 }