X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffull_config_dialog.cc;h=ffe7b4749c67c22a9fce59281c8ff8fceb3e7c5c;hb=e9e8951e0961564121f9c6cc4ce87555eebf9ec8;hp=46a9f1b4f710050a4ea6828e68b34f31cc115b6b;hpb=35841948169c44863f9fb39cdee4dccf0463846a;p=dcpomatic.git

diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index 46a9f1b4f..ffe7b4749 100644
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -36,6 +36,10 @@
 #include "nag_dialog.h"
 #include "config_move_dialog.h"
 #include "config_dialog.h"
+#include "static_text.h"
+#include "check_box.h"
+#include "dcpomatic_button.h"
+#include "password_entry.h"
 #include "lib/config.h"
 #include "lib/ratio.h"
 #include "lib/filter.h"
@@ -85,6 +89,11 @@ private:
 		int r = 0;
 		add_language_controls (table, r);
 
+		add_label_to_sizer (table, _panel, _("Interface complexity"), true, wxGBPosition(r, 0));
+		_interface_complexity = new wxChoice (_panel, wxID_ANY);
+		table->Add (_interface_complexity, wxGBPosition (r, 1));
+		++r;
+
 		add_label_to_sizer (table, _panel, _("Number of threads DCP-o-matic should use"), true, wxGBPosition (r, 0));
 		_master_encoding_threads = new wxSpinCtrl (_panel);
 		table->Add (_master_encoding_threads, wxGBPosition (r, 1));
@@ -103,17 +112,19 @@ private:
 		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", true);
 		table->Add (_cinemas_file, wxGBPosition (r, 1));
+		Button* export_cinemas = new Button (_panel, _("Export..."));
+		table->Add (export_cinemas, wxGBPosition (r, 2));
 		++r;
 
 		add_play_sound_controls (table, 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"));
+		_analyse_ebur128 = new CheckBox (_panel, _("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"));
+		_automatic_audio_analysis = new CheckBox (_panel, _("Automatically analyse content audio"));
 		table->Add (_automatic_audio_analysis, wxGBPosition (r, 0), wxGBSpan (1, 2));
 		++r;
 
@@ -136,10 +147,15 @@ private:
 		_config_file->Bind  (wxEVT_FILEPICKER_CHANGED, boost::bind (&FullGeneralPage::config_file_changed,   this));
 		_cinemas_file->Bind (wxEVT_FILEPICKER_CHANGED, boost::bind (&FullGeneralPage::cinemas_file_changed,  this));
 
+		_interface_complexity->Append (_("Simple"));
+		_interface_complexity->Append (_("Full"));
+		_interface_complexity->Bind (wxEVT_CHOICE, boost::bind(&FullGeneralPage::interface_complexity_changed, this));
+
 		_master_encoding_threads->SetRange (1, 128);
 		_master_encoding_threads->Bind (wxEVT_SPINCTRL, boost::bind (&FullGeneralPage::master_encoding_threads_changed, this));
 		_server_encoding_threads->SetRange (1, 128);
 		_server_encoding_threads->Bind (wxEVT_SPINCTRL, boost::bind (&FullGeneralPage::server_encoding_threads_changed, this));
+		export_cinemas->Bind (wxEVT_BUTTON, boost::bind (&FullGeneralPage::export_cinemas_file, this));
 
 #ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
 		_analyse_ebur128->Bind (wxEVT_CHECKBOX, boost::bind (&FullGeneralPage::analyse_ebur128_changed, this));
@@ -154,6 +170,14 @@ private:
 	{
 		Config* config = Config::instance ();
 
+		switch (config->interface_complexity()) {
+		case Config::INTERFACE_SIMPLE:
+			checked_set (_interface_complexity, 0);
+			break;
+		case Config::INTERFACE_FULL:
+			checked_set (_interface_complexity, 1);
+			break;
+		}
 		checked_set (_master_encoding_threads, config->master_encoding_threads ());
 		checked_set (_server_encoding_threads, config->server_encoding_threads ());
 #ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
@@ -168,6 +192,28 @@ private:
 		GeneralPage::config_changed ();
 	}
 
+	void export_cinemas_file ()
+	{
+		wxFileDialog* d = new wxFileDialog (
+			_panel, _("Select Cinemas File"), wxEmptyString, wxEmptyString, wxT ("XML files (*.xml)|*.xml"),
+			wxFD_SAVE | wxFD_OVERWRITE_PROMPT
+                );
+
+		if (d->ShowModal () == wxID_OK) {
+			boost::filesystem::copy_file (Config::instance()->cinemas_file(), wx_to_std(d->GetPath()));
+		}
+		d->Destroy ();
+	}
+
+	void interface_complexity_changed ()
+	{
+		if (_interface_complexity->GetSelection() == 0) {
+			Config::instance()->set_interface_complexity (Config::INTERFACE_SIMPLE);
+		} else {
+			Config::instance()->set_interface_complexity (Config::INTERFACE_FULL);
+		}
+	}
+
 
 #ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
 	void analyse_ebur128_changed ()
@@ -232,6 +278,7 @@ private:
 		Config::instance()->set_cinemas_file (wx_to_std (_cinemas_file->GetPath ()));
 	}
 
+	wxChoice* _interface_complexity;
 	wxSpinCtrl* _master_encoding_threads;
 	wxSpinCtrl* _server_encoding_threads;
 	FilePickerCtrl* _config_file;
@@ -288,7 +335,7 @@ private:
 		table->Add (_directory, 1, wxEXPAND);
 
 		add_label_to_sizer (table, _panel, _("Default ISDCF name details"), true);
-		_isdcf_metadata_button = new wxButton (_panel, wxID_ANY, _("Edit..."));
+		_isdcf_metadata_button = new Button (_panel, _("Edit..."));
 		table->Add (_isdcf_metadata_button);
 
 		add_label_to_sizer (table, _panel, _("Default container"), true);
