X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fplugin_selector.cc;h=8161c9da055e1e56b2ae3b4a2ed866695b2dccd2;hb=bb090c0012340b637508e0930376b3d5afba5f5c;hp=fcf056307e7be2deaf81460a609df947fbdc46b0;hpb=23e7cf10191270d70357ccf0ed9294f020c7b7ab;p=ardour.git

diff --git a/gtk2_ardour/plugin_selector.cc b/gtk2_ardour/plugin_selector.cc
index fcf056307e..8161c9da05 100644
--- a/gtk2_ardour/plugin_selector.cc
+++ b/gtk2_ardour/plugin_selector.cc
@@ -38,9 +38,9 @@
 #include "ardour/plugin.h"
 #include "ardour/utils.h"
 
-#include "ardour_ui.h"
 #include "plugin_selector.h"
 #include "gui_thread.h"
+#include "tooltips.h"
 
 #include "i18n.h"
 
@@ -48,6 +48,7 @@ using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtk;
 using namespace std;
+using namespace ARDOUR_UI_UTILS;
 
 static const char* _filter_mode_strings[] = {
 	N_("Name contains"),
@@ -63,8 +64,16 @@ static const char* _filter_mode_strings[] = {
 PluginSelector::PluginSelector (PluginManager& mgr)
 	: ArdourDialog (_("Plugin Manager"), true, false)
 	, filter_button (Stock::CLEAR)
+	, fil_hidden_button (ArdourButton::led_default_elements)
+	, fil_instruments_button (ArdourButton::default_elements)
+	, fil_analysis_button (ArdourButton::default_elements)
+	, fil_utils_button (ArdourButton::default_elements)
 	, manager (mgr)
-	  
+	, _show_hidden (false)
+	, _show_instruments (Gtkmm2ext::ImplicitActive)
+	, _show_analysers (Gtkmm2ext::Off)
+	, _show_utils (Gtkmm2ext::Off)
+
 {
 	set_name ("PluginSelectorWindow");
 	add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
@@ -74,6 +83,8 @@ PluginSelector::PluginSelector (PluginManager& mgr)
 
 	manager.PluginListChanged.connect (plugin_list_changed_connection, invalidator (*this), boost::bind (&PluginSelector::build_plugin_menu, this), gui_context());
 	manager.PluginListChanged.connect (plugin_list_changed_connection, invalidator (*this), boost::bind (&PluginSelector::refill, this), gui_context());
+	manager.PluginStatusesChanged.connect (plugin_list_changed_connection, invalidator (*this), boost::bind (&PluginSelector::build_plugin_menu, this), gui_context());
+	manager.PluginStatusesChanged.connect (plugin_list_changed_connection, invalidator (*this), boost::bind (&PluginSelector::refill, this), gui_context());
 	build_plugin_menu ();
 
 	plugin_model = Gtk::ListStore::create (plugin_columns);
@@ -96,6 +107,11 @@ PluginSelector::PluginSelector (PluginManager& mgr)
 	plugin_display.set_headers_clickable (true);
 	plugin_display.set_reorderable (false);
 	plugin_display.set_rules_hint (true);
+	plugin_display.add_object_drag (plugin_columns.plugin.index(), "PluginInfoPtr");
+	plugin_display.set_drag_column (plugin_columns.name.index());
+
+	// setting a sort-column prevents re-ordering via Drag/Drop
+	plugin_model->set_sort_column (plugin_columns.name.index(), Gtk::SORT_ASCENDING);
 
 	CellRendererToggle* fav_cell = dynamic_cast<CellRendererToggle*>(plugin_display.get_column_cell_renderer (0));
 	fav_cell->property_activatable() = true;
@@ -126,45 +142,78 @@ PluginSelector::PluginSelector (PluginManager& mgr)
 	ascroller.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
 	ascroller.add(added_list);
 	btn_add = manage(new Gtk::Button(Stock::ADD));
-	ARDOUR_UI::instance()->set_tip(*btn_add, _("Add a plugin to the effect list"));
+	set_tooltip(*btn_add, _("Add a plugin to the effect list"));
 	btn_add->set_sensitive (false);
 	btn_remove = manage(new Gtk::Button(Stock::REMOVE));
 	btn_remove->set_sensitive (false);
-	ARDOUR_UI::instance()->set_tip(*btn_remove, _("Remove a plugin from the effect list"));
-	Gtk::Button *btn_update = manage(new Gtk::Button(Stock::REFRESH));
-	ARDOUR_UI::instance()->set_tip(*btn_update, _("Update available plugins"));
+	set_tooltip(*btn_remove, _("Remove a plugin from the effect list"));
 
 	btn_add->set_name("PluginSelectorButton");
 	btn_remove->set_name("PluginSelectorButton");
 
+
 	Gtk::Table* table = manage(new Gtk::Table(7, 11));
 	table->set_size_request(750, 500);
-	table->attach(scroller, 0, 7, 0, 5);
 
-	HBox* filter_box = manage (new HBox);
+	Gtk::Table* filter_table = manage(new Gtk::Table(2, 5));
+
+	fil_hidden_button.set_name ("pluginlist hide button");
+	fil_hidden_button.set_text (_("Show Hidden"));
+	fil_hidden_button.set_active (_show_hidden);
+	set_tooltip (fil_hidden_button, _("Include hidden plugins in list."));
+
+	fil_instruments_button.set_name ("pluginlist filter button");
+	fil_instruments_button.set_text (_("Instruments"));
+	fil_instruments_button.set_active_state (_show_instruments);
+	set_tooltip (fil_instruments_button, _("Cycle display of instrument plugins (if any)."));
+
+	fil_analysis_button.set_name ("pluginlist filter button");
+	fil_analysis_button.set_text (_("Analyzers"));
+	fil_analysis_button.set_active_state (_show_analysers);
+	set_tooltip (fil_analysis_button, _("Cycle display of analysis plugins (if any)."));
+
+	fil_utils_button.set_name ("pluginlist filter button");
+	fil_utils_button.set_text (_("Utils"));
+	fil_utils_button.set_active_state (_show_utils);
+	set_tooltip (fil_utils_button, _("Cycle display of utility plugins (if any)."));
 
 	vector<string> filter_strings = I18N (_filter_mode_strings);
 	Gtkmm2ext::set_popdown_strings (filter_mode, filter_strings);
 	filter_mode.set_active_text (filter_strings.front());
 
-	filter_box->pack_start (filter_mode, false, false);
-	filter_box->pack_start (filter_entry, true, true);
-	filter_box->pack_start (filter_button, false, false);
+	fil_hidden_button.signal_button_release_event().connect (sigc::mem_fun(*this, &PluginSelector::fil_hidden_button_release), false);
+	fil_instruments_button.signal_button_release_event().connect (sigc::mem_fun(*this, &PluginSelector::fil_instruments_button_release), false);
+	fil_analysis_button.signal_button_release_event().connect (sigc::mem_fun(*this, &PluginSelector::fil_analysis_button_release), false);
+	fil_utils_button.signal_button_release_event().connect (sigc::mem_fun(*this, &PluginSelector::fil_utils_button_release), false);
 
 	filter_entry.signal_changed().connect (sigc::mem_fun (*this, &PluginSelector::filter_entry_changed));
 	filter_button.signal_clicked().connect (sigc::mem_fun (*this, &PluginSelector::filter_button_clicked));
 	filter_mode.signal_changed().connect (sigc::mem_fun (*this, &PluginSelector::filter_mode_changed));
 
-	filter_box->show ();
-	filter_mode.show ();
-	filter_entry.show ();
-	filter_button.show ();
+	filter_table->attach (filter_mode,            0, 1, 0, 1, FILL, FILL);
+	filter_table->attach (filter_entry,           1, 4, 0, 1, FILL|EXPAND, FILL);
+	filter_table->attach (filter_button,          4, 5, 0, 1, FILL, FILL);
+
+	filter_table->attach (fil_hidden_button,      1, 2, 1, 2, FILL, FILL);
+	filter_table->attach (fil_instruments_button, 2, 3, 1, 2, FILL, FILL);
+	filter_table->attach (fil_analysis_button,    3, 4, 1, 2, FILL, FILL);
+	filter_table->attach (fil_utils_button,       4, 5, 1, 2, FILL, FILL);
+
+	filter_table->set_border_width (4);
+	filter_table->set_col_spacings (2);
+	filter_table->set_row_spacings (4);
 
-	table->attach (*filter_box, 0, 7, 5, 6, FILL|EXPAND, FILL, 5, 5);
+	Frame* filter_frame = manage (new Frame);
+	filter_frame->set_name ("BaseFrame");
+	filter_frame->set_label (_("Filter"));
+	filter_frame->add (*filter_table);
 
-	table->attach(*btn_add, 1, 2, 6, 7, FILL, FILL, 5, 5);
-	table->attach(*btn_remove, 3, 4, 6, 7, FILL, FILL, 5, 5);
-	table->attach(*btn_update, 5, 6, 6, 7, FILL, FILL, 5, 5);
+	filter_frame->show_all ();
+
+	table->attach (scroller, 0, 7, 0, 5);
+	table->attach (*filter_frame, 0, 7, 6, 7, FILL|EXPAND, FILL, 5, 5);
+	table->attach(*btn_add, 1, 2, 7, 8, FILL, FILL, 5, 5);
+	table->attach(*btn_remove, 5, 6, 7, 8, FILL, FILL, 5, 5);
 
 	table->attach(ascroller, 0, 7, 8, 10);
 
@@ -183,10 +232,10 @@ PluginSelector::PluginSelector (PluginManager& mgr)
 	plugin_display.get_selection()->signal_changed().connect (sigc::mem_fun(*this, &PluginSelector::display_selection_changed));
 	plugin_display.grab_focus();
 
-	btn_update->signal_clicked().connect (sigc::mem_fun(*this, &PluginSelector::btn_update_clicked));
 	btn_add->signal_clicked().connect(sigc::mem_fun(*this, &PluginSelector::btn_add_clicked));
 	btn_remove->signal_clicked().connect(sigc::mem_fun(*this, &PluginSelector::btn_remove_clicked));
 	added_list.get_selection()->signal_changed().connect (sigc::mem_fun(*this, &PluginSelector::added_list_selection_changed));
+	added_list.signal_button_press_event().connect_notify (mem_fun(*this, &PluginSelector::added_row_clicked));
 
 	refill ();
 }
@@ -202,6 +251,13 @@ PluginSelector::row_activated(Gtk::TreeModel::Path, Gtk::TreeViewColumn*)
 	btn_add_clicked();
 }
 
+void
+PluginSelector::added_row_clicked(GdkEventButton* event)
+{
+	if (event->type == GDK_2BUTTON_PRESS)
+		btn_remove_clicked();
+}
+
 bool
 PluginSelector::show_this_plugin (const PluginInfoPtr& info, const std::string& filterstr)
 {
@@ -216,6 +272,40 @@ PluginSelector::show_this_plugin (const PluginInfoPtr& info, const std::string&
 		return manager.get_status (info) == PluginManager::Hidden;
 	}
 
+	if (!_show_hidden && manager.get_status (info) == PluginManager::Hidden) {
+		return false;
+	}
+
+	if (_show_instruments == Gtkmm2ext::Off && info->is_instrument()) {
+		return false;
+	}
+	if (_show_analysers == Gtkmm2ext::Off && info->in_category ("Analyser")) {
+		return false;
+	}
+	if (_show_utils == Gtkmm2ext::Off && info->in_category ("Utility")) {
+		return false;
+	}
+
+	/* NB once lilv_node_as_string() does honor translation AND
+	 * the lv2 onthology provides localized class name,
+	 * PluginInfo will need methods for Util & Analysis.
+	 */
+	bool exp_ok = false;
+	if (_show_instruments == Gtkmm2ext::ExplicitActive && info->is_instrument()) {
+		exp_ok = true;
+	}
+	if (_show_analysers == Gtkmm2ext::ExplicitActive && info->in_category ("Analyser")) {
+		exp_ok = true;
+	}
+	if (_show_utils == Gtkmm2ext::ExplicitActive && info->in_category ("Utility")) {
+		exp_ok = true;
+	}
+	if (_show_instruments == Gtkmm2ext::ExplicitActive  || _show_analysers == Gtkmm2ext::ExplicitActive || _show_utils == Gtkmm2ext::ExplicitActive) {
+		if (!exp_ok) {
+			return false;
+		}
+	}
+
 	if (!filterstr.empty()) {
 
 		if (mode == _("Name contains")) {
@@ -240,6 +330,8 @@ PluginSelector::show_this_plugin (const PluginInfoPtr& info, const std::string&
 			case LXVST:
 				compstr = X_("LXVST");
 				break;
+			case Lua:
+				break;
 			}
 
 		} else if (mode == _("Author contains")) {
@@ -335,7 +427,7 @@ PluginSelector::refiller (const PluginInfoList& plugs, const::std::string& filte
 				newrow[plugin_columns.audio_ins] = buf;
 				snprintf (buf, sizeof(buf), "%d", (*i)->n_inputs.n_midi());
 				newrow[plugin_columns.midi_ins] = buf;
-				
+
 				snprintf (buf, sizeof(buf), "%d", (*i)->n_outputs.n_audio());
 				newrow[plugin_columns.audio_outs] = buf;
 				snprintf (buf, sizeof(buf), "%d", (*i)->n_outputs.n_midi());
@@ -438,12 +530,6 @@ PluginSelector::btn_remove_clicked()
 	}
 }
 
-void
-PluginSelector::btn_update_clicked()
-{
-	manager.refresh ();
-}
-
 void
 PluginSelector::display_selection_changed()
 {
@@ -528,8 +614,18 @@ PluginSelector::filter_mode_changed ()
 
 	if (mode == _("Favorites only") || mode == _("Hidden only")) {
 		filter_entry.set_sensitive (false);
+		filter_button.set_sensitive (false);
+		fil_hidden_button.set_sensitive (false);
+		fil_instruments_button.set_sensitive (false);
+		fil_analysis_button.set_sensitive (false);
+		fil_utils_button.set_sensitive (false);
 	} else {
 		filter_entry.set_sensitive (true);
+		filter_button.set_sensitive (true);
+		fil_hidden_button.set_sensitive (true);
+		fil_instruments_button.set_sensitive (true);
+		fil_analysis_button.set_sensitive (true);
+		fil_utils_button.set_sensitive (true);
 	}
 
 	refill ();
@@ -846,6 +942,96 @@ PluginSelector::hidden_changed (const std::string& path)
 	in_row_change = false;
 }
 
+bool
+PluginSelector::fil_hidden_button_release (GdkEventButton*)
+{
+	_show_hidden = (fil_hidden_button.active_state() == 0);
+	fil_hidden_button.set_active (_show_hidden);
+	refill ();
+	return false;
+}
+
+static Gtkmm2ext::ActiveState next_state (Gtkmm2ext::ActiveState s){
+	switch (s) {
+		case Gtkmm2ext::Off:
+			return Gtkmm2ext::ImplicitActive;
+			break;
+		case Gtkmm2ext::ImplicitActive:
+			return Gtkmm2ext::ExplicitActive;
+			break;
+		case Gtkmm2ext::ExplicitActive:
+			return Gtkmm2ext::Off;
+			break;
+		default: assert(0); break; // not reached
+	}
+	/* impossible, but keep some compiles happy */
+	fatal << string_compose (_("programming error: %1"),
+			X_("Illegal Active State."))
+		<< endmsg;
+	abort(); /*NOTREACHED*/
+	return Gtkmm2ext::Off;
+}
+
+static Gtkmm2ext::ActiveState prev_state (Gtkmm2ext::ActiveState s){
+	switch (s) {
+		case Gtkmm2ext::Off:
+			return Gtkmm2ext::ExplicitActive;
+			break;
+		case Gtkmm2ext::ImplicitActive:
+			return Gtkmm2ext::Off;
+			break;
+		case Gtkmm2ext::ExplicitActive:
+			return Gtkmm2ext::ImplicitActive;
+			break;
+		default: assert(0); break; // not reached
+	}
+	/* impossible, but keep some compiles happy */
+	fatal << string_compose (_("programming error: %1"),
+			X_("Illegal Active State."))
+		<< endmsg;
+	abort(); /*NOTREACHED*/
+	return Gtkmm2ext::Off;
+}
+
+bool
+PluginSelector::fil_instruments_button_release (GdkEventButton* ev)
+{
+	if (ev->button == 3) {
+		_show_instruments = prev_state (fil_instruments_button.active_state());
+	} else {
+		_show_instruments = next_state (fil_instruments_button.active_state());
+	}
+	fil_instruments_button.set_active_state (_show_instruments);
+	refill ();
+	return false;
+}
+
+bool
+PluginSelector::fil_analysis_button_release (GdkEventButton* ev)
+{
+	if (ev->button == 3) {
+		_show_analysers = prev_state (fil_analysis_button.active_state());
+	} else {
+		_show_analysers = next_state (fil_analysis_button.active_state());
+	}
+	fil_analysis_button.set_active_state (_show_analysers);
+	refill ();
+	return false;
+}
+
+bool
+PluginSelector::fil_utils_button_release (GdkEventButton* ev)
+{
+	if (ev->button == 3) {
+		_show_utils = prev_state (fil_utils_button.active_state());
+	} else {
+		_show_utils = next_state (fil_utils_button.active_state());
+	}
+	fil_utils_button.set_active_state (_show_utils);
+	refill ();
+	return false;
+}
+
 void
 PluginSelector::show_manager ()
 {