ardour/livetrax
13
0
Fork 0
Code

remove VCA drop button

Browse Source
This commit is contained in:
Paul Davis 2016-07-12 17:03:09 -04:00
parent a4ff28006e
commit 28bb82cee7
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk2_ardour/vca_master_strip.cc
View File

@ -95,7 +95,7 @@ VCAMasterStrip::VCAMasterStrip (Session* s, boost::shared_ptr<VCA> v)
number_label.set_alignment (.5, .5); number_label.set_alignment (.5, .5);
number_label.set_fallthrough_to_parent (true); 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<Pango::Layout> layout = vertical_button.get_layout (); //Glib::RefPtr<Pango::Layout> layout = vertical_button.get_layout ();
// layout->set_justify (JUSTIFY_CENTER); // layout->set_justify (JUSTIFY_CENTER);
@ -107,10 +107,6 @@ VCAMasterStrip::VCAMasterStrip (Session* s, boost::shared_ptr<VCA> v)
vertical_button.set_active_color (_vca->presentation_info().color ()); vertical_button.set_active_color (_vca->presentation_info().color ());
set_tooltip (vertical_button, _("Click to show slaves only")); /* tooltip updated dynamically */ 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_border_width (1);
global_vpacker.set_spacing (0); global_vpacker.set_spacing (0);
@ -120,7 +116,6 @@ VCAMasterStrip::VCAMasterStrip (Session* s, boost::shared_ptr<VCA> v)
global_vpacker.pack_start (solo_mute_box, false, false); global_vpacker.pack_start (solo_mute_box, false, false);
global_vpacker.pack_start (gain_meter, false, false, 2); global_vpacker.pack_start (gain_meter, false, false, 2);
global_vpacker.pack_start (control_slave_ui, false, false); 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_vpacker.pack_start (bottom_padding, false, false);
global_frame.add (global_vpacker); global_frame.add (global_vpacker);
@ -139,7 +134,6 @@ VCAMasterStrip::VCAMasterStrip (Session* s, boost::shared_ptr<VCA> v)
gain_meter.show (); gain_meter.show ();
solo_mute_box.show_all (); solo_mute_box.show_all ();
control_slave_ui.show (); control_slave_ui.show ();
drop_button.show ();
/* force setting of visible selected status */ /* force setting of visible selected status */
@ -448,12 +442,6 @@ VCAMasterStrip::drop_all_slaves ()
} }
} }
void
VCAMasterStrip::drop_button_press ()
{
drop_all_slaves ();
}
Gdk::Color Gdk::Color
VCAMasterStrip::color () const VCAMasterStrip::color () const
{ {

2
gtk2_ardour/vca_master_strip.h
View File

@ -70,7 +70,6 @@ class VCAMasterStrip : public AxisView, public Gtk::EventBox
ArdourButton number_label; ArdourButton number_label;
ArdourButton solo_button; ArdourButton solo_button;
ArdourButton mute_button; ArdourButton mute_button;
ArdourButton drop_button;
Gtk::Menu* context_menu; Gtk::Menu* context_menu;
Gtk::MessageDialog* delete_dialog; Gtk::MessageDialog* delete_dialog;
ArdourButton vertical_button; ArdourButton vertical_button;
@ -98,7 +97,6 @@ class VCAMasterStrip : public AxisView, public Gtk::EventBox
void hide_confirmation (int); void hide_confirmation (int);
void self_delete (); void self_delete ();
void remove (); void remove ();
void drop_button_press ();
void drop_all_slaves (); void drop_all_slaves ();
void parameter_changed (std::string const& p); void parameter_changed (std::string const& p);