remove Glib::ustring from gtk2_ardour

[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 4c8c83204427060987e66bf2c8937f0f03ece430..ff5b2a1d12999de566ff807b7c3d8a984ab87c8f 100644 (file)
--- a/gtk2_ardour/add_route_dialog.cc
+++ b/gtk2_ardour/add_route_dialog.cc
@@ -40,7 +40,6 @@
 
 using namespace Gtk;
 using namespace Gtkmm2ext;
-using namespace sigc;
 using namespace std;
 using namespace PBD;
 using namespace ARDOUR;
@@ -52,13 +51,24 @@ static const char* track_mode_names[] = {
        0
 };
 
-AddRouteDialog::AddRouteDialog (Session & s)
-       : ArdourDialog (X_("add route dialog"))
-       , _session (s)
+static const char* bus_mode_names[] = {
+       N_("Aux"),
+       N_("Direct"),
+       0
+};
+
+std::vector<std::string> AddRouteDialog::channel_combo_strings;
+std::vector<std::string> AddRouteDialog::track_mode_strings;
+std::vector<std::string> AddRouteDialog::bus_mode_strings;
+
+AddRouteDialog::AddRouteDialog (Session* s)
+       : ArdourDialog (_("Add Track or Bus"))
        , routes_adjustment (1, 1, 128, 1, 4)
        , routes_spinner (routes_adjustment)
-       , track_mode_label (_("Track mode:"))
+       , mode_label (_("Track mode:"))
 {
+       set_session (s);
+
        if (track_mode_strings.empty()) {
                track_mode_strings = I18N (track_mode_names);
 
@@ -71,25 +81,27 @@ AddRouteDialog::AddRouteDialog (Session & s)
                }
        }
 
+       if (bus_mode_strings.empty()) {
+               bus_mode_strings = I18N (bus_mode_names);
+       }
+
        set_name ("AddRouteDialog");
        set_position (Gtk::WIN_POS_MOUSE);
        set_modal (true);
        set_skip_taskbar_hint (true);
        set_resizable (false);
 
-       set_title (_("Add Track/Bus"));
-
        name_template_entry.set_name (X_("AddRouteDialogNameTemplateEntry"));
        routes_spinner.set_name (X_("AddRouteDialogSpinner"));
        channel_combo.set_name (X_("ChannelCountSelector"));
-       track_mode_combo.set_name (X_("ChannelCountSelector"));
+       mode_combo.set_name (X_("ChannelCountSelector"));
 
        refill_channel_setups ();
        refill_route_groups ();
-       set_popdown_strings (track_mode_combo, track_mode_strings, true);
+       set_popdown_strings (mode_combo, track_mode_strings, true);
 
        channel_combo.set_active_text (channel_combo_strings.front());
-       track_mode_combo.set_active_text (track_mode_strings.front());
+       mode_combo.set_active_text (track_mode_strings.front());
 
        track_bus_combo.append_text (_("tracks"));
        track_bus_combo.append_text (_("busses"));
@@ -139,9 +151,9 @@ AddRouteDialog::AddRouteDialog (Session & s)
 
                /* Track mode */
 
-               track_mode_label.set_alignment (Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
-               table2->attach (track_mode_label, 1, 2, 1, 2, Gtk::FILL, Gtk::EXPAND, 0, 0);
-               table2->attach (track_mode_combo, 2, 3, 1, 2, Gtk::FILL, Gtk::EXPAND & Gtk::FILL, 0, 0);
+               mode_label.set_alignment (Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
+               table2->attach (mode_label, 1, 2, 1, 2, Gtk::FILL, Gtk::EXPAND, 0, 0);
+               table2->attach (mode_combo, 2, 3, 1, 2, Gtk::FILL, Gtk::EXPAND & Gtk::FILL, 0, 0);
 
        }
 
@@ -156,10 +168,10 @@ AddRouteDialog::AddRouteDialog (Session & s)
 
        get_vbox()->pack_start (*vbox, false, false);
 
-       track_bus_combo.signal_changed().connect (mem_fun (*this, &AddRouteDialog::track_type_chosen));
-       channel_combo.set_row_separator_func (mem_fun (*this, &AddRouteDialog::channel_separator));
-       route_group_combo.set_row_separator_func (mem_fun (*this, &AddRouteDialog::route_separator));
-       route_group_combo.signal_changed ().connect (mem_fun (*this, &AddRouteDialog::group_changed));
+       track_bus_combo.signal_changed().connect (sigc::mem_fun (*this, &AddRouteDialog::track_type_chosen));
+       channel_combo.set_row_separator_func (sigc::mem_fun (*this, &AddRouteDialog::channel_separator));
+       route_group_combo.set_row_separator_func (sigc::mem_fun (*this, &AddRouteDialog::route_separator));
+       route_group_combo.signal_changed ().connect (sigc::mem_fun (*this, &AddRouteDialog::group_changed));
 
        show_all_children ();
 
@@ -180,8 +192,16 @@ AddRouteDialog::~AddRouteDialog ()
 void
 AddRouteDialog::track_type_chosen ()
 {
-       track_mode_label.set_sensitive (track ());
-       track_mode_combo.set_sensitive (track ());
+       if (track()) {
+               mode_label.set_text (_("Track mode:"));
+               set_popdown_strings (mode_combo, track_mode_strings);
+               mode_combo.set_active_text (track_mode_strings.front());
+       } else {
+               mode_label.set_text (_("Bus type:"));
+               set_popdown_strings (mode_combo, bus_mode_strings);
+               mode_combo.set_active_text (bus_mode_strings.front());
+       }
+
 }
 
 bool
@@ -190,6 +210,12 @@ AddRouteDialog::track ()
        return track_bus_combo.get_active_row_number () == 0;
 }
 
+bool
+AddRouteDialog::aux ()
+{
+       return !track() && mode_combo.get_active_row_number () == 0;
+}
+
 ARDOUR::DataType
 AddRouteDialog::type ()
 {
@@ -217,7 +243,7 @@ AddRouteDialog::mode ()
                return ARDOUR::Normal;
        }
 
-       Glib::ustring str = track_mode_combo.get_active_text();
+       std::string str = mode_combo.get_active_text();
        if (str == _("Normal")) {
                return ARDOUR::Normal;
        } else if (str == _("Non Layered")){
@@ -338,7 +364,7 @@ AddRouteDialog::refill_channel_setups ()
                chn.channels = 12;
                channel_setups.push_back (chn);
 
-               chn.name = X_("Custom");
+               chn.name = _("Custom");
                chn.channels = 0;
                channel_setups.push_back (chn);
        }
@@ -364,7 +390,7 @@ AddRouteDialog::route_group ()
                return 0;
        }
 
