track templates; indent fixes needed and will be forthcoming; minor fix for the curvetest hack

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4565 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 122 insertions, 31 deletions

diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc
index d5e207ad79..d3da0d5893 100644
--- a/gtk2_ardour/add_route_dialog.cc
+++ b/gtk2_ardour/add_route_dialog.cc
@@ -22,10 +22,12 @@
 
 #include <sigc++/bind.h>
 #include <gtkmm/stock.h>
+#include <gtkmm/separator.h>
 #include <pbd/error.h>
 #include <pbd/convert.h>
 #include <gtkmm2ext/utils.h>
 #include <ardour/profile.h>
+#include <ardour/session.h>
 
 #include "utils.h"
 #include "add_route_dialog.h"
@@ -36,6 +38,7 @@ using namespace Gtkmm2ext;
 using namespace sigc;
 using namespace std;
 using namespace PBD;
+using namespace ARDOUR;
 
 static const char* channel_setup_names[] = {
 	N_("Mono"),
@@ -62,6 +65,7 @@ AddRouteDialog::AddRouteDialog ()
 	: Dialog (_("ardour: add track/bus")),
 	  track_button (_("Tracks")),
 	  bus_button (_("Busses")),
+	  template_button (_("Using this template:")),
 	  routes_adjustment (1, 1, 128, 1, 4),
 	  routes_spinner (routes_adjustment)
 {
@@ -89,6 +93,8 @@ AddRouteDialog::AddRouteDialog ()
 			}
 		}
 	}
+	
+	refill_track_templates ();
 
 	set_name ("AddRouteDialog");
 	set_wmclass (X_("ardour_add_track_bus"), "Ardour");
@@ -98,22 +104,54 @@ AddRouteDialog::AddRouteDialog ()
 	name_template_entry.set_name ("AddRouteDialogNameTemplateEntry");
 	track_button.set_name ("AddRouteDialogRadioButton");
 	bus_button.set_name ("AddRouteDialogRadioButton");
+	template_button.set_name ("AddRouteDialogRadioButton");
 	routes_spinner.set_name ("AddRouteDialogSpinner");
 	
 	RadioButton::Group g = track_button.get_group();
 	bus_button.set_group (g);
+	template_button.set_group (g);
 	track_button.set_active (true);
 
-	HBox *hbrb = manage (new HBox);
+	/* add */
+
+	HBox* hbox1 = manage (new HBox);
+	hbox1->set_spacing (6);
+	Label* label1 = manage (new Label (_("Add this many:")));
+	hbox1->pack_start (*label1, PACK_SHRINK);
+	hbox1->pack_start (routes_spinner, PACK_SHRINK);
+
+	HBox* hbox2 = manage (new HBox);
+	hbox2->set_spacing (6);
+	hbox2->set_border_width (6);
+	hbox2->pack_start (*hbox1, PACK_EXPAND_WIDGET);
+
+	/* templates */
+
+	HBox* hbox3 = manage (new HBox);
+	hbox3->set_spacing (6);
+	hbox3->set_border_width (6);
+	hbox3->pack_start (template_button, PACK_SHRINK);
+
+	HBox* hbox9 = manage (new HBox);
+	hbox9->set_spacing (6);
+	hbox9->set_border_width (6);
+	hbox9->pack_start (track_template_combo, PACK_EXPAND_WIDGET);
+	
+	/* separator */
 
-	hbrb->set_spacing (6);
-	hbrb->pack_start (routes_spinner, true, false, 5);
-	hbrb->pack_start (track_button, true, false, 5);
-	hbrb->pack_start (bus_button, true, false, 5);
+	HBox* hbox4 = manage (new HBox);
+	hbox4->set_spacing (6);
+	Label* label2 = manage (new Label (_("OR")));
+	hbox4->pack_start (*(manage (new HSeparator)), PACK_EXPAND_WIDGET);
+	hbox4->pack_start (*label2, false, false);
+	hbox4->pack_start (*(manage (new HSeparator)), PACK_EXPAND_WIDGET);
 
-	aframe.set_label (_("Add"));
-	aframe.set_shadow_type (SHADOW_IN);
-	aframe.add (*hbrb);
+	/* track/bus choice & modes */
+
+	HBox* hbox5 = manage (new HBox);
+	hbox5->set_spacing (6);
+	hbox5->pack_start (track_button, PACK_EXPAND_PADDING);
+	hbox5->pack_start (bus_button, PACK_EXPAND_PADDING);
 
 	set_popdown_strings (channel_combo, channel_combo_strings);
 	set_popdown_strings (track_mode_combo, track_mode_strings);
@@ -122,40 +160,44 @@ AddRouteDialog::AddRouteDialog ()
 
 	track_button.signal_clicked().connect (mem_fun (*this, &AddRouteDialog::track_type_chosen));
 	bus_button.signal_clicked().connect (mem_fun (*this, &AddRouteDialog::track_type_chosen));
