Update fr.po
[ardour.git] / gtk2_ardour / mixer_ui.cc
index e3a97daa6f98431e465a29b1f0a192b24536504f..e58a61948db0ecdc02bbacb7a170e746884becca 100644 (file)
@@ -41,6 +41,7 @@
 #include "ardour/midi_track.h"
 #include "ardour/plugin_manager.h"
 #include "ardour/route_group.h"
+#include "ardour/route_sorters.h"
 #include "ardour/session.h"
 
 #include "keyboard.h"
 #include "actions.h"
 #include "gui_thread.h"
 #include "mixer_group_tabs.h"
+#include "timers.h"
+#include "ui_config.h"
 
 #include "i18n.h"
 
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 using namespace PBD;
 using namespace Gtk;
 using namespace Glib;
@@ -72,11 +76,11 @@ using PBD::Unwinder;
 Mixer_UI* Mixer_UI::_instance = 0;
 
 Mixer_UI*
-Mixer_UI::instance () 
+Mixer_UI::instance ()
 {
        if (!_instance) {
                _instance  = new Mixer_UI;
-       } 
+       }
 
        return _instance;
 }
@@ -89,14 +93,18 @@ Mixer_UI::Mixer_UI ()
        , in_group_row_change (false)
        , track_menu (0)
        , _monitor_section (0)
-       , _strip_width (Config->get_default_narrow_ms() ? Narrow : Wide)
+       , _plugin_selector (0)
+       , _strip_width (UIConfiguration::instance().get_default_narrow_ms() ? Narrow : Wide)
        , ignore_reorder (false)
+        , _in_group_rebuild_or_clear (false)
+        , _route_deletion_in_progress (false)
        , _following_editor_selection (false)
+       , _maximised (false)
 {
        /* allow this window to become the key focus window */
        set_flags (CAN_FOCUS);
 
-       Route::SyncOrderKeys.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::sync_treeview_from_order_keys, this, _1), gui_context());
+       Route::SyncOrderKeys.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::sync_treeview_from_order_keys, this), gui_context());
 
        scroller.set_can_default (true);
        set_default (scroller);
@@ -115,7 +123,7 @@ Mixer_UI::Mixer_UI ()
        b->show_all ();
 
        scroller.add (*b);
-       scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+       scroller.set_policy (Gtk::POLICY_ALWAYS, Gtk::POLICY_AUTOMATIC);
 
        setup_track_display ();
 
@@ -132,6 +140,7 @@ Mixer_UI::Mixer_UI ()
        group_display.set_reorderable (true);
        group_display.set_headers_visible (true);
        group_display.set_rules_hint (true);
+       group_display.set_can_focus(false);
 
        /* name is directly editable */
 
@@ -195,7 +204,7 @@ Mixer_UI::Mixer_UI ()
 #else
        global_hpacker.pack_start (out_packer, false, false, 12);
 #endif
-       list_hpane.pack1(list_vpacker, true, true);
+       list_hpane.pack1(list_vpacker, false, true);
        list_hpane.pack2(global_hpacker, true, false);
 
        rhs_pane1.signal_size_allocate().connect (sigc::bind (sigc::mem_fun(*this, &Mixer_UI::pane_allocation_handler),
@@ -239,12 +248,8 @@ Mixer_UI::Mixer_UI ()
        list_hpane.show();
        group_display.show();
 
-       _in_group_rebuild_or_clear = false;
-
        MixerStrip::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::remove_strip, this, _1), gui_context());
 
-        MonitorSection::setup_knob_images ();
-
 #ifndef DEFER_PLUGIN_SELECTOR_LOAD
        _plugin_selector = new PluginSelector (PluginManager::instance ());
 #endif
@@ -255,6 +260,7 @@ Mixer_UI::~Mixer_UI ()
        if (_monitor_section) {
                delete _monitor_section;
        }
+       delete _plugin_selector;
 }
 
 void
@@ -290,10 +296,10 @@ Mixer_UI::show_window ()
                        ms = (*ri)[track_columns.strip];
                        ms->set_width_enum (ms->get_width_enum (), ms->width_owner());
                        /* Fix visibility of mixer strip stuff */
-                       ms->parameter_changed (X_("mixer-strip-visibility"));
+                       ms->parameter_changed (X_("mixer-element-visibility"));
                }
        }
-       
+
        /* force focus into main area */
        scroller_base.grab_focus ();
 
@@ -313,6 +319,22 @@ Mixer_UI::hide_window (GdkEventAny *ev)
 void
 Mixer_UI::add_strips (RouteList& routes)
 {
+       bool from_scratch = track_model->children().size() == 0;
+       Gtk::TreeModel::Children::iterator insert_iter = track_model->children().end();
+
+       for (Gtk::TreeModel::Children::iterator it = track_model->children().begin(); it != track_model->children().end(); ++it) {
+               boost::shared_ptr<Route> r = (*it)[track_columns.route];
+
+               if (r->order_key() == (routes.front()->order_key() + routes.size())) {
+                       insert_iter = it;
+                       break;
+               }
+       }
+
+       if(!from_scratch) {
+               _selection.clear_routes ();
+       }
+
        MixerStrip* strip;
 
        try {
@@ -321,52 +343,56 @@ Mixer_UI::add_strips (RouteList& routes)
 
                for (RouteList::iterator x = routes.begin(); x != routes.end(); ++x) {
                        boost::shared_ptr<Route> route = (*x);
-                       
+
                        if (route->is_auditioner()) {
                                continue;
                        }
-                       
+
                        if (route->is_monitor()) {
-                               
+
                                if (!_monitor_section) {
                                        _monitor_section = new MonitorSection (_session);
-                                       
+
                                        XMLNode* mnode = ARDOUR_UI::instance()->tearoff_settings (X_("monitor-section"));
                                        if (mnode) {
                                                _monitor_section->tearoff().set_state (*mnode);
                                        }
-                               } 
-                               
+                               }
+
                                out_packer.pack_end (_monitor_section->tearoff(), false, false);
                                _monitor_section->set_session (_session);
                                _monitor_section->tearoff().show_all ();
-                               
+
                                route->DropReferences.connect (*this, invalidator(*this), boost::bind (&Mixer_UI::monitor_section_going_away, this), gui_context());
-                               
+
                                /* no regular strip shown for control out */
-                               
+
                                continue;
                        }
-                       
+
                        strip = new MixerStrip (*this, _session, route);
                        strips.push_back (strip);
 
-                       Config->get_default_narrow_ms() ? _strip_width = Narrow : _strip_width = Wide;
-                       
+                       UIConfiguration::instance().get_default_narrow_ms() ? _strip_width = Narrow : _strip_width = Wide;
+
                        if (strip->width_owner() != strip) {
                                strip->set_width_enum (_strip_width, this);
                        }
-                       
+
                        show_strip (strip);
-                       
-                       TreeModel::Row row = *(track_model->append());
+
+                       TreeModel::Row row = *(track_model->insert(insert_iter));
                        row[track_columns.text] = route->name();
                        row[track_columns.visible] = strip->route()->is_master() ? true : strip->marked_for_display();
                        row[track_columns.route] = route;
                        row[track_columns.strip] = strip;
-                       
+
+                       if (!from_scratch) {
+                               _selection.add (strip);
+                       }
+
                        route->PropertyChanged.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::strip_property_changed, this, _1, strip), gui_context());
-                       
+
                        strip->WidthChanged.connect (sigc::mem_fun(*this, &Mixer_UI::strip_width_changed));
                        strip->signal_button_release_event().connect (sigc::bind (sigc::mem_fun(*this, &Mixer_UI::strip_button_release_event), strip));
                }
@@ -376,11 +402,35 @@ Mixer_UI::add_strips (RouteList& routes)
 
        no_track_list_redisplay = false;
        track_display.set_model (track_model);
-       
+
        sync_order_keys_from_treeview ();
        redisplay_track_list ();
 }
 
+void
+Mixer_UI::deselect_all_strip_processors ()
+{
+       for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
+               (*i)->deselect_all_processors();
+       }
+}
+
+void
+Mixer_UI::select_none ()
+{
+       _selection.clear_routes();
+       deselect_all_strip_processors();
+}
+
+void
+Mixer_UI::delete_processors ()
+{
+       for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
+               (*i)->delete_processors();
+       }
+}
+
+
 void
 Mixer_UI::remove_strip (MixerStrip* strip)
 {
@@ -392,13 +442,14 @@ Mixer_UI::remove_strip (MixerStrip* strip)
        TreeModel::Children rows = track_model->children();
        TreeModel::Children::iterator ri;
        list<MixerStrip *>::iterator i;
-       
+
        if ((i = find (strips.begin(), strips.end(), strip)) != strips.end()) {
                strips.erase (i);
        }
-       
+
        for (ri = rows.begin(); ri != rows.end(); ++ri) {
                if ((*ri)[track_columns.strip] == strip) {
+                        PBD::Unwinder<bool> uw (_route_deletion_in_progress, true);
                        track_model->erase (ri);
                        break;
                }
@@ -408,12 +459,12 @@ Mixer_UI::remove_strip (MixerStrip* strip)
 void
 Mixer_UI::reset_remote_control_ids ()
 {
-       if (Config->get_remote_model() != MixerOrdered || !_session || _session->deletion_in_progress()) {
+       if (Config->get_remote_model() == UserOrdered || !_session || _session->deletion_in_progress()) {
                return;
        }
 
        TreeModel::Children rows = track_model->children();
-       
+
        if (rows.empty()) {
                return;
        }
@@ -426,18 +477,29 @@ Mixer_UI::reset_remote_control_ids ()
        uint32_t invisible_key = UINT32_MAX;
 
        for (ri = rows.begin(); ri != rows.end(); ++ri) {
+
+               /* skip two special values */
+
+               if (rid == Route::MasterBusRemoteControlID) {
+                       rid++;
+               }
+
+               if (rid == Route::MonitorBusRemoteControlID) {
+                       rid++;
+               }
+
                boost::shared_ptr<Route> route = (*ri)[track_columns.route];
                bool visible = (*ri)[track_columns.visible];
 
                if (!route->is_master() && !route->is_monitor()) {
-                       
+
                        uint32_t new_rid = (visible ? rid : invisible_key--);
-                       
+
                        if (new_rid != route->remote_control_id()) {
-                               route->set_remote_control_id_from_order_key (MixerSort, new_rid);       
+                               route->set_remote_control_id_explicit (new_rid);
                                rid_change = true;
                        }
-                       
+
                        if (visible) {
                                rid++;
                        }
@@ -458,7 +520,7 @@ Mixer_UI::sync_order_keys_from_treeview ()
        }
 
        TreeModel::Children rows = track_model->children();
-       
+
        if (rows.empty()) {
                return;
        }
@@ -476,10 +538,10 @@ Mixer_UI::sync_order_keys_from_treeview ()
                boost::shared_ptr<Route> route = (*ri)[track_columns.route];
                bool visible = (*ri)[track_columns.visible];
 
-               uint32_t old_key = route->order_key (MixerSort);
+               uint32_t old_key = route->order_key ();
 
                if (order != old_key) {
-                       route->set_order_key (MixerSort, order);
+                       route->set_order_key (order);
                        changed = true;
                }
 
@@ -488,10 +550,10 @@ Mixer_UI::sync_order_keys_from_treeview ()
                        uint32_t new_rid = (visible ? rid : invisible_key--);
 
                        if (new_rid != route->remote_control_id()) {
-                               route->set_remote_control_id_from_order_key (MixerSort, new_rid);       
+                               route->set_remote_control_id_explicit (new_rid);
                                rid_change = true;
                        }
-                       
+
                        if (visible) {
                                rid++;
                        }
@@ -503,7 +565,7 @@ Mixer_UI::sync_order_keys_from_treeview ()
 
        if (changed) {
                /* tell everyone that we changed the mixer sort keys */
-               _session->sync_order_keys (MixerSort);
+               _session->sync_order_keys ();
        }
 
        if (rid_change) {
@@ -513,33 +575,13 @@ Mixer_UI::sync_order_keys_from_treeview ()
 }
 
 void
-Mixer_UI::sync_treeview_from_order_keys (RouteSortOrderKey src)
+Mixer_UI::sync_treeview_from_order_keys ()
 {
        if (!_session || _session->deletion_in_progress()) {
                return;
        }
 
-       DEBUG_TRACE (DEBUG::OrderKeys, string_compose ("mixer sync model from order keys, src = %1\n", enum_2_string (src)));
-
-       if (src == EditorSort) {
-
-               if (!Config->get_sync_all_route_ordering()) {
-                       /* editor sort keys changed - we don't care */
-                       return;
-               }
-
-               DEBUG_TRACE (DEBUG::OrderKeys, "reset mixer order key to match editor\n");
-
-               /* editor sort keys were changed, update the mixer sort
-                * keys since "sync mixer+editor order" is enabled.
-                */
-
-               boost::shared_ptr<RouteList> r = _session->get_routes ();
-               
-               for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-                       (*i)->sync_order_keys (src);
-               }
-       }
+       DEBUG_TRACE (DEBUG::OrderKeys, "mixer sync model from order keys.\n");
 
        /* we could get here after either a change in the Mixer or Editor sort
         * order, but either way, the mixer order keys reflect the intended
@@ -559,7 +601,7 @@ Mixer_UI::sync_treeview_from_order_keys (RouteSortOrderKey src)
 
        for (TreeModel::Children::iterator ri = rows.begin(); ri != rows.end(); ++ri, ++old_order) {
                boost::shared_ptr<Route> route = (*ri)[track_columns.route];
-               sorted_routes.push_back (RoutePlusOrderKey (route, old_order, route->order_key (MixerSort)));
+               sorted_routes.push_back (RoutePlusOrderKey (route, old_order, route->order_key ()));
        }
 
        SortByNewDisplayOrder cmp;
@@ -568,7 +610,7 @@ Mixer_UI::sync_treeview_from_order_keys (RouteSortOrderKey src)
        neworder.assign (sorted_routes.size(), 0);
 
        uint32_t n = 0;
-       
+
        for (OrderKeySortedRoutes::iterator sr = sorted_routes.begin(); sr != sorted_routes.end(); ++sr, ++n) {
 
                neworder[n] = sr->old_display_order;
@@ -592,13 +634,13 @@ Mixer_UI::sync_treeview_from_order_keys (RouteSortOrderKey src)
 void
 Mixer_UI::follow_editor_selection ()
 {
-       if (!Config->get_link_editor_and_mixer_selection() || _following_editor_selection) {
+       if (_following_editor_selection) {
                return;
        }
 
        _following_editor_selection = true;
        _selection.block_routes_changed (true);
-       
+
        TrackSelection& s (PublicEditor::instance().get_selection().tracks);
 
        _selection.clear_routes ();
@@ -638,24 +680,28 @@ Mixer_UI::strip_button_release_event (GdkEventButton *ev, MixerStrip *strip)
                        /* primary-click: toggle selection state of strip */
                        if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
                                _selection.remove (strip);
-                       } 
+                       } else if (_selection.routes.size() > 1) {
+                               /* de-select others */
+                               _selection.set (strip);
+                       }
                } else {
                        if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
                                _selection.add (strip);
                        } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::RangeSelectModifier)) {
 
                                if (!_selection.selected(strip)) {
-                               
+
                                        /* extend selection */
-                                       
+
                                        vector<MixerStrip*> tmp;
                                        bool accumulate = false;
-                                       
+                                       bool found_another = false;
+
                                        tmp.push_back (strip);
 
                                        for (list<MixerStrip*>::iterator i = strips.begin(); i != strips.end(); ++i) {
                                                if ((*i) == strip) {
-                                                       /* hit clicked strip, start accumulating till we hit the first 
+                                                       /* hit clicked strip, start accumulating till we hit the first
                                                           selected strip
                                                        */
                                                        if (accumulate) {
@@ -668,6 +714,7 @@ Mixer_UI::strip_button_release_event (GdkEventButton *ev, MixerStrip *strip)
                                                        /* hit selected strip. if currently accumulating others,
                                                           we're done. if not accumulating others, start doing so.
                                                        */
+                                                       found_another = true;
                                                        if (accumulate) {
                                                                /* done */
                                                                break;
@@ -681,9 +728,12 @@ Mixer_UI::strip_button_release_event (GdkEventButton *ev, MixerStrip *strip)
                                                }
                                        }
 
-                                       for (vector<MixerStrip*>::iterator i = tmp.begin(); i != tmp.end(); ++i) {
-                                               _selection.add (*i);
-                                       }
+                                       if (found_another) {
+                                               for (vector<MixerStrip*>::iterator i = tmp.begin(); i != tmp.end(); ++i) {
+                                                       _selection.add (*i);
+                                               }
+                                       } else
+                                               _selection.set (strip);  //user wants to start a range selection, but there aren't any others selected yet
                                }
 
                        } else {
@@ -731,12 +781,6 @@ Mixer_UI::set_session (Session* sess)
 
        if (_visible) {
                show_window();
-
-               /* Bit of a hack; if we're here, we're opening the mixer because of our
-                  instant XML state having a show-mixer property.  Fix up the corresponding
-                  action state.
-               */
-               ActionManager::check_toggleaction ("<Actions>/Common/toggle-mixer");
        }
 
        start_updating ();
@@ -801,15 +845,15 @@ Mixer_UI::update_track_visibility ()
 
        {
                Unwinder<bool> uw (no_track_list_redisplay, true);
-               
+
                for (i = rows.begin(); i != rows.end(); ++i) {
                        MixerStrip *strip = (*i)[track_columns.strip];
                        (*i)[track_columns.visible] = strip->marked_for_display ();
                }
-               
+
                /* force route order keys catch up with visibility changes
                 */
-               
+
                sync_order_keys_from_treeview ();
        }
 
@@ -853,7 +897,7 @@ Mixer_UI::hide_strip (MixerStrip* ms)
 gint
 Mixer_UI::start_updating ()
 {
-    fast_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (sigc::mem_fun(*this, &Mixer_UI::fast_update_strips));
+    fast_screen_update_connection = Timers::super_rapid_connect (sigc::mem_fun(*this, &Mixer_UI::fast_update_strips));
     return 0;
 }
 
@@ -882,20 +926,20 @@ Mixer_UI::set_all_strips_visibility (bool yn)
 
        {
                Unwinder<bool> uw (no_track_list_redisplay, true);
-               
+
                for (i = rows.begin(); i != rows.end(); ++i) {
-                       
+
                        TreeModel::Row row = (*i);
                        MixerStrip* strip = row[track_columns.strip];
-                       
+
                        if (strip == 0) {
                                continue;
                        }
-                       
+
                        if (strip->route()->is_master() || strip->route()->is_monitor()) {
                                continue;
                        }
-                       
+
                        (*i)[track_columns.visible] = yn;
                }
        }
@@ -905,41 +949,48 @@ Mixer_UI::set_all_strips_visibility (bool yn)
 
 
 void
-Mixer_UI::set_all_audio_visibility (int tracks, bool yn)
+Mixer_UI::set_all_audio_midi_visibility (int tracks, bool yn)
 {
        TreeModel::Children rows = track_model->children();
        TreeModel::Children::iterator i;
 
        {
                Unwinder<bool> uw (no_track_list_redisplay, true);
-               
+
                for (i = rows.begin(); i != rows.end(); ++i) {
                        TreeModel::Row row = (*i);
                        MixerStrip* strip = row[track_columns.strip];
-                       
+
                        if (strip == 0) {
                                continue;
                        }
-                       
+
                        if (strip->route()->is_master() || strip->route()->is_monitor()) {
                                continue;
                        }
-                       
+
                        boost::shared_ptr<AudioTrack> at = strip->audio_track();
-                       
+                       boost::shared_ptr<MidiTrack> mt = strip->midi_track();
+
                        switch (tracks) {
                        case 0:
                                (*i)[track_columns.visible] = yn;
                                break;
-                               
+
                        case 1:
                                if (at) { /* track */
                                        (*i)[track_columns.visible] = yn;
                                }
                                break;
-                               
+
                        case 2:
-                               if (!at) { /* bus */
+                               if (!at && !mt) { /* bus */
+                                       (*i)[track_columns.visible] = yn;
+                               }
+                               break;
+
+                       case 3:
+                               if (mt) { /* midi-track */
                                        (*i)[track_columns.visible] = yn;
                                }
                                break;
@@ -965,25 +1016,37 @@ Mixer_UI::show_all_routes ()
 void
 Mixer_UI::show_all_audiobus ()
 {
-       set_all_audio_visibility (2, true);
+       set_all_audio_midi_visibility (2, true);
 }
 void
 Mixer_UI::hide_all_audiobus ()
 {
-       set_all_audio_visibility (2, false);
+       set_all_audio_midi_visibility (2, false);
 }
 
 void
 Mixer_UI::show_all_audiotracks()
 {
-       set_all_audio_visibility (1, true);
+       set_all_audio_midi_visibility (1, true);
 }
 void
 Mixer_UI::hide_all_audiotracks ()
 {
-       set_all_audio_visibility (1, false);
+       set_all_audio_midi_visibility (1, false);
 }
 
+void
+Mixer_UI::show_all_miditracks()
+{
+       set_all_audio_midi_visibility (3, true);
+}
+void
+Mixer_UI::hide_all_miditracks ()
+{
+       set_all_audio_midi_visibility (3, false);
+}
+
+
 void
 Mixer_UI::track_list_reorder (const TreeModel::Path&, const TreeModel::iterator&, int* /*new_order*/)
 {
@@ -996,9 +1059,17 @@ Mixer_UI::track_list_delete (const Gtk::TreeModel::Path&)
 {
        /* this happens as the second step of a DnD within the treeview as well
           as when a row/route is actually deleted.
+
+           if it was a deletion then we have to force a redisplay because
+           order keys may not have changed.
        */
+
        DEBUG_TRACE (DEBUG::OrderKeys, "mixer UI treeview row deleted\n");
        sync_order_keys_from_treeview ();
+
+        if (_route_deletion_in_progress) {
+                redisplay_track_list ();
+        }
 }
 
 void
@@ -1006,7 +1077,7 @@ Mixer_UI::redisplay_track_list ()
 {
        TreeModel::Children rows = track_model->children();
        TreeModel::Children::iterator i;
-       
+
        if (no_track_list_redisplay) {
                return;
        }
@@ -1089,28 +1160,12 @@ Mixer_UI::strip_width_changed ()
 
 }
 
-struct SignalOrderRouteSorter {
-    bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
-           if (a->is_master() || a->is_monitor()) {
-                   /* "a" is a special route (master, monitor, etc), and comes
-                    * last in the mixer ordering
-                    */
-                   return false;
-           } else if (b->is_master() || b->is_monitor()) {
-                   /* everything comes before b */
-                   return true;
-           }
-           return a->order_key (MixerSort) < b->order_key (MixerSort);
-
-    }
-};
-
 void
 Mixer_UI::initial_track_display ()
 {
        boost::shared_ptr<RouteList> routes = _session->get_routes();
        RouteList copy (*routes);
-       SignalOrderRouteSorter sorter;
+       ARDOUR::SignalOrderRouteSorter sorter;
 
        copy.sort (sorter);
 
@@ -1121,8 +1176,8 @@ Mixer_UI::initial_track_display ()
                track_model->clear ();
                add_strips (copy);
        }
-       
-       _session->sync_order_keys (MixerSort);
+
+       _session->sync_order_keys ();
 
        redisplay_track_list ();
 }
@@ -1164,6 +1219,8 @@ Mixer_UI::build_track_menu ()
        items.push_back (MenuElem (_("Hide All Audio Tracks"), sigc::mem_fun(*this, &Mixer_UI::hide_all_audiotracks)));
        items.push_back (MenuElem (_("Show All Audio Busses"), sigc::mem_fun(*this, &Mixer_UI::show_all_audiobus)));
        items.push_back (MenuElem (_("Hide All Audio Busses"), sigc::mem_fun(*this, &Mixer_UI::hide_all_audiobus)));
+       items.push_back (MenuElem (_("Show All Midi Tracks"), sigc::mem_fun (*this, &Mixer_UI::show_all_miditracks)));
+       items.push_back (MenuElem (_("Hide All Midi Tracks"), sigc::mem_fun (*this, &Mixer_UI::hide_all_miditracks)));
 
 }
 
@@ -1198,12 +1255,14 @@ Mixer_UI::group_display_button_press (GdkEventButton* ev)
        int celly;
 
        if (!group_display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) {
-               return false;
+               _group_tabs->get_menu(0)->popup (1, ev->time);
+               return true;
        }
 
        TreeIter iter = group_model->get_iter (path);
        if (!iter) {
-               return false;
+               _group_tabs->get_menu(0)->popup (1, ev->time);
+               return true;
        }
 
        RouteGroup* group = (*iter)[group_columns.group];
@@ -1266,6 +1325,14 @@ Mixer_UI::route_groups_changed ()
 
        group_model->clear ();
 
+#if 0
+       /* this is currently not used,
+        * Mixer_UI::group_display_button_press() has a case for it,
+        * and a commented edit_route_group() but that's n/a since 2011.
+        *
+        * This code is left as reminder that
+        * row[group_columns.group] = 0 has special meaning.
+        */
        {
                TreeModel::Row row;
                row = *(group_model->append());
@@ -1273,6 +1340,7 @@ Mixer_UI::route_groups_changed ()
                row[group_columns.text] = (_("-all-"));
                row[group_columns.group] = 0;
        }
+#endif
 
        _session->foreach_route_group (sigc::mem_fun (*this, &Mixer_UI::add_route_group));
 
@@ -1477,12 +1545,12 @@ Mixer_UI::strip_scroller_button_release (GdkEventButton* ev)
 }
 
 void
-Mixer_UI::set_strip_width (Width w)
+Mixer_UI::set_strip_width (Width w, bool save)
 {
        _strip_width = w;
 
        for (list<MixerStrip*>::iterator i = strips.begin(); i != strips.end(); ++i) {
-               (*i)->set_width_enum (w, this);
+               (*i)->set_width_enum (w, save ? (*i)->width_owner() : this);
        }
 }
 
@@ -1559,6 +1627,19 @@ Mixer_UI::set_state (const XMLNode& node)
                }
        }
 
+       if ((prop = node.property ("maximised"))) {
+               bool yn = string_is_affirmative (prop->value());
+               Glib::RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleMaximalMixer"));
+               assert (act);
+               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
+               bool fs = tact && tact->get_active();
+               if (yn ^ fs) {
+                       ActionManager::do_action ("Common",
+                                       "ToggleMaximalMixer");
+               }
+       }
+
+
        return 0;
 }
 
@@ -1601,6 +1682,8 @@ Mixer_UI::get_state (void)
 
        node->add_property ("show-mixer", _visible ? "yes" : "no");
 
+       node->add_property ("maximised", _maximised ? "yes" : "no");
+
        return *node;
 }
 
@@ -1655,7 +1738,7 @@ Mixer_UI::pane_allocation_handler (Allocation&, Gtk::Paned* which)
                        pos = 75;
                        snprintf (buf, sizeof(buf), "%d", pos);
                } else {
-                       pos = atoi (prop->value());
+                       pos = max (36, atoi (prop->value ()));
                }
 
                if ((done[2] = GTK_WIDGET(list_hpane.gobj())->allocation.width > pos)) {
@@ -1666,6 +1749,7 @@ Mixer_UI::pane_allocation_handler (Allocation&, Gtk::Paned* which)
 void
 Mixer_UI::scroll_left ()
 {
+       if (!scroller.get_hscrollbar()) return;
        Adjustment* adj = scroller.get_hscrollbar()->get_adjustment();
        /* stupid GTK: can't rely on clamping across versions */
        scroller.get_hscrollbar()->set_value (max (adj->get_lower(), adj->get_value() - adj->get_step_increment()));
@@ -1674,6 +1758,7 @@ Mixer_UI::scroll_left ()
 void
 Mixer_UI::scroll_right ()
 {
+       if (!scroller.get_hscrollbar()) return;
        Adjustment* adj = scroller.get_hscrollbar()->get_adjustment();
        /* stupid GTK: can't rely on clamping across versions */
        scroller.get_hscrollbar()->set_value (min (adj->get_upper(), adj->get_value() + adj->get_step_increment()));
@@ -1707,7 +1792,7 @@ Mixer_UI::on_key_release_event (GdkEventKey* ev)
        }
 
        KeyboardKey k (ev->state, ev->keyval);
-       
+
        if (bindings.activate (k, Bindings::Release)) {
                return true;
        }
@@ -1758,7 +1843,7 @@ Mixer_UI::parameter_changed (string const & p)
                        _group_tabs->hide ();
                }
        } else if (p == "default-narrow_ms") {
-               bool const s = Config->get_default_narrow_ms ();
+               bool const s = UIConfiguration::instance().get_default_narrow_ms ();
                for (list<MixerStrip*>::iterator i = strips.begin(); i != strips.end(); ++i) {
                        (*i)->set_width_enum (s ? Narrow : Wide, this);
                }
@@ -1795,10 +1880,12 @@ Mixer_UI::setup_track_display ()
        track_display.get_column (1)->set_data (X_("colnum"), GUINT_TO_POINTER(1));
        track_display.get_column (0)->set_expand(true);
        track_display.get_column (1)->set_expand(false);
+       track_display.get_column (0)->set_sizing (Gtk::TREE_VIEW_COLUMN_FIXED);
        track_display.set_name (X_("EditGroupList"));
        track_display.get_selection()->set_mode (Gtk::SELECTION_NONE);
        track_display.set_reorderable (true);
        track_display.set_headers_visible (true);
+       track_display.set_can_focus(false);
 
        track_model->signal_row_deleted().connect (sigc::mem_fun (*this, &Mixer_UI::track_list_delete));
        track_model->signal_rows_reordered().connect (sigc::mem_fun (*this, &Mixer_UI::track_list_reorder));
@@ -1848,7 +1935,7 @@ Mixer_UI::update_title ()
 {
        if (_session) {
                string n;
-               
+
                if (_session->snap_name() != _session->name()) {
                        n = _session->snap_name ();
                } else {
@@ -1858,14 +1945,14 @@ Mixer_UI::update_title ()
                if (_session->dirty ()) {
                        n = "*" + n;
                }
-               
+
                WindowTitle title (n);
                title += S_("Window|Mixer");
                title += Glib::get_application_name ();
                set_title (title.get_string());
 
        } else {
-               
+
                WindowTitle title (S_("Window|Mixer"));
                title += Glib::get_application_name ();
                set_title (title.get_string());
@@ -1899,16 +1986,8 @@ Mixer_UI::set_route_targets_for_operation ()
                return;
        }
 
-       /* nothing selected ... try to get mixer strip at mouse */
+//  removed "implicit" selections of strips, after discussion on IRC
 
-       int x, y;
-       get_pointer (x, y);
-       
-       MixerStrip* ms = strip_by_x (x);
-       
-       if (ms) {
-               _route_targets.insert (ms);
-       }
 }
 
 void
@@ -1924,7 +2003,7 @@ void
 Mixer_UI::toggle_midi_input_active (bool flip_others)
 {
        boost::shared_ptr<RouteList> rl (new RouteList);
-       bool onoff;
+       bool onoff = false;
 
        set_route_targets_for_operation ();
 
@@ -1936,7 +2015,30 @@ Mixer_UI::toggle_midi_input_active (bool flip_others)
                        onoff = !mt->input_active();
                }
        }
-       
+
        _session->set_exclusive_input_active (rl, onoff, flip_others);
 }
 
+void
+Mixer_UI::maximise_mixer_space ()
+{
+       if (_maximised) {
+               return;
+       }
+
+       fullscreen ();
+
+       _maximised = true;
+}
+
+void
+Mixer_UI::restore_mixer_space ()
+{
+       if (!_maximised) {
+               return;
+       }
+
+       unfullscreen();
+
+       _maximised = false;
+}