@@ -338,7 +385,7 @@ private:
 
 		table->Add (_kdm_directory, 1, wxEXPAND);
 
-		_upload_after_make_dcp = new wxCheckBox (_panel, wxID_ANY, _("Default to enabling upload of DCP to TMS"));
+		_upload_after_make_dcp = new CheckBox (_panel, _("Default to enabling upload of DCP to TMS"));
 		table->Add (_upload_after_make_dcp, 1, wxEXPAND);
 
 		_still_length->SetRange (1, 3600);
@@ -542,11 +589,11 @@ public:
 private:
 	void setup ()
 	{
-		_use_any_servers = new wxCheckBox (_panel, wxID_ANY, _("Search network for servers"));
+		_use_any_servers = new CheckBox (_panel, _("Search network for servers"));
 		_panel->GetSizer()->Add (_use_any_servers, 0, wxALL, _border);
 
-		vector<string> columns;
-		columns.push_back (wx_to_std (_("IP address / host name")));
+		vector<EditableListColumn> columns;
+		columns.push_back (EditableListColumn(wx_to_std(_("IP address / host name"))));
 		_servers_list = new EditableList<string, ServerDialog> (
 			_panel,
 			columns,
@@ -623,8 +670,8 @@ private:
 		table->Add (_tms_user, 1, wxEXPAND);
 
 		add_label_to_sizer (table, _panel, _("Password"), true);
-		_tms_password = new wxTextCtrl (_panel, wxID_ANY);
-		table->Add (_tms_password, 1, wxEXPAND);
+		_tms_password = new PasswordEntry (_panel);
+		table->Add (_tms_password->get_panel(), 1, wxEXPAND);
 
 		_tms_protocol->Append (_("SCP (for AAM and Doremi)"));
 		_tms_protocol->Append (_("FTP (for Dolby)"));
@@ -633,7 +680,7 @@ private:
 		_tms_ip->Bind (wxEVT_TEXT, boost::bind (&TMSPage::tms_ip_changed, this));
 		_tms_path->Bind (wxEVT_TEXT, boost::bind (&TMSPage::tms_path_changed, this));
 		_tms_user->Bind (wxEVT_TEXT, boost::bind (&TMSPage::tms_user_changed, this));
-		_tms_password->Bind (wxEVT_TEXT, boost::bind (&TMSPage::tms_password_changed, this));
+		_tms_password->Changed.connect (boost::bind (&TMSPage::tms_password_changed, this));
 	}
 
 	void config_changed ()
@@ -649,7 +696,7 @@ private:
 
 	void tms_protocol_changed ()
 	{
-		Config::instance()->set_tms_protocol (static_cast<Protocol> (_tms_protocol->GetSelection ()));
+		Config::instance()->set_tms_protocol(static_cast<FileTransferProtocol>(_tms_protocol->GetSelection()));
 	}
 
 	void tms_ip_changed ()
@@ -669,14 +716,14 @@ private:
 
 	void tms_password_changed ()
 	{
-		Config::instance()->set_tms_password (wx_to_std (_tms_password->GetValue ()));
+		Config::instance()->set_tms_password (_tms_password->get());
 	}
 
 	wxChoice* _tms_protocol;
 	wxTextCtrl* _tms_ip;
 	wxTextCtrl* _tms_path;
 	wxTextCtrl* _tms_user;
-	wxTextCtrl* _tms_password;
+	PasswordEntry* _tms_password;
 };
 
 static string
@@ -685,28 +732,22 @@ column (string s)
 	return s;
 }
 