-       return _session.route_group_by_name (route_group_combo.get_active_text());
+       return _session->route_group_by_name (route_group_combo.get_active_text());
 }
 
 void
@@ -377,7 +403,7 @@ AddRouteDialog::refill_route_groups ()
 
        route_group_combo.append_text (_("No group"));
 
-       _session.foreach_route_group (mem_fun (*this, &AddRouteDialog::add_route_group));
+       _session->foreach_route_group (sigc::mem_fun (*this, &AddRouteDialog::add_route_group));
 
        route_group_combo.set_active (2);
 }
@@ -385,14 +411,18 @@ AddRouteDialog::refill_route_groups ()
 void
 AddRouteDialog::group_changed ()
 {
-       if (route_group_combo.get_active_text () == _("New group...")) {
-               RouteGroup* g = new RouteGroup (_session, "", RouteGroup::Active);
+       if (_session && route_group_combo.get_active_text () == _("New group...")) {
+               RouteGroup* g = new RouteGroup (*_session, "");
+
+               PropertyList plist;
+               plist.add (Properties::active, true);
+               g->apply_changes (plist);
 
                RouteGroupDialog d (g, Gtk::Stock::NEW);
                int const r = d.do_run ();
 
                if (r == Gtk::RESPONSE_OK) {
-                       _session.add_route_group (g);
+                       _session->add_route_group (g);
                        add_route_group (g);
                        route_group_combo.set_active (3);
                } else {