X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fconfig_dialog.cc;h=0369070a7c32edd900588ec56a6b5568e775a33b;hp=5edf11c7f2d235331522779f3cfbed178e20cc49;hb=b42066b7d664ac322e6d2c79c5b0fa8bb0eb75c9;hpb=a28709f05088fea7337ca37c7854f85bf30fcaee

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 5edf11c7f..0369070a7 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -26,25 +27,27 @@
 #include "editable_list.h"
 #include "filter_dialog.h"
 #include "dir_picker_ctrl.h"
+#include "file_picker_ctrl.h"
 #include "isdcf_metadata_dialog.h"
 #include "server_dialog.h"
 #include "make_chain_dialog.h"
+#include "email_dialog.h"
+#include "name_format_editor.h"
 #include "lib/config.h"
 #include "lib/ratio.h"
 #include "lib/filter.h"
 #include "lib/dcp_content_type.h"
 #include "lib/log.h"
 #include "lib/util.h"
-#include "lib/raw_convert.h"
 #include "lib/cross.h"
 #include "lib/exceptions.h"
+#include <dcp/locale_convert.h>
 #include <dcp/exceptions.h>
 #include <dcp/certificate_chain.h>
 #include <wx/stdpaths.h>
 #include <wx/preferences.h>
-#include <wx/filepicker.h>
 #include <wx/spinctrl.h>
-#include <boost/lexical_cast.hpp>
+#include <wx/filepicker.h>
 #include <boost/filesystem.hpp>
 #include <boost/foreach.hpp>
 #include <iostream>
@@ -53,11 +56,14 @@ using std::vector;
 using std::string;
 using std::list;
 using std::cout;
+using std::pair;
+using std::make_pair;
+using std::map;
 using boost::bind;
 using boost::shared_ptr;
-using boost::lexical_cast;
 using boost::function;
 using boost::optional;