-class KDMEmailPage : public StandardPage
+class EmailPage : public StandardPage
 {
 public:
-
-	KDMEmailPage (wxSize panel_size, int border)
-#ifdef DCPOMATIC_OSX
-		/* We have to force both width and height of this one */
-		: StandardPage (wxSize (480, 128), border)
-#else
+	EmailPage (wxSize panel_size, int border)
 		: StandardPage (panel_size, border)
-#endif
 	{}
 
 	wxString GetName () const
 	{
-		return _("KDM Email");
+		return _("Email");
 	}
 
 #ifdef DCPOMATIC_OSX
 	wxBitmap GetLargeIcon () const
 	{
-		return wxBitmap ("kdm_email", wxBITMAP_TYPE_PNG_RESOURCE);
+		return wxBitmap ("email", wxBITMAP_TYPE_PNG_RESOURCE);
 	}
 #endif
 
@@ -720,142 +761,535 @@ private:
 		add_label_to_sizer (table, _panel, _("Outgoing mail server"), true);
 		{
 			wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-			_mail_server = new wxTextCtrl (_panel, wxID_ANY);
-			s->Add (_mail_server, 1, wxEXPAND | wxALL);
+			_server = new wxTextCtrl (_panel, wxID_ANY);
+			s->Add (_server, 1, wxEXPAND | wxALL);
 			add_label_to_sizer (s, _panel, _("port"), false);
-			_mail_port = new wxSpinCtrl (_panel, wxID_ANY);
-			_mail_port->SetRange (0, 65535);
-			s->Add (_mail_port);
+			_port = new wxSpinCtrl (_panel, wxID_ANY);
+			_port->SetRange (0, 65535);
+			s->Add (_port);
+			add_label_to_sizer (s, _panel, _("protocol"), false);
+			_protocol = new wxChoice (_panel, wxID_ANY);
+			/* Make sure this matches the switches in config_changed and port_changed below */
+			_protocol->Append (_("Auto"));
+			_protocol->Append (_("Plain"));
+			_protocol->Append (_("STARTTLS"));
+			_protocol->Append (_("SSL"));
+			s->Add (_protocol);
 			table->Add (s, 1, wxEXPAND | wxALL);
 		}
 
-		add_label_to_sizer (table, _panel, _("Mail user name"), true);
-		_mail_user = new wxTextCtrl (_panel, wxID_ANY);
-		table->Add (_mail_user, 1, wxEXPAND | wxALL);
+		add_label_to_sizer (table, _panel, _("User name"), true);
+		_user = new wxTextCtrl (_panel, wxID_ANY);
+		table->Add (_user, 1, wxEXPAND | wxALL);
+
+		add_label_to_sizer (table, _panel, _("Password"), true);
+		_password = new PasswordEntry (_panel);
+		table->Add (_password->get_panel(), 1, wxEXPAND | wxALL);
+
+		_server->Bind (wxEVT_TEXT, boost::bind (&EmailPage::server_changed, this));
+		_port->Bind (wxEVT_SPINCTRL, boost::bind (&EmailPage::port_changed, this));
+		_protocol->Bind (wxEVT_CHOICE, boost::bind (&EmailPage::protocol_changed, this));
+		_user->Bind (wxEVT_TEXT, boost::bind (&EmailPage::user_changed, this));
+		_password->Changed.connect (boost::bind (&EmailPage::password_changed, this));
+	}
+
+	void config_changed ()
+	{
+		Config* config = Config::instance ();
 
-		add_label_to_sizer (table, _panel, _("Mail password"), true);
-		_mail_password = new wxTextCtrl (_panel, wxID_ANY);
-		table->Add (_mail_password, 1, wxEXPAND | wxALL);
+		checked_set (_server, config->mail_server ());
+		checked_set (_port, config->mail_port ());
+		switch (config->mail_protocol()) {
+		case EMAIL_PROTOCOL_AUTO:
+			checked_set (_protocol, 0);
+			break;
+		case EMAIL_PROTOCOL_PLAIN:
+			checked_set (_protocol, 1);
+			break;
+		case EMAIL_PROTOCOL_STARTTLS:
+			checked_set (_protocol, 2);
+			break;
+		case EMAIL_PROTOCOL_SSL:
+			checked_set (_protocol, 3);
+			break;
+		}
+		checked_set (_user, config->mail_user ());
+		checked_set (_password, config->mail_password());
+	}
+
+	void server_changed ()
+	{
+		Config::instance()->set_mail_server (wx_to_std (_server->GetValue ()));
+	}
+
+	void port_changed ()
+	{
+		Config::instance()->set_mail_port (_port->GetValue ());
+	}
+
+	void protocol_changed ()
+	{
+		switch (_protocol->GetSelection()) {
+		case 0:
+			Config::instance()->set_mail_protocol(EMAIL_PROTOCOL_AUTO);
+			break;
+		case 1:
+			Config::instance()->set_mail_protocol(EMAIL_PROTOCOL_PLAIN);
+			break;
+		case 2:
+			Config::instance()->set_mail_protocol(EMAIL_PROTOCOL_STARTTLS);
+			break;
+		case 3:
+			Config::instance()->set_mail_protocol(EMAIL_PROTOCOL_SSL);
+			break;
+		}
+	}
+
+	void user_changed ()
+	{
+		Config::instance()->set_mail_user (wx_to_std (_user->GetValue ()));
+	}
+
+	void password_changed ()
+	{
+		Config::instance()->set_mail_password(_password->get());
+	}
+
+	wxTextCtrl* _server;
+	wxSpinCtrl* _port;
+	wxChoice* _protocol;
+	wxTextCtrl* _user;
+	PasswordEntry* _password;
+};
+
+class KDMEmailPage : public StandardPage
+{
+public:
+
+	KDMEmailPage (wxSize panel_size, int border)
+#ifdef DCPOMATIC_OSX
+		/* We have to force both width and height of this one */
+		: StandardPage (wxSize (panel_size.GetWidth(), 128), border)
+#else
+		: StandardPage (panel_size, border)
+#endif
+	{}
+
+	wxString GetName () const
+	{
+		return _("KDM Email");
+	}
+
+#ifdef DCPOMATIC_OSX
+	wxBitmap GetLargeIcon () const
+	{
+		return wxBitmap ("kdm_email", wxBITMAP_TYPE_PNG_RESOURCE);
+	}
+#endif
+
+private:
+	void setup ()
+	{
+		wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+		table->AddGrowableCol (1, 1);
+		_panel->GetSizer()->Add (table, 1, wxEXPAND | wxALL, _border);
 
 		add_label_to_sizer (table, _panel, _("Subject"), true);
-		_kdm_subject = new wxTextCtrl (_panel, wxID_ANY);
-		table->Add (_kdm_subject, 1, wxEXPAND | wxALL);
+		_subject = new wxTextCtrl (_panel, wxID_ANY);
+		table->Add (_subject, 1, wxEXPAND | wxALL);
 
 		add_label_to_sizer (table, _panel, _("From address"), true);
-		_kdm_from = new wxTextCtrl (_panel, wxID_ANY);
-		table->Add (_kdm_from, 1, wxEXPAND | wxALL);
+		_from = new wxTextCtrl (_panel, wxID_ANY);
+		table->Add (_from, 1, wxEXPAND | wxALL);
 
-		vector<string> columns;
-		columns.push_back (wx_to_std (_("Address")));
+		vector<EditableListColumn> columns;
+		columns.push_back (EditableListColumn(wx_to_std(_("Address"))));
 		add_label_to_sizer (table, _panel, _("CC addresses"), true);
-		_kdm_cc = new EditableList<string, EmailDialog> (
+		_cc = new EditableList<string, EmailDialog> (
 			_panel,
 			columns,
 			bind (&Config::kdm_cc, Config::instance()),
 			bind (&Config::set_kdm_cc, Config::instance(), _1),
 			bind (&column, _1)
 			);
-		table->Add (_kdm_cc, 1, wxEXPAND | wxALL);
+		table->Add (_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);
+		_bcc = new wxTextCtrl (_panel, wxID_ANY);
+		table->Add (_bcc, 1, wxEXPAND | wxALL);
 
-		_kdm_email = new wxTextCtrl (_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (-1, 200), wxTE_MULTILINE);
-		_panel->GetSizer()->Add (_kdm_email, 0, wxEXPAND | wxALL, _border);
+		_email = new wxTextCtrl (_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (-1, 200), wxTE_MULTILINE);
+		_panel->GetSizer()->Add (_email, 0, wxEXPAND | wxALL, _border);
 
-		_reset_kdm_email = new wxButton (_panel, wxID_ANY, _("Reset to default subject and text"));
-		_panel->GetSizer()->Add (_reset_kdm_email, 0, wxEXPAND | wxALL, _border);
+		_reset_email = new Button (_panel, _("Reset to default subject and text"));
+		_panel->GetSizer()->Add (_reset_email, 0, wxEXPAND | wxALL, _border);
 
-		_kdm_cc->layout ();
+		_cc->layout ();
 
-		_mail_server->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::mail_server_changed, this));
-		_mail_port->Bind (wxEVT_SPINCTRL, boost::bind (&KDMEmailPage::mail_port_changed, this));
-		_mail_user->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::mail_user_changed, this));
-		_mail_password->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::mail_password_changed, this));
-		_kdm_subject->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::kdm_subject_changed, this));
-		_kdm_from->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::kdm_from_changed, this));
-		_kdm_bcc->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::kdm_bcc_changed, this));
-		_kdm_email->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::kdm_email_changed, this));
-		_reset_kdm_email->Bind (wxEVT_BUTTON, boost::bind (&KDMEmailPage::reset_kdm_email, this));
+		_subject->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::kdm_subject_changed, this));
+		_from->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::kdm_from_changed, this));
+		_bcc->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::kdm_bcc_changed, this));
+		_email->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::kdm_email_changed, this));
+		_reset_email->Bind (wxEVT_BUTTON, boost::bind (&KDMEmailPage::reset_email, this));
 	}
 
 	void config_changed ()
 	{
 		Config* config = Config::instance ();
 
-		checked_set (_mail_server, config->mail_server ());
-		checked_set (_mail_port, config->mail_port ());
-		checked_set (_mail_user, config->mail_user ());
-		checked_set (_mail_password, config->mail_password ());
-		checked_set (_kdm_subject, config->kdm_subject ());
-		checked_set (_kdm_from, config->kdm_from ());
-		checked_set (_kdm_bcc, config->kdm_bcc ());
-		checked_set (_kdm_email, Config::instance()->kdm_email ());
+		checked_set (_subject, config->kdm_subject ());
+		checked_set (_from, config->kdm_from ());
+		checked_set (_bcc, config->kdm_bcc ());
+		checked_set (_email, Config::instance()->kdm_email ());
 	}
 
