From c4f855d13a455ba28a72a9df14562d0efc335cfc Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Fri, 16 Jul 2021 17:19:21 +0200
Subject: [PATCH] PM-Sel: remove hidden toggle, turn Fav into a checkbox

---
 gtk2_ardour/plugin_selector.cc | 47 +---------------------------------
 gtk2_ardour/plugin_selector.h  |  3 ---
 2 files changed, 1 insertion(+), 49 deletions(-)

diff --git a/gtk2_ardour/plugin_selector.cc b/gtk2_ardour/plugin_selector.cc
index 1047186a58..e198ef68e2 100644
--- a/gtk2_ardour/plugin_selector.cc
+++ b/gtk2_ardour/plugin_selector.cc
@@ -94,12 +94,7 @@ PluginSelector::PluginSelector (PluginManager& mgr)
 
 	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" and "Hid" into a short term
-	 * related to "hidden"
-	 */
-	plugin_display.append_column (_("Fav"), plugin_columns.favorite);
-	plugin_display.append_column (_("Hide"), plugin_columns.hidden);
+	plugin_display.append_column (S_("Favorite|Fav"), plugin_columns.favorite);
 	plugin_display.append_column (_("Name"), plugin_columns.name);
 	plugin_display.append_column (_("Tags"), plugin_columns.tags);
 	plugin_display.append_column (_("Creator"), plugin_columns.creator);
@@ -122,14 +117,8 @@ PluginSelector::PluginSelector (PluginManager& mgr)
 
 	CellRendererToggle* fav_cell = dynamic_cast<CellRendererToggle*>(plugin_display.get_column_cell_renderer (0));
 	fav_cell->property_activatable() = true;
-	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);
 	scroller.add(plugin_display);
@@ -553,7 +542,6 @@ PluginSelector::refiller (const PluginInfoList& plugs, const::std::string& searc
 
 			PluginManager::PluginStatusType status = manager.get_status (*i);
 			newrow[plugin_columns.favorite] = status == PluginManager::Favorite;
-			newrow[plugin_columns.hidden] = status == PluginManager::Hidden;
 
 			string name = (*i)->name;
 			if (name.length() > 48) {
@@ -869,7 +857,6 @@ PluginSelector::plugin_status_changed (PluginType t, std::string uid, PluginMana
 		PluginInfoPtr pp = (*i)[plugin_columns.plugin];
 		if ((pp->type == t) && (pp->unique_id == uid)) {
 			(*i)[plugin_columns.favorite] = (stat == PluginManager::Favorite) ? true : false;
-			(*i)[plugin_columns.hidden] = (stat == PluginManager::Hidden) ? true : false;
 
 			/* if plug was hidden, remove it from the view */
 			if (stat == PluginManager::Hidden || stat == PluginManager::Concealed) {
@@ -1192,38 +1179,6 @@ PluginSelector::favorite_changed (const std::string& path)
 	in_row_change = false;
 }
 
-void
-PluginSelector::hidden_changed (const std::string& 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 */
-
-		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);
-
-		_need_status_save = true;
-	}
-	in_row_change = false;
-}
-
 void
 PluginSelector::show_manager ()
 {
diff --git a/gtk2_ardour/plugin_selector.h b/gtk2_ardour/plugin_selector.h
index 33c984c1fc..4f16688ae7 100644
--- a/gtk2_ardour/plugin_selector.h
+++ b/gtk2_ardour/plugin_selector.h
@@ -111,7 +111,6 @@ private:
 	struct PluginColumns : public Gtk::TreeModel::ColumnRecord {
 		PluginColumns () {
 			add (favorite);
-			add (hidden);
 			add (name);
 			add (tags);
 			add (creator);
@@ -121,7 +120,6 @@ private:
 			add (plugin);
 		}
 		Gtk::TreeModelColumn<bool> favorite;
-		Gtk::TreeModelColumn<bool> hidden;
 		Gtk::TreeModelColumn<std::string> name;
 		Gtk::TreeModelColumn<std::string> type_name;
 		Gtk::TreeModelColumn<std::string> creator;
@@ -173,7 +171,6 @@ private:
 	bool show_this_plugin (const ARDOUR::PluginInfoPtr&, const std::string&);
 
 	void favorite_changed (const std::string& path);
-	void hidden_changed (const std::string& path);
 	bool in_row_change;
 
 	void plugin_chosen_from_menu (const ARDOUR::PluginInfoPtr&);