convert all mixer strip buttons to ArdourButton; not entirely finished because colors in the name and comments buttons don't work as intended - needs a bit of thinking

git-svn-id: svn://localhost/ardour2/branches/3.0@10830 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 9 insertions, 9 deletions

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 50d5cec5d7..a0f9364687 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -1765,7 +1765,7 @@ void
 RouteUI::setup_invert_buttons ()
 {
 	/* remove old invert buttons */
-	for (list<BindableToggleButton*>::iterator i = _invert_buttons.begin(); i != _invert_buttons.end(); ++i) {
+	for (list<ArdourButton*>::iterator i = _invert_buttons.begin(); i != _invert_buttons.end(); ++i) {
 		_invert_button_box.remove (**i);
 	}
 
@@ -1780,15 +1780,15 @@ RouteUI::setup_invert_buttons ()
 	uint32_t const to_add = (N <= _max_invert_buttons) ? N : 1;
 
 	for (uint32_t i = 0; i < to_add; ++i) {
-		BindableToggleButton* b = manage (new BindableToggleButton);
-		b->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &RouteUI::invert_toggled), i, b));
+		ArdourButton* b = manage (new ArdourButton);
+		b->StateChanged.connect (sigc::bind (sigc::mem_fun (*this, &RouteUI::invert_toggled), i, b));
 		b->signal_button_press_event().connect (sigc::mem_fun (*this, &RouteUI::invert_press));
 
-		b->set_name (X_("MixerInvertButton"));
+		b->set_name (X_("mixer strip button"));
 		if (to_add == 1) {
-			b->add (*manage (new Label (X_("Ø"))));
+			b->set_text (X_("Ø"));
 		} else {
-			b->add (*manage (new Label (string_compose (X_("Ø%1"), i + 1))));
+			b->set_text (string_compose (X_("Ø%1"), i + 1));
 		}
 
 		if (N <= 4) {
@@ -1817,7 +1817,7 @@ RouteUI::set_invert_button_state ()
 	}
 
 	int j = 0;
-	for (list<BindableToggleButton*>::iterator i = _invert_buttons.begin(); i != _invert_buttons.end(); ++i, ++j) {
+	for (list<ArdourButton*>::iterator i = _invert_buttons.begin(); i != _invert_buttons.end(); ++i, ++j) {
 		(*i)->set_active (_route->phase_invert (j));
 	}
 
@@ -1825,7 +1825,7 @@ RouteUI::set_invert_button_state ()
 }
 
 void
-RouteUI::invert_toggled (uint32_t i, BindableToggleButton* b)
+RouteUI::invert_toggled (uint32_t i, ArdourButton* b)
 {
 	if (_i_am_the_modifier) {
 		return;
@@ -1884,7 +1884,7 @@ RouteUI::invert_menu_toggled (uint32_t c)
 void
 RouteUI::set_invert_sensitive (bool yn)
 {
-        for (list<BindableToggleButton*>::iterator b = _invert_buttons.begin(); b != _invert_buttons.end(); ++b) {
+        for (list<ArdourButton*>::iterator b = _invert_buttons.begin(); b != _invert_buttons.end(); ++b) {
                 (*b)->set_sensitive (yn);
         }
 }