-	void mail_server_changed ()
+	void kdm_subject_changed ()
 	{
-		Config::instance()->set_mail_server (wx_to_std (_mail_server->GetValue ()));
+		Config::instance()->set_kdm_subject (wx_to_std (_subject->GetValue ()));
 	}
 
-	void mail_port_changed ()
+	void kdm_from_changed ()
 	{
-		Config::instance()->set_mail_port (_mail_port->GetValue ());
+		Config::instance()->set_kdm_from (wx_to_std (_from->GetValue ()));
 	}
 
-	void mail_user_changed ()
+	void kdm_bcc_changed ()
 	{
-		Config::instance()->set_mail_user (wx_to_std (_mail_user->GetValue ()));
+		Config::instance()->set_kdm_bcc (wx_to_std (_bcc->GetValue ()));
 	}
 
-	void mail_password_changed ()
+	void kdm_email_changed ()
 	{
-		Config::instance()->set_mail_password (wx_to_std (_mail_password->GetValue ()));
+		if (_email->GetValue().IsEmpty ()) {
+			/* Sometimes we get sent an erroneous notification that the email
+			   is empty; I don't know why.
+			*/
+			return;
+		}
+		Config::instance()->set_kdm_email (wx_to_std (_email->GetValue ()));
 	}
 
-	void kdm_subject_changed ()
+	void reset_email ()
 	{
-		Config::instance()->set_kdm_subject (wx_to_std (_kdm_subject->GetValue ()));
+		Config::instance()->reset_kdm_email ();
+		checked_set (_email, Config::instance()->kdm_email ());
 	}
 
