N_("Author contains"),
N_("Library contains"),
N_("Favorites only"),
+ N_("Hidden only"),
0
};
PluginSelector::PluginSelector (PluginManager *mgr)
- : ArdourDialog (_("ardour: plugins"), true, false),
+ : ArdourDialog (_("Plugin Manager"), true, false),
filter_button (Stock::CLEAR)
{
set_position (Gtk::WIN_POS_MOUSE);
set_name ("PluginSelectorWindow");
add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
+ _plugin_menu = 0;
manager = mgr;
- session = 0;
- _menu = 0;
in_row_change = false;
+ manager->PluginListChanged.connect (plugin_list_changed_connection, invalidator (*this), boost::bind (&PluginSelector::build_plugin_menu, this), gui_context());
+ build_plugin_menu ();
+
plugin_model = Gtk::ListStore::create (plugin_columns);
plugin_display.set_model (plugin_model);
/* XXX translators: try to convert "Fav" into a short term
- related to "favorite"
+ related to "favorite" and "Hid" into a short term
+ related to "hidden"
*/
plugin_display.append_column (_("Fav"), plugin_columns.favorite);
+ plugin_display.append_column (_("Hid"), plugin_columns.hidden);
plugin_display.append_column (_("Available Plugins"), plugin_columns.name);
plugin_display.append_column (_("Type"), plugin_columns.type_name);
plugin_display.append_column (_("Category"), plugin_columns.category);
CellRendererToggle* fav_cell = dynamic_cast<CellRendererToggle*>(plugin_display.get_column_cell_renderer (0));
fav_cell->property_activatable() = true;
- fav_cell->property_radio() = false;
- fav_cell->signal_toggled().connect (mem_fun (*this, &PluginSelector::favorite_changed));
+ fav_cell->property_radio() = true;
+ fav_cell->signal_toggled().connect (sigc::mem_fun (*this, &PluginSelector::favorite_changed));
+
+ CellRendererToggle* hidden_cell = dynamic_cast<CellRendererToggle*>(plugin_display.get_column_cell_renderer (1));
+ hidden_cell->property_activatable() = true;
+ hidden_cell->property_radio() = true;
+ hidden_cell->signal_toggled().connect (sigc::mem_fun (*this, &PluginSelector::hidden_changed));
scroller.set_border_width(10);
scroller.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
added_list.set_headers_visible (true);
added_list.set_reorderable (false);
- for (int i = 0; i <=7; i++) {
+ for (int i = 0; i <=8; i++) {
Gtk::TreeView::Column* column = plugin_display.get_column(i);
column->set_sort_column(i);
}
ascroller.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
ascroller.add(added_list);
btn_add = manage(new Gtk::Button(Stock::ADD));
- ARDOUR_UI::instance()->tooltips().set_tip(*btn_add, _("Add a plugin to the effect list"));
+ ARDOUR_UI::instance()->set_tip(*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()->tooltips().set_tip(*btn_remove, _("Remove a plugin from the effect list"));
+ 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()->tooltips().set_tip(*btn_update, _("Update available plugins"));
+ ARDOUR_UI::instance()->set_tip(*btn_update, _("Update available plugins"));
btn_add->set_name("PluginSelectorButton");
btn_remove->set_name("PluginSelectorButton");
filter_box->pack_start (filter_entry, true, true);
filter_box->pack_start (filter_button, false, false);
- filter_entry.signal_changed().connect (mem_fun (*this, &PluginSelector::filter_entry_changed));
- filter_button.signal_clicked().connect (mem_fun (*this, &PluginSelector::filter_button_clicked));
- filter_mode.signal_changed().connect (mem_fun (*this, &PluginSelector::filter_mode_changed));
+ 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 ();
table->attach(ascroller, 0, 7, 8, 10);
- add_button (Stock::CANCEL, RESPONSE_CANCEL);
+ add_button (Stock::CLOSE, RESPONSE_CLOSE);
add_button (_("Insert Plugin(s)"), RESPONSE_APPLY);
set_default_response (RESPONSE_APPLY);
set_response_sensitive (RESPONSE_APPLY, false);
//plugin_display.set_name("PluginSelectorList");
added_list.set_name("PluginSelectorList");
- plugin_display.signal_button_press_event().connect_notify (mem_fun(*this, &PluginSelector::row_clicked));
- plugin_display.get_selection()->signal_changed().connect (mem_fun(*this, &PluginSelector::display_selection_changed));
+ plugin_display.signal_button_press_event().connect_notify (sigc::mem_fun(*this, &PluginSelector::row_clicked));
+ plugin_display.get_selection()->signal_changed().connect (sigc::mem_fun(*this, &PluginSelector::display_selection_changed));
plugin_display.grab_focus();
- btn_update->signal_clicked().connect (mem_fun(*this, &PluginSelector::btn_update_clicked));
- btn_add->signal_clicked().connect(mem_fun(*this, &PluginSelector::btn_add_clicked));
- btn_remove->signal_clicked().connect(mem_fun(*this, &PluginSelector::btn_remove_clicked));
- added_list.get_selection()->signal_changed().connect (mem_fun(*this, &PluginSelector::added_list_selection_changed));
+ 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));
refill ();
}
-void
-PluginSelector::row_clicked(GdkEventButton* event)
+PluginSelector::~PluginSelector ()
{
- if (event->type == GDK_2BUTTON_PRESS)
- btn_add_clicked();
+ delete _plugin_menu;
}
void
-PluginSelector::set_session (Session* s)
+PluginSelector::row_clicked(GdkEventButton* event)
{
- ENSURE_GUI_THREAD(bind (mem_fun(*this, &PluginSelector::set_session), s));
-
- session = s;
-
- if (session) {
- session->GoingAway.connect (bind (mem_fun(*this, &PluginSelector::set_session), static_cast<Session*> (0)));
+ if (event->type == GDK_2BUTTON_PRESS) {
+ btn_add_clicked();
}
}
std::string mode = filter_mode.get_active_text ();
if (mode == _("Favorites only")) {
- return manager->is_a_favorite_plugin (info);
+ return manager->get_status (info) == PluginManager::Favorite;
+ }
+
+ if (mode == _("Hidden only")) {
+ return manager->get_status (info) == PluginManager::Hidden;
}
if (!filterstr.empty()) {
if (show_this_plugin (*i, filterstr)) {
TreeModel::Row newrow = *(plugin_model->append());
- newrow[plugin_columns.favorite] = manager->is_a_favorite_plugin (*i);
+ newrow[plugin_columns.favorite] = (manager->get_status (*i) == PluginManager::Favorite);
+ newrow[plugin_columns.hidden] = (manager->get_status (*i) == PluginManager::Hidden);
newrow[plugin_columns.name] = (*i)->name;
newrow[plugin_columns.type_name] = type;
newrow[plugin_columns.category] = (*i)->category;
PluginPtr
PluginSelector::load_plugin (PluginInfoPtr pi)
{
- if (session == 0) {
+ if (_session == 0) {
return PluginPtr();
}
- return pi->load (*session);
+ return pi->load (*_session);
}
void
{
ResponseType r;
TreeModel::Children::iterator i;
- SelectedPlugins plugins;
- r = (ResponseType) Dialog::run ();
+ bool finish = false;
+
+ while (!finish) {
- switch (r) {
- case RESPONSE_APPLY:
- for (i = amodel->children().begin(); i != amodel->children().end(); ++i) {
- PluginInfoPtr pp = (*i)[acols.plugin];
- PluginPtr p = load_plugin (pp);
- if (p) {
- plugins.push_back (p);
+ SelectedPlugins plugins;
+ r = (ResponseType) Dialog::run ();
+
+ switch (r) {
+ case RESPONSE_APPLY:
+ for (i = amodel->children().begin(); i != amodel->children().end(); ++i) {
+ PluginInfoPtr pp = (*i)[acols.plugin];
+ PluginPtr p = load_plugin (pp);
+ if (p) {
+ plugins.push_back (p);
+ }
}
+ if (interested_object && !plugins.empty()) {
+ finish = !interested_object->use_plugins (plugins);
+ }
+
+ break;
+
+ default:
+ finish = true;
+ break;
}
- if (interested_object && !plugins.empty()) {
- interested_object->use_plugins (plugins);
- }
-
- break;
-
- default:
- break;
}
-
+
+
hide();
amodel->clear();
interested_object = 0;
{
std::string mode = filter_mode.get_active_text ();
- if (mode == _("Favorites only")) {
+ if (mode == _("Favorites only") || mode == _("Hidden only")) {
filter_entry.set_sensitive (false);
} else {
filter_entry.set_sensitive (true);
filter_entry.grab_focus ();
}
-struct PluginMenuCompare {
+struct PluginMenuCompareByCreator {
bool operator() (PluginInfoPtr a, PluginInfoPtr b) const {
int cmp;
}
};
-Gtk::Menu&
-PluginSelector::plugin_menu()
-{
- using namespace Menu_Helpers;
+struct PluginMenuCompareByName {
+ bool operator() (PluginInfoPtr a, PluginInfoPtr b) const {
+ int cmp;
- typedef std::map<Glib::ustring,Gtk::Menu*> SubmenuMap;
- SubmenuMap submenu_map;
+ cmp = strcasecmp (a->name.c_str(), b->name.c_str());
- if (!_menu) {
- _menu = new Menu();
- _menu->set_name("ArdourContextMenu");
- }
+ if (cmp < 0) {
+ return true;
+ } else if (cmp == 0) {
+ /* same name ... compare type */
+ if (a->type < b->type) {
+ return true;
+ }
+ }
+ return false;
+ }
+};
- MenuList& items = _menu->items();
- Menu* favs = new Menu();
- favs->set_name("ArdourContextMenu");
+struct PluginMenuCompareByCategory {
+ bool operator() (PluginInfoPtr a, PluginInfoPtr b) const {
+ int cmp;
- items.clear ();
- items.push_back (MenuElem (_("Favorites"), *favs));
- items.push_back (MenuElem (_("Plugin Manager"), mem_fun (*this, &PluginSelector::show_manager)));
- items.push_back (SeparatorElem ());
+ cmp = strcasecmp (a->category.c_str(), b->category.c_str());
+
+ if (cmp < 0) {
+ return true;
+ } else if (cmp == 0) {
+ /* same category ... compare names */
+ if (strcasecmp (a->name.c_str(), b->name.c_str()) < 0) {
+ return true;
+ }
+ }
+ return false;
+ }
+};
+
+/** @return Plugin menu. The caller should not delete it */
+Gtk::Menu*
+PluginSelector::plugin_menu()
+{
+ return _plugin_menu;
+}
+void
+PluginSelector::build_plugin_menu ()
+{
PluginInfoList all_plugs;
all_plugs.insert (all_plugs.end(), manager->ladspa_plugin_info().begin(), manager->ladspa_plugin_info().end());
all_plugs.insert (all_plugs.end(), manager->lv2_plugin_info().begin(), manager->lv2_plugin_info().end());
#endif
- PluginMenuCompare cmp;
- all_plugs.sort (cmp);
+ using namespace Menu_Helpers;
- for (PluginInfoList::const_iterator i = all_plugs.begin(); i != all_plugs.end(); ++i) {
- SubmenuMap::iterator x;
- Gtk::Menu* submenu;
+ delete _plugin_menu;
+
+ _plugin_menu = manage (new Menu);
+ _plugin_menu->set_name("ArdourContextMenu");
+
+ MenuList& items = _plugin_menu->items();
+ items.clear ();
- string creator = (*i)->creator;
- string::size_type pos = 0;
+ Gtk::Menu* favs = create_favs_menu(all_plugs);
+ items.push_back (MenuElem (_("Favorites"), *manage (favs)));
- if (manager->is_a_favorite_plugin (*i)) {
- favs->items().push_back (MenuElem ((*i)->name, (bind (mem_fun (*this, &PluginSelector::plugin_chosen_from_menu), *i))));
+ items.push_back (MenuElem (_("Plugin Manager"), sigc::mem_fun (*this, &PluginSelector::show_manager)));
+ items.push_back (SeparatorElem ());
+
+ Menu* by_creator = create_by_creator_menu(all_plugs);
+ items.push_back (MenuElem (_("By Creator"), *manage (by_creator)));
+
+ Menu* by_category = create_by_category_menu(all_plugs);
+ items.push_back (MenuElem (_("By Category"), *manage (by_category)));
+}
+
+Gtk::Menu*
+PluginSelector::create_favs_menu (PluginInfoList& all_plugs)
+{
+ using namespace Menu_Helpers;
+
+ Menu* favs = new Menu();
+ favs->set_name("ArdourContextMenu");
+
+ PluginMenuCompareByName cmp_by_name;
+ all_plugs.sort (cmp_by_name);
+
+ for (PluginInfoList::const_iterator i = all_plugs.begin(); i != all_plugs.end(); ++i) {
+ if (manager->get_status (*i) == PluginManager::Favorite) {
+ favs->items().push_back (MenuElem ((*i)->name, (sigc::bind (sigc::mem_fun (*this, &PluginSelector::plugin_chosen_from_menu), *i))));
}
+ }
+ return favs;
+}
- /* stupid LADSPA creator strings */
+Gtk::Menu*
+PluginSelector::create_by_creator_menu (ARDOUR::PluginInfoList& all_plugs)
+{
+ using namespace Menu_Helpers;
+
+ typedef std::map<Glib::ustring,Gtk::Menu*> SubmenuMap;
+ SubmenuMap creator_submenu_map;
+
+ Menu* by_creator = new Menu();
+ by_creator->set_name("ArdourContextMenu");
+
+ MenuList& by_creator_items = by_creator->items();
+ PluginMenuCompareByCreator cmp_by_creator;
+ all_plugs.sort (cmp_by_creator);
+
+ for (PluginInfoList::const_iterator i = all_plugs.begin(); i != all_plugs.end(); ++i) {
+
+ if (manager->get_status (*i) == PluginManager::Hidden) continue;
+
+ string creator = (*i)->creator;
+ /* stupid LADSPA creator strings */
+ string::size_type pos = 0;
while (pos < creator.length() && (isalnum (creator[pos]) || isspace (creator[pos]))) ++pos;
creator = creator.substr (0, pos);
- if ((x = submenu_map.find (creator)) != submenu_map.end()) {
+ SubmenuMap::iterator x;
+ Gtk::Menu* submenu;
+ if ((x = creator_submenu_map.find (creator)) != creator_submenu_map.end()) {
submenu = x->second;
} else {
submenu = new Gtk::Menu;
- items.push_back (MenuElem (creator, *submenu));
- submenu_map.insert (pair<Glib::ustring,Menu*> (creator, submenu));
+ by_creator_items.push_back (MenuElem (creator, *manage (submenu)));
+ creator_submenu_map.insert (pair<Glib::ustring,Menu*> (creator, submenu));
submenu->set_name("ArdourContextMenu");
}
-
- submenu->items().push_back (MenuElem ((*i)->name, (bind (mem_fun (*this, &PluginSelector::plugin_chosen_from_menu), *i))));
+ submenu->items().push_back (MenuElem ((*i)->name, (sigc::bind (sigc::mem_fun (*this, &PluginSelector::plugin_chosen_from_menu), *i))));
}
+ return by_creator;
+}
+
+Gtk::Menu*
+PluginSelector::create_by_category_menu (ARDOUR::PluginInfoList& all_plugs)
+{
+ using namespace Menu_Helpers;
- return *_menu;
+ typedef std::map<Glib::ustring,Gtk::Menu*> SubmenuMap;
+ SubmenuMap category_submenu_map;
+
+ Menu* by_category = new Menu();
+ by_category->set_name("ArdourContextMenu");
+
+ MenuList& by_category_items = by_category->items();
+ PluginMenuCompareByCategory cmp_by_category;
+ all_plugs.sort (cmp_by_category);
+
+ for (PluginInfoList::const_iterator i = all_plugs.begin(); i != all_plugs.end(); ++i) {
+
+ if (manager->get_status (*i) == PluginManager::Hidden) continue;
+
+ string category = (*i)->category;
+
+ SubmenuMap::iterator x;
+ Gtk::Menu* submenu;
+ if ((x = category_submenu_map.find (category)) != category_submenu_map.end()) {
+ submenu = x->second;
+ } else {
+ submenu = new Gtk::Menu;
+ by_category_items.push_back (MenuElem (category, *manage (submenu)));
+ category_submenu_map.insert (pair<Glib::ustring,Menu*> (category, submenu));
+ submenu->set_name("ArdourContextMenu");
+ }
+ submenu->items().push_back (MenuElem ((*i)->name, (sigc::bind (sigc::mem_fun (*this, &PluginSelector::plugin_chosen_from_menu), *i))));
+ }
+ return by_category;
}
void
/* change state */
(*iter)[plugin_columns.favorite] = favorite;
+ (*iter)[plugin_columns.hidden] = false;
+ PluginManager::PluginStatusType status = (favorite ? PluginManager::Favorite : PluginManager::Normal);
- /* save new favorites list */
+ /* save new statuses list */
pi = (*iter)[plugin_columns.plugin];
- if (favorite) {
- manager->add_favorite (pi->type, pi->unique_id);
- } else {
- manager->remove_favorite (pi->type, pi->unique_id);
- }
+ manager->set_status (pi->type, pi->unique_id, status);
+
+ manager->save_statuses ();
+
+ build_plugin_menu ();
+ }
+ in_row_change = false;
+}
+
+void
+PluginSelector::hidden_changed (const Glib::ustring& path)
+{
+ PluginInfoPtr pi;
+
+ if (in_row_change) {
+ return;
+ }
+
+ in_row_change = true;
+
+ TreeModel::iterator iter = plugin_model->get_iter (path);
+
+ if (iter) {
+
+ bool hidden = !(*iter)[plugin_columns.hidden];
+
+ /* change state */
+
+ (*iter)[plugin_columns.favorite] = false;
+ (*iter)[plugin_columns.hidden] = hidden;
+ PluginManager::PluginStatusType status = (hidden ? PluginManager::Hidden : PluginManager::Normal);
+
+ /* save new statuses list */
+
+ pi = (*iter)[plugin_columns.plugin];
+
+ manager->set_status (pi->type, pi->unique_id, status);
- manager->save_favorites ();
+ manager->save_statuses ();
}
in_row_change = false;
}
projects / ardour.git / blobdiff