Make Route Group dialog instant-apply. Disallow identically-named route group; fixes...

git-svn-id: svn://localhost/ardour2/branches/3.0@8481 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc
index 3330b14b9257c77b9cbe1436da0895597f0f9361..2b91cebff91a1308a94bac6fd840d5775aa6c3d2 100644 (file)
--- a/gtk2_ardour/add_route_dialog.cc
+++ b/gtk2_ardour/add_route_dialog.cc
@@ -399,17 +399,15 @@ AddRouteDialog::group_changed ()
                plist.add (Properties::active, true);
                g->apply_changes (plist);
 
-               RouteGroupDialog d (g, Gtk::Stock::NEW);
-               int const r = d.do_run ();
+               RouteGroupDialog d (g, true);
 
-               if (r == Gtk::RESPONSE_OK) {
+               if (d.do_run ()) {
+                       delete g;
+                       route_group_combo.set_active (2);
+               } else {
                        _session->add_route_group (g);
                        add_route_group (g);
                        route_group_combo.set_active (3);
-               } else {
-                       delete g;
-
-                       route_group_combo.set_active (2);
                }
        }
 }

diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc
index e1ac807b8afc5ac54e00e8a7f409fa757f438f18..297698e85c9d27e14d27bc1e4f8ab6b19de9ef41 100644 (file)
--- a/gtk2_ardour/group_tabs.cc
+++ b/gtk2_ardour/group_tabs.cc
@@ -173,7 +173,7 @@ GroupTabs::on_button_release_event (GdkEventButton* ev)
                        if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
                                
                                /* edit */
-                               RouteGroupDialog d (_dragging->group, Gtk::Stock::APPLY);
+                               RouteGroupDialog d (_dragging->group, false);
                                d.do_run ();
                                
                        } else {
@@ -374,7 +374,6 @@ GroupTabs::new_from_soloed ()
        }
 
        run_new_group_dialog (soloed);
-
 }
 
 void
@@ -383,19 +382,15 @@ GroupTabs::run_new_group_dialog (RouteList const & rl)
        RouteGroup* g = new RouteGroup (*_session, "");
        g->apply_changes (default_properties ());
 
-       RouteGroupDialog d (g, Gtk::Stock::NEW);
-       int const r = d.do_run ();
+       RouteGroupDialog d (g, true);
 
-       switch (r) {
-       case Gtk::RESPONSE_OK:
-       case Gtk::RESPONSE_ACCEPT:
+       if (d.do_run ()) {
+               delete g;
+       } else {
                _session->add_route_group (g);
                for (RouteList::const_iterator i = rl.begin(); i != rl.end(); ++i) {
                        g->add (*i);
                }
-               break;
-       default:
-               delete g;
        }
 }
 
@@ -406,10 +401,9 @@ GroupTabs::create_and_add_group () const
 
        g->apply_changes (default_properties ());
 
-       RouteGroupDialog d (g, Gtk::Stock::NEW);
-       int const r = d.do_run ();
+       RouteGroupDialog d (g, true);
 