-	void kdm_from_changed ()
+	wxTextCtrl* _subject;
+	wxTextCtrl* _from;
+	EditableList<string, EmailDialog>* _cc;
+	wxTextCtrl* _bcc;
+	wxTextCtrl* _email;
+	wxButton* _reset_email;
+};
+
+class AccountsPage : public StandardPage
+{
+public:
+	AccountsPage (wxSize panel_size, int border)
+		: StandardPage (panel_size, border)
+	{}
+
+	wxString GetName () const
 	{
-		Config::instance()->set_kdm_from (wx_to_std (_kdm_from->GetValue ()));
+		return _("Accounts");
 	}
 
-	void kdm_bcc_changed ()
+#ifdef DCPOMATIC_OSX
+	wxBitmap GetLargeIcon () const
 	{
-		Config::instance()->set_kdm_bcc (wx_to_std (_kdm_bcc->GetValue ()));
+		return wxBitmap ("accounts", wxBITMAP_TYPE_PNG_RESOURCE);
 	}
+#endif
 
-	void kdm_email_changed ()
+	void setup ()
+	{
+		wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+		table->AddGrowableCol (1, 1);
+		_panel->GetSizer()->Add (table, 1, wxEXPAND | wxALL, _border);
+
+		add_label_to_sizer (table, _panel, _("certificates.barco.com user name"), true);
+		_barco_username = new wxTextCtrl (_panel, wxID_ANY);
+		table->Add (_barco_username, 1, wxEXPAND | wxALL);
+
+		add_label_to_sizer (table, _panel, _("certificates.barco.com password"), true);
+		_barco_password = new PasswordEntry (_panel);
+		table->Add (_barco_password->get_panel(), 1, wxEXPAND | wxALL);
+
+		add_label_to_sizer (table, _panel, _("certificates.christiedigital.com user name"), true);
+		_christie_username = new wxTextCtrl (_panel, wxID_ANY);
+		table->Add (_christie_username, 1, wxEXPAND | wxALL);
+
+		add_label_to_sizer (table, _panel, _("certificates.christiedigital.com password"), true);
+		_christie_password = new PasswordEntry (_panel);
+		table->Add (_christie_password->get_panel(), 1, wxEXPAND | wxALL);
+
+		add_label_to_sizer (table, _panel, _("GDC user name"), true);
+		_gdc_username = new wxTextCtrl (_panel, wxID_ANY);
+		table->Add (_gdc_username, 1, wxEXPAND | wxALL);
+
+		add_label_to_sizer (table, _panel, _("GDC password"), true);
+		_gdc_password = new PasswordEntry (_panel);
+		table->Add (_gdc_password->get_panel(), 1, wxEXPAND | wxALL);
+
+		_barco_username->Bind (wxEVT_TEXT, boost::bind(&AccountsPage::barco_username_changed, this));
+		_barco_password->Changed.connect (boost::bind(&AccountsPage::barco_password_changed, this));
+		_christie_username->Bind (wxEVT_TEXT, boost::bind(&AccountsPage::christie_username_changed, this));
+		_christie_password->Changed.connect (boost::bind(&AccountsPage::christie_password_changed, this));
+		_gdc_username->Bind (wxEVT_TEXT, boost::bind(&AccountsPage::gdc_username_changed, this));
+		_gdc_password->Changed.connect (boost::bind(&AccountsPage::gdc_password_changed, this));
+	}
+
+	void config_changed ()
+	{
+		Config* config = Config::instance ();
+
+		checked_set (_barco_username, config->barco_username().get_value_or(""));
+		checked_set (_barco_password, config->barco_password().get_value_or(""));
+		checked_set (_christie_username, config->christie_username().get_value_or(""));
+		checked_set (_christie_password, config->christie_password().get_value_or(""));
+		checked_set (_gdc_username, config->gdc_username().get_value_or(""));
+		checked_set (_gdc_password, config->gdc_password().get_value_or(""));
+	}
+
+	void barco_username_changed ()
 	{
-		if (_kdm_email->GetValue().IsEmpty ()) {
+		wxString const s = _barco_username->GetValue();
+		if (!s.IsEmpty()) {
+			Config::instance()->set_barco_username (wx_to_std(s));
+		} else {
+			Config::instance()->unset_barco_username ();
+		}
+	}
+
+	void barco_password_changed ()
+	{
+		string const s = _barco_password->get();
+		if (!s.empty()) {
+			Config::instance()->set_barco_password(s);
+		} else {
+			Config::instance()->unset_barco_password();
+		}
+	}
+
+	void christie_username_changed ()
+	{
+		wxString const s = _christie_username->GetValue();
+		if (!s.IsEmpty()) {
+			Config::instance()->set_christie_username (wx_to_std(s));
+		} else {
+			Config::instance()->unset_christie_username ();
+		}
+	}
+
+	void christie_password_changed ()
+	{
+		string const s = _christie_password->get();
+		if (!s.empty()) {
+			Config::instance()->set_christie_password(s);
+		} else {
+			Config::instance()->unset_christie_password();
+		}
+	}
+
+	void gdc_username_changed ()
+	{
+		wxString const s = _gdc_username->GetValue();
+		if (!s.IsEmpty()) {
+			Config::instance()->set_gdc_username (wx_to_std(s));
+		} else {
+			Config::instance()->unset_gdc_username ();
+		}
+	}
+
+	void gdc_password_changed ()
+	{
+		string const s = _gdc_password->get();
+		if (!s.empty()) {
+			Config::instance()->set_gdc_password(s);
+		} else {
+			Config::instance()->unset_gdc_password();
+		}
+	}
+
+private:
+	wxTextCtrl* _barco_username;
+	PasswordEntry* _barco_password;
+	wxTextCtrl* _christie_username;
+	PasswordEntry* _christie_password;
+	wxTextCtrl* _gdc_username;
+	PasswordEntry* _gdc_password;
+};
+
+
+class NotificationsPage : public StandardPage
+{
+public:
+	NotificationsPage (wxSize panel_size, int border)
+#ifdef DCPOMATIC_OSX
+		/* We have to force both width and height of this one */
+		: StandardPage (wxSize (panel_size.GetWidth(), 128), border)
+#else
+		: StandardPage (panel_size, border)
+#endif
+	{}
+
+	wxString GetName () const
+	{
+		return _("Notifications");
+	}
+
+#ifdef DCPOMATIC_OSX
+	wxBitmap GetLargeIcon () const
+	{
+		return wxBitmap ("notifications", wxBITMAP_TYPE_PNG_RESOURCE);
+	}
+#endif
+
+private:
+	void setup ()
+	{
+		wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+		table->AddGrowableCol (1, 1);
+		_panel->GetSizer()->Add (table, 1, wxEXPAND | wxALL, _border);
+
+		_enable_message_box = new CheckBox (_panel, _("Message box"));
+		table->Add (_enable_message_box, 1, wxEXPAND | wxALL);
+		table->AddSpacer (0);
+
+		_enable_email = new CheckBox (_panel, _("Email"));
+		table->Add (_enable_email, 1, wxEXPAND | wxALL);
+		table->AddSpacer (0);
+
+		add_label_to_sizer (table, _panel, _("Subject"), true);
+		_subject = new wxTextCtrl (_panel, wxID_ANY);
+		table->Add (_subject, 1, wxEXPAND | wxALL);
+
+		add_label_to_sizer (table, _panel, _("From address"), true);
+		_from = new wxTextCtrl (_panel, wxID_ANY);
+		table->Add (_from, 1, wxEXPAND | wxALL);
+
+		add_label_to_sizer (table, _panel, _("To address"), true);
+		_to = new wxTextCtrl (_panel, wxID_ANY);
+		table->Add (_to, 1, wxEXPAND | wxALL);
+
+		vector<EditableListColumn> columns;
+		columns.push_back (EditableListColumn(wx_to_std(_("Address"))));
+		add_label_to_sizer (table, _panel, _("CC addresses"), true);
+		_cc = new EditableList<string, EmailDialog> (
+			_panel,
+			columns,
+			bind (&Config::notification_cc, Config::instance()),
+			bind (&Config::set_notification_cc, Config::instance(), _1),
+			bind (&column, _1)
+			);
+		table->Add (_cc, 1, wxEXPAND | wxALL);
+
+		add_label_to_sizer (table, _panel, _("BCC address"), true);
+		_bcc = new wxTextCtrl (_panel, wxID_ANY);
+		table->Add (_bcc, 1, wxEXPAND | wxALL);
+
+		_email = new wxTextCtrl (_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (-1, 200), wxTE_MULTILINE);
+		_panel->GetSizer()->Add (_email, 0, wxEXPAND | wxALL, _border);
+
+		_reset_email = new Button (_panel, _("Reset to default subject and text"));
+		_panel->GetSizer()->Add (_reset_email, 0, wxEXPAND | wxALL, _border);
+
+		_cc->layout ();
+
+		_enable_message_box->Bind (wxEVT_CHECKBOX, boost::bind (&NotificationsPage::type_changed, this, _enable_message_box, Config::MESSAGE_BOX));
+		_enable_email->Bind (wxEVT_CHECKBOX, boost::bind (&NotificationsPage::type_changed, this, _enable_email, Config::EMAIL));
+
+		_subject->Bind (wxEVT_TEXT, boost::bind (&NotificationsPage::notification_subject_changed, this));
+		_from->Bind (wxEVT_TEXT, boost::bind (&NotificationsPage::notification_from_changed, this));
+		_to->Bind (wxEVT_TEXT, boost::bind (&NotificationsPage::notification_to_changed, this));
+		_bcc->Bind (wxEVT_TEXT, boost::bind (&NotificationsPage::notification_bcc_changed, this));
+		_email->Bind (wxEVT_TEXT, boost::bind (&NotificationsPage::notification_email_changed, this));
+		_reset_email->Bind (wxEVT_BUTTON, boost::bind (&NotificationsPage::reset_email, this));
+
+		update_sensitivity ();
+	}
+
+	void update_sensitivity ()
+	{
+		bool const s = _enable_email->GetValue();
+		_subject->Enable(s);
+		_from->Enable(s);
+		_to->Enable(s);
+		_cc->Enable(s);
+		_bcc->Enable(s);
+		_email->Enable(s);
+		_reset_email->Enable(s);
+	}
+
+	void config_changed ()
+	{
+		Config* config = Config::instance ();
+
+		checked_set (_enable_message_box, config->notification(Config::MESSAGE_BOX));
+		checked_set (_enable_email, config->notification(Config::EMAIL));
+		checked_set (_subject, config->notification_subject ());
+		checked_set (_from, config->notification_from ());
+		checked_set (_to, config->notification_to ());
+		checked_set (_bcc, config->notification_bcc ());
+		checked_set (_email, Config::instance()->notification_email ());
+
+		update_sensitivity ();
+	}
+
+	void notification_subject_changed ()
+	{
+		Config::instance()->set_notification_subject (wx_to_std (_subject->GetValue ()));
+	}
+
+	void notification_from_changed ()
+	{
+		Config::instance()->set_notification_from (wx_to_std (_from->GetValue ()));
+	}
+
+	void notification_to_changed ()
+	{
+		Config::instance()->set_notification_to (wx_to_std (_to->GetValue ()));
+	}
+
+	void notification_bcc_changed ()
+	{
+		Config::instance()->set_notification_bcc (wx_to_std (_bcc->GetValue ()));
+	}
+
+	void notification_email_changed ()
+	{
+		if (_email->GetValue().IsEmpty ()) {
 			/* Sometimes we get sent an erroneous notification that the email
 			   is empty; I don't know why.
 			*/
 			return;
 		}
-		Config::instance()->set_kdm_email (wx_to_std (_kdm_email->GetValue ()));
+		Config::instance()->set_notification_email (wx_to_std (_email->GetValue ()));
 	}
 
-	void reset_kdm_email ()
+	void reset_email ()
 	{
-		Config::instance()->reset_kdm_email ();
-		checked_set (_kdm_email, Config::instance()->kdm_email ());
-	}
-
-	wxTextCtrl* _mail_server;
-	wxSpinCtrl* _mail_port;
-	wxTextCtrl* _mail_user;
-	wxTextCtrl* _mail_password;
-	wxTextCtrl* _kdm_subject;
-	wxTextCtrl* _kdm_from;
-	EditableList<string, EmailDialog>* _kdm_cc;
-	wxTextCtrl* _kdm_bcc;
-	wxTextCtrl* _kdm_email;
-	wxButton* _reset_kdm_email;
+		Config::instance()->reset_notification_email ();
+		checked_set (_email, Config::instance()->notification_email ());
+	}
+
+	void type_changed (wxCheckBox* b, Config::Notification n)
+	{
+		Config::instance()->set_notification(n, b->GetValue());
+		update_sensitivity ();
+	}
+
+	wxCheckBox* _enable_message_box;
+	wxCheckBox* _enable_email;
+
+	wxTextCtrl* _subject;
+	wxTextCtrl* _from;
+	wxTextCtrl* _to;
+	EditableList<string, EmailDialog>* _cc;
+	wxTextCtrl* _bcc;
+	wxTextCtrl* _email;
+	wxButton* _reset_email;
 };
 
 class CoverSheetPage : public StandardPage
