X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_params_ui.cc;h=b8ec7301a1c5ece7dfe0dfb4d64e56643fc78e4f;hb=6b641cdde4fa01baa1bf03e69131bd2b1a81b67b;hp=5e0cc0f0a52b4e74c0712f9dd2e7d6eace597c5e;hpb=fa701b8c065251d242342b86a54d91826d2290a0;p=ardour.git diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc index 5e0cc0f0a5..b8ec7301a1 100644 --- a/gtk2_ardour/route_params_ui.cc +++ b/gtk2_ardour/route_params_ui.cc @@ -23,7 +23,6 @@ #include #include -#include #include #include "ardour/ardour.h" @@ -60,7 +59,7 @@ using namespace Gtk; using namespace Gtkmm2ext; RouteParams_UI::RouteParams_UI () - : ArdourDialog ("track/bus inspector"), + : ArdourDialog (_("Tracks and Busses")), latency_apply_button (Stock::APPLY), track_menu(0) { @@ -93,6 +92,8 @@ RouteParams_UI::RouteParams_UI () route_display.set_headers_visible(true); route_display.set_headers_clickable(true); + dynamic_cast(route_display.get_column_cell_renderer(0))->property_ellipsize() = Pango::ELLIPSIZE_START; + route_select_scroller.add(route_display); route_select_scroller.set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); @@ -143,8 +144,6 @@ RouteParams_UI::RouteParams_UI () set_default_size (620,370); set_wmclass (X_("ardour_route_parameters"), "Ardour"); - set_title (_("Track/Bus Inspector")); - // events route_display.get_selection()->signal_changed().connect(sigc::mem_fun(*this, &RouteParams_UI::route_selected)); route_display.get_column(0)->signal_clicked().connect(sigc::mem_fun(*this, &RouteParams_UI::show_track_menu)); @@ -181,8 +180,8 @@ RouteParams_UI::add_routes (RouteList& routes) //route_select_list.rows().back().select (); - route->PropertyChanged.connect (*this, ui_bind (&RouteParams_UI::route_property_changed, this, _1, boost::weak_ptr(route)), gui_context()); - route->DropReferences.connect (*this, boost::bind (&RouteParams_UI::route_removed, this, boost::weak_ptr(route)), gui_context()); + route->PropertyChanged.connect (*this, invalidator (*this), ui_bind (&RouteParams_UI::route_property_changed, this, _1, boost::weak_ptr(route)), gui_context()); + route->DropReferences.connect (*this, invalidator (*this), boost::bind (&RouteParams_UI::route_removed, this, boost::weak_ptr(route)), gui_context()); } } @@ -297,8 +296,8 @@ RouteParams_UI::setup_latency_frame () latency_packer.pack_start (delay_label); latency_click_connection = latency_apply_button.signal_clicked().connect (sigc::mem_fun (*latency_widget, &LatencyGUI::finish)); - _route->signal_latency_changed.connect (latency_connections, boost::bind (&RouteParams_UI::refresh_latency, this), gui_context()); - _route->initial_delay_changed.connect (latency_connections, boost::bind (&RouteParams_UI::refresh_latency, this), gui_context()); + _route->signal_latency_changed.connect (latency_connections, invalidator (*this), boost::bind (&RouteParams_UI::refresh_latency, this), gui_context()); + _route->initial_delay_changed.connect (latency_connections, invalidator (*this), boost::bind (&RouteParams_UI::refresh_latency, this), gui_context()); latency_frame.add (latency_packer); latency_frame.show_all (); @@ -367,7 +366,7 @@ RouteParams_UI::route_removed (boost::weak_ptr wr) return; } - ENSURE_GUI_THREAD (*this, &RouteParams_UI::route_removed, wr) + ENSURE_GUI_THREAD (*this, invalidator (*this), &RouteParams_UI::route_removed, wr) TreeModel::Children rows = route_display_model->children(); TreeModel::Children::iterator ri; @@ -403,7 +402,7 @@ RouteParams_UI::set_session (Session *sess) if (_session) { boost::shared_ptr r = _session->get_routes(); add_routes (*r); - _session->RouteAdded.connect (_session_connections, ui_bind (&RouteParams_UI::add_routes, this, _1), gui_context()); + _session->RouteAdded.connect (_session_connections, invalidator (*this), ui_bind (&RouteParams_UI::add_routes, this, _1), gui_context()); start_updating (); } else { stop_updating (); @@ -462,7 +461,7 @@ RouteParams_UI::route_selected() setup_processor_boxes(); setup_latency_frame (); - route->processors_changed.connect (_route_processors_connection, ui_bind (&RouteParams_UI::processors_changed, this, _1), gui_context()); + route->processors_changed.connect (_route_processors_connection, invalidator (*this), ui_bind (&RouteParams_UI::processors_changed, this, _1), gui_context()); track_input_label.set_text (_route->name()); @@ -507,7 +506,7 @@ RouteParams_UI::show_track_menu() track_menu = new Menu; track_menu->set_name ("ArdourContextMenu"); track_menu->items().push_back - (MenuElem (_("Add Track/Bus"), + (MenuElem (_("Add Track or Bus"), sigc::bind (sigc::mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::add_route), (Gtk::Window*) 0))); } track_menu->popup (1, gtk_get_current_event_time()); @@ -526,7 +525,7 @@ RouteParams_UI::redirect_selected (boost::shared_ptr proc) SendUI *send_ui = new SendUI (this, send, _session); cleanup_view(); - send->DropReferences.connect (_processor_going_away_connection, boost::bind (&RouteParams_UI::processor_going_away, this, boost::weak_ptr(proc)), gui_context()); + send->DropReferences.connect (_processor_going_away_connection, invalidator (*this), boost::bind (&RouteParams_UI::processor_going_away, this, boost::weak_ptr(proc)), gui_context()); _active_view = send_ui; redir_hpane.add2 (*_active_view); @@ -537,7 +536,7 @@ RouteParams_UI::redirect_selected (boost::shared_ptr proc) ReturnUI *return_ui = new ReturnUI (this, retrn, _session); cleanup_view(); - retrn->DropReferences.connect (_processor_going_away_connection, boost::bind (&RouteParams_UI::processor_going_away, this, boost::weak_ptr(proc)), gui_context()); + retrn->DropReferences.connect (_processor_going_away_connection, invalidator (*this), boost::bind (&RouteParams_UI::processor_going_away, this, boost::weak_ptr(proc)), gui_context()); _active_view = return_ui; redir_hpane.add2 (*_active_view); @@ -548,7 +547,7 @@ RouteParams_UI::redirect_selected (boost::shared_ptr proc) GenericPluginUI *plugin_ui = new GenericPluginUI (plugin_insert, true); cleanup_view(); - plugin_insert->plugin()->DropReferences.connect (_processor_going_away_connection, boost::bind (&RouteParams_UI::plugin_going_away, this, PreFader), gui_context()); + plugin_insert->plugin()->DropReferences.connect (_processor_going_away_connection, invalidator (*this), boost::bind (&RouteParams_UI::plugin_going_away, this, PreFader), gui_context()); plugin_ui->start_updating (0); _active_view = plugin_ui; @@ -560,7 +559,7 @@ RouteParams_UI::redirect_selected (boost::shared_ptr proc) PortInsertUI *portinsert_ui = new PortInsertUI (this, _session, port_insert); cleanup_view(); - port_insert->DropReferences.connect (_processor_going_away_connection, boost::bind (&RouteParams_UI::processor_going_away, this, boost::weak_ptr (proc)), gui_context()); + port_insert->DropReferences.connect (_processor_going_away_connection, invalidator (*this), boost::bind (&RouteParams_UI::processor_going_away, this, boost::weak_ptr (proc)), gui_context()); _active_view = portinsert_ui; redir_hpane.pack2 (*_active_view); @@ -608,31 +607,15 @@ RouteParams_UI::processor_going_away (boost::weak_ptr wproc) void RouteParams_UI::update_title () { - WindowTitle title(_("Track/Bus Inspector")); + WindowTitle title (_("Tracks and Busses")); if (_route) { - - // title += ": "; - - // if (_redirect && (_current_view == PLUGIN_CONFIG_VIEW || _current_view == SEND_CONFIG_VIEW)) { - // title += _redirect->name(); - // } - // else if (_current_view == INPUT_CONFIG_VIEW) { - // title += _("INPUT"); - // } - // else if (_current_view == OUTPUT_CONFIG_VIEW) { - // title += _("OUTPUT"); - // } - title_label.set_text(_route->name()); - title += _route->name(); - set_title(title.get_string()); - } - else { - title_label.set_text(_("No Route Selected")); - title += _("No Route Selected"); + } else { + title_label.set_text(_("No Track or Bus Selected")); + title += _("No Track or Bus Selected"); set_title(title.get_string()); } }