Use ISDCF name as a default export filename (#1584).

3 files changed, 5 insertions, 3 deletions

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index d3cd2b06b..331e2995a 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -908,7 +908,7 @@ private:
 
 	void jobs_export ()
 	{
-		ExportDialog* d = new ExportDialog (this);
+		ExportDialog* d = new ExportDialog (this, _film->isdcf_name(true));
 		if (d->ShowModal() == wxID_OK) {
 			shared_ptr<TranscodeJob> job (new TranscodeJob (_film));
 			job->set_encoder (
diff --git a/src/wx/export_dialog.cc b/src/wx/export_dialog.cc
index e90686216..804200596 100644
--- a/src/wx/export_dialog.cc
+++ b/src/wx/export_dialog.cc
@@ -25,6 +25,7 @@
 #include <wx/filepicker.h>
 #include <boost/bind.hpp>
 
+using std::string;
 using boost::bind;
 
 #define FORMATS 2
@@ -49,7 +50,7 @@ ExportFormat formats[] = {
 	EXPORT_FORMAT_H264_AAC
 };
 
-ExportDialog::ExportDialog (wxWindow* parent)
+ExportDialog::ExportDialog (wxWindow* parent, string name)
 	: TableDialog (parent, _("Export film"), 2, 1, true)
 {
 	add (_("Format"), true);
@@ -73,6 +74,7 @@ ExportDialog::ExportDialog (wxWindow* parent)
 
 	add (_("Output file"), true);
 	_file = new FilePickerCtrl (this, _("Select output file"), format_filters[0], false);
+	_file->SetPath (name);
 	add (_file);
 
 	for (int i = 0; i < FORMATS; ++i) {
diff --git a/src/wx/export_dialog.h b/src/wx/export_dialog.h
index 509cd60e9..3314e22da 100644
--- a/src/wx/export_dialog.h
+++ b/src/wx/export_dialog.h
@@ -28,7 +28,7 @@ class FilePickerCtrl;
 class ExportDialog : public TableDialog
 {
 public:
-	explicit ExportDialog (wxWindow* parent);
+	explicit ExportDialog (wxWindow* parent, std::string name);
 
 	boost::filesystem::path path () const;
 	ExportFormat format () const;