X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fexport_format_dialog.cc;h=d93eb23a2a20efdef2787c31c47c360b1f642c71;hb=04416e2d1df3cc8d9f014765e5ca5ce818b7b4d7;hp=e0f6d51216e13805f6ba5c61455f429ac6e71c1d;hpb=e58e614f2046bf6275a99c24c74a5795b6680a1f;p=ardour.git

diff --git a/gtk2_ardour/export_format_dialog.cc b/gtk2_ardour/export_format_dialog.cc
index e0f6d51216..d93eb23a2a 100644
--- a/gtk2_ardour/export_format_dialog.cc
+++ b/gtk2_ardour/export_format_dialog.cc
@@ -36,6 +36,7 @@ ExportFormatDialog::ExportFormatDialog (FormatPtr format, bool new_dialog) :
   applying_changes_from_engine (0),
 
   name_label (_("Label: "), Gtk::ALIGN_LEFT),
+  name_generated_part ("", Gtk::ALIGN_LEFT),
 
   normalize_checkbox (_("Normalize to:")),
   normalize_adjustment (0.00, -90.00, 0.00, 0.1, 0.2),
@@ -72,16 +73,22 @@ ExportFormatDialog::ExportFormatDialog (FormatPtr format, bool new_dialog) :
 
 	/* Pack containers in dialog */
 
-	get_vbox()->pack_start (name_hbox, false, false, 0);
 	get_vbox()->pack_start (silence_table, false, false, 6);
 	get_vbox()->pack_start (format_table, false, false, 6);
 	get_vbox()->pack_start (encoding_options_vbox, false, false, 0);
 	get_vbox()->pack_start (cue_toc_vbox, false, false, 0);
+	get_vbox()->pack_start (name_hbox, false, false, 6);
 
 	/* Name, new and remove */
 
 	name_hbox.pack_start (name_label, false, false, 0);
-	name_hbox.pack_start (name_entry, true, true, 0);
+	name_hbox.pack_start (name_entry, false, false, 0);
+	name_hbox.pack_start (name_generated_part, true, true, 0);
+	name_entry.set_width_chars(20);
+	update_description();
+	manager.DescriptionChanged.connect(
+		*this, invalidator (*this),
+		boost::bind (&ExportFormatDialog::update_description, this), gui_context());
 
 	/* Normalize */
 
@@ -710,6 +717,16 @@ ExportFormatDialog::update_with_toc ()
 	manager.select_with_toc (with_toc.get_active());
 }
 
+void
+ExportFormatDialog::update_description()
+{
+	std::string text;
+	if (format->is_complete()) {
+		text = ": " + format->description(false);
+	}
+	name_generated_part.set_text(text);
+}
+
 void
 ExportFormatDialog::update_name ()
 {