packaging tweaks for OS X

[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 acc4eefbcc1c448163b18d576136d2c72d50c2b4..3e2c497475422dfa88a0c592bcc6e427e4ca4586 100644 (file)
--- a/gtk2_ardour/route_group_dialog.cc
+++ b/gtk2_ardour/route_group_dialog.cc
@@ -33,7 +33,7 @@ using namespace std;
 using namespace PBD;
 
 RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new)
-       : ArdourDialog (_("Route Group"))
+       : ArdourDialog (_("Track/bus Group"))
        , _group (g)
        , _initial_name (g->name ())
        , _active (_("Active"))
@@ -44,11 +44,13 @@ RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new)
        , _rec_enable (_("Record enable"))
        , _select (_("Selection"))
        , _edit (_("Editing"))
-       , _route_active (_("Route active state"))
+       , _route_active (_("Active state"))
+       , _share_color (_("Color"))
+       , _share_monitoring (_("Monitoring"))
 {
        set_modal (true);
        set_skip_taskbar_hint (true);
-       set_resizable (false);
+       set_resizable (true);
        set_position (Gtk::WIN_POS_MOUSE);
        set_name (N_("RouteGroupDialog"));
 
@@ -73,10 +75,18 @@ RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new)
        top_vbox->pack_start (*hbox, false, true);
        top_vbox->pack_start (_active);
 
+       l = manage (new Label (_("Color"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+       hbox = manage (new HBox);
+       hbox->set_spacing (12);
+       hbox->pack_start (*l, false, false);
+       hbox->pack_start (_color, false, false);
+       top_vbox->pack_start (*hbox, false, false);
+       
        main_vbox->pack_start (*top_vbox, false, false);
 
        _name.set_text (_group->name ());
        _active.set_active (_group->is_active ());
+       _color.set_color (GroupTabs::group_color (_group));
 
        VBox* options_box = manage (new VBox);
        options_box->set_spacing (6);
@@ -95,10 +105,12 @@ RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new)
        _select.set_active (_group->is_select());
        _edit.set_active (_group->is_edit());
        _route_active.set_active (_group->is_route_active());
-       _color.set_color (GroupTabs::group_color (_group));
+       _share_color.set_active (_group->is_color());
+       _share_monitoring.set_active (_group->is_monitoring());
 
        _name.signal_changed().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
        _active.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
+       _color.signal_color_set().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
        _gain.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
        _relative.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
        _mute.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
@@ -107,11 +119,12 @@ RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new)
        _select.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
        _edit.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
        _route_active.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
-       _color.signal_color_set().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
-
+       _share_color.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
+       _share_monitoring.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
+       
        gain_toggled ();
 
-       Table* table = manage (new Table (11, 4, false));
+       Table* table = manage (new Table (12, 4, false));
        table->set_row_spacings (6);
 
        l = manage (new Label ("", Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
@@ -131,12 +144,8 @@ RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new)
        table->attach (_select, 1, 3, 6, 7, Gtk::FILL, Gtk::FILL, 0, 0);
        table->attach (_edit, 1, 3, 7, 8, Gtk::FILL, Gtk::FILL, 0, 0);
        table->attach (_route_active, 1, 3, 8, 9, Gtk::FILL, Gtk::FILL, 0, 0);
-
-       HBox* b = manage (new HBox);
-       l = manage (new Label (_("Color"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
-       b->pack_start (*l, Gtk::SHRINK, Gtk::SHRINK);
-       b->pack_start (_color, Gtk::FILL, Gtk::FILL);
-       table->attach (*b, 1, 3, 10, 11, Gtk::FILL, Gtk::FILL, 0, 0);
+       table->attach (_share_color, 1, 3, 9, 10, Gtk::FILL, Gtk::FILL, 0, 0);
+       table->attach (_share_monitoring, 1, 3, 10, 11, Gtk::FILL, Gtk::FILL, 0, 0);
 
        options_box->pack_start (*table, false, true);
        main_vbox->pack_start (*options_box, false, true);
@@ -204,10 +213,12 @@ RouteGroupDialog::update ()
        plist.add (Properties::relative, _relative.get_active());
        plist.add (Properties::active, _active.get_active());
        plist.add (Properties::name, string (_name.get_text()));
+       plist.add (Properties::color, _share_color.get_active());
+       plist.add (Properties::monitoring, _share_monitoring.get_active());
 
-       GroupTabs::set_group_color (_group, _color.get_color ());
-       
        _group->apply_changes (plist);
+       
+       GroupTabs::set_group_color (_group, _color.get_color ());
 }
 
 void