@@ -865,7 +1299,7 @@ public:
 	CoverSheetPage (wxSize panel_size, int border)
 #ifdef DCPOMATIC_OSX
 		/* We have to force both width and height of this one */
-		: StandardPage (wxSize (480, 128), border)
+		: StandardPage (wxSize (panel_size.GetWidth(), 128), border)
 #else
 		: StandardPage (panel_size, border)
 #endif
@@ -889,7 +1323,7 @@ private:
 		_cover_sheet = new wxTextCtrl (_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (-1, 200), wxTE_MULTILINE);
 		_panel->GetSizer()->Add (_cover_sheet, 0, wxEXPAND | wxALL, _border);
 
-		_reset_cover_sheet = new wxButton (_panel, wxID_ANY, _("Reset to default text"));
+		_reset_cover_sheet = new Button (_panel, _("Reset to default text"));
 		_panel->GetSizer()->Add (_reset_cover_sheet, 0, wxEXPAND | wxALL, _border);
 
 		_cover_sheet->Bind (wxEVT_TEXT, boost::bind (&CoverSheetPage::cover_sheet_changed, this));
@@ -933,6 +1367,7 @@ public:
 		: StockPage (Kind_Advanced, panel_size, border)
 		, _maximum_j2k_bandwidth (0)
 		, _allow_any_dcp_frame_rate (0)