+using dcp::locale_convert;
 
 class Page
 {
@@ -157,21 +163,28 @@ private:
 		_set_language = new wxCheckBox (_panel, wxID_ANY, _("Set language"));
 		table->Add (_set_language, wxGBPosition (r, 0));
 		_language = new wxChoice (_panel, wxID_ANY);
-		_language->Append (wxT ("Deutsch"));
-		_language->Append (wxT ("English"));
-		_language->Append (wxT ("Español"));
-		_language->Append (wxT ("Français"));
-		_language->Append (wxT ("Italiano"));
-		_language->Append (wxT ("Nederlands"));
-		_language->Append (wxT ("Svenska"));
-		_language->Append (wxT ("Русский"));
-		_language->Append (wxT ("Polski"));
-		_language->Append (wxT ("Dansk"));
-		_language->Append (wxT ("Português europeu"));
+		vector<pair<string, string> > languages;
+		languages.push_back (make_pair ("Čeština", "cs_CZ"));
+		languages.push_back (make_pair ("汉语/漢語", "zh_CN"));
+		languages.push_back (make_pair ("Dansk", "da_DK"));
+		languages.push_back (make_pair ("Deutsch", "de_DE"));
+		languages.push_back (make_pair ("English", "en_GB"));
+		languages.push_back (make_pair ("Español", "es_ES"));
+		languages.push_back (make_pair ("Français", "fr_FR"));
+		languages.push_back (make_pair ("Italiano", "it_IT"));
+		languages.push_back (make_pair ("Nederlands", "nl_NL"));
+		languages.push_back (make_pair ("Русский", "ru_RU"));
+		languages.push_back (make_pair ("Polski", "pl_PL"));
+		languages.push_back (make_pair ("Português europeu", "pt_PT"));
+		languages.push_back (make_pair ("Português do Brasil", "pt_BR"));
+		languages.push_back (make_pair ("Svenska", "sv_SE"));
+		languages.push_back (make_pair ("Slovenský jazyk", "sk_SK"));
+		languages.push_back (make_pair ("українська мова", "uk_UA"));
+		checked_set (_language, languages);
 		table->Add (_language, wxGBPosition (r, 1));
 		++r;
 
-		wxStaticText* restart = add_label_to_grid_bag_sizer (
+		wxStaticText* restart = add_label_to_sizer (
 			table, _panel, _("(restart DCP-o-matic to see language changes)"), false, wxGBPosition (r, 0), wxGBSpan (1, 2)
 			);
 		wxFont font = restart->GetFont();
@@ -180,11 +193,22 @@ private:
 		restart->SetFont (font);
 		++r;
 
-		add_label_to_grid_bag_sizer (table, _panel, _("Threads to use for encoding on this host"), true, wxGBPosition (r, 0));
+		add_label_to_sizer (table, _panel, _("Threads to use for encoding on this host"), true, wxGBPosition (r, 0));
 		_num_local_encoding_threads = new wxSpinCtrl (_panel);
 		table->Add (_num_local_encoding_threads, wxGBPosition (r, 1));
 		++r;
 
+		add_label_to_sizer (table, _panel, _("Cinema and screen database file"), true, wxGBPosition (r, 0));
+		_cinemas_file = new FilePickerCtrl (_panel, _("Select cinema and screen database file"), "*.xml");
+		table->Add (_cinemas_file, wxGBPosition (r, 1));
+		++r;
+
+#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
+		_analyse_ebur128 = new wxCheckBox (_panel, wxID_ANY, _("Find integrated loudness, true peak and loudness range when analysing audio"));
+		table->Add (_analyse_ebur128, wxGBPosition (r, 0), wxGBSpan (1, 2));
+		++r;
+#endif
+
 		_automatic_audio_analysis = new wxCheckBox (_panel, wxID_ANY, _("Automatically analyse content audio"));
 		table->Add (_automatic_audio_analysis, wxGBPosition (r, 0), wxGBSpan (1, 2));
 		++r;
@@ -193,7 +217,7 @@ private:
 		table->Add (_check_for_updates, wxGBPosition (r, 0), wxGBSpan (1, 2));
 		++r;
 
-		_check_for_test_updates = new wxCheckBox (_panel, wxID_ANY, _("Check for testing updates as well as stable ones"));
+		_check_for_test_updates = new wxCheckBox (_panel, wxID_ANY, _("Check for testing updates on startup"));
 		table->Add (_check_for_test_updates, wxGBPosition (r, 0), wxGBSpan (1, 2));
 		++r;
 
@@ -211,12 +235,16 @@ private:
 		table->Add (bottom_table, wxGBPosition (r, 0), wxGBSpan (2, 2), wxEXPAND);
 		++r;
 
-		_set_language->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&GeneralPage::set_language_changed, this));
-		_language->Bind     (wxEVT_COMMAND_CHOICE_SELECTED,  boost::bind (&GeneralPage::language_changed,     this));
+		_set_language->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED,   boost::bind (&GeneralPage::set_language_changed, this));
+		_language->Bind     (wxEVT_COMMAND_CHOICE_SELECTED,    boost::bind (&GeneralPage::language_changed,     this));
+		_cinemas_file->Bind (wxEVT_COMMAND_FILEPICKER_CHANGED, boost::bind (&GeneralPage::cinemas_file_changed, this));
 
 		_num_local_encoding_threads->SetRange (1, 128);
 		_num_local_encoding_threads->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&GeneralPage::num_local_encoding_threads_changed, this));
 
+#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
+		_analyse_ebur128->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&GeneralPage::analyse_ebur128_changed, this));
+#endif
 		_automatic_audio_analysis->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&GeneralPage::automatic_audio_analysis_changed, this));
 		_check_for_updates->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&GeneralPage::check_for_updates_changed, this));
 		_check_for_test_updates->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&GeneralPage::check_for_test_updates_changed, this));
@@ -231,48 +259,53 @@ private:
 
 		checked_set (_set_language, static_cast<bool>(config->language()));
 
