Tweak group tabs class hierarchy and offer the same menu in both editor and mixer. Fixes #3336.

git-svn-id: svn://localhost/ardour2/branches/3.0@7441 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 18 insertions, 60 deletions

diff --git a/gtk2_ardour/mixer_group_tabs.cc b/gtk2_ardour/mixer_group_tabs.cc
index a52271d0de..a948fe1b61 100644
--- a/gtk2_ardour/mixer_group_tabs.cc
+++ b/gtk2_ardour/mixer_group_tabs.cc
@@ -32,9 +32,7 @@ using namespace ARDOUR;
 using namespace PBD;
 
 MixerGroupTabs::MixerGroupTabs (Mixer_UI* m)
-	: GroupTabs (0),
-	  _mixer (m),
-	  _menu (0)
+	: _mixer (m)
 {
 
 }
@@ -152,74 +150,34 @@ MixerGroupTabs::routes_for_tab (Tab const * t) const
 	return routes;
 }
 
-Gtk::Menu*
-MixerGroupTabs::get_menu (RouteGroup* g)
+PropertyList
+MixerGroupTabs::default_properties () const
 {
-	if (g == 0) {
-		return 0;
-	}
-
-	using namespace Menu_Helpers;
-
-	delete _menu;
-	_menu = new Menu;
-
-	MenuList& items = _menu->items ();
-	items.push_back (MenuElem (_("Edit..."), sigc::bind (sigc::mem_fun (*this, &MixerGroupTabs::edit_group), g)));
-	items.push_back (MenuElem (_("Subgroup"), sigc::bind (sigc::mem_fun (*this, &MixerGroupTabs::make_subgroup), g)));
-	items.push_back (SeparatorElem());
-	items.push_back (MenuElem (_("Remove"), sigc::bind (sigc::mem_fun (*this, &MixerGroupTabs::remove_group), g)));
+	PropertyList plist;
 
-	return _menu;
-}
+	plist.add (Properties::active, true);
+	plist.add (Properties::mute, true);
+	plist.add (Properties::solo, true);
+	plist.add (Properties::gain, true);
+	plist.add (Properties::recenable, true);
 
-void
-MixerGroupTabs::edit_group (RouteGroup* g)
-{
-	RouteGroupDialog d (g, Gtk::Stock::APPLY);
-	d.do_run ();
+	return plist;
 }
 
-void
-MixerGroupTabs::remove_group (RouteGroup *g)
+string
+MixerGroupTabs::order_key () const
 {
-	_session->remove_route_group (*g);
+	return X_("signal");
 }
 
-void
-MixerGroupTabs::make_subgroup (RouteGroup* g)
+RouteList
+MixerGroupTabs::selected_routes () const
 {
-	g->make_subgroup ();
+	return _mixer->selection().routes;
 }
 
 void
-MixerGroupTabs::destroy_subgroup (RouteGroup* g)
-{
-	g->destroy_subgroup ();
-}
-
-ARDOUR::RouteGroup *
-MixerGroupTabs::new_route_group () const
+MixerGroupTabs::sync_order_keys ()
 {
-	PropertyList plist;
-
-	plist.add (Properties::active, true);
-	plist.add (Properties::mute, true);
-	plist.add (Properties::solo, true);
-	plist.add (Properties::gain, true);
-	plist.add (Properties::recenable, true);
-
-	RouteGroup* g = new RouteGroup (*_session, "");
-	g->set_properties (plist);
-
-	RouteGroupDialog d (g, Gtk::Stock::NEW);
-	int const r = d.do_run ();
-
-	if (r != Gtk::RESPONSE_OK) {
-		delete g;
-		return 0;
-	}
-	
-	_session->add_route_group (g);
-	return g;
+	_mixer->sync_order_keys ("");
 }