Plugin-Selector: Use ArdourButton instead of Gtk::CheckButton

diff --git a/gtk2_ardour/plugin_selector.cc b/gtk2_ardour/plugin_selector.cc
index 80dd1da5728079dad8bce0bdae218cb9fe5a3fc5..925deea978dd4a1d33a4db52d772d06cefe83902 100644 (file)
--- a/gtk2_ardour/plugin_selector.cc
+++ b/gtk2_ardour/plugin_selector.cc
@@ -148,15 +148,17 @@ PluginSelector::PluginSelector (PluginManager& mgr)
        search_entry.signal_changed().connect (sigc::mem_fun (*this, &PluginSelector::search_entry_changed));
        search_clear_button.signal_clicked().connect (sigc::mem_fun (*this, &PluginSelector::search_clear_button_clicked));
 
-       _search_name_checkbox = manage (new CheckButton (_("Name")));
-       _search_name_checkbox->set_active();
+       _search_name_checkbox = manage (new ArdourButton (_("Name"), ArdourButton::led_default_elements, true));
+       _search_name_checkbox->set_active(true);
+       _search_name_checkbox->set_name ("pluginlist filter button");
 
-       _search_tags_checkbox = manage (new CheckButton (_("Tags")));
-       _search_tags_checkbox->set_active();
+       _search_tags_checkbox = manage (new ArdourButton (_("Tags"), ArdourButton::led_default_elements, true));
+       _search_tags_checkbox->set_active(true);
+       _search_tags_checkbox->set_name ("pluginlist filter button");
 
-       _search_ignore_checkbox = manage (new CheckButton(_("Ignore Filters when searching")));
-       _search_ignore_checkbox->set_active();
-       _search_ignore_checkbox->signal_toggled().connect (sigc::mem_fun (*this, &PluginSelector::set_sensitive_widgets));
+       _search_ignore_checkbox = manage (new ArdourButton(_("Ignore Filters when searching"), ArdourButton::led_default_elements, true));
+       _search_ignore_checkbox->set_active(true);
+       _search_ignore_checkbox->set_name ("pluginlist filter button");
 
        Gtk::Label* search_help_label1 = manage (new Label(
                _("All search terms must be matched."), Gtk::ALIGN_LEFT));
@@ -182,8 +184,9 @@ PluginSelector::PluginSelector (PluginManager& mgr)
        search_frame->add (*search_table);
        search_frame->show_all ();
 
-       _search_name_checkbox->signal_clicked().connect (sigc::mem_fun (*this, &PluginSelector::refill));
-       _search_tags_checkbox->signal_clicked().connect (sigc::mem_fun (*this, &PluginSelector::refill));
+       _search_name_checkbox->signal_clicked.connect (sigc::mem_fun (*this, &PluginSelector::refill));
+       _search_tags_checkbox->signal_clicked.connect (sigc::mem_fun (*this, &PluginSelector::refill));
+       _search_ignore_checkbox->signal_clicked.connect (sigc::mem_fun (*this, &PluginSelector::set_sensitive_widgets));
 
        /* FILTER */
 

diff --git a/gtk2_ardour/plugin_selector.h b/gtk2_ardour/plugin_selector.h
index 061a972d242767144ff0d4a6b341690413c37438..d35b780261cbcc2b1f29355d0fcb4de5a19b04f2 100644 (file)
--- a/gtk2_ardour/plugin_selector.h
+++ b/gtk2_ardour/plugin_selector.h
@@ -30,6 +30,7 @@
 #include <gtkmm/treemodel.h>
 #include <gtkmm/treeview.h>
 
+#include "widgets/ardour_button.h"
 #include "widgets/ardour_dropdown.h"
 
 #include "gtkmm2ext/dndtreeview.h"
@@ -66,9 +67,9 @@ public:
 private:
 
        //search
-       Gtk::CheckButton *_search_name_checkbox;
-       Gtk::CheckButton *_search_tags_checkbox;
-       Gtk::CheckButton *_search_ignore_checkbox;
+       ArdourWidgets::ArdourButton* _search_name_checkbox;
+       ArdourWidgets::ArdourButton* _search_tags_checkbox;
+       ArdourWidgets::ArdourButton* _search_ignore_checkbox;
 
        //radio-button filters
        Gtk::RadioButton *_fil_effects_radio;

diff --git a/gtk2_ardour/themes/dark-ardour.colors b/gtk2_ardour/themes/dark-ardour.colors
index 9c201dc46b351b13a9c6f9ed34771d8352650d64..cb7844eace074b4f573d7381287b0da7de8a33cf 100644 (file)
--- a/gtk2_ardour/themes/dark-ardour.colors
+++ b/gtk2_ardour/themes/dark-ardour.colors
@@ -345,8 +345,7 @@
     <ColorAlias name="piano roll white" alias="color 45"/>
     <ColorAlias name="play head" alias="color 9"/>
     <ColorAlias name="plugin bypass button: led active" alias="color 8"/>
-    <ColorAlias name="pluginlist hide button: led active" alias="color 14"/>
-    <ColorAlias name="pluginlist filter button: fill active" alias="color 14"/>
+    <ColorAlias name="pluginlist filter button: led active" alias="color 8"/>
     <ColorAlias name="pluginui toggle: fill" alias="color 71"/>
     <ColorAlias name="pluginui toggle: fill active" alias="color 9"/>
     <ColorAlias name="processor automation line" alias="color 77"/>