-		if (config->language().get_value_or ("") == "fr") {
-			checked_set (_language, 3);
-		} else if (config->language().get_value_or ("") == "it") {
-			checked_set (_language, 4);
-		} else if (config->language().get_value_or ("") == "es") {
-			checked_set (_language, 2);
-		} else if (config->language().get_value_or ("") == "sv") {
-			checked_set (_language, 6);
-		} else if (config->language().get_value_or ("") == "de") {
-			checked_set (_language, 0);
-		} else if (config->language().get_value_or ("") == "nl") {
-			checked_set (_language, 5);
-		} else if (config->language().get_value_or ("") == "ru") {
-			checked_set (_language, 7);
-		} else if (config->language().get_value_or ("") == "pl") {
-			checked_set (_language, 8);
-		} else if (config->language().get_value_or ("") == "da") {
-			checked_set (_language, 9);
-		} else if (config->language().get_value_or ("") == "pt") {
-			checked_set (_language, 10);
-		} else {
-			_language->SetSelection (1);
+		/* Backwards compatibility of config file */
+
+		map<string, string> compat_map;
+		compat_map["fr"] = "fr_FR";
+		compat_map["it"] = "it_IT";
+		compat_map["es"] = "es_ES";
+		compat_map["sv"] = "sv_SE";
+		compat_map["de"] = "de_DE";
+		compat_map["nl"] = "nl_NL";
+		compat_map["ru"] = "ru_RU";
+		compat_map["pl"] = "pl_PL";
+		compat_map["da"] = "da_DK";
+		compat_map["pt"] = "pt_PT";
+		compat_map["sk"] = "sk_SK";
+		compat_map["cs"] = "cs_CZ";
+		compat_map["uk"] = "uk_UA";
+
+		string lang = config->language().get_value_or ("en_GB");
+		if (compat_map.find (lang) != compat_map.end ()) {
+			lang = compat_map[lang];
 		}
 
-		setup_language_sensitivity ();
+		checked_set (_language, lang);
 
 		checked_set (_num_local_encoding_threads, config->num_local_encoding_threads ());
+#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
+		checked_set (_analyse_ebur128, config->analyse_ebur128 ());
+#endif
 		checked_set (_automatic_audio_analysis, config->automatic_audio_analysis ());
 		checked_set (_check_for_updates, config->check_for_updates ());
 		checked_set (_check_for_test_updates, config->check_for_test_updates ());
 		checked_set (_issuer, config->dcp_issuer ());
 		checked_set (_creator, config->dcp_creator ());
+		checked_set (_cinemas_file, config->cinemas_file());
+
+		setup_sensitivity ();
 	}
 
