mega commit to remove gtk_object cruft, and much other stuff
[ardour.git] / gtk2_ardour / redirect_box.cc
index 6a16dc7bf35df54403930af67e2db3bd74e2a643..c3eecf97b2a8064d5510a0c963051eaa654b988d 100644 (file)
@@ -51,6 +51,7 @@
 #include "plugin_selector.h"
 #include "route_redirect_selection.h"
 #include "mixer_ui.h"
+#include "actions.h"
 
 #include "plugin_ui.h"
 #include "send_ui.h"
 using namespace sigc;
 using namespace ARDOUR;
 using namespace Gtk;
+using namespace Glib;
 using namespace Gtkmm2ext;
 
+RedirectBox* RedirectBox::_current_redirect_box = 0;
 
 
-RedirectBox::RedirectBox (Placement pcmnt, Session& sess, Route& rt, PluginSelector &plugsel, RouteRedirectSelection & rsel, bool owner_is_mixer)
+RedirectBox::RedirectBox (Placement pcmnt, Session& sess, Route& rt, PluginSelector &plugsel, 
+                         RouteRedirectSelection & rsel, bool owner_is_mixer)
        : _route(rt), 
          _session(sess), 
          _owner_is_mixer (owner_is_mixer), 
          _placement(pcmnt), 
