From 28bb82cee7400cb26a97cd4113e76b5a7dc81ca2 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 12 Jul 2016 17:03:09 -0400 Subject: remove VCA drop button --- gtk2_ardour/vca_master_strip.cc | 14 +------------- gtk2_ardour/vca_master_strip.h | 2 -- 2 files changed, 1 insertion(+), 15 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/vca_master_strip.cc b/gtk2_ardour/vca_master_strip.cc index 3ea00b1a47..ad4bd5c589 100644 --- a/gtk2_ardour/vca_master_strip.cc +++ b/gtk2_ardour/vca_master_strip.cc @@ -95,7 +95,7 @@ VCAMasterStrip::VCAMasterStrip (Session* s, boost::shared_ptr v) number_label.set_alignment (.5, .5); number_label.set_fallthrough_to_parent (true); - bottom_padding.set_size_request (-1, 32); /* this one is a hack. there's no trivial way to compute it */ + bottom_padding.set_size_request (-1, 55); /* this one is a hack. there's no trivial way to compute it */ //Glib::RefPtr layout = vertical_button.get_layout (); // layout->set_justify (JUSTIFY_CENTER); @@ -107,10 +107,6 @@ VCAMasterStrip::VCAMasterStrip (Session* s, boost::shared_ptr v) vertical_button.set_active_color (_vca->presentation_info().color ()); set_tooltip (vertical_button, _("Click to show slaves only")); /* tooltip updated dynamically */ - drop_button.set_text(_("drop")); - drop_button.signal_clicked.connect (sigc::mem_fun (*this, &VCAMasterStrip::drop_button_press)); - set_tooltip (drop_button, _("Unassign all slaves from this control master")); - global_vpacker.set_border_width (1); global_vpacker.set_spacing (0); @@ -120,7 +116,6 @@ VCAMasterStrip::VCAMasterStrip (Session* s, boost::shared_ptr v) global_vpacker.pack_start (solo_mute_box, false, false); global_vpacker.pack_start (gain_meter, false, false, 2); global_vpacker.pack_start (control_slave_ui, false, false); - global_vpacker.pack_start (drop_button, false, false); global_vpacker.pack_start (bottom_padding, false, false); global_frame.add (global_vpacker); @@ -139,7 +134,6 @@ VCAMasterStrip::VCAMasterStrip (Session* s, boost::shared_ptr v) gain_meter.show (); solo_mute_box.show_all (); control_slave_ui.show (); - drop_button.show (); /* force setting of visible selected status */ @@ -448,12 +442,6 @@ VCAMasterStrip::drop_all_slaves () } } -void -VCAMasterStrip::drop_button_press () -{ - drop_all_slaves (); -} - Gdk::Color VCAMasterStrip::color () const { diff --git a/gtk2_ardour/vca_master_strip.h b/gtk2_ardour/vca_master_strip.h index ea8ee52f6d..7208071f85 100644 --- a/gtk2_ardour/vca_master_strip.h +++ b/gtk2_ardour/vca_master_strip.h @@ -70,7 +70,6 @@ class VCAMasterStrip : public AxisView, public Gtk::EventBox ArdourButton number_label; ArdourButton solo_button; ArdourButton mute_button; - ArdourButton drop_button; Gtk::Menu* context_menu; Gtk::MessageDialog* delete_dialog; ArdourButton vertical_button; @@ -98,7 +97,6 @@ class VCAMasterStrip : public AxisView, public Gtk::EventBox void hide_confirmation (int); void self_delete (); void remove (); - void drop_button_press (); void drop_all_slaves (); void parameter_changed (std::string const& p); -- cgit v1.2.3