-	void setup_language_sensitivity ()
+	void setup_sensitivity ()
 	{
 		_language->Enable (_set_language->GetValue ());
+		_check_for_test_updates->Enable (_check_for_updates->GetValue ());
 	}
 
 	void set_language_changed ()
 	{
-		setup_language_sensitivity ();
+		setup_sensitivity ();
 		if (_set_language->GetValue ()) {
 			language_changed ();
 		} else {
@@ -282,43 +315,21 @@ private:
 
 	void language_changed ()
 	{
-		switch (_language->GetSelection ()) {
-		case 0:
-			Config::instance()->set_language ("de");
-			break;
-		case 1:
-			Config::instance()->set_language ("en");
-			break;
-		case 2:
-			Config::instance()->set_language ("es");
-			break;
-		case 3:
-			Config::instance()->set_language ("fr");
-			break;
-		case 4:
-			Config::instance()->set_language ("it");
-			break;
-		case 5:
-			Config::instance()->set_language ("nl");
-			break;
-		case 6:
-			Config::instance()->set_language ("sv");
-			break;
-		case 7:
-			Config::instance()->set_language ("ru");
-			break;
-		case 8:
-			Config::instance()->set_language ("pl");
-			break;
-		case 9:
-			Config::instance()->set_language ("da");
-			break;
-		case 10:
-			Config::instance()->set_language ("pt");
-			break;
+		int const sel = _language->GetSelection ();
+		if (sel != -1) {
+			Config::instance()->set_language (string_client_data (_language->GetClientObject (sel)));
+		} else {
+			Config::instance()->unset_language ();
 		}
 	}
 
+#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
+	void analyse_ebur128_changed ()
+	{
+		Config::instance()->set_analyse_ebur128 (_analyse_ebur128->GetValue ());
+	}
+#endif
+
 	void automatic_audio_analysis_changed ()
 	{
 		Config::instance()->set_automatic_audio_analysis (_automatic_audio_analysis->GetValue ());
@@ -349,9 +360,18 @@ private:
 		Config::instance()->set_dcp_creator (wx_to_std (_creator->GetValue ()));
 	}
 
+	void cinemas_file_changed ()
+	{
+		Config::instance()->set_cinemas_file (wx_to_std (_cinemas_file->GetPath ()));
+	}
+
 	wxCheckBox* _set_language;
 	wxChoice* _language;
 	wxSpinCtrl* _num_local_encoding_threads;
+	FilePickerCtrl* _cinemas_file;
+#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
+	wxCheckBox* _analyse_ebur128;
+#endif
 	wxCheckBox* _automatic_audio_analysis;
 	wxCheckBox* _check_for_updates;
 	wxCheckBox* _check_for_test_updates;
@@ -414,6 +434,10 @@ private:
 		_dcp_content_type = new wxChoice (_panel, wxID_ANY);
 		table->Add (_dcp_content_type);
 
+		add_label_to_sizer (table, _panel, _("Default DCP audio channels"), true);
+		_dcp_audio_channels = new wxChoice (_panel, wxID_ANY);
+		table->Add (_dcp_audio_channels);
+
 		{
 			add_label_to_sizer (table, _panel, _("Default JPEG2000 bandwidth"), true);
 			wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
@@ -455,7 +479,10 @@ private:
 			_dcp_content_type->Append (std_to_wx (ct[i]->pretty_name ()));
 		}
 
+		setup_audio_channels_choice (_dcp_audio_channels, 2);
+
 		_dcp_content_type->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DefaultsPage::dcp_content_type_changed, this));
+		_dcp_audio_channels->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DefaultsPage::dcp_audio_channels_changed, this));
 
 		_j2k_bandwidth->SetRange (50, 250);
 		_j2k_bandwidth->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&DefaultsPage::j2k_bandwidth_changed, this));
@@ -490,6 +517,7 @@ private:
 		_directory->SetPath (std_to_wx (config->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir())).string ()));
 		checked_set (_j2k_bandwidth, config->default_j2k_bandwidth() / 1000000);
 		_j2k_bandwidth->SetRange (50, config->maximum_j2k_bandwidth() / 1000000);
+		checked_set (_dcp_audio_channels, locale_convert<string> (config->default_dcp_audio_channels()));
 		checked_set (_audio_delay, config->default_audio_delay ());
 		checked_set (_standard, config->default_interop() ? 1 : 0);
 	}
@@ -504,6 +532,16 @@ private:
 		Config::instance()->set_default_audio_delay (_audio_delay->GetValue());
 	}
 
+	void dcp_audio_channels_changed ()
+	{
+		int const s = _dcp_audio_channels->GetSelection ();
+		if (s != wxNOT_FOUND) {
+			Config::instance()->set_default_dcp_audio_channels (
+				locale_convert<int> (string_client_data (_dcp_audio_channels->GetClientObject (s)))
+				);
+		}
+	}
+
 	void directory_changed ()
 	{
 		Config::instance()->set_default_directory (wx_to_std (_directory->GetPath ()));
@@ -550,6 +588,7 @@ private:
 #endif
 	wxChoice* _container;
 	wxChoice* _dcp_content_type;
+	wxChoice* _dcp_audio_channels;
 	wxChoice* _standard;
 };
 
@@ -575,7 +614,7 @@ public:
 private:
 	void setup ()
 	{
-		_use_any_servers = new wxCheckBox (_panel, wxID_ANY, _("Use all servers"));
+		_use_any_servers = new wxCheckBox (_panel, wxID_ANY, _("Search network for servers"));
 		_panel->GetSizer()->Add (_use_any_servers, 0, wxALL, _border);
 
 		vector<string> columns;
@@ -585,6 +624,7 @@ private:
 			columns,
 			boost::bind (&Config::servers, Config::instance()),
 			boost::bind (&Config::set_servers, Config::instance(), _1),
+			boost::bind (&always_valid),
 			boost::bind (&EncodingServersPage::server_column, this, _1)
 			);
 