-         _plugin_selector(plugsel), 
-         _rr_selection(rsel)
-         redirect_display (1)
+         _plugin_selector(plugsel),
+         _rr_selection(rsel)
+         //redirect_display (1)
 {
        _width = Wide;
        redirect_menu = 0;
        send_action_menu = 0;
        redirect_drag_in_progress = false;
        
+       model = ListStore::create(columns);
+
+       RefPtr<TreeSelection> selection = redirect_display.get_selection();
+       selection->set_mode (Gtk::SELECTION_MULTIPLE);
+       selection->signal_changed().connect (mem_fun (*this, &RedirectBox::selection_changed));
+
+       redirect_display.set_model (model);
+       redirect_display.append_column (NULL, columns.text);
        redirect_display.set_name ("MixerRedirectSelector");
-       redirect_display.column_titles_active ();
+       redirect_display.set_headers_visible (false);
        redirect_display.set_reorderable (true);
-       redirect_display.set_button_actions (0, (GTK_BUTTON_SELECTS|GTK_BUTTON_DRAGS));
-       redirect_display.set_button_actions (1, 0);
-       redirect_display.set_button_actions (2, 0);
-       redirect_display.set_button_actions (3, 0);
-       redirect_display.drag_begin.connect (mem_fun(*this, &RedirectBox::redirect_drag_begin));
-       redirect_display.drag_end.connect (mem_fun(*this, &RedirectBox::redirect_drag_end));
        redirect_display.set_size_request (-1, 48);
-       redirect_display.set_selection_mode (GTK_SELECTION_MULTIPLE);
-       redirect_display.set_shadow_type (Gtk::SHADOW_IN);
-       redirect_display.row_move.connect (mem_fun(*this, &RedirectBox::redirects_reordered));
+       redirect_display.add_object_drag (columns.redirect.index(), "redirects");
+       redirect_display.signal_object_drop.connect (mem_fun (*this, &RedirectBox::object_drop));
 
+       // Does this adequately replace the drag start/stop signal handlers?
+       model->signal_rows_reordered().connect (mem_fun (*this, &RedirectBox::redirects_reordered));
        redirect_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
 
        redirect_scroller.add (redirect_display);
@@ -108,14 +115,13 @@ RedirectBox::RedirectBox (Placement pcmnt, Session& sess, Route& rt, PluginSelec
 
        _route.redirects_changed.connect (mem_fun(*this, &RedirectBox::redirects_changed));
 
+       redirect_eventbox.signal_enter_notify_event().connect (bind (sigc::ptr_fun (RedirectBox::enter_box), this));
+       redirect_eventbox.signal_leave_notify_event().connect (bind (sigc::ptr_fun (RedirectBox::leave_box), this));
+
        redirect_display.signal_button_press_event().connect (mem_fun(*this, &RedirectBox::redirect_button));
        redirect_display.signal_button_release_event().connect (mem_fun(*this, &RedirectBox::redirect_button));
 
-       redirect_display.signal_button_release_event().connect_after (ptr_fun (do_not_propagate));
-       _plugin_selector.hide.connect(mem_fun(*this,&RedirectBox::disconnect_newplug));
-
-       redirect_display.click_column.connect (mem_fun(*this, &RedirectBox::show_redirect_menu));
-       
+       //redirect_display.signal_button_release_event().connect_after (ptr_fun (do_not_propagate));
        set_stuff_from_route ();
 
        /* start off as a passthru strip. we'll correct this, if necessary,
@@ -137,6 +143,14 @@ RedirectBox::~RedirectBox ()
 
 }
 
+void
+RedirectBox::object_drop (string type, uint32_t cnt, void** ptr)
+{
+       if (type != "redirects") {
+               return;
+       }
+}
+
 void
 RedirectBox::set_stuff_from_route ()
 {
@@ -145,17 +159,12 @@ RedirectBox::set_stuff_from_route ()
 void
 RedirectBox::set_title (const std::string & title)
 {
-       redirect_display.column(0).set_title (title);
+       redirect_display.get_column(0)->set_title (title);
 }
 
 void
 RedirectBox::set_title_shown (bool flag)
 {
-       if (flag) {
-               redirect_display.column_titles_show();
-       } else {
-               redirect_display.column_titles_hide();
-       }
 }
 
 
@@ -230,7 +239,7 @@ void
 RedirectBox::show_redirect_menu (gint arg)
 {
        if (redirect_menu == 0) {
-               redirect_menu = build_redirect_menu (redirect_display);
+               redirect_menu = build_redirect_menu ();
        }
 
        redirect_menu->popup (1, 0);
@@ -251,19 +260,18 @@ RedirectBox::redirect_drag_end (GdkDragContext *context)
 gint
 RedirectBox::redirect_button (GdkEventButton *ev)
 {
-       gint row=-1, col=-1;
        Redirect *redirect;
-       CList *clist = &redirect_display;
-
-       if (clist->get_selection_info ((int)ev->x, (int)ev->y, &row, &col) != 1) {
-               redirect = 0;
-       } else {
-               redirect = reinterpret_cast<Redirect *> (clist->row (row).get_data ());
-       }
+       TreeModel::Row row = *(redirect_display.get_selection()->get_selected());
+       redirect = row[columns.redirect];
 
        switch (ev->type) {
        case GDK_BUTTON_PRESS:
-               return FALSE;
+               if (ev->button == 3) {
+                       show_redirect_menu (0); // Handle the context-click menu here as well
+                       return TRUE;
+               }
+               else
+                       return FALSE;
 
        case GDK_2BUTTON_PRESS:
                if (ev->state != 0) {
@@ -273,11 +281,6 @@ RedirectBox::redirect_button (GdkEventButton *ev)
                break;
 
        case GDK_BUTTON_RELEASE:
-               if (redirect_drag_in_progress) {
-                       // drag-n-drop reordering 
-                       return stop_signal (*clist, "button-release-event");
-               }
-               /* continue on */
                break;
 
        default:
@@ -287,7 +290,7 @@ RedirectBox::redirect_button (GdkEventButton *ev)
 
        if (redirect && Keyboard::is_delete_event (ev)) {
                
-               Gtk::Main::idle.connect (bind (mem_fun(*this, &RedirectBox::idle_delete_redirect), redirect));
+               Glib::signal_idle().connect (bind (mem_fun(*this, &RedirectBox::idle_delete_redirect), redirect));
                return TRUE;
 
        } else if (redirect && (Keyboard::is_edit_event (ev) || ev->type == GDK_2BUTTON_PRESS)) {
@@ -300,32 +303,11 @@ RedirectBox::redirect_button (GdkEventButton *ev)
 
        } else if (Keyboard::is_context_menu_event (ev)) {
                show_redirect_menu(0);
-               return stop_signal (*clist, "button-release-event");
+               return TRUE; //stop_signal (*clist, "button-release-event");
 
        } else {
                switch (ev->button) {
                case 1:
-                       if (redirect) {
-                               using namespace CList_Helpers;
-                               SelectionList& sel (redirect_display.selection());
-                               bool selecting = true;
-                               
-                               for (SelectionIterator i = sel.begin(); i != sel.end(); ++i) {
-                                       if ((*i).get_row_num() == row) {
-                                               // clicked row is not selected yet, so it is
-                                               // becoming selected now
-                                               selecting = false;
-                                               break;
-                                       }
-                               }
-
-                               if (selecting) {
-                                       RedirectSelected (redirect); // emit
-                               }
-                               else {
-                                       RedirectUnselected (redirect); // emit
-                               }
-                       }
                        return FALSE;
                        break;
 
@@ -347,111 +329,53 @@ RedirectBox::redirect_button (GdkEventButton *ev)
 }
 
 Menu *
-RedirectBox::build_redirect_menu (CList& clist)
+RedirectBox::build_redirect_menu ()
 {
-       using namespace Menu_Helpers;
-       Menu * menu = new Menu;
-       menu->set_name ("ArdourContextMenu");
-       MenuList& items = menu->items();
-       menu->set_name ("ArdourContextMenu");
-       
-       /* new stuff */
-       
-       items.push_back (MenuElem (_("New Plugin ..."), mem_fun(*this, &RedirectBox::choose_plugin)));
-       items.push_back (MenuElem (_("New Insert"), mem_fun(*this, &RedirectBox::choose_insert)));
-       items.push_back (MenuElem (_("New Send ..."), mem_fun(*this, &RedirectBox::choose_send)));
-       items.push_back (SeparatorElem());
-       items.push_back (MenuElem (_("Clear"), mem_fun(*this, &RedirectBox::clear_redirects)));
-       items.push_back (SeparatorElem());
-
-       /* standard editing stuff */
-
-       items.push_back (MenuElem (_("Cut"), mem_fun(*this, &RedirectBox::cut_redirects)));
-       selection_dependent_items.push_back (items.back());
-       items.push_back (MenuElem (_("Copy"), mem_fun(*this, &RedirectBox::copy_redirects)));
-       selection_dependent_items.push_back (items.back());
-       items.push_back (MenuElem (_("Paste"), mem_fun(*this, &RedirectBox::paste_redirects)));
-       redirect_paste_item = items.back();
-       
-       items.push_back (SeparatorElem());
-       items.push_back (MenuElem (_("Rename"), mem_fun(*this, &RedirectBox::rename_redirects)));
-
-       items.push_back (SeparatorElem());
-       items.push_back (MenuElem (_("Select all"), mem_fun(*this, &RedirectBox::select_all_redirects)));
-       items.push_back (MenuElem (_("Deselect all"), mem_fun(*this, &RedirectBox::deselect_all_redirects)));
-
-#if LATER
-       Menu *select_sub_menu = manage (new Menu);
-       MenuList& sitems = select_sub_menu->items();
-       select_sub_menu->set_name ("ArdourContextMenu");
-       
-       sitems.push_back (MenuElem (_("Plugins")));
-       sitems.push_back (MenuElem (_("Inserts")));
-       sitems.push_back (MenuElem (_("Sends")));
-       sitems.push_back (SeparatorElem());
-
-       items.push_back (MenuElem (_("Select all ..."), *select_sub_menu));
-#endif 
-       /* activation */
-                                                    
-       items.push_back (SeparatorElem());
-       items.push_back (MenuElem (_("Activate"), bind (mem_fun(*this, &RedirectBox::for_selected_redirects),
-                                                       &RedirectBox::activate_redirect)));
-       selection_dependent_items.push_back (items.back());
-       items.push_back (MenuElem (_("Deactivate"), bind (mem_fun(*this, &RedirectBox::for_selected_redirects),
-                                                          &RedirectBox::deactivate_redirect)));
-       selection_dependent_items.push_back (items.back());
-       items.push_back (SeparatorElem());
-
-       items.push_back (MenuElem (_("Activate All"), bind (mem_fun(*this, &RedirectBox::all_redirects_active), true)));
-       items.push_back (MenuElem (_("Deactivate All"), bind (mem_fun(*this, &RedirectBox::all_redirects_active), false)));
+       redirect_menu = dynamic_cast<Gtk::Menu*>(ActionManager::get_widget("/redirectmenu") );
+       redirect_menu->signal_map_event().connect (mem_fun(*this, &RedirectBox::redirect_menu_map_handler));
+       redirect_menu->set_name ("ArdourContextMenu");
 
-       /* show editors */
-
-       items.push_back (SeparatorElem());
-       items.push_back (MenuElem (_("Edit"), bind (mem_fun(*this, &RedirectBox::for_selected_redirects),
-                                                   &RedirectBox::edit_redirect)));
-       selection_dependent_items.push_back (items.back());
+       show_all_children();
 
-       menu->signal_map_event().connect (mem_fun(*this, &RedirectBox::redirect_menu_map_handler));
-
-       return menu;
+       return redirect_menu;
 }
 
-gint
-RedirectBox::redirect_menu_map_handler (GdkEventAny *ev)
+void
+RedirectBox::selection_changed ()
 {
-       using namespace Menu_Helpers;
-       using namespace CList_Helpers;
+       bool sensitive = (redirect_display.get_selection()->count_selected_rows()) ? true : false;
 
-       Gtk::CList* clist = &redirect_display;
-
-       bool sensitive = !clist->selection().empty();
-
-       for (vector<MenuItem*>::iterator i = selection_dependent_items.begin(); i != selection_dependent_items.end(); ++i) {
+       for (vector<Glib::RefPtr<Gtk::Action> >::iterator i = ActionManager::plugin_selection_sensitive_actions.begin(); i != ActionManager::plugin_selection_sensitive_actions.end(); ++i) {
                (*i)->set_sensitive (sensitive);
        }
+}
 
-       redirect_paste_item->set_sensitive (!_rr_selection.redirects.empty());
+gint
+RedirectBox::redirect_menu_map_handler (GdkEventAny *ev)
+{
+       // GTK2FIX
+       // popup_act_grp->get_action("paste")->set_sensitive (!_rr_selection.redirects.empty());
        return FALSE;
 }
 
 void
 RedirectBox::select_all_redirects ()
 {
-       redirect_display.selection().all();
+       redirect_display.get_selection()->select_all();
 }
 
 void
 RedirectBox::deselect_all_redirects ()
 {
-       redirect_display.selection().clear ();
+       redirect_display.get_selection()->unselect_all();
 }
 
 void
 RedirectBox::choose_plugin ()
 {
-       show_plugin_selector();
+       sigc::connection newplug_connection = _plugin_selector.PluginCreated.connect (mem_fun(*this,&RedirectBox::insert_plugin_chosen));
+       _plugin_selector.run ();
+       newplug_connection.disconnect();
 }
 
 void
@@ -477,14 +401,11 @@ RedirectBox::wierd_plugin_dialog (Plugin& p, uint32_t streams, IO& io)
 {
        ArdourDialog dialog ("wierd plugin dialog");
        Label label;
-       Button button (_("OK"));
-       VBox vpacker;
-       HBox button_box;
 
        /* i hate this kind of code */
 
        if (streams > p.get_info().n_inputs) {
-               label.set_text (compose (_(
+               label.set_text (string_compose (_(
 "You attempted to add a plugin (%1).\n"
 "The plugin has %2 inputs\n"
 "but at the insertion point, there are\n"
@@ -496,7 +417,7 @@ RedirectBox::wierd_plugin_dialog (Plugin& p, uint32_t streams, IO& io)
                                         p.get_info().n_inputs,
                                         streams));
        } else if (streams < p.get_info().n_inputs) {
-               label.set_text (compose (_(
+               label.set_text (string_compose (_(
 "You attempted to add a plugin (%1).\n"
 "The plugin has %2 inputs\n"
 "but at the insertion point there are\n"
@@ -509,7 +430,7 @@ RedirectBox::wierd_plugin_dialog (Plugin& p, uint32_t streams, IO& io)
                                         p.get_info().n_inputs,
                                         streams));
        } else {
-               label.set_text (compose (_(
+               label.set_text (string_compose (_(
 "You attempted to add a plugin (%1).\n"
 "\n"
 "The I/O configuration doesn't make sense:\n"
@@ -527,23 +448,17 @@ RedirectBox::wierd_plugin_dialog (Plugin& p, uint32_t streams, IO& io)
                                         streams));
        }
 
-       button_box.pack_start (button, false, true);
+       dialog.get_vbox()->pack_start (label);
+       dialog.add_button (Stock::OK, RESPONSE_ACCEPT);
 
-       vpacker.set_spacing (12);
-       vpacker.set_border_width (12);
-       vpacker.pack_start (label);
-       vpacker.pack_start (button_box);
-
-       button.signal_clicked().connect (bind (mem_fun (dialog, &ArdourDialog::stop), 0));
-
-       dialog.add (vpacker);
        dialog.set_name (X_("PluginIODialog"));
        dialog.set_position (Gtk::WIN_POS_MOUSE);
        dialog.set_modal (true);
        dialog.show_all ();
 
-       dialog.realize();
-       dialog.get_window().set_decorations (GdkWMDecoration (GDK_DECOR_BORDER|GDK_DECOR_RESIZEH));
+       // GTK2FIX
+       //dialog.realize();
+       //dialog.get_window()->set_decorations (Gdk::WMDecoration (GDK_DECOR_BORDER|GDK_DECOR_RESIZEH));
 
        dialog.run ();
 }
@@ -587,25 +502,13 @@ RedirectBox::send_io_finished (IOSelector::Result r, Redirect* redirect, IOSelec
        delete_when_idle (ios);
 }
 
-void 
-RedirectBox::disconnect_newplug ()
-{
-    newplug_connection.disconnect();
-}
-void
-RedirectBox::show_plugin_selector ()
-{
-       newplug_connection = _plugin_selector.PluginCreated.connect (mem_fun(*this,&RedirectBox::insert_plugin_chosen));
-       _plugin_selector.show_all ();
-}
-
 void
 RedirectBox::redirects_changed (void *src)
 {
        ENSURE_GUI_THREAD(bind (mem_fun(*this, &RedirectBox::redirects_changed), src));
        
-       redirect_display.freeze ();
-       redirect_display.clear ();
+       //redirect_display.freeze ();
+       model->clear ();
        redirect_active_connections.clear ();
        redirect_name_connections.clear ();
 
@@ -613,40 +516,30 @@ RedirectBox::redirects_changed (void *src)
 
        switch (_placement) {
        case PreFader:
-               build_redirect_tooltip(redirect_display, redirect_eventbox, _("Pre-fader inserts, sends & plugins:"));
+               build_redirect_tooltip(redirect_eventbox, _("Pre-fader inserts, sends & plugins:"));
                break;
        case PostFader:
-               build_redirect_tooltip(redirect_display, redirect_eventbox, _("Post-fader inserts, sends & plugins:"));
+               build_redirect_tooltip(redirect_eventbox, _("Post-fader inserts, sends & plugins:"));
                break;
        }
-       redirect_display.thaw ();
+       //redirect_display.thaw ();
 }
 
 void
 RedirectBox::add_redirect_to_display (Redirect *redirect)
 {
-       const gchar *rowdata[1];
-       gint row;
-       CList *clist = 0;
-
        if (redirect->placement() != _placement) {
                return;
        }
        
-       clist = &redirect_display;
-
-       string rname = redirect_name (*redirect);
-       rowdata[0] = rname.c_str();
-       clist->rows().push_back (rowdata);
-       row = clist->rows().size() - 1;
-       clist->row (row).set_data (redirect);
-
+       Gtk::TreeModel::Row row = *(model->append());
+       row[columns.text] = redirect_name (*redirect);
+       row[columns.redirect] = redirect;
+       
        show_redirect_active (redirect, this);
 
-       redirect_active_connections.push_back
-               (redirect->active_changed.connect (mem_fun(*this, &RedirectBox::show_redirect_active)));
-       redirect_name_connections.push_back
-               (redirect->name_changed.connect (bind (mem_fun(*this, &RedirectBox::show_redirect_name), redirect)));
+       redirect_active_connections.push_back (redirect->active_changed.connect (mem_fun(*this, &RedirectBox::show_redirect_active)));
+       redirect_name_connections.push_back (redirect->name_changed.connect (bind (mem_fun(*this, &RedirectBox::show_redirect_name), redirect)));
 }
 
 string
@@ -699,14 +592,15 @@ RedirectBox::redirect_name (Redirect& redirect)
 }
 
 void
-RedirectBox::build_redirect_tooltip (CList& clist, EventBox& box, string start)
+RedirectBox::build_redirect_tooltip (EventBox& box, string start)
 {
-       CList_Helpers::RowIterator ri;
        string tip(start);
 
-       for (ri = clist.rows().begin(); ri != clist.rows().end(); ++ri) {
+       Gtk::TreeModel::Children children = model->children();
+       for(Gtk::TreeModel::Children::iterator iter = children.begin(); iter != children.end(); ++iter) {
+               Gtk::TreeModel::Row row = *iter;
                tip += '\n';
-               tip += clist.cell(ri->get_row_num(), 0).get_text();
+               tip += row[columns.text];
        }
        ARDOUR_UI::instance()->tooltips().set_tip (box, tip);
 }
@@ -724,44 +618,43 @@ RedirectBox::show_redirect_active (Redirect *redirect, void *src)
 {
        ENSURE_GUI_THREAD(bind (mem_fun(*this, &RedirectBox::show_redirect_active), redirect, src));
 
-       CList_Helpers::RowIterator ri;
-       CList *clist;
+       Gtk::TreeModel::Children children = model->children();
+       Gtk::TreeModel::Children::iterator iter = children.begin();
 
-       if ((ri = redirect_display.rows().find_data (redirect)) == redirect_display.rows().end()) {
-               return;
+       while( iter != children.end())
+       {
+               if ((*iter)[columns.redirect] == redirect)
+                       break;
+               iter++;
        }
 
-       clist = &redirect_display;
-               
-       clist->cell(ri->get_row_num(), 0).set_text (redirect_name (*redirect));
+       (*iter)[columns.text] = redirect_name (*redirect);
 
        if (redirect->active()) {
-               // ri->select ();
+               redirect_display.get_selection()->select (iter);
        } else {
-               // ri->unselect ();
+               redirect_display.get_selection()->unselect (iter);
        }
 }
 
 void
-RedirectBox::redirects_reordered (gint src, gint dst)
+RedirectBox::redirects_reordered (const TreeModel::Path& path,const TreeModel::iterator& iter ,int* hmm)
 {
        /* this is called before the reorder has been done, so just queue
           something for idle time.
        */
 
-       Gtk::Main::idle.connect (mem_fun(*this, &RedirectBox::compute_redirect_sort_keys));
+       Glib::signal_idle().connect (mem_fun(*this, &RedirectBox::compute_redirect_sort_keys));
 }
 
 gint
 RedirectBox::compute_redirect_sort_keys ()
 {
-       CList_Helpers::RowList::iterator i;
-       uint32_t sort_key;
+       uint32_t sort_key = 0;
+       Gtk::TreeModel::Children children = model->children();
 
-       sort_key = 0;
-
-       for (i = redirect_display.rows().begin(); i != redirect_display.rows().end(); ++i) {
-               Redirect *redirect = reinterpret_cast<Redirect*> (i->get_data());
+       for (Gtk::TreeModel::Children::iterator iter = children.begin(); iter != children.end(); ++iter) {
+               Redirect *redirect = (*iter)[columns.redirect];
                redirect->set_sort_key (sort_key, this);
                sort_key++;
        }
@@ -774,32 +667,24 @@ RedirectBox::compute_redirect_sort_keys ()
 
                ArdourDialog dialog ("wierd plugin dialog");
                Label label;
-               Button button (_("OK"));
-               VBox vpacker;
-               HBox button_box;
 
                label.set_text (_("\
 You cannot reorder this set of redirects\n\
 in that way because the inputs and\n\
 outputs do not work correctly."));
 
-               button_box.pack_start (button, false, true);
-               
-               vpacker.set_spacing (12);
-               vpacker.set_border_width (12);
-               vpacker.pack_start (label);
-               vpacker.pack_start (button_box);
                
-               button.signal_clicked().connect (bind (mem_fun (dialog, &ArdourDialog::stop), 0));
-               
-               dialog.add (vpacker);
+               dialog.get_vbox()->pack_start (label);
+               dialog.add_button (Stock::OK, RESPONSE_ACCEPT);
+
                dialog.set_name (X_("PluginIODialog"));
                dialog.set_position (Gtk::WIN_POS_MOUSE);
                dialog.set_modal (true);
                dialog.show_all ();
 
-               dialog.realize();
-               dialog.get_window().set_decorations (GdkWMDecoration (GDK_DECOR_BORDER|GDK_DECOR_RESIZEH));
+               // GTK2FIX
+               //dialog.realize();
+               //dialog.get_window()->set_decorations (Gdk::WMDecoration (GDK_DECOR_BORDER|GDK_DECOR_RESIZEH));
                
                dialog.run ();
        }
@@ -893,47 +778,32 @@ RedirectBox::idle_delete_redirect (Redirect *redirect)
 void
 RedirectBox::rename_redirect (Redirect* redirect)
 {
-       ArdourDialog dialog ("rename redirect dialog");
+       ArdourDialog dialog (_("ardour: rename redirect"), true);
        Entry  entry;
        VBox   vbox;
        HBox   hbox;
        Button ok_button (_("OK"));
        Button cancel_button (_("Cancel"));
 
-       dialog.set_title (_("ardour: rename redirect"));
        dialog.set_name ("RedirectRenameWindow");
        dialog.set_size_request (300, -1);
        dialog.set_position (Gtk::WIN_POS_MOUSE);
-       dialog.set_modal (true);
 
-       vbox.set_border_width (12);
-       vbox.set_spacing (12);
-       vbox.pack_start (entry, false, false);
-       vbox.pack_start (hbox, false, false);
-       hbox.pack_start (ok_button);
-       hbox.pack_start (cancel_button);
+       dialog.add_action_widget (entry, RESPONSE_ACCEPT);
+       dialog.add_button (Stock::OK, RESPONSE_ACCEPT);
+       dialog.add_button (Stock::CANCEL, RESPONSE_CANCEL);
        
-       dialog.add (vbox);
-
        entry.set_name ("RedirectNameDisplay");
        entry.set_text (redirect->name());
        entry.select_region (0, -1);
        entry.grab_focus ();
 
-       ok_button.set_name ("EditorGTKButton");
-       cancel_button.set_name ("EditorGTKButton");
-
-       entry.activate.connect (bind (mem_fun (dialog, &ArdourDialog::stop), 1));
-       cancel_button.signal_clicked().connect (bind (mem_fun (dialog, &ArdourDialog::stop), -1));
-       ok_button.signal_clicked().connect (bind (mem_fun (dialog, &ArdourDialog::stop), 1));
-
-       /* recurse */
-       
-       dialog.set_keyboard_input (true);
-       dialog.run ();
-
-       if (dialog.run_status() == 1) {
+       switch (dialog.run ()) {
+       case RESPONSE_ACCEPT:
                redirect->set_name (entry.get_text(), this);
+               break;
+       default:
+               break;
        }
 }
 
@@ -1011,23 +881,19 @@ RedirectBox::deactivate_redirect (Redirect *r)
 void
 RedirectBox::get_selected_redirects (vector<Redirect*>& redirects)
 {
-       using namespace CList_Helpers;
-       SelectionList& sel (redirect_display.selection());
-
-       for (SelectionIterator i = sel.begin(); i != sel.end(); ++i) {
-               Redirect* redirect = reinterpret_cast<Redirect *> ((*i).get_data ());
-               redirects.push_back (redirect);
-       }
+    vector<Gtk::TreeModel::Path> pathlist = redirect_display.get_selection()->get_selected_rows();
+       for (vector<Gtk::TreeModel::Path>::iterator iter = pathlist.begin(); iter != pathlist.end(); ++iter)
+               redirects.push_back ((*(model->get_iter(*iter)))[columns.redirect]);
 }
 
 void
 RedirectBox::for_selected_redirects (void (RedirectBox::*pmf)(Redirect*))
 {
-       using namespace CList_Helpers;
-       SelectionList& sel (redirect_display.selection());
+    vector<Gtk::TreeModel::Path> pathlist = redirect_display.get_selection()->get_selected_rows();
 
-       for (SelectionIterator i = sel.begin(); i != sel.end(); ++i) {
-               Redirect* redirect = reinterpret_cast<Redirect *> ((*i).get_data ());
+       for (vector<Gtk::TreeModel::Path>::iterator iter = pathlist.begin(); iter != pathlist.end(); ++iter) {
+               Redirect* redirect = (*(model->get_iter(*iter)))[columns.redirect];
                (this->*pmf)(redirect);
        }
 }
@@ -1073,7 +939,7 @@ RedirectBox::clear_redirects()
 
        Gtkmm2ext::Choice prompter (prompt, choices);
 
-       prompter.chosen.connect (Gtk::Main::quit.slot());
+       prompter.chosen.connect(sigc::ptr_fun(Gtk::Main::quit));
        prompter.show_all ();
 
        Gtk::Main::run ();
@@ -1111,7 +977,7 @@ RedirectBox::edit_redirect (Redirect* redirect)
                if (send->get_gui() == 0) {
                        
                        string title;
-                       title = compose(_("ardour: %1"), send->name()); 
+                       title = string_compose(_("ardour: %1"), send->name());  
                        
                        send_ui = new SendUIWindow (*send, _session);
                        send_ui->set_title (title);
@@ -1122,7 +988,7 @@ RedirectBox::edit_redirect (Redirect* redirect)
                }
                
                if (send_ui->is_visible()) {
-                       send_ui->get_window().raise ();
+                       send_ui->get_window()->raise ();
                } else {
                        send_ui->show_all ();
                }
@@ -1153,7 +1019,7 @@ RedirectBox::edit_redirect (Redirect* redirect)
                                        maker += " ...";
                                }
 
-                               title = compose(_("ardour: %1: %2 (by %3)"), _route.name(), plugin_insert->name(), maker);      
+                               title = string_compose(_("ardour: %1: %2 (by %3)"), _route.name(), plugin_insert->name(), maker);       
                                
                                plugin_ui = new PluginUIWindow (_session.engine(), *plugin_insert);
                                if (_owner_is_mixer) {
@@ -1169,7 +1035,7 @@ RedirectBox::edit_redirect (Redirect* redirect)
                        }
                        
                        if (plugin_ui->is_visible()) {
-                               plugin_ui->get_window().raise ();
+                               plugin_ui->get_window()->raise ();
                        } else {
                                plugin_ui->show_all ();
                        }
@@ -1192,7 +1058,7 @@ RedirectBox::edit_redirect (Redirect* redirect)
                        }
                        
                        if (io_selector->is_visible()) {
-                               io_selector->get_window().raise ();
+                               io_selector->get_window()->raise ();
                        } else {
                                io_selector->show_all ();
                        }
@@ -1200,4 +1066,215 @@ RedirectBox::edit_redirect (Redirect* redirect)
        }
 }
 
+bool
+RedirectBox::enter_box (GdkEventCrossing *ev, RedirectBox* rb)
+{
+       switch (ev->detail) {
+       case GDK_NOTIFY_INFERIOR:
+               break;
+
+       case GDK_NOTIFY_VIRTUAL:
+               /* fallthru */
+
+       default:
+               _current_redirect_box = rb;
+       }
+
+       return false;
+}
+
+bool
+RedirectBox::leave_box (GdkEventCrossing *ev, RedirectBox* rb)
+{
+       switch (ev->detail) {
+       case GDK_NOTIFY_INFERIOR:
+               break;
+
+       case GDK_NOTIFY_VIRTUAL:
+               /* fallthru */
+       default:
+               _current_redirect_box = 0;
+       }
+
+       return false;
+}
+
+void
+RedirectBox::register_actions ()
+{
+       Glib::RefPtr<Gtk::ActionGroup> popup_act_grp = Gtk::ActionGroup::create(X_("redirectmenu"));
+       Glib::RefPtr<Action> act;
+
+       /* new stuff */
+       ActionManager::register_action (popup_act_grp, X_("newplugin"), _("New Plugin ..."),  sigc::ptr_fun (RedirectBox::rb_choose_plugin));
+       ActionManager::register_action (popup_act_grp, X_("newinsert"), _("New Insert"),  sigc::ptr_fun (RedirectBox::rb_choose_insert));
+       ActionManager::register_action (popup_act_grp, X_("newsend"), _("New Send ..."),  sigc::ptr_fun (RedirectBox::rb_choose_send));
+       ActionManager::register_action (popup_act_grp, X_("clear"), _("Clear"),  sigc::ptr_fun (RedirectBox::rb_clear));
+
+       /* standard editing stuff */
+       act = ActionManager::register_action (popup_act_grp, X_("cut"), _("Cut"),  sigc::ptr_fun (RedirectBox::rb_cut));
+       ActionManager::plugin_selection_sensitive_actions.push_back(act);
+       act = ActionManager::register_action (popup_act_grp, X_("copy"), _("Copy"),  sigc::ptr_fun (RedirectBox::rb_copy));
+       ActionManager::plugin_selection_sensitive_actions.push_back(act);
+       ActionManager::ActionManager::register_action (popup_act_grp, X_("paste"), _("Paste"),  sigc::ptr_fun (RedirectBox::rb_paste));
+       act = ActionManager::register_action (popup_act_grp, X_("rename"), _("Rename"),  sigc::ptr_fun (RedirectBox::rb_rename));
+       ActionManager::plugin_selection_sensitive_actions.push_back(act);
+       ActionManager::register_action (popup_act_grp, X_("selectall"), _("Select All"),  sigc::ptr_fun (RedirectBox::rb_select_all));
+       ActionManager::register_action (popup_act_grp, X_("deselectall"), _("Deselect All"),  sigc::ptr_fun (RedirectBox::rb_deselect_all));
+               
+       /* activation */
+       act = ActionManager::register_action (popup_act_grp, X_("activate"), _("Activate"),  sigc::ptr_fun (RedirectBox::rb_activate));
+       ActionManager::plugin_selection_sensitive_actions.push_back(act);
+       act = ActionManager::register_action (popup_act_grp, X_("deactivate"), _("Deactivate"),  sigc::ptr_fun (RedirectBox::rb_deactivate));
+       ActionManager::plugin_selection_sensitive_actions.push_back(act);
+       ActionManager::register_action (popup_act_grp, X_("activate_all"), _("Activate all"),  sigc::ptr_fun (RedirectBox::rb_activate_all));
+       ActionManager::register_action (popup_act_grp, X_("deactivate_all"), _("Deactivate all"),  sigc::ptr_fun (RedirectBox::rb_deactivate_all));
+
+       /* show editors */
+       act = ActionManager::register_action (popup_act_grp, X_("edit"), _("Edit"),  sigc::ptr_fun (RedirectBox::rb_edit));
+       ActionManager::plugin_selection_sensitive_actions.push_back(act);
+
+       ActionManager::add_action_group (popup_act_grp);
+}
+
+void
+RedirectBox::rb_choose_plugin ()
+{
+       if (_current_redirect_box == 0) {
+               return;
+       }
+       _current_redirect_box->choose_plugin ();
+}
+
+void
+RedirectBox::rb_choose_insert ()
+{
+       if (_current_redirect_box == 0) {
+               return;
+       }
+       _current_redirect_box->choose_insert ();
+}
+
+void
+RedirectBox::rb_choose_send ()
+{
+       if (_current_redirect_box == 0) {
+               return;
+       }
+       _current_redirect_box->choose_send ();
+}
+
+void
+RedirectBox::rb_clear ()
+{
+       if (_current_redirect_box == 0) {
+               return;
+       }
+
+       _current_redirect_box->clear_redirects ();
+}
+
+void
+RedirectBox::rb_cut ()
+{
+       if (_current_redirect_box == 0) {
+               return;
+       }
+
+       _current_redirect_box->cut_redirects ();
+}
+
+void
+RedirectBox::rb_copy ()
+{
+       if (_current_redirect_box == 0) {
+               return;
+       }
+       _current_redirect_box->copy_redirects ();
+}
+
+void
+RedirectBox::rb_paste ()
+{
+       if (_current_redirect_box == 0) {
+               return;
+       }
+}
+
+void
+RedirectBox::rb_rename ()
+{
+       if (_current_redirect_box == 0) {
+               return;
+       }
+       _current_redirect_box->rename_redirects ();
+}
+
+void
+RedirectBox::rb_select_all ()
+{
+       if (_current_redirect_box == 0) {
+               return;
+       }
+
+       _current_redirect_box->select_all_redirects ();
+}
+
+void
+RedirectBox::rb_deselect_all ()
+{
+       if (_current_redirect_box == 0) {
+               return;
+       }
+
+       _current_redirect_box->deselect_all_redirects ();
+}
+
+void
+RedirectBox::rb_activate ()
+{
+       if (_current_redirect_box == 0) {
+               return;
+       }
+
+       _current_redirect_box->for_selected_redirects (&RedirectBox::activate_redirect);
+}
+
+void
+RedirectBox::rb_deactivate ()
+{
+       if (_current_redirect_box == 0) {
+               return;
+       }
+       _current_redirect_box->for_selected_redirects (&RedirectBox::deactivate_redirect);
+}
+
+void
+RedirectBox::rb_activate_all ()
+{
+       if (_current_redirect_box == 0) {
+               return;
+       }
+
+       _current_redirect_box->all_redirects_active (true);
+}
+
+void
+RedirectBox::rb_deactivate_all ()
+{
+       if (_current_redirect_box == 0) {
+               return;
+       }
+       _current_redirect_box->all_redirects_active (false);
+}
+
+void
+RedirectBox::rb_edit ()
+{
+       if (_current_redirect_box == 0) {
+               return;
+       }
+
+       _current_redirect_box->for_selected_redirects (&RedirectBox::edit_redirect);
+}