summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2010-08-26 02:34:45 +0000
committerCarl Hetherington <carl@carlh.net>2010-08-26 02:34:45 +0000
commitbdb84342381310f6162418e0603e7eeaabde20bd (patch)
treec5a3894eeacf181e4f457cddb633b304d147f983 /gtk2_ardour
parentc243a02c998f585295f2179657673e2cf0fa4428 (diff)
Copy-edit.
git-svn-id: svn://localhost/ardour2/branches/3.0@7695 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/editor.cc2
-rw-r--r--gtk2_ardour/region_layering_order_editor.cc27
2 files changed, 8 insertions, 21 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 816217cf0b..b153967cd3 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -2017,7 +2017,7 @@ Editor::add_region_context_items (StreamView* sv, list<boost::shared_ptr<Region>
edit_items.push_back (MenuElem (menu_item_name, *region_menu));
if (multiple_regions_at_position && (layering_order_editor == 0 || !layering_order_editor->is_visible ())) {
- edit_items.push_back (MenuElem (_("Choose Top Region"), (bind (mem_fun(*this, &Editor::change_region_layering_order), position))));
+ edit_items.push_back (MenuElem (_("Choose Top Region..."), (bind (mem_fun(*this, &Editor::change_region_layering_order), position))));
}
edit_items.push_back (SeparatorElem());
}
diff --git a/gtk2_ardour/region_layering_order_editor.cc b/gtk2_ardour/region_layering_order_editor.cc
index 2f6963d7b7..f6bc74a6ff 100644
--- a/gtk2_ardour/region_layering_order_editor.cc
+++ b/gtk2_ardour/region_layering_order_editor.cc
@@ -36,50 +36,37 @@ RegionLayeringOrderEditor::RegionLayeringOrderEditor (PublicEditor& pe)
layering_order_display.set_reorderable (false);
layering_order_display.set_rules_hint (true);
- scroller.set_border_width (10);
scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
scroller.add (layering_order_display);
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);
- scroller_table->set_border_width (5);
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_alignment (0, 0.5);
track_name_label.set_name ("RegionLayeringOrderEditorNameLabel");
+ track_name_label.set_alignment (0, 0.5);
clock.set_mode (AudioClock::BBT);
- Gtk::Alignment* track_alignment = manage (new Gtk::Alignment);
- track_alignment->set (1.0, 0.5);
- track_alignment->add (track_label);
-
- Gtk::Alignment* clock_alignment = manage (new Gtk::Alignment);
- clock_alignment->set (1.0, 0.5);
- clock_alignment->add (clock_label);
-
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_label, 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_label, 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()->set_spacing (12);
+ get_vbox()->pack_start (*info_table, false, false);
get_vbox()->pack_start (*scroller_table, true, true);
info_table->set_name ("RegionLayeringOrderTable");