Index: gtk2_ardour/region_layering_order_editor.h =================================================================== --- gtk2_ardour/region_layering_order_editor.h (revisión: 6073) +++ gtk2_ardour/region_layering_order_editor.h (copia de trabajo) @@ -50,9 +50,10 @@ Glib::RefPtr layering_order_model; Gtk::TreeView layering_order_display; AudioClock clock; - Gtk::Label label; + Gtk::Label track_label; + Gtk::Label track_name_label; + Gtk::Label clock_label; Gtk::ScrolledWindow scroller; // Available layers - PublicEditor& the_editor; void row_activated (const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* column); void refill (); Index: gtk2_ardour/ardour2_ui.rc =================================================================== --- gtk2_ardour/ardour2_ui.rc (revisión: 6073) +++ gtk2_ardour/ardour2_ui.rc (copia de trabajo) @@ -1464,6 +1464,9 @@ widget "*NewSessionMainButton" style:highest "larger_bold_text" widget "*NewSessionMainButton*" style:highest "larger_bold_text" widget "*NewSessionMainLabel" style:highest "larger_bold_text" +widget "*RegionLayeringOrderEditorLabel" style:highest "medium_text" +widget "*RegionLayeringOrderEditorNameLabel" style:highest "medium_bold_text" +widget "*RegionLayeringOrderEditorClock" style:highest "default_clock_display" widget "*LocationEditRowClock" style:highest "location_rows_clock" widget "*LocationEditNameLabel" style:highest "medium_text" widget "*LocationEditSetButton" style:highest "location_row_button" Index: gtk2_ardour/region_layering_order_editor.cc =================================================================== --- gtk2_ardour/region_layering_order_editor.cc (revisión: 6073) +++ gtk2_ardour/region_layering_order_editor.cc (copia de trabajo) @@ -1,5 +1,6 @@ #include #include +#include #include #include "i18n.h" @@ -16,13 +17,16 @@ , playlist () , position () , in_row_change (false) - , regions_at_position (0) + , regions_at_position (0) + , playlist_modified_connection () , layering_order_columns () , layering_order_model (Gtk::ListStore::create (layering_order_columns)) , layering_order_display () - , clock ("layer dialog", true, "TransportClock", false, false, false) + , clock ("layer dialog", true, "RegionLayeringOrderEditorClock", false, false, false) + , track_label () + , track_name_label () + , clock_label () , scroller () - , the_editor(pe) { set_name ("RegionLayeringOrderEditorWindow"); @@ -30,7 +34,7 @@ layering_order_display.append_column (_("Region Name"), layering_order_columns.name); layering_order_display.set_headers_visible (true); - layering_order_display.set_headers_clickable (true); + layering_order_display.set_headers_clickable (false); layering_order_display.set_reorderable (false); layering_order_display.set_rules_hint (true); @@ -38,21 +42,47 @@ scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); scroller.add (layering_order_display); - Gtk::Table* table = manage (new Gtk::Table (7, 11)); - table->set_size_request (300, 250); - table->attach (scroller, 0, 7, 0, 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); + scroller_table->set_border_width (5); + track_label.set_name ("RegionLayeringOrderEditorLabel"); + track_label.set_text (_("Track:")); + clock_label.set_name ("RegionLayeringOrderEditorLabel"); + clock_label.set_text (_("Position:")); + track_name_label.set_name ("RegionLayeringOrderEditorNameLabel"); clock.set_mode (AudioClock::BBT); - HBox* hbox = manage (new HBox); - hbox->pack_start (clock, true, false); + Gtk::Alignment* track_alignment = manage (new Gtk::Alignment); + track_alignment->set (1.0, 0.5); + track_alignment->add (track_label); - get_vbox()->set_spacing (6); - get_vbox()->pack_start (label, false, false); - get_vbox()->pack_start (*hbox, false, false); - get_vbox()->pack_start (*table); + Gtk::Alignment* clock_alignment = manage (new Gtk::Alignment); + clock_alignment->set (1.0, 0.5); + clock_alignment->add (clock_label); - table->set_name ("RegionLayeringOrderTable"); + Gtk::Table* info_table = manage (new Gtk::Table (2, 2)); + info_table->set_col_spacings (5); + info_table->set_row_spacings (5); + info_table->set_border_width (5); + info_table->attach (*track_alignment, 0, 1, 0, 1, FILL, FILL); + info_table->attach (track_name_label, 1, 2, 0, 1, FILL, FILL); + info_table->attach (*clock_alignment, 0, 1, 1, 2, FILL, FILL); + info_table->attach (clock, 1, 2, 1, 2, FILL, FILL); + + HBox* info_hbox = manage (new HBox); + + info_hbox->pack_start (*info_table, true, false); + + get_vbox()->set_spacing (5); + get_vbox()->pack_start (*info_hbox, false, false); + get_vbox()->pack_start (*scroller_table, true, true); + + info_table->set_name ("RegionLayeringOrderTable"); + scroller_table->set_name ("RegionLayeringOrderTable"); layering_order_display.set_name ("RegionLayeringOrderDisplay"); layering_order_display.signal_row_activated ().connect (mem_fun (*this, &RegionLayeringOrderEditor::row_activated)); @@ -126,9 +156,9 @@ newrow[layering_order_columns.name] = (*i)->name(); newrow[layering_order_columns.region] = *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; @@ -137,7 +167,7 @@ void RegionLayeringOrderEditor::set_context (const string& a_name, Session* s, const boost::shared_ptr & pl, nframes64_t pos) { - label.set_text (a_name); + track_name_label.set_text (a_name); clock.set_session (s); clock.set (pos, true, 0, 0); @@ -154,13 +184,13 @@ RegionLayeringOrderEditor::on_key_press_event (GdkEventKey* ev) { if (ev->keyval == GDK_Return) { - Keyboard::magic_widget_grab_focus (); + Keyboard::magic_widget_grab_focus (); } bool result = key_press_focus_accelerator_handler (*this, ev); if (ev->keyval == GDK_Return) { - Keyboard::magic_widget_drop_focus (); + Keyboard::magic_widget_drop_focus (); } if (!result) { Index: gtk2_ardour/editor.cc =================================================================== --- gtk2_ardour/editor.cc (revisión: 6073) +++ gtk2_ardour/editor.cc (copia de trabajo) @@ -5120,6 +5120,9 @@ Editor::change_region_layering_order (nframes64_t position) { if (clicked_regionview == 0) { + if (layering_order_editor) { + layering_order_editor->hide (); + } return; } Index: gtk2_ardour/ardour2_ui_dark.rc.in =================================================================== --- gtk2_ardour/ardour2_ui_dark.rc.in (revisión: 6073) +++ gtk2_ardour/ardour2_ui_dark.rc.in (copia de trabajo) @@ -1458,6 +1458,9 @@ widget "*RegionEditorClock" style:highest "default_clock_display" widget "*RegionEditorToggleButton" style:highest "paler_red_when_active" widget "*RegionEditorToggleButton*" style:highest "paler_red_when_active" +widget "*RegionLayeringOrderEditorLabel" style:highest "medium_text" +widget "*RegionLayeringOrderEditorNameLabel" style:highest "medium_bold_text" +widget "*RegionLayeringOrderEditorClock" style:highest "default_clock_display" widget "*MixerStripSpeedBase" style:highest "small_entry" widget "*MixerStripSpeedBase*" style:highest "small_entry" widget "*MixerStripSpeedBaseNotOne" style:highest "small_red_on_black_entry" Index: gtk2_ardour/ardour2_ui_light.rc.in =================================================================== --- gtk2_ardour/ardour2_ui_light.rc.in (revisión: 6073) +++ gtk2_ardour/ardour2_ui_light.rc.in (copia de trabajo) @@ -1462,6 +1462,9 @@ widget "*RegionEditorClock" style:highest "default_clock_display" widget "*RegionEditorToggleButton" style:highest "paler_red_when_active" widget "*RegionEditorToggleButton*" style:highest "paler_red_when_active" +widget "*RegionLayeringOrderEditorLabel" style:highest "medium_text" +widget "*RegionLayeringOrderEditorNameLabel" style:highest "medium_bold_text" +widget "*RegionLayeringOrderEditorClock" style:highest "default_clock_display" widget "*MixerStripSpeedBase" style:highest "small_entry" widget "*MixerStripSpeedBase*" style:highest "small_entry" widget "*MixerStripSpeedBaseNotOne" style:highest "small_red_on_black_entry"