From 135e865302b5cd20a6cb0a0a4aaa682f839ffe67 Mon Sep 17 00:00:00 2001 From: nick_m Date: Mon, 16 Mar 2015 04:01:30 +1100 Subject: Add route dialog order hint changes. Add an option to insert new routes at the top of the list ("First"). Reorder/rename the entries in the dialog. Session's _order_hint is now the signed int it always wanted to be. --- gtk2_ardour/add_route_dialog.cc | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'gtk2_ardour/add_route_dialog.cc') diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc index 24e9ca81df..990a84ba88 100644 --- a/gtk2_ardour/add_route_dialog.cc +++ b/gtk2_ardour/add_route_dialog.cc @@ -80,11 +80,12 @@ AddRouteDialog::AddRouteDialog () track_bus_combo.append_text (_("Busses")); track_bus_combo.set_active (0); - insert_at_combo.append_text (_("Editor Selection")); - insert_at_combo.append_text (_("Mixer Selection")); - insert_at_combo.append_text (_("End")); + insert_at_combo.append_text (_("First")); + insert_at_combo.append_text (_("After Editor Selection")); + insert_at_combo.append_text (_("After Mixer Selection")); + insert_at_combo.append_text (_("Last")); - insert_at_combo.set_active (0); + insert_at_combo.set_active (1); VBox* vbox = manage (new VBox); Gtk::Label* l; @@ -158,7 +159,7 @@ AddRouteDialog::AddRouteDialog () ++n; /* New route will be inserted at.. */ - l = manage (new Label (_("Insert at:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false)); + l = manage (new Label (_("Insert:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false)); table2->attach (*l, 1, 2, n, n + 1, Gtk::FILL, Gtk::EXPAND, 0, 0); table2->attach (insert_at_combo, 2, 3, n, n + 1, Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0); ++n; @@ -555,13 +556,14 @@ AddRouteDialog::insert_at () { std::string str = insert_at_combo.get_active_text(); - if (str == _("Editor Selection")) { + if (str == _("First")) { + return First; + } else if (str == _("After Editor Selection")) { return EditorSelection; - } else if (str == _("Mixer Selection")){ + } else if (str == _("After Mixer Selection")){ return MixerSelection; } - - return End; + return Last; } bool -- cgit v1.2.3