fix background of ArdourButtons with no Body

[ardour.git] / gtk2_ardour / add_route_dialog.cc

diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc
index 79414f7cd0f6ee6d15382816d66a238cae6055c1..b01faaf05f5bed9f8fb9032b326005b2991c75d1 100644 (file)
--- a/gtk2_ardour/add_route_dialog.cc
+++ b/gtk2_ardour/add_route_dialog.cc
@@ -28,13 +28,16 @@
 
 #include "pbd/error.h"
 #include "pbd/convert.h"
+
 #include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/doi.h"
 
 #include "ardour/plugin_manager.h"
 #include "ardour/profile.h"
 #include "ardour/template_utils.h"
 #include "ardour/route_group.h"
 #include "ardour/session.h"
+#include "ardour/vca.h"
 
 #include "utils.h"
 #include "add_route_dialog.h"
@@ -60,21 +63,17 @@ AddRouteDialog::AddRouteDialog ()
        , instrument_label (_("Instrument:"))
 {
        set_name ("AddRouteDialog");
-       set_modal (true);
        set_skip_taskbar_hint (true);
        set_resizable (false);
+       set_position (WIN_POS_MOUSE);
 
        name_template_entry.set_name (X_("AddRouteDialogNameTemplateEntry"));
        // routes_spinner.set_name (X_("AddRouteDialogSpinner"));
        channel_combo.set_name (X_("ChannelCountSelector"));
        mode_combo.set_name (X_("ChannelCountSelector"));
 
-       refill_channel_setups ();
-       refill_route_groups ();
        refill_track_modes ();
 
-       channel_combo.set_active_text (channel_combo_strings.front());
-
        track_bus_combo.append_text (_("Audio Tracks"));
        track_bus_combo.append_text (_("MIDI Tracks"));
        track_bus_combo.append_text (_("Audio+MIDI Tracks"));
@@ -238,7 +237,7 @@ AddRouteDialog::maybe_update_name_template_entry ()
 {
        if (
                name_template_entry.get_text() != "" &&
-               name_template_entry.get_text() != _("VCA") &&
+               name_template_entry.get_text() != VCA::default_name_template() &&
                name_template_entry.get_text() != _("Audio") &&
                name_template_entry.get_text() != _("MIDI")  &&
                name_template_entry.get_text() != _("Audio+MIDI")  &&
@@ -264,7 +263,7 @@ AddRouteDialog::maybe_update_name_template_entry ()
                name_template_entry.set_text (_("Bus"));
                break;
        case VCAMaster:
-               name_template_entry.set_text (_("VCA"));
+               name_template_entry.set_text (VCA::default_name_template());
                break;
        }
 }
@@ -292,7 +291,7 @@ AddRouteDialog::track_type_chosen ()
                route_group_combo.set_sensitive (true);
                break;
        case MixedTrack:
-               {
+               {
                        MessageDialog msg (_("Audio+MIDI tracks are intended for use <b>ONLY</b> with plugins that use both audio and MIDI input data\n\n"
                                             "If you do not plan to use such a plugin, then use a normal audio or MIDI track instead."),
                                           true, MESSAGE_INFO, BUTTONS_OK, true);
@@ -354,7 +353,7 @@ AddRouteDialog::name_template_is_default() const
            n == _("MIDI") ||
            n == _("Audio+MIDI") ||
            n == _("Bus") ||
-           n == _("VCA")) {
+           n == VCA::default_name_template()) {
                return true;
        }
 
@@ -469,6 +468,9 @@ AddRouteDialog::refill_channel_setups ()
        ChannelSetup chn;
 
        route_templates.clear ();
+
+       string channel_current_choice = channel_combo.get_active_text();
+
        channel_combo_strings.clear ();
        channel_setups.clear ();
 
@@ -532,7 +534,12 @@ AddRouteDialog::refill_channel_setups ()
        }
 
        set_popdown_strings (channel_combo, channel_combo_strings);
-       channel_combo.set_active_text (channel_combo_strings.front());
+
+       if (!channel_current_choice.empty()) {
+               channel_combo.set_active_text (channel_current_choice);
+       } else {
+               channel_combo.set_active_text (channel_combo_strings.front());
+       }
 }
 
 void
@@ -578,19 +585,34 @@ AddRouteDialog::group_changed ()
 {
        if (_session && route_group_combo.get_active_text () == _("New Group...")) {
                RouteGroup* g = new RouteGroup (*_session, "");
-               RouteGroupDialog d (g, true);
-
-               if (d.do_run ()) {
-                       delete g;
-                       route_group_combo.set_active (2);
-               } else {
-                       if (_session) {
-                               _session->add_route_group (g);
-                       }
-                       add_route_group (g);
-                       route_group_combo.set_active (3);
+               RouteGroupDialog* d = new RouteGroupDialog (g, true);
+
+               d->signal_response().connect (sigc::bind (sigc::mem_fun (*this, &AddRouteDialog::new_group_dialog_finished), d));
+               d->present();
+       }
+}
+
+void
+AddRouteDialog::new_group_dialog_finished (int r, RouteGroupDialog* d)
+{
+       if (r == RESPONSE_OK) {
+
+               if (!d->name_check()) {
+                       return;
                }
+
+               if (_session) {
+                       _session->add_route_group (d->group());
+               }
+
+               add_route_group (d->group());
+               route_group_combo.set_active (3);
+       } else {
+               delete d->group ();
+               route_group_combo.set_active (2);
        }
+
+       delete_when_idle (d);
 }
 
 AddRouteDialog::InsertAt