X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fsave_template_dialog.cc;h=bf09e3334363d9d05778a960e47e48f06bc3dc03;hb=69194df4d9a2f985423eca7d44c3d3292cc8baad;hp=ed803bf405c8b350047e9738bd5f5eef5e20d9b7;hpb=ae51d5fd4ebb90f782334ac0b4addc0c88e1629c;p=ardour.git

diff --git a/gtk2_ardour/save_template_dialog.cc b/gtk2_ardour/save_template_dialog.cc
index ed803bf405..bf09e33343 100644
--- a/gtk2_ardour/save_template_dialog.cc
+++ b/gtk2_ardour/save_template_dialog.cc
@@ -23,18 +23,20 @@
 #include <gtkmm/label.h>
 #include <gtkmm/stock.h>
 
-#include "pbd/i18n.h"
 #include "ardour/session.h"
 
 #include "save_template_dialog.h"
 
+#include "pbd/i18n.h"
+
 using namespace Gtk;
 using namespace ARDOUR;
 
-SaveTemplateDialog::SaveTemplateDialog (const Session& s)
+SaveTemplateDialog::SaveTemplateDialog (const std::string& name, const std::string& desc)
 	: ArdourDialog (_("Save as template"))
 {
-	_name_editor.get_buffer()->set_text (s.name() + _("-template"));
+	_name_entry.get_buffer()->set_text (name);
+	_description_editor.get_buffer()->set_text (desc);
 	_description_editor.set_wrap_mode (Gtk::WRAP_WORD);
 	_description_editor.set_size_request(400, 300);
 
@@ -42,7 +44,7 @@ SaveTemplateDialog::SaveTemplateDialog (const Session& s)
 	hb->set_spacing (8);
 	Label* lb = manage (new Label(_("Template name:")));
 	hb->pack_start (*lb, false, true);
-	hb->pack_start (_name_editor, true, true);
+	hb->pack_start (_name_entry, true, true);
 
 	Frame* fd = manage (new Frame(_("Description:")));
 	fd->add (_description_editor);
@@ -61,11 +63,17 @@ SaveTemplateDialog::SaveTemplateDialog (const Session& s)
 std::string
 SaveTemplateDialog::get_template_name () const
 {
-	return _name_editor.get_buffer()->get_text();
+	return _name_entry.get_buffer()->get_text();
 }
 
 std::string
 SaveTemplateDialog::get_description () const
 {
-	return _description_editor.get_buffer()->get_text();
+	std::string desc_txt = _description_editor.get_buffer()->get_text ();
+	std::string::reverse_iterator wss = desc_txt.rbegin();
+	while (wss != desc_txt.rend() && isspace (*wss)) {
+		desc_txt.erase (--(wss++).base());
+	}
+
+	return desc_txt;
 }