-       if (r != Gtk::RESPONSE_OK) {
+       if (d.do_run ()) {
                delete g;
                return 0;
        }
@@ -421,7 +415,7 @@ GroupTabs::create_and_add_group () const
 void
 GroupTabs::edit_group (RouteGroup* g)
 {
-       RouteGroupDialog d (g, Gtk::Stock::APPLY);
+       RouteGroupDialog d (g, false);
        d.do_run ();
 }
 

diff --git a/gtk2_ardour/route_group_dialog.cc b/gtk2_ardour/route_group_dialog.cc
index a65807d75da6d242b13dd6f1851339e41e8a210a..a807741d1df7b0dab5b54cf95a40c94058132d83 100644 (file)
--- a/gtk2_ardour/route_group_dialog.cc
+++ b/gtk2_ardour/route_group_dialog.cc
@@ -19,7 +19,9 @@
 
 #include <gtkmm/table.h>
 #include <gtkmm/stock.h>
+#include <gtkmm/messagedialog.h>
 #include "ardour/route_group.h"
+#include "ardour/session.h"
 #include "route_group_dialog.h"
 #include "i18n.h"
 #include <iostream>
@@ -29,17 +31,18 @@ using namespace ARDOUR;
 using namespace std;
 using namespace PBD;
 
-RouteGroupDialog::RouteGroupDialog (RouteGroup* g, StockID const & s)
-       : ArdourDialog (_("Route Group")),
-         _group (g),
-         _active (_("Active")),
-         _gain (_("Gain")),
-         _relative (_("Relative")),
-         _mute (_("Muting")),
-         _solo (_("Soloing")),
-         _rec_enable (_("Record enable")),
-         _select (_("Selection")),
-         _edit (_("Editing"))
+RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new)
+       : ArdourDialog (_("Route Group"))
+       , _group (g)
+       , _initial_name (g->name ())
+       , _active (_("Active"))
+       , _gain (_("Gain"))
+       , _relative (_("Relative"))
+       , _mute (_("Muting"))
+       , _solo (_("Soloing"))
+       , _rec_enable (_("Record enable"))
+       , _select (_("Selection"))
+       , _edit (_("Editing"))
 {
        set_modal (true);
        set_skip_taskbar_hint (true);
@@ -84,6 +87,16 @@ RouteGroupDialog::RouteGroupDialog (RouteGroup* g, StockID const & s)
        _select.set_active (_group->is_select());
        _edit.set_active (_group->is_edit());
 
+       _name.signal_changed().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
+       _active.signal_toggled().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));
+       _solo.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
+       _rec_enable.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
+       _select.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
+       _edit.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
+
        gain_toggled ();
 
        Table* table = manage (new Table (8, 3, false));
@@ -114,36 +127,61 @@ RouteGroupDialog::RouteGroupDialog (RouteGroup* g, StockID const & s)
 
        _gain.signal_toggled().connect(sigc::mem_fun (*this, &RouteGroupDialog::gain_toggled));
 
-       add_button (Stock::CANCEL, RESPONSE_CANCEL);
-       add_button (s, RESPONSE_OK);
-       set_default_response (RESPONSE_OK);
-
+       if (creating_new) {
+               add_button (Stock::CANCEL, RESPONSE_CANCEL);
+               add_button (Stock::NEW, RESPONSE_OK);
+               set_default_response (RESPONSE_OK);
+       } else {
+               add_button (Stock::CLOSE, RESPONSE_CLOSE);
+               set_default_response (RESPONSE_CLOSE);
+       }
+       
        show_all_children ();
 }
 
-int
+/** @return true if the route group edit was cancelled, otherwise false */
+bool
 RouteGroupDialog::do_run ()
 {
-       int const r = run ();
-
-       if (r == Gtk::RESPONSE_OK || r == Gtk::RESPONSE_ACCEPT) {
-
-               PropertyList plist;
-
-               plist.add (Properties::gain, _gain.get_active());
-               plist.add (Properties::recenable, _rec_enable.get_active());
-               plist.add (Properties::mute, _mute.get_active());
-               plist.add (Properties::solo, _solo.get_active ());
-               plist.add (Properties::select, _select.get_active());
-               plist.add (Properties::edit, _edit.get_active());
-               plist.add (Properties::relative, _relative.get_active());
-               plist.add (Properties::active, _active.get_active());
-               plist.add (Properties::name, string (_name.get_text()));
-
-               _group->apply_changes (plist);
+       while (1) {
+               int const r = run ();
+
+               if (unique_name ()) {
+                       return (r == Gtk::RESPONSE_CANCEL);
+               }
+       
+               _group->set_name (_initial_name);
+               MessageDialog msg (
+                       _("A route group of this name already exists.  Please use a different name."),
+                       false,
+                       Gtk::MESSAGE_ERROR,
+                       Gtk::BUTTONS_OK,
+                       true
+                       );
+               
+               msg.run ();
        }
 
-       return r;
+       /* NOTREACHED */
+       return false;
+}
+
+void
+RouteGroupDialog::update ()
+{
+       PropertyList plist;
+
+       plist.add (Properties::gain, _gain.get_active());
+       plist.add (Properties::recenable, _rec_enable.get_active());
+       plist.add (Properties::mute, _mute.get_active());
+       plist.add (Properties::solo, _solo.get_active ());
+       plist.add (Properties::select, _select.get_active());
+       plist.add (Properties::edit, _edit.get_active());
+       plist.add (Properties::relative, _relative.get_active());
+       plist.add (Properties::active, _active.get_active());
+       plist.add (Properties::name, string (_name.get_text()));
+
+       _group->apply_changes (plist);
 }
 
 void
@@ -152,3 +190,15 @@ RouteGroupDialog::gain_toggled ()
        _relative.set_sensitive (_gain.get_active ());
 }
 
