_plugin_menu = 0;
in_row_change = false;
+ //anytime the list changes ( Status, Tags, or scanned plugins ) we need to rebuild redirect-box plugin selector menu
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::plugin_status_changed, this, _1, _2, _3), gui_context());
- manager.PluginTagsChanged.connect(plugin_list_changed_connection, invalidator (*this), boost::bind (&PluginSelector::tags_changed, this, _1, _2, _3), gui_context());
+
+ //these are used to update the info of specific entries, while they are being edited
+ manager.PluginStatusChanged.connect (plugin_list_changed_connection, invalidator (*this), boost::bind (&PluginSelector::plugin_status_changed, this, _1, _2, _3), gui_context());
+ manager.PluginTagChanged.connect(plugin_list_changed_connection, invalidator (*this), boost::bind (&PluginSelector::tags_changed, this, _1, _2, _3), gui_context());
plugin_model = Gtk::ListStore::create (plugin_columns);
plugin_display.set_model (plugin_model);
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));
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 */
tag_entry = manage (new Gtk::Entry);
tag_entry_connection = tag_entry->signal_changed().connect (sigc::mem_fun (*this, &PluginSelector::tag_entry_changed));
- Gtk::Button* tag_reset_button = manage (new Button (_("Reset")));
+ tag_reset_button = manage (new Button (_("Reset")));
tag_reset_button->signal_clicked().connect (sigc::mem_fun (*this, &PluginSelector::tag_reset_button_clicked));
Gtk::Label* tagging_help_label1 = manage (new Label(
plugin_display.grab_focus();
build_plugin_menu ();
+ display_selection_changed ();
}
PluginSelector::~PluginSelector ()
/* user asked to ignore filters */
if (maybe_show && _search_ignore_checkbox->get_active()) {
+ if (manager.get_status (info) == PluginManager::Hidden) {
+ return false;
+ }
return true;
}
}
return false;
}
- if (manager.get_status (info) == PluginManager::Hidden) {
- if (!_fil_hidden_radio->get_active() && !_fil_all_radio->get_active()) {
- return false;
- }
+ if (!_fil_hidden_radio->get_active() && manager.get_status (info) == PluginManager::Hidden) {
+ return false;
}
/* Filter "type" combobox */
void
PluginSelector::btn_add_clicked()
{
+ if (plugin_display.get_selection()->count_selected_rows() == 0) {
+ /* may happen with ctrl + double-click un-selecting but activating a row */
+ return;
+ }
std::string name;
PluginInfoPtr pi;
TreeModel::Row newrow = *(amodel->append());
tag_entry->set_text (tags);
tag_entry->set_sensitive (true);
+ tag_reset_button->set_sensitive (true);
btn_add->set_sensitive (true);
} else {
tag_entry->set_text ("");
tag_entry->set_sensitive (false);
+ tag_reset_button->set_sensitive (false);
btn_add->set_sensitive (false);
}
tag_entry_connection.unblock ();
manager.save_statuses();
}
- if (_need_menu_rebuild) {
- build_plugin_menu();
+ if ( _need_tag_save || _need_status_save || _need_menu_rebuild ) {
+ manager.PluginListChanged(); //emit signal
}
return (int) r;
manager.reset_tags (pi);
display_selection_changed ();
_need_tag_save = true;
+ _need_menu_rebuild = true;
}
}
manager.set_tags (pi->type, pi->unique_id, tag_entry->get_text(), false);
_need_tag_save = true;
+ _need_menu_rebuild = true;
}
}
}
row[plugin_columns.tags] = tags;
}
-
- /* A plugin's tags change while the user is entering them.
- * defer a rebuilding of the "tag" menu until the dialog is closed.
- */
- _need_menu_rebuild = true;
}
void
plugin_model->erase(i);
}
- /* plugin menu must be re-built to accommodate Hidden and Favorite plugins */
- build_plugin_menu();
-
return;
}
}
by_tags->set_name("ArdourContextMenu");
MenuList& by_tags_items = by_tags->items();
- std::vector<std::string> all_tags = manager.get_all_tags(false);
+ std::vector<std::string> all_tags = manager.get_all_tags (PluginManager::NoHidden);
for (vector<string>::iterator t = all_tags.begin(); t != all_tags.end(); ++t) {
Gtk::Menu *submenu = new Gtk::Menu;
by_tags_items.push_back (MenuElem (*t, *manage (submenu)));
Gtk::Menu* submenu;
if ((x = tags_submenu_map.find (*t)) != tags_submenu_map.end()) {
submenu = x->second;
- } else {
+ string typ = GetPluginTypeStr(*i);
+ MenuElem elem ((*i)->name + typ, (sigc::bind (sigc::mem_fun (*this, &PluginSelector::plugin_chosen_from_menu), *i)));
+ elem.get_child()->set_use_underline (false);
+ submenu->items().push_back (elem);
}
- string typ = GetPluginTypeStr(*i);
- MenuElem elem ((*i)->name + typ, (sigc::bind (sigc::mem_fun (*this, &PluginSelector::plugin_chosen_from_menu), *i)));
- elem.get_child()->set_use_underline (false);
- submenu->items().push_back (elem);
}
}
return by_tags;
manager.set_status (pi->type, pi->unique_id, status);
_need_status_save = true;
+ _need_menu_rebuild = true;
}
in_row_change = false;
}
manager.set_status (pi->type, pi->unique_id, status);
_need_status_save = true;
+ _need_menu_rebuild = true;
}
in_row_change = false;
}
projects / ardour.git / blobdiff