+	template_button.signal_clicked().connect (mem_fun (*this, &AddRouteDialog::track_type_chosen));
 
 	track_mode_combo.set_active_text (track_mode_strings.front());
 	track_mode_combo.set_name (X_("ChannelCountSelector"));
 	
-#if NOT_USEFUL_YET
-	HBox *hbnt = manage (new HBox);
+	VBox* vbox1 = manage (new VBox);
+	vbox1->set_spacing (6);
+	vbox1->set_border_width (6);
 
-	hbnt->pack_start (*(manage (new Label (_("Name (template)")))), false, false);
-	hbnt->pack_start (name_template_entry, true, true);
-#endif
-	VBox *dvbox = manage (new VBox);
-	HBox *dhbox = manage (new HBox);
+	Frame* frame1 = manage (new Frame (_("Channel Configuration")));
+	frame1->add (channel_combo);
+	Frame* frame2 = manage (new Frame (_("Track Mode")));
+	frame2->add (track_mode_combo);
 
-	ccframe.set_label (_("Channel Configuration"));
-	ccframe.set_shadow_type (SHADOW_IN);
+	vbox1->pack_start (*hbox5, PACK_SHRINK);
+	vbox1->pack_start (*frame1, PACK_SHRINK);
 
-	dvbox->pack_start (channel_combo, true, false, 5);
 	if (!ARDOUR::Profile->get_sae()) {
-		dvbox->pack_start (track_mode_combo, true, false, 5);
+	  vbox1->pack_start (*frame2, PACK_SHRINK);
 	}
-	dhbox->pack_start (*dvbox, true, false, 5);
 
-	ccframe.add (*dhbox);
+	get_vbox()->set_spacing (6);
+	get_vbox()->set_border_width (6);
 
-	get_vbox()->pack_start (aframe, true, false, 10);
-	get_vbox()->pack_start (ccframe, true, false);
-#if NOT_USEFUL_YET
-	get_vbox()->pack_start (*hbnt, false, false);
-#endif
+	get_vbox()->pack_start (*hbox2, PACK_SHRINK);
+	if (!route_templates.empty()) {
+	  get_vbox()->pack_start (*hbox3, PACK_SHRINK);
+	  get_vbox()->pack_start (*hbox9, PACK_SHRINK);
+	  get_vbox()->pack_start (*hbox4, PACK_SHRINK);
+	}
+	get_vbox()->pack_start (*vbox1, PACK_SHRINK);
 
 	get_vbox()->show_all ();
 
 	add_button (Stock::CANCEL, RESPONSE_CANCEL);
 	add_button (Stock::ADD, RESPONSE_ACCEPT);
+
+	track_type_chosen ();
 }
 
 AddRouteDialog::~AddRouteDialog ()
@@ -165,11 +207,19 @@ AddRouteDialog::~AddRouteDialog ()
 void
 AddRouteDialog::track_type_chosen ()
 {
-	if (track_button.get_active()) {
-		track_mode_combo.set_sensitive (true);
-	} else {
-		track_mode_combo.set_sensitive (false);
-	}
+  if (template_button.get_active()) {
+    track_mode_combo.set_sensitive (false);
+    channel_combo.set_sensitive (false);
+    track_template_combo.set_sensitive (true);
+  } else {
+    track_template_combo.set_sensitive (false);
+    channel_combo.set_sensitive (true);
+    if (track_button.get_active()) {
+      track_mode_combo.set_sensitive (true);
+    } else {
+      track_mode_combo.set_sensitive (false);
+    }
+  }
 }
 
 bool
@@ -228,3 +278,44 @@ AddRouteDialog::channels ()
 	return 0;
 }
 
+string
+AddRouteDialog::track_template ()
+{
+  if (!template_button.get_active()) {
+    return string ();
+  }
+
+  string str = track_template_combo.get_active_text();
+
+  for (vector<Session::RouteTemplateInfo>::iterator x = route_templates.begin(); x != route_templates.end(); ++x) {
+    if ((*x).name == str) {
+      return (*x).path;
+    }
+  }
+
+  return string();
+}
+
+bool
+AddRouteDialog::on_map_event (GdkEventAny *ev)
+{
+  refill_track_templates ();
+  return Dialog::on_map_event (ev);
+}
+
+void
+AddRouteDialog::refill_track_templates ()
+{
+  route_templates.clear ();
+  Session::get_route_templates (route_templates);
+  
+  
+  if (!route_templates.empty()) {
+    vector<string> v;
+    for (vector<Session::RouteTemplateInfo>::iterator x = route_templates.begin(); x != route_templates.end(); ++x) {
+      v.push_back ((*x).name);
+    }
+    set_popdown_strings (track_template_combo, v);
+    track_template_combo.set_active_text (v.front());
+  } 
+}