@@ -681,7 +721,7 @@ public:
 		_sizer->Add (table, 1, wxALL | wxEXPAND, border);
 		int r = 0;
 
-		add_label_to_grid_bag_sizer (table, this, _("Leaf private key"), true, wxGBPosition (r, 0));
+		add_label_to_sizer (table, this, _("Leaf private key"), true, wxGBPosition (r, 0));
 		_private_key = new wxStaticText (this, wxID_ANY, wxT (""));
 		wxFont font = _private_key->GetFont ();
 		font.SetFamily (wxFONTFAMILY_TELETYPE);
@@ -694,9 +734,9 @@ public:
 		++r;
 
 		_button_sizer = new wxBoxSizer (wxHORIZONTAL);
-		_remake_certificates = new wxButton (this, wxID_ANY, _("Re-make certificates and key..."));
+		_remake_certificates = new wxButton (this, wxID_ANY, _("Re-make certificates\nand key..."));
 		_button_sizer->Add (_remake_certificates, 1, wxRIGHT, border);
-		table->Add (_button_sizer, wxGBPosition (r, 0), wxGBSpan (1, 3));
+		table->Add (_button_sizer, wxGBPosition (r, 0), wxGBSpan (1, 4));
 		++r;
 
 		_add_certificate->Bind     (wxEVT_COMMAND_BUTTON_CLICKED,       boost::bind (&CertificateChainEditor::add_certificate, this));
@@ -722,7 +762,7 @@ public:
 
 	void add_button (wxWindow* button)
 	{
-		_button_sizer->Add (button);
+		_button_sizer->Add (button, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_X_GAP);
 		_sizer->Layout ();
 	}
 
