diff options
| author | Nick Mainsbridge <beatroute@iprimus.com.au> | 2008-02-05 15:58:10 +0000 |
|---|---|---|
| committer | Nick Mainsbridge <beatroute@iprimus.com.au> | 2008-02-05 15:58:10 +0000 |
| commit | 8cddcec46f5d1398b7f8d1ecd71968d9d72a929b (patch) | |
| tree | 18a90195d017e77606543b3f7250db8e1e806fcf | |
| parent | 4a0f94395d130a55107249a74f1adf4b758afd76 (diff) | |
show loop and punch locations properly in location ui, reorder some dialog buttons.
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3011 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/editor_ops.cc | 10 | ||||
| -rw-r--r-- | gtk2_ardour/location_ui.cc | 10 |
3 files changed, 13 insertions, 9 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index ee110c435a..5fda922f86 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -3012,8 +3012,8 @@ The audioengine is currently running at %2 Hz\n"), desired, actual)); hbox->pack_start (*image, PACK_EXPAND_WIDGET, 12); hbox->pack_end (message, PACK_EXPAND_PADDING, 12); dialog.get_vbox()->pack_start(*hbox, PACK_EXPAND_PADDING, 6); - dialog.add_button (_("Load session anyway"), RESPONSE_ACCEPT); dialog.add_button (_("Do not load session"), RESPONSE_REJECT); + dialog.add_button (_("Load session anyway"), RESPONSE_ACCEPT); dialog.set_default_response (RESPONSE_ACCEPT); dialog.set_position (WIN_POS_CENTER); message.show(); diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index df36c4032f..74611e0346 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -5019,18 +5019,20 @@ Editor::define_one_bar (nframes64_t start, nframes64_t end) */ vector<string> options; - options.push_back (_("Set global tempo")); - options.push_back (_("Add new marker")); options.push_back (_("Cancel")); + options.push_back (_("Add new marker")); + options.push_back (_("Set global tempo")); Choice c (_("Do you want to set the global tempo or add new tempo marker?"), options); + c.set_default_response (2); switch (c.run()) { case 0: + return; + + case 2: do_global = true; break; - case 2: - return; default: do_global = false; diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc index 6e0be908ae..5833bb160a 100644 --- a/gtk2_ardour/location_ui.cc +++ b/gtk2_ardour/location_ui.cc @@ -222,7 +222,7 @@ LocationEditRow::set_location (Location *loc) name_label.set_size_request (80, -1); if (!name_label.get_parent()) { - item_table.attach (name_label, 1, 2, 0, 1, FILL, Gtk::FILL, 4, 0); + item_table.attach (name_label, 1, 2, 0, 1, FILL, FILL, 4, 0); } name_label.show(); @@ -240,10 +240,10 @@ LocationEditRow::set_location (Location *loc) name_entry.show(); if (!cd_check_button.get_parent()) { - item_table.attach (cd_check_button, 5, 6, 0, 1, FILL, Gtk::FILL, 4, 0); + item_table.attach (cd_check_button, 5, 6, 0, 1, FILL, FILL, 4, 0); } if (!remove_button.get_parent()) { - item_table.attach (remove_button, 7, 8, 0, 1, FILL, Gtk::FILL, 4, 0); + item_table.attach (remove_button, 7, 8, 0, 1, FILL, FILL, 4, 0); } /* XXX i can't find a way to hide the button without messing up @@ -267,7 +267,7 @@ LocationEditRow::set_location (Location *loc) } start_clock.set (location->start(), true); - + if (!location->is_mark()) { if (!end_hbox.get_parent()) { @@ -793,10 +793,12 @@ LocationUI::map_locations (Locations::LocationList& locations) else if (location->is_auto_punch()) { punch_edit_row.set_session (session); punch_edit_row.set_location (location); + punch_edit_row.show_all(); } else if (location->is_auto_loop()) { loop_edit_row.set_session (session); loop_edit_row.set_location (location); + loop_edit_row.show_all(); } else { erow = manage (new LocationEditRow(session, location)); |