From e98824e3287bc2ab85ae882f5faf5a7aacb1fd4f Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 2 Dec 2005 21:45:56 +0000 Subject: [PATCH] make all of dialog visible for add_route_dialog git-svn-id: svn://localhost/trunk/ardour2@161 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/add_route_dialog.cc | 24 ++++++------------------ gtk2_ardour/editor_canvas.cc | 2 +- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc index 1126bbe53a..9020b6c74d 100644 --- a/gtk2_ardour/add_route_dialog.cc +++ b/gtk2_ardour/add_route_dialog.cc @@ -65,14 +65,9 @@ AddRouteDialog::AddRouteDialog () hbrb->pack_start (bus_button, false, false); set_popdown_strings (channel_combo, channel_combo_strings); + channel_combo.set_active_text (channel_combo_strings.front()); channel_combo.set_name (X_("ChannelCountSelector")); - VBox *vbcc = manage (new VBox); - - vbcc->set_spacing (6); - vbcc->pack_start (*(manage (new Label ("Channel configuration"))), false, false); - vbcc->pack_start (channel_combo, false, false); - #if NOT_USEFUL_YET HBox *hbnt = manage (new HBox); @@ -80,22 +75,15 @@ AddRouteDialog::AddRouteDialog () hbnt->pack_start (name_template_entry, true, true); #endif - VBox* vb2 = manage (new VBox); - - vb2->set_border_width (12); - vb2->set_spacing (6); - vb2->pack_start (*hbrb, false, false); - vb2->pack_start (*vbcc, false, false); -#if NOT_USEFUL_YET - vb2->pack_start (*hbnt, false, false); -#endif - get_vbox()->pack_start (*hbrb, false, false); - get_vbox()->pack_start (*vbcc, false, false); + get_vbox()->pack_start (*(manage (new Label ("Channel configuration"))), false, false); + get_vbox()->pack_start (channel_combo, false, false); #if NOT_USEFUL_YET get_vbox()->pack_start (*hbnt, false, false); #endif - + + get_vbox()->show_all (); + add_button (Stock::OK, RESPONSE_ACCEPT); add_button (Stock::CANCEL, RESPONSE_CANCEL); } diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index f0c91ce89d..32fefe664d 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -83,7 +83,7 @@ Editor::initialize_canvas () { ArdourCanvas::init (); ardour_canvas_type_init (); - + /* don't try to center the canvas */ track_canvas.set_center_scroll_region (false);