Move active checkbutton out of the sharing section of the dialogue.

[ardour.git] / gtk2_ardour / route_group_dialog.cc

diff --git a/gtk2_ardour/route_group_dialog.cc b/gtk2_ardour/route_group_dialog.cc
index 94a36d1605f1397c4a25f8a7d576b74214066a01..9d58ea816ce0e66dfc808abb7a20dd9542baca6d 100644 (file)
--- a/gtk2_ardour/route_group_dialog.cc
+++ b/gtk2_ardour/route_group_dialog.cc
@@ -51,13 +51,13 @@ RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new)
        set_position (Gtk::WIN_POS_MOUSE);
        set_name (N_("RouteGroupDialog"));
 
-       VBox* vbox = manage (new VBox);
+       VBox* main_vbox = manage (new VBox);
        Gtk::Label* l;
 
        get_vbox()->set_spacing (4);
 
-       vbox->set_spacing (18);
-       vbox->set_border_width (5);
+       main_vbox->set_spacing (18);
+       main_vbox->set_border_width (5);
 
        HBox* hbox = manage (new HBox);
        hbox->set_spacing (6);
@@ -66,18 +66,24 @@ RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new)
        hbox->pack_start (*l, false, true);
        hbox->pack_start (_name, true, true);
 
-       vbox->pack_start (*hbox, false, true);
+       VBox* top_vbox = manage (new VBox);
+       top_vbox->set_spacing (4);
+
+       top_vbox->pack_start (*hbox, false, true);
+       top_vbox->pack_start (_active);
+
+       main_vbox->pack_start (*top_vbox, false, false);
+
+       _name.set_text (_group->name ());
+       _active.set_active (_group->is_active ());
 
        VBox* options_box = manage (new VBox);
        options_box->set_spacing (6);
-
+       
        l = manage (new Label (_("<b>Sharing</b>"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false ));
        l->set_use_markup ();
        options_box->pack_start (*l, false, true);
 
-       _name.set_text (_group->name ());
-       _active.set_active (_group->is_active ());
-
        _name.signal_activate ().connect (sigc::bind (sigc::mem_fun (*this, &Dialog::response), RESPONSE_OK));
 
        _gain.set_active (_group->is_gain());
@@ -109,7 +115,6 @@ RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new)
        l->set_padding (8, 0);
        table->attach (*l, 0, 1, 0, 8, Gtk::FILL, Gtk::FILL, 0, 0);
 
-       table->attach (_active, 1, 3, 0, 1, Gtk::FILL, Gtk::FILL, 0, 0);
        table->attach (_gain, 1, 3, 1, 2, Gtk::FILL, Gtk::FILL, 0, 0);
 
        l = manage (new Label ("", Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
@@ -125,9 +130,9 @@ RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new)
        table->attach (_route_active, 1, 3, 8, 9, Gtk::FILL, Gtk::FILL, 0, 0);
 
        options_box->pack_start (*table, false, true);
-       vbox->pack_start (*options_box, false, true);
+       main_vbox->pack_start (*options_box, false, true);
 
-       get_vbox()->pack_start (*vbox, false, false);
+       get_vbox()->pack_start (*main_vbox, false, false);
 
        _gain.signal_toggled().connect(sigc::mem_fun (*this, &RouteGroupDialog::gain_toggled));