diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2009-04-15 18:04:23 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-04-15 18:04:23 +0000 |
commit | 54d9f2f2d83af1f0f44579fe2ebf090e68259938 (patch) | |
tree | 44a61c36048be6edabeb5fc5461d47c95623f79f /gtk2_ardour/add_route_dialog.cc | |
parent | ece2bacb2c7d7f72b6a25a75760837efce0d5e30 (diff) |
first half of the mega-by-hand-commit-by-commit merge from 2.X
git-svn-id: svn://localhost/ardour2/branches/3.0@4980 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/add_route_dialog.cc')
-rw-r--r-- | gtk2_ardour/add_route_dialog.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc index 855ce5d248..d5856fa4e6 100644 --- a/gtk2_ardour/add_route_dialog.cc +++ b/gtk2_ardour/add_route_dialog.cc @@ -160,17 +160,19 @@ AddRouteDialog::AddRouteDialog () hbox5->pack_start (track_button, PACK_EXPAND_PADDING); hbox5->pack_start (bus_button, PACK_EXPAND_PADDING); - set_popdown_strings (channel_combo, channel_combo_strings); - set_popdown_strings (track_mode_combo, track_mode_strings); - channel_combo.set_active_text (channel_combo_strings.front()); channel_combo.set_name (X_("ChannelCountSelector")); + track_mode_combo.set_name (X_("ChannelCountSelector")); + + set_popdown_strings (channel_combo, channel_combo_strings, true); + set_popdown_strings (track_mode_combo, track_mode_strings, true); + + channel_combo.set_active_text (channel_combo_strings.front()); + track_mode_combo.set_active_text (track_mode_strings.front()); track_button.signal_clicked().connect (mem_fun (*this, &AddRouteDialog::track_type_chosen)); bus_button.signal_clicked().connect (mem_fun (*this, &AddRouteDialog::track_type_chosen)); template_button.signal_clicked().connect (mem_fun (*this, &AddRouteDialog::track_type_chosen)); - track_mode_combo.set_active_text (track_mode_strings.front()); - track_mode_combo.set_name (X_("ChannelCountSelector")); VBox* vbox1 = manage (new VBox); vbox1->set_spacing (6); |