+		, _allow_any_container (0)
 		, _only_servers_encode (0)
 		, _log_general (0)
 		, _log_warning (0)
@@ -951,7 +1386,7 @@ private:
 		flags |= wxALIGN_RIGHT;
 		text += wxT (":");
 #endif
-		wxStaticText* m = new wxStaticText (parent, wxID_ANY, text);
+		wxStaticText* m = new StaticText (parent, text);
 		table->Add (m, 0, flags, DCPOMATIC_SIZER_Y_GAP);
 	}
 
@@ -970,11 +1405,30 @@ private:
 			table->Add (s, 1);
 		}
 
-		_allow_any_dcp_frame_rate = new wxCheckBox (_panel, wxID_ANY, _("Allow any DCP frame rate"));
+		add_label_to_sizer (table, _panel, _("Video display mode"), true);
+		_video_display_mode = new wxChoice (_panel, wxID_ANY);
+		table->Add (_video_display_mode);
+
+		wxStaticText* restart = add_label_to_sizer (table, _panel, _("(restart DCP-o-matic to change display mode)"), false);
+		wxFont font = restart->GetFont();
+		font.SetStyle (wxFONTSTYLE_ITALIC);
+		font.SetPointSize (font.GetPointSize() - 1);
+		restart->SetFont (font);
+		table->AddSpacer (0);
+
+		_allow_any_dcp_frame_rate = new CheckBox (_panel, _("Allow any DCP frame rate"));
 		table->Add (_allow_any_dcp_frame_rate, 1, wxEXPAND | wxALL);
 		table->AddSpacer (0);
 
-		_only_servers_encode = new wxCheckBox (_panel, wxID_ANY, _("Only servers encode"));
+		_allow_any_container = new CheckBox (_panel, _("Allow non-standard container ratios"));
+		table->Add (_allow_any_container, 1, wxEXPAND | wxALL);
+		table->AddSpacer (0);
+
+		restart = add_label_to_sizer (table, _panel, _("(restart DCP-o-matic to see all ratios)"), false);
+		restart->SetFont (font);
+		table->AddSpacer (0);
+
+		_only_servers_encode = new CheckBox (_panel, _("Only servers encode"));
 		table->Add (_only_servers_encode, 1, wxEXPAND | wxALL);
 		table->AddSpacer (0);
 