+/** @return true if the current group's name is unique accross the session */
+bool
+RouteGroupDialog::unique_name () const
+{
+       list<RouteGroup*> route_groups = _group->session().route_groups ();
+       list<RouteGroup*>::iterator i = route_groups.begin ();
+       while (i != route_groups.end() && ((*i)->name() != _name.get_text() || *i == _group)) {
+               ++i;
+       }
+
+       return (i == route_groups.end ());
+}

diff --git a/gtk2_ardour/route_group_dialog.h b/gtk2_ardour/route_group_dialog.h
index 35080ba21f8497fc2db718cc559f5981dad2791d..20ae0384e9281b41ae495921e985e4926f5c930e 100644 (file)
--- a/gtk2_ardour/route_group_dialog.h
+++ b/gtk2_ardour/route_group_dialog.h
@@ -29,12 +29,13 @@
 class RouteGroupDialog : public ArdourDialog
 {
 public:
-       RouteGroupDialog (ARDOUR::RouteGroup *, Gtk::StockID const &);
-
-       int do_run ();
+       RouteGroupDialog (ARDOUR::RouteGroup *, bool);
 
+       bool do_run ();
+       
 private:
        ARDOUR::RouteGroup* _group;
+       std::string _initial_name;
 
        Gtk::Entry _name;
        Gtk::CheckButton _active;
@@ -45,8 +46,11 @@ private:
        Gtk::CheckButton _rec_enable;
        Gtk::CheckButton _select;
        Gtk::CheckButton _edit;
+       Gtk::Button* _ok;
 
        void gain_toggled ();
+       void update ();
+       bool unique_name () const;
 };
 
 

diff --git a/gtk2_ardour/route_group_menu.cc b/gtk2_ardour/route_group_menu.cc
index 544e730c8271f97aa4d8357923a9d42b77a3db3b..123d925a8e8e7dc699ec7753c6664c578158b53d 100644 (file)
--- a/gtk2_ardour/route_group_menu.cc
+++ b/gtk2_ardour/route_group_menu.cc
@@ -113,13 +113,12 @@ RouteGroupMenu::new_group ()
        RouteGroup* g = new RouteGroup (*_session, "");
        g->apply_changes (*_default_properties);
 
-       RouteGroupDialog d (g, Gtk::Stock::NEW);
-       int const r = d.do_run ();
+       RouteGroupDialog d (g, true);
 
-       if (r == Gtk::RESPONSE_OK) {
+       if (d.do_run ()) {
+               delete g;
+       } else {
                _session->add_route_group (g);
                set_group (g);
-       } else {
-               delete g;
        }
 }

diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index d7aef0960ed8cb7835f03b5b629290b92512f037..c63e6e3ebed41ddc5578c30d08baf5b3df6b1952 100644 (file)
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -409,6 +409,10 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
                }
        }
 
+       std::list<RouteGroup*> const & route_groups () const {
+               return _route_groups;
+       }
+
        /* fundamental operations. duh. */
 
        std::list<boost::shared_ptr<AudioTrack> > new_audio_track (