@@ -733,7 +773,15 @@ private:
 
 		if (d->ShowModal() == wxID_OK) {
 			try {
-				dcp::Certificate c (dcp::file_to_string (wx_to_std (d->GetPath ())));
+				dcp::Certificate c;
+				string const extra = c.read_string (dcp::file_to_string (wx_to_std (d->GetPath ())));
+				if (!extra.empty ()) {
+					message_dialog (
+						this,
+						_("This file contains other certificates (or other data) after its first certificate. "
+						  "Only the first certificate will be used.")
+						);
+				}
 				_chain->add (c);
 				_set (_chain);
 				update_certificate_list ();
@@ -782,7 +830,7 @@ private:
 		if (d->ShowModal () == wxID_OK) {
 			FILE* f = fopen_boost (wx_to_std (d->GetPath ()), "w");
 			if (!f) {
-				throw OpenFileError (wx_to_std (d->GetPath ()));
+				throw OpenFileError (wx_to_std (d->GetPath ()), errno, false);
 			}
 
 			string const s = j->certificate (true);
@@ -894,8 +942,11 @@ private:
 		if (d->ShowModal() == wxID_OK) {
 			try {
 				boost::filesystem::path p (wx_to_std (d->GetPath ()));
-				if (boost::filesystem::file_size (p) > 1024) {
-					error_dialog (this, wxString::Format (_("Could not read key file (%s)"), std_to_wx (p.string ())));
+				if (boost::filesystem::file_size (p) > 8192) {
+					error_dialog (
+						this,
+						wxString::Format (_("Could not read key file; file is too long (%s)"), std_to_wx (p.string ()))
+						);
 					return;
 				}
 
@@ -927,7 +978,7 @@ private:
 		if (d->ShowModal () == wxID_OK) {
 			FILE* f = fopen_boost (wx_to_std (d->GetPath ()), "w");
 			if (!f) {
-				throw OpenFileError (wx_to_std (d->GetPath ()));
+				throw OpenFileError (wx_to_std (d->GetPath ()), errno, false);
 			}
 
 			string const s = _chain->key().get ();
@@ -991,10 +1042,13 @@ private:
 
 		_panel->GetSizer()->Add (_decryption);
 
-		_export_decryption_certificate = new wxButton (_decryption, wxID_ANY, _("Export DCP decryption certificate..."));
+		_export_decryption_certificate = new wxButton (_decryption, wxID_ANY, _("Export DCP decryption\ncertificate..."));
 		_decryption->add_button (_export_decryption_certificate);
+		_export_decryption_chain = new wxButton (_decryption, wxID_ANY, _("Export DCP decryption\nchain..."));
+		_decryption->add_button (_export_decryption_chain);
 
 		_export_decryption_certificate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KeysPage::export_decryption_certificate, this));
+		_export_decryption_chain->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KeysPage::export_decryption_chain, this));
 	}
 
 	void export_decryption_certificate ()
@@ -1007,7 +1061,7 @@ private:
 		if (d->ShowModal () == wxID_OK) {
 			FILE* f = fopen_boost (wx_to_std (d->GetPath ()), "w");
 			if (!f) {
-				throw OpenFileError (wx_to_std (d->GetPath ()));
+				throw OpenFileError (wx_to_std (d->GetPath ()), errno, false);
 			}
 
 			string const s = Config::instance()->decryption_chain()->leaf().certificate (true);
@@ -1017,6 +1071,26 @@ private:
 		d->Destroy ();
 	}
 
+	void export_decryption_chain ()
+	{
+		wxFileDialog* d = new wxFileDialog (
+			_panel, _("Select Chain File"), wxEmptyString, wxEmptyString, wxT ("PEM files (*.pem)|*.pem"),
+			wxFD_SAVE | wxFD_OVERWRITE_PROMPT
+			);
+
+		if (d->ShowModal () == wxID_OK) {
+			FILE* f = fopen_boost (wx_to_std (d->GetPath ()), "w");
+			if (!f) {
+				throw OpenFileError (wx_to_std (d->GetPath ()), errno, false);
+			}
+
+			string const s = Config::instance()->decryption_chain()->chain();
+			fwrite (s.c_str(), 1, s.length(), f);
+			fclose (f);
+		}
+		d->Destroy ();
+	}
+
 	void config_changed ()
 	{
 		_signer->config_changed ();
@@ -1026,6 +1100,7 @@ private:
 	CertificateChainEditor* _signer;
 	CertificateChainEditor* _decryption;
 	wxButton* _export_decryption_certificate;
+	wxButton* _export_decryption_chain;
 };
 
 class TMSPage : public StandardPage
@@ -1127,6 +1202,12 @@ private:
 	wxTextCtrl* _tms_password;
 };
 
+static string
+column (string s)
+{
+	return s;
+}
+
 class KDMEmailPage : public StandardPage
 {
 public:
@@ -1136,7 +1217,7 @@ public:
 		/* We have to force both width and height of this one */
 		: StandardPage (wxSize (480, 128), border)
 #else
-		 : StandardPage (panel_size, border)
+		: StandardPage (panel_size, border)
 #endif
 	{}
 
@@ -1187,27 +1268,37 @@ private:
 		_kdm_from = new wxTextCtrl (_panel, wxID_ANY);
 		table->Add (_kdm_from, 1, wxEXPAND | wxALL);
 
-		add_label_to_sizer (table, _panel, _("CC address"), true);
-		_kdm_cc = new wxTextCtrl (_panel, wxID_ANY);
+		vector<string> columns;
+		columns.push_back (wx_to_std (_("Address")));
+		add_label_to_sizer (table, _panel, _("CC addresses"), true);
+		_kdm_cc = new EditableList<string, EmailDialog> (
+			_panel,
+			columns,
+			bind (&Config::kdm_cc, Config::instance()),
+			bind (&Config::set_kdm_cc, Config::instance(), _1),
+			bind (&string_not_empty, _1),
+			bind (&column, _1)
+			);
 		table->Add (_kdm_cc, 1, wxEXPAND | wxALL);
 
 		add_label_to_sizer (table, _panel, _("BCC address"), true);
 		_kdm_bcc = new wxTextCtrl (_panel, wxID_ANY);
 		table->Add (_kdm_bcc, 1, wxEXPAND | wxALL);
 
-		_kdm_email = new wxTextCtrl (_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (480, 128), wxTE_MULTILINE);
-		_panel->GetSizer()->Add (_kdm_email, 1, wxEXPAND | wxALL, _border);
+		_kdm_email = new wxTextCtrl (_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (-1, 200), wxTE_MULTILINE);
+		_panel->GetSizer()->Add (_kdm_email, 0, wxEXPAND | wxALL, _border);
 
-		_reset_kdm_email = new wxButton (_panel, wxID_ANY, _("Reset to default text"));
+		_reset_kdm_email = new wxButton (_panel, wxID_ANY, _("Reset to default subject and text"));
 		_panel->GetSizer()->Add (_reset_kdm_email, 0, wxEXPAND | wxALL, _border);
 
+		_kdm_cc->layout ();
+
 		_mail_server->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::mail_server_changed, this));
 		_mail_port->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&KDMEmailPage::mail_port_changed, this));
 		_mail_user->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::mail_user_changed, this));
 		_mail_password->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::mail_password_changed, this));
 		_kdm_subject->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_subject_changed, this));
 		_kdm_from->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_from_changed, this));