@@ -989,7 +1443,7 @@ private:
 		{
 			add_top_aligned_label_to_sizer (table, _panel, _("DCP metadata filename format"));
 			dcp::NameFormat::Map titles;
-			titles['t'] = "type (cpl/pkl)";
+			titles['t'] = wx_to_std (_("type (cpl/pkl)"));
 			dcp::NameFormat::Map examples;
 			examples['t'] = "cpl";
 			_dcp_metadata_filename_format = new NameFormatEditor (
@@ -1001,10 +1455,10 @@ private:
 		{
 			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";
+			titles['t'] = wx_to_std (_("type (j2c/pcm/sub)"));
+			titles['r'] = wx_to_std (_("reel number"));
+			titles['n'] = wx_to_std (_("number of reels"));
+			titles['c'] = wx_to_std (_("content filename"));
 			dcp::NameFormat::Map examples;
 			examples['t'] = "j2c";
 			examples['r'] = "1";
@@ -1019,33 +1473,37 @@ private:
 		{
 			add_top_aligned_label_to_sizer (table, _panel, _("Log"));
 			wxBoxSizer* t = new wxBoxSizer (wxVERTICAL);
-			_log_general = new wxCheckBox (_panel, wxID_ANY, _("General"));
+			_log_general = new CheckBox (_panel, _("General"));
 			t->Add (_log_general, 1, wxEXPAND | wxALL);
-			_log_warning = new wxCheckBox (_panel, wxID_ANY, _("Warnings"));
+			_log_warning = new CheckBox (_panel, _("Warnings"));
 			t->Add (_log_warning, 1, wxEXPAND | wxALL);
-			_log_error = new wxCheckBox (_panel, wxID_ANY, _("Errors"));
+			_log_error = new CheckBox (_panel, _("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"));
+			_log_timing = new CheckBox (_panel, S_("Config|Timing"));
 			t->Add (_log_timing, 1, wxEXPAND | wxALL);
-			_log_debug_decode = new wxCheckBox (_panel, wxID_ANY, _("Debug: decode"));
+			_log_debug_decode = new CheckBox (_panel, _("Debug: decode"));
 			t->Add (_log_debug_decode, 1, wxEXPAND | wxALL);
-			_log_debug_encode = new wxCheckBox (_panel, wxID_ANY, _("Debug: encode"));
+			_log_debug_encode = new CheckBox (_panel, _("Debug: encode"));
 			t->Add (_log_debug_encode, 1, wxEXPAND | wxALL);
-			_log_debug_email = new wxCheckBox (_panel, wxID_ANY, _("Debug: email sending"));
+			_log_debug_email = new CheckBox (_panel, _("Debug: email sending"));
 			t->Add (_log_debug_email, 1, wxEXPAND | wxALL);
 			table->Add (t, 0, wxALL, 6);
 		}
 
 #ifdef DCPOMATIC_WINDOWS
-		_win32_console = new wxCheckBox (_panel, wxID_ANY, _("Open console window"));
+		_win32_console = new CheckBox (_panel, _("Open console window"));
 		table->Add (_win32_console, 1, wxEXPAND | wxALL);
 		table->AddSpacer (0);
 #endif
 
 		_maximum_j2k_bandwidth->SetRange (1, 1000);
 		_maximum_j2k_bandwidth->Bind (wxEVT_SPINCTRL, boost::bind (&AdvancedPage::maximum_j2k_bandwidth_changed, this));
+		_video_display_mode->Append (_("Simple (safer)"));
+		_video_display_mode->Append (_("OpenGL (faster)"));
+		_video_display_mode->Bind (wxEVT_CHOICE, boost::bind(&AdvancedPage::video_display_mode_changed, this));
 		_allow_any_dcp_frame_rate->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::allow_any_dcp_frame_rate_changed, this));
+		_allow_any_container->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::allow_any_container_changed, this));
 		_only_servers_encode->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::only_servers_encode_changed, this));
 		_frames_in_memory_multiplier->Bind (wxEVT_SPINCTRL, boost::bind(&AdvancedPage::frames_in_memory_multiplier_changed, this));
 		_dcp_metadata_filename_format->Changed.connect (boost::bind (&AdvancedPage::dcp_metadata_filename_format_changed, this));
@@ -1067,7 +1525,16 @@ private:
 		Config* config = Config::instance ();
 
 		checked_set (_maximum_j2k_bandwidth, config->maximum_j2k_bandwidth() / 1000000);
+		switch (config->video_view_type()) {
+		case Config::VIDEO_VIEW_SIMPLE:
+			checked_set (_video_display_mode, 0);
+			break;
+		case Config::VIDEO_VIEW_OPENGL:
+			checked_set (_video_display_mode, 1);
+			break;
+		}
 		checked_set (_allow_any_dcp_frame_rate, config->allow_any_dcp_frame_rate ());
+		checked_set (_allow_any_container, config->allow_any_container ());
 		checked_set (_only_servers_encode, config->only_servers_encode ());
 		checked_set (_log_general, config->log_types() & LogEntry::TYPE_GENERAL);
 		checked_set (_log_warning, config->log_types() & LogEntry::TYPE_WARNING);
@@ -1087,6 +1554,15 @@ private:
 		Config::instance()->set_maximum_j2k_bandwidth (_maximum_j2k_bandwidth->GetValue() * 1000000);
 	}
 
+	void video_display_mode_changed ()
+	{
+		if (_video_display_mode->GetSelection() == 0) {
+			Config::instance()->set_video_view_type (Config::VIDEO_VIEW_SIMPLE);
+		} else {
+			Config::instance()->set_video_view_type (Config::VIDEO_VIEW_OPENGL);
+		}
+	}
+
 	void frames_in_memory_multiplier_changed ()
 	{
 		Config::instance()->set_frames_in_memory_multiplier (_frames_in_memory_multiplier->GetValue());
@@ -1097,6 +1573,11 @@ private:
 		Config::instance()->set_allow_any_dcp_frame_rate (_allow_any_dcp_frame_rate->GetValue ());
 	}
 
+	void allow_any_container_changed ()
+	{
+		Config::instance()->set_allow_any_container (_allow_any_container->GetValue ());
+	}
+
 	void only_servers_encode_changed ()
 	{
 		Config::instance()->set_only_servers_encode (_only_servers_encode->GetValue ());
@@ -1147,8 +1628,10 @@ private:
 #endif
 
 	wxSpinCtrl* _maximum_j2k_bandwidth;
+	wxChoice* _video_display_mode;
 	wxSpinCtrl* _frames_in_memory_multiplier;
 	wxCheckBox* _allow_any_dcp_frame_rate;
+	wxCheckBox* _allow_any_container;
 	wxCheckBox* _only_servers_encode;
 	NameFormatEditor* _dcp_metadata_filename_format;
 	NameFormatEditor* _dcp_asset_filename_format;
@@ -1174,7 +1657,7 @@ create_full_config_dialog ()
 	   the containing window doesn't shrink too much when we select those panels.
 	   This is obviously an unpleasant hack.
 	*/
-	wxSize ps = wxSize (520, -1);
+	wxSize ps = wxSize (700, -1);
 	int const border = 16;
 #else
 	wxSize ps = wxSize (-1, -1);
@@ -1186,7 +1669,10 @@ create_full_config_dialog ()
 	e->AddPage (new EncodingServersPage (ps, border));
 	e->AddPage (new KeysPage (ps, border));
 	e->AddPage (new TMSPage (ps, border));
+	e->AddPage (new EmailPage (ps, border));
 	e->AddPage (new KDMEmailPage (ps, border));
+	e->AddPage (new AccountsPage (ps, border));
+	e->AddPage (new NotificationsPage (ps, border));
 	e->AddPage (new CoverSheetPage (ps, border));
 	e->AddPage (new AdvancedPage (ps, border));
 	return e;