add nominal owners for all action groups

[ardour.git] / gtk2_ardour / region_layering_order_editor.cc

diff --git a/gtk2_ardour/region_layering_order_editor.cc b/gtk2_ardour/region_layering_order_editor.cc
index 7a1a2c21405c964e417d657e09da7566abe3b107..63a39cd270e921326458f40ff5576bed3f900e1f 100644 (file)
--- a/gtk2_ardour/region_layering_order_editor.cc
+++ b/gtk2_ardour/region_layering_order_editor.cc
@@ -31,7 +31,7 @@
 #include "region_layering_order_editor.h"
 #include "region_view.h"
 #include "utils.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;
@@ -42,9 +42,9 @@ RegionLayeringOrderEditor::RegionLayeringOrderEditor (PublicEditor& pe)
        : ArdourWindow (_("RegionLayeringOrderEditor"))
        , position (0)
        , in_row_change (false)
-        , regions_at_position (0)
+       , regions_at_position (0)
        , layering_order_model (Gtk::ListStore::create (layering_order_columns))
-        , clock ("layer dialog", true, "", false, false, false)
+       , clock ("layer dialog", true, "", false, false, false)
        , editor (pe)
        , _time_axis_view (0)
 {
@@ -62,29 +62,29 @@ RegionLayeringOrderEditor::RegionLayeringOrderEditor (PublicEditor& pe)
 
        clock.set_mode (AudioClock::BBT);
 
-        Gtk::Table* scroller_table = manage (new Gtk::Table);
-        scroller_table->set_size_request (300, 250);
-        scroller_table->attach (scroller, 0, 1, 0, 1);
-        scroller_table->set_col_spacings (5);
-        scroller_table->set_row_spacings (5);
+       Gtk::Table* scroller_table = manage (new Gtk::Table);
+       scroller_table->set_size_request (300, 250);
+       scroller_table->attach (scroller, 0, 1, 0, 1);
+       scroller_table->set_col_spacings (5);
+       scroller_table->set_row_spacings (5);
 
-        track_label.set_name ("RegionLayeringOrderEditorLabel");
-        track_label.set_text (_("Track:"));
+       track_label.set_name ("RegionLayeringOrderEditorLabel");
+       track_label.set_text (_("Track:"));
        track_label.set_alignment (0, 0.5);
-        clock_label.set_name ("RegionLayeringOrderEditorLabel");
-        clock_label.set_text (_("Position:"));
+       clock_label.set_name ("RegionLayeringOrderEditorLabel");
+       clock_label.set_text (_("Position:"));
        clock_label.set_alignment (0, 0.5);
-        track_name_label.set_name ("RegionLayeringOrderEditorNameLabel");
+       track_name_label.set_name ("RegionLayeringOrderEditorNameLabel");
        track_name_label.set_alignment (0, 0.5);
-        clock.set_mode (AudioClock::BBT);
+       clock.set_mode (AudioClock::BBT);
 
-        Gtk::Table* info_table = manage (new Gtk::Table (2, 2));
-        info_table->set_col_spacings (5);
-        info_table->set_row_spacings (5);
-        info_table->attach (track_label, 0, 1, 0, 1, FILL, FILL);
-        info_table->attach (track_name_label, 1, 2, 0, 1, FILL, FILL);
-        info_table->attach (clock_label, 0, 1, 1, 2, FILL, FILL);
-        info_table->attach (clock, 1, 2, 1, 2, Gtk::AttachOptions(0), FILL);
+       Gtk::Table* info_table = manage (new Gtk::Table (2, 2));
+       info_table->set_col_spacings (5);
+       info_table->set_row_spacings (5);
+       info_table->attach (track_label, 0, 1, 0, 1, FILL, FILL);
+       info_table->attach (track_name_label, 1, 2, 0, 1, FILL, FILL);
+       info_table->attach (clock_label, 0, 1, 1, 2, FILL, FILL);
+       info_table->attach (clock, 1, 2, 1, 2, Gtk::AttachOptions(0), FILL);
 
        Gtk::VBox* vbox = Gtk::manage (new Gtk::VBox ());
        vbox->set_spacing (12);
@@ -92,8 +92,8 @@ RegionLayeringOrderEditor::RegionLayeringOrderEditor (PublicEditor& pe)
        vbox->pack_start (*scroller_table, true, true);
        add (*vbox);
 
-        info_table->set_name ("RegionLayeringOrderTable");
-        scroller_table->set_name ("RegionLayeringOrderTable");
+       info_table->set_name ("RegionLayeringOrderTable");
+       scroller_table->set_name ("RegionLayeringOrderTable");
 
        layering_order_display.set_name ("RegionLayeringOrderDisplay");
        layering_order_display.get_selection()->set_mode (SELECTION_SINGLE);
@@ -107,7 +107,7 @@ RegionLayeringOrderEditor::RegionLayeringOrderEditor (PublicEditor& pe)
 
 RegionLayeringOrderEditor::~RegionLayeringOrderEditor ()
 {
-       
+
 }
 
 void
@@ -123,15 +123,15 @@ RegionLayeringOrderEditor::row_selected ()
        if (!iter) {
                return;
        }
-       
+
        TreeModel::Row row = *iter;
        RegionView* rv = row[layering_order_columns.region_view];
-       
+
        vector<RegionView*> eq;
-       editor.get_equivalent_regions (rv, eq, Properties::select.property_id);
+       editor.get_equivalent_regions (rv, eq, Properties::group_select.property_id);
 
        /* XXX this should be reversible, really */
-       
+
        for (vector<RegionView*>::iterator i = eq.begin(); i != eq.end(); ++i) {
                boost::shared_ptr<Playlist> pl = (*i)->region()->playlist();
                if (pl) {
@@ -150,7 +150,7 @@ void
 RegionLayeringOrderEditor::refill ()
 {
        assert (_time_axis_view);
-       
+
        regions_at_position = 0;
        in_row_change = true;
        layering_order_model->clear ();
@@ -177,18 +177,18 @@ RegionLayeringOrderEditor::refill ()
                newrow[layering_order_columns.name] = (*i)->region()->name();
                newrow[layering_order_columns.region_view] = *i;
 
-               if (i == region_list.begin()) {
-                       layering_order_display.get_selection()->select(newrow);
-               }
+              if (i == region_list.begin()) {
+                      layering_order_display.get_selection()->select(newrow);
+              }
        }
 
        in_row_change = false;
 }
 
 void
-RegionLayeringOrderEditor::set_context (const string& a_name, Session* s, TimeAxisView* tav, boost::shared_ptr<Playlist> pl, framepos_t pos)
+RegionLayeringOrderEditor::set_context (const string& a_name, Session* s, TimeAxisView* tav, boost::shared_ptr<Playlist> pl, samplepos_t pos)
 {
-        track_name_label.set_text (a_name);
+       track_name_label.set_text (a_name);
 
        clock.set_session (s);
        clock.set (pos, true);
@@ -222,7 +222,7 @@ RegionLayeringOrderEditor::on_key_press_event (GdkEventKey* ev)
        }
 
        if (!handled) {
-               handled = key_press_focus_accelerator_handler (editor, ev);
+               handled = relay_key_press (ev, this);
        }
 
        if (!handled) {