-		_kdm_cc->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_cc_changed, this));
 		_kdm_bcc->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_bcc_changed, this));
 		_kdm_email->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_email_changed, this));
 		_reset_kdm_email->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KDMEmailPage::reset_kdm_email, this));
@@ -1223,7 +1314,6 @@ private:
 		checked_set (_mail_password, config->mail_password ());
 		checked_set (_kdm_subject, config->kdm_subject ());
 		checked_set (_kdm_from, config->kdm_from ());
-		checked_set (_kdm_cc, config->kdm_cc ());
 		checked_set (_kdm_bcc, config->kdm_bcc ());
 		checked_set (_kdm_email, Config::instance()->kdm_email ());
 	}
@@ -1258,11 +1348,6 @@ private:
 		Config::instance()->set_kdm_from (wx_to_std (_kdm_from->GetValue ()));
 	}
 
-	void kdm_cc_changed ()
-	{
-		Config::instance()->set_kdm_cc (wx_to_std (_kdm_cc->GetValue ()));
-	}
-
 	void kdm_bcc_changed ()
 	{
 		Config::instance()->set_kdm_bcc (wx_to_std (_kdm_bcc->GetValue ()));
@@ -1291,7 +1376,7 @@ private:
 	wxTextCtrl* _mail_password;
 	wxTextCtrl* _kdm_subject;
 	wxTextCtrl* _kdm_from;
-	wxTextCtrl* _kdm_cc;
+	EditableList<string, EmailDialog>* _kdm_cc;
 	wxTextCtrl* _kdm_bcc;
 	wxTextCtrl* _kdm_email;
 	wxButton* _reset_kdm_email;
@@ -1318,6 +1403,17 @@ public:
 	{}
 
 private:
+	void add_top_aligned_label_to_sizer (wxSizer* table, wxWindow* parent, wxString text)
+	{
+		int flags = wxALIGN_TOP | wxTOP | wxLEFT;
+#ifdef __WXOSX__
+		flags |= wxALIGN_RIGHT;
+		text += wxT (":");
+#endif
+		wxStaticText* m = new wxStaticText (parent, wxID_ANY, text);
+		table->Add (m, 0, flags, DCPOMATIC_SIZER_Y_GAP);
+	}
+
 	void setup ()
 	{
 		wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
@@ -1341,15 +1437,38 @@ private:
 		table->Add (_only_servers_encode, 1, wxEXPAND | wxALL);
 		table->AddSpacer (0);
 
-#ifdef __WXOSX__
-		wxStaticText* m = new wxStaticText (_panel, wxID_ANY, _("Log:"));
-		table->Add (m, 0, wxALIGN_TOP | wxLEFT | wxRIGHT | wxEXPAND | wxALL | wxALIGN_RIGHT, 6);
-#else
-		wxStaticText* m = new wxStaticText (_panel, wxID_ANY, _("Log"));
-		table->Add (m, 0, wxALIGN_TOP | wxLEFT | wxRIGHT | wxEXPAND | wxALL, 6);
-#endif
+		{
+			add_top_aligned_label_to_sizer (table, _panel, _("DCP metadata filename format"));
+			dcp::NameFormat::Map titles;
+			titles['t'] = "type (cpl/pkl)";
+			dcp::NameFormat::Map examples;
+			examples['t'] = "cpl";
+			_dcp_metadata_filename_format = new NameFormatEditor (
+				_panel, Config::instance()->dcp_metadata_filename_format(), titles, examples, "_eb1c112c-ca3c-4ae6-9263-c6714ff05d64.xml"
+				);
+			table->Add (_dcp_metadata_filename_format->panel(), 1, wxEXPAND | wxALL);
+		}
 
 		{
+			add_top_aligned_label_to_sizer (table, _panel, _("DCP asset filename format"));
+			dcp::NameFormat::Map titles;
+			titles['t'] = "type (j2c/pcm/sub)";
+			titles['r'] = "reel number";
+			titles['n'] = "number of reels";
+			titles['c'] = "content filename";
+			dcp::NameFormat::Map examples;
+			examples['t'] = "j2c";
+			examples['r'] = "1";
+			examples['n'] = "4";
+			examples['c'] = "myfile.mp4";
+			_dcp_asset_filename_format = new NameFormatEditor (
+				_panel, Config::instance()->dcp_asset_filename_format(), titles, examples, "_eb1c112c-ca3c-4ae6-9263-c6714ff05d64.mxf"
+				);
+			table->Add (_dcp_asset_filename_format->panel(), 1, wxEXPAND | wxALL);
+		}
+
+		{
+			add_top_aligned_label_to_sizer (table, _panel, _("Log"));
 			wxBoxSizer* t = new wxBoxSizer (wxVERTICAL);
 			_log_general = new wxCheckBox (_panel, wxID_ANY, _("General"));
 			t->Add (_log_general, 1, wxEXPAND | wxALL);
@@ -1357,6 +1476,7 @@ private:
 			t->Add (_log_warning, 1, wxEXPAND | wxALL);
 			_log_error = new wxCheckBox (_panel, wxID_ANY, _("Errors"));
 			t->Add (_log_error, 1, wxEXPAND | wxALL);
+			/// TRANSLATORS: translate the word "Timing" here; do not include the "Config|" prefix
 			_log_timing = new wxCheckBox (_panel, wxID_ANY, S_("Config|Timing"));
 			t->Add (_log_timing, 1, wxEXPAND | wxALL);
 			_log_debug_decode = new wxCheckBox (_panel, wxID_ANY, _("Debug: decode"));
@@ -1378,6 +1498,8 @@ private:
 		_maximum_j2k_bandwidth->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&AdvancedPage::maximum_j2k_bandwidth_changed, this));
 		_allow_any_dcp_frame_rate->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::allow_any_dcp_frame_rate_changed, this));
 		_only_servers_encode->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::only_servers_encode_changed, this));
+		_dcp_metadata_filename_format->Changed.connect (boost::bind (&AdvancedPage::dcp_metadata_filename_format_changed, this));
+		_dcp_asset_filename_format->Changed.connect (boost::bind (&AdvancedPage::dcp_asset_filename_format_changed, this));
 		_log_general->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::log_changed, this));
 		_log_warning->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::log_changed, this));
 		_log_error->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::log_changed, this));
@@ -1424,6 +1546,16 @@ private:
 		Config::instance()->set_only_servers_encode (_only_servers_encode->GetValue ());
 	}
 
+	void dcp_metadata_filename_format_changed ()
+	{
+		Config::instance()->set_dcp_metadata_filename_format (_dcp_metadata_filename_format->get ());
+	}
+
+	void dcp_asset_filename_format_changed ()
+	{
+		Config::instance()->set_dcp_asset_filename_format (_dcp_asset_filename_format->get ());
+	}
+
 	void log_changed ()
 	{
 		int types = 0;
@@ -1461,6 +1593,8 @@ private:
 	wxSpinCtrl* _maximum_j2k_bandwidth;
 	wxCheckBox* _allow_any_dcp_frame_rate;
 	wxCheckBox* _only_servers_encode;
+	NameFormatEditor* _dcp_metadata_filename_format;
+	NameFormatEditor* _dcp_asset_filename_format;
 	wxCheckBox* _log_general;
 	wxCheckBox* _log_warning;
 	wxCheckBox* _log_error;