smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 08:14:58 +01:00
Code Issues Projects Releases Wiki Activity

Major overhaul of plugin-selector: tag-management & filter

Browse source 
This is a squashed commit of various 'nutag' topic branch commits:
* re-layout plugin-manager
* remove category, add tags
* combine I/O columns in list.
* update filter to search name and tags
This commit is contained in:
Robin Gareus 2018-01-30 01:32:15 +01:00
parent 9e1acce333
commit cebfec8125
2 changed files with 599 additions and 439 deletions
Download patch file Download diff file Expand all files Collapse all files

957
gtk2_ardour/plugin_selector.cc
View file

File diff suppressed because it is too large Load diff

81
gtk2_ardour/plugin_selector.h
View file

@ -21,6 +21,7 @@
#define __ardour_plugin_selector_h__ #define __ardour_plugin_selector_h__
#include <gtkmm/button.h> #include <gtkmm/button.h>
#include <gtkmm/checkbutton.h>
#include <gtkmm/comboboxtext.h> #include <gtkmm/comboboxtext.h>
#include <gtkmm/entry.h> #include <gtkmm/entry.h>
#include <gtkmm/liststore.h> #include <gtkmm/liststore.h>
@ -32,6 +33,7 @@
#include "gtkmm2ext/dndtreeview.h" #include "gtkmm2ext/dndtreeview.h"
#include "ardour/plugin.h" #include "ardour/plugin.h"
#include "ardour/plugin_manager.h"
#include "ardour/session_handle.h" #include "ardour/session_handle.h"
#include "widgets/ardour_button.h" #include "widgets/ardour_button.h"
@ -60,36 +62,57 @@ public:
void show_manager (); void show_manager ();
private: private:
//search
Gtk::CheckButton *_search_name_checkbox;
Gtk::CheckButton *_search_tags_checkbox;
Gtk::CheckButton *_search_ignore_checkbox;
//radio-button filters
Gtk::RadioButton *_fil_effects_radio;
Gtk::RadioButton *_fil_instruments_radio;
Gtk::RadioButton *_fil_utils_radio;
Gtk::RadioButton *_fil_favorites_radio;
Gtk::RadioButton *_fil_hidden_radio;
Gtk::RadioButton *_fil_all_radio;
//combobox filters
Gtk::ComboBoxText *_fil_type_combo;
Gtk::ComboBoxText *_fil_creator_combo;
Gtk::ComboBoxText *_fil_channel_combo;
PluginInterestedObject* interested_object; PluginInterestedObject* interested_object;
Gtk::ScrolledWindow scroller; // Available plugins Gtk::ScrolledWindow scroller; // Available plugins
Gtk::ScrolledWindow ascroller; // Added plugins Gtk::ScrolledWindow ascroller; // Added plugins
Gtk::ComboBoxText filter_mode; Gtk::Entry search_entry;
Gtk::Entry filter_entry; Gtk::Button search_clear_button;
Gtk::Button filter_button;
ArdourWidgets::ArdourButton fil_hidden_button; Gtk::Entry *tag_entry;
ArdourWidgets::ArdourButton fil_instruments_button; void tag_reset_button_clicked ();
ArdourWidgets::ArdourButton fil_analysis_button;
ArdourWidgets::ArdourButton fil_utils_button;
void filter_button_clicked (); void set_sensitive_widgets();
void filter_entry_changed ();
void filter_mode_changed (); void search_clear_button_clicked ();
void search_entry_changed ();
void tag_entry_changed ();
sigc::connection tag_entry_connection;
void tags_changed ( ARDOUR::PluginType t, std::string unique_id, std::string tag);
struct PluginColumns : public Gtk::TreeModel::ColumnRecord { struct PluginColumns : public Gtk::TreeModel::ColumnRecord {
PluginColumns () { PluginColumns () {
add (favorite); add (favorite);
add (hidden); add (hidden);
add (name); add (name);
add (type_name); add (tags);
add (category);
add (creator); add (creator);
add (audio_ins); add (type_name);
add (audio_outs); add (audio_io);
add (midi_ins); add (midi_io);
add (midi_outs); add (category);
add (plugin); add (plugin);
} }
Gtk::TreeModelColumn<bool> favorite; Gtk::TreeModelColumn<bool> favorite;
@ -98,10 +121,9 @@ private:
Gtk::TreeModelColumn<std::string> type_name; Gtk::TreeModelColumn<std::string> type_name;
Gtk::TreeModelColumn<std::string> category; Gtk::TreeModelColumn<std::string> category;
Gtk::TreeModelColumn<std::string> creator; Gtk::TreeModelColumn<std::string> creator;
Gtk::TreeModelColumn<std::string> audio_ins; Gtk::TreeModelColumn<std::string> tags;
Gtk::TreeModelColumn<std::string> audio_outs; Gtk::TreeModelColumn<std::string> audio_io;
Gtk::TreeModelColumn<std::string> midi_ins; Gtk::TreeModelColumn<std::string> midi_io;
Gtk::TreeModelColumn<std::string> midi_outs;
Gtk::TreeModelColumn<ARDOUR::PluginInfoPtr> plugin; Gtk::TreeModelColumn<ARDOUR::PluginInfoPtr> plugin;
}; };
PluginColumns plugin_columns; PluginColumns plugin_columns;
@ -144,12 +166,8 @@ private:
void btn_apply_clicked(); void btn_apply_clicked();
ARDOUR::PluginPtr load_plugin (ARDOUR::PluginInfoPtr); ARDOUR::PluginPtr load_plugin (ARDOUR::PluginInfoPtr);
bool show_this_plugin (const ARDOUR::PluginInfoPtr&, const std::string&); bool show_this_plugin (const ARDOUR::PluginInfoPtr&, const std::string&);
void setup_filter_string (std::string&);
bool fil_hidden_button_release (GdkEventButton*); void setup_search_string (std::string&);
bool fil_instruments_button_release (GdkEventButton*);
bool fil_analysis_button_release (GdkEventButton*);
bool fil_utils_button_release (GdkEventButton*);
void favorite_changed (const std::string& path); void favorite_changed (const std::string& path);
void hidden_changed (const std::string& path); void hidden_changed (const std::string& path);
@ -157,16 +175,19 @@ private:
void plugin_chosen_from_menu (const ARDOUR::PluginInfoPtr&); void plugin_chosen_from_menu (const ARDOUR::PluginInfoPtr&);
void plugin_status_changed ( ARDOUR::PluginType t, std::string unique_id, ARDOUR::PluginManager::PluginStatusType s );
Gtk::Menu* create_favs_menu (ARDOUR::PluginInfoList&); Gtk::Menu* create_favs_menu (ARDOUR::PluginInfoList&);
Gtk::Menu* create_by_creator_menu (ARDOUR::PluginInfoList&); Gtk::Menu* create_by_creator_menu (ARDOUR::PluginInfoList&);
Gtk::Menu* create_by_category_menu (ARDOUR::PluginInfoList&); Gtk::Menu* create_by_tags_menu (ARDOUR::PluginInfoList&);
void build_plugin_menu (); void build_plugin_menu ();
PBD::ScopedConnectionList plugin_list_changed_connection; PBD::ScopedConnectionList plugin_list_changed_connection;
bool _show_hidden; bool _need_tag_save;
Gtkmm2ext::ActiveState _show_instruments; bool _need_status_save;
Gtkmm2ext::ActiveState _show_analysers; bool _need_menu_rebuild;
Gtkmm2ext::ActiveState _show_utils;
bool inhibit_refill;
}; };
#endif // __ardour_plugin_selector_h__ #endif // __ardour_plugin_selector_h__