Merge master.
[dcpomatic.git] / src / wx / config_dialog.cc
index 5479c22cee8857955cc321208264a05ca764e194..175ed94ade131a754781e69476f9d6d6f4f3a534 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 #include <boost/lexical_cast.hpp>
 #include <boost/filesystem.hpp>
 #include <wx/stdpaths.h>
-#include <wx/notebook.h>
-#include <libdcp/colour_matrix.h>
+#include <wx/preferences.h>
+#include <wx/filepicker.h>
+#include <wx/spinctrl.h>
+#include <dcp/colour_matrix.h>
+#include <dcp/exceptions.h>
+#include <dcp/signer.h>
 #include "lib/config.h"
-#include "lib/server.h"
 #include "lib/ratio.h"
 #include "lib/scaler.h"
 #include "lib/filter.h"
 #include "lib/dcp_content_type.h"
 #include "lib/colour_conversion.h"
+#include "lib/log.h"
+#include "lib/util.h"
+#include "lib/cross.h"
+#include "lib/exceptions.h"
 #include "config_dialog.h"
 #include "wx_util.h"
+#include "editable_list.h"
 #include "filter_dialog.h"
-#include "server_dialog.h"
 #include "dir_picker_ctrl.h"
-#include "dci_metadata_dialog.h"
+#include "isdcf_metadata_dialog.h"
 #include "preset_colour_conversion_dialog.h"
+#include "server_dialog.h"
 
 using std::vector;
 using std::string;
 using std::list;
+using std::cout;
 using boost::bind;
 using boost::shared_ptr;
 using boost::lexical_cast;
 
-ConfigDialog::ConfigDialog (wxWindow* parent)
-       : wxDialog (parent, wxID_ANY, _("DCP-o-matic Preferences"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+class Page
 {
-       wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
-       _notebook = new wxNotebook (this, wxID_ANY);
-       s->Add (_notebook, 1);
-
-       make_misc_panel ();
-       _notebook->AddPage (_misc_panel, _("Miscellaneous"), true);
-       make_servers_panel ();
-       _notebook->AddPage (_servers_panel, _("Encoding servers"), false);
-       make_colour_conversions_panel ();
-       _notebook->AddPage (_colour_conversions_panel, _("Colour conversions"), false);
-       make_metadata_panel ();
-       _notebook->AddPage (_metadata_panel, _("Metadata"), false);
-       make_tms_panel ();
-       _notebook->AddPage (_tms_panel, _("TMS"), false);
-       make_kdm_email_panel ();
-       _notebook->AddPage (_kdm_email_panel, _("KDM email"), false);
-
-       wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-       overall_sizer->Add (s, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
-
-       wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
-       if (buttons) {
-               overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
-       }
-
-       SetSizer (overall_sizer);
-       overall_sizer->Layout ();
-       overall_sizer->SetSizeHints (this);
-}
+public:
+       Page (wxSize panel_size, int border)
+               : _panel_size (panel_size)
+               , _border (border)
+       {}
+
+protected:
+       wxSize _panel_size;
+       int _border;
+};
+
+class GeneralPage : public wxStockPreferencesPage, public Page
+{
+public:
+       GeneralPage (wxSize panel_size, int border)
+               : wxStockPreferencesPage (Kind_General)
+               , Page (panel_size, border)
+       {}
+
+       wxWindow* CreateWindow (wxWindow* parent)
+       {
+               wxPanel* panel = new wxPanel (parent);
+               wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
+               panel->SetSizer (s);
+
+               wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+               table->AddGrowableCol (1, 1);
+               s->Add (table, 1, wxALL | wxEXPAND, _border);
+               
+               _set_language = new wxCheckBox (panel, wxID_ANY, _("Set language"));
+               table->Add (_set_language, 1);
+               _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"));
+               table->Add (_language);
+               
+               wxStaticText* restart = add_label_to_sizer (table, panel, _("(restart DCP-o-matic to see language changes)"), false);
+               wxFont font = restart->GetFont();
+               font.SetStyle (wxFONTSTYLE_ITALIC);
+               font.SetPointSize (font.GetPointSize() - 1);
+               restart->SetFont (font);
+               table->AddSpacer (0);
+               
+               add_label_to_sizer (table, panel, _("Threads to use for encoding on this host"), true);
+               _num_local_encoding_threads = new wxSpinCtrl (panel);
+               table->Add (_num_local_encoding_threads, 1);
+
+               _check_for_updates = new wxCheckBox (panel, wxID_ANY, _("Check for updates on startup"));
+               table->Add (_check_for_updates, 1, wxEXPAND | wxALL);
+               table->AddSpacer (0);
+               
+               _check_for_test_updates = new wxCheckBox (panel, wxID_ANY, _("Check for testing updates as well as stable ones"));
+               table->Add (_check_for_test_updates, 1, wxEXPAND | wxALL);
+               table->AddSpacer (0);
+               
+               Config* config = Config::instance ();
+               
+               _set_language->SetValue (config->language ());
+               
+               if (config->language().get_value_or ("") == "fr") {
+                       _language->SetSelection (3);
+               } else if (config->language().get_value_or ("") == "it") {
+                       _language->SetSelection (4);
+               } else if (config->language().get_value_or ("") == "es") {
+                       _language->SetSelection (2);
+               } else if (config->language().get_value_or ("") == "sv") {
+                       _language->SetSelection (6);
+               } else if (config->language().get_value_or ("") == "de") {
+                       _language->SetSelection (0);
+               } else if (config->language().get_value_or ("") == "nl") {
+                       _language->SetSelection (5);
+               } else {
+                       _language->SetSelection (1);
+               }
+               
+               setup_language_sensitivity ();
+               
+               _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));
+               
+               _num_local_encoding_threads->SetRange (1, 128);
+               _num_local_encoding_threads->SetValue (config->num_local_encoding_threads ());
+               _num_local_encoding_threads->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&GeneralPage::num_local_encoding_threads_changed, this));
+
+               _check_for_updates->SetValue (config->check_for_updates ());
+               _check_for_updates->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&GeneralPage::check_for_updates_changed, this));
+               _check_for_test_updates->SetValue (config->check_for_test_updates ());
+               _check_for_test_updates->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&GeneralPage::check_for_test_updates_changed, this));
+               
+               return panel;
+       }
 
-void
-ConfigDialog::make_misc_panel ()
+private:       
+       void setup_language_sensitivity ()
+       {
+               _language->Enable (_set_language->GetValue ());
+       }
+
+       void set_language_changed ()
+       {
+               setup_language_sensitivity ();
+               if (_set_language->GetValue ()) {
+                       language_changed ();
+               } else {
+                       Config::instance()->unset_language ();
+               }
+       }
+
+       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;
+               }
+       }
+       
+       void check_for_updates_changed ()
+       {
+               Config::instance()->set_check_for_updates (_check_for_updates->GetValue ());
+       }
+       
+       void check_for_test_updates_changed ()
+       {
+               Config::instance()->set_check_for_test_updates (_check_for_test_updates->GetValue ());
+       }
+
+       void num_local_encoding_threads_changed ()
+       {
+               Config::instance()->set_num_local_encoding_threads (_num_local_encoding_threads->GetValue ());
+       }
+
+       wxCheckBox* _set_language;
+       wxChoice* _language;
+       wxSpinCtrl* _num_local_encoding_threads;
+       wxCheckBox* _check_for_updates;
+       wxCheckBox* _check_for_test_updates;
+};
+
+class DefaultsPage : public wxPreferencesPage, public Page
 {
-       _misc_panel = new wxPanel (_notebook);
-       wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
-       _misc_panel->SetSizer (s);
-
-       wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-       table->AddGrowableCol (1, 1);
-       s->Add (table, 1, wxALL | wxEXPAND, 8);
-
-       _set_language = new wxCheckBox (_misc_panel, wxID_ANY, _("Set language"));
-       table->Add (_set_language, 1);
-       _language = new wxChoice (_misc_panel, wxID_ANY);
-       _language->Append (wxT ("English"));
-       _language->Append (wxT ("Français"));
-       _language->Append (wxT ("Italiano"));
-       _language->Append (wxT ("Español"));
-       _language->Append (wxT ("Svenska"));
-       table->Add (_language);
-
-       wxStaticText* restart = add_label_to_sizer (table, _misc_panel, _("(restart DCP-o-matic to see language changes)"), false);
-       wxFont font = restart->GetFont();
-       font.SetStyle (wxFONTSTYLE_ITALIC);
-       font.SetPointSize (font.GetPointSize() - 1);
-       restart->SetFont (font);
-       table->AddSpacer (0);
-
-       add_label_to_sizer (table, _misc_panel, _("Threads to use for encoding on this host"), true);
-       _num_local_encoding_threads = new wxSpinCtrl (_misc_panel);
-       table->Add (_num_local_encoding_threads, 1);
-
-       add_label_to_sizer (table, _misc_panel, _("Outgoing mail server"), true);
-       _mail_server = new wxTextCtrl (_misc_panel, wxID_ANY);
-       table->Add (_mail_server, 1, wxEXPAND | wxALL);
-
-       add_label_to_sizer (table, _misc_panel, _("From address for KDM emails"), true);
-       _kdm_from = new wxTextCtrl (_misc_panel, wxID_ANY);
-       table->Add (_kdm_from, 1, wxEXPAND | wxALL);
+public:
+       DefaultsPage (wxSize panel_size, int border)
+               : Page (panel_size, border)
+       {}
        
+       wxString GetName () const
        {
-               add_label_to_sizer (table, _misc_panel, _("Default duration of still images"), true);
-               wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-               _default_still_length = new wxSpinCtrl (_misc_panel);
-               s->Add (_default_still_length);
-               add_label_to_sizer (s, _misc_panel, _("s"), false);
-               table->Add (s, 1);
+               return _("Defaults");
        }
 
-       add_label_to_sizer (table, _misc_panel, _("Default directory for new films"), true);
+#ifdef DCPOMATIC_OSX   
+       wxBitmap GetLargeIcon () const
+       {
+               return wxBitmap ("defaults", wxBITMAP_TYPE_PNG_RESOURCE);
+       }
+#endif 
+
+       wxWindow* CreateWindow (wxWindow* parent)
+       {
+               wxPanel* panel = new wxPanel (parent);
+               wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
+               panel->SetSizer (s);
+
+               wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+               table->AddGrowableCol (1, 1);
+               s->Add (table, 1, wxALL | wxEXPAND, _border);
+               
+               {
+                       add_label_to_sizer (table, panel, _("Default duration of still images"), true);
+                       wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+                       _still_length = new wxSpinCtrl (panel);
+                       s->Add (_still_length);
+                       add_label_to_sizer (s, panel, _("s"), false);
+                       table->Add (s, 1);
+               }
+               
+               add_label_to_sizer (table, panel, _("Default directory for new films"), true);
 #ifdef DCPOMATIC_USE_OWN_DIR_PICKER
-       _default_directory = new DirPickerCtrl (_misc_panel);
+               _directory = new DirPickerCtrl (panel);
 #else  
-       _default_directory = new wxDirPickerCtrl (_misc_panel, wxDD_DIR_MUST_EXIST);
+               _directory = new wxDirPickerCtrl (panel, wxDD_DIR_MUST_EXIST);
 #endif
-       table->Add (_default_directory, 1, wxEXPAND);
-
-       add_label_to_sizer (table, _misc_panel, _("Default DCI name details"), true);
-       _default_dci_metadata_button = new wxButton (_misc_panel, wxID_ANY, _("Edit..."));
-       table->Add (_default_dci_metadata_button);
-
-       add_label_to_sizer (table, _misc_panel, _("Default container"), true);
-       _default_container = new wxChoice (_misc_panel, wxID_ANY);
-       table->Add (_default_container);
+               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..."));
+               table->Add (_isdcf_metadata_button);
+
+               add_label_to_sizer (table, panel, _("Default scale to"), true);
+               _scale = new wxChoice (panel, wxID_ANY);
+               table->Add (_scale);
+               
+               add_label_to_sizer (table, panel, _("Default container"), true);
+               _container = new wxChoice (panel, wxID_ANY);
+               table->Add (_container);
+               
+               add_label_to_sizer (table, panel, _("Default content type"), true);
+               _dcp_content_type = new wxChoice (panel, wxID_ANY);
+               table->Add (_dcp_content_type);
+               
+               {
+                       add_label_to_sizer (table, panel, _("Default JPEG2000 bandwidth"), true);
+                       wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+                       _j2k_bandwidth = new wxSpinCtrl (panel);
+                       s->Add (_j2k_bandwidth);
+                       add_label_to_sizer (s, panel, _("Mbit/s"), false);
+                       table->Add (s, 1);
+               }
+               
+               {
+                       add_label_to_sizer (table, panel, _("Default audio delay"), true);
+                       wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+                       _audio_delay = new wxSpinCtrl (panel);
+                       s->Add (_audio_delay);
+                       add_label_to_sizer (s, panel, _("ms"), false);
+                       table->Add (s, 1);
+               }
 
-       add_label_to_sizer (table, _misc_panel, _("Default content type"), true);
-       _default_dcp_content_type = new wxChoice (_misc_panel, wxID_ANY);
-       table->Add (_default_dcp_content_type);
+               add_label_to_sizer (table, panel, _("Default issuer"), true);
+               _issuer = new wxTextCtrl (panel, wxID_ANY);
+               table->Add (_issuer, 1, wxEXPAND);
+
+               add_label_to_sizer (table, panel, _("Default creator"), true);
+               _creator = new wxTextCtrl (panel, wxID_ANY);
+               table->Add (_creator, 1, wxEXPAND);
+               
+               Config* config = Config::instance ();
+               
+               _still_length->SetRange (1, 3600);
+               _still_length->SetValue (config->default_still_length ());
+               _still_length->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&DefaultsPage::still_length_changed, this));
+               
+               _directory->SetPath (std_to_wx (config->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir())).string ()));
+               _directory->Bind (wxEVT_COMMAND_DIRPICKER_CHANGED, boost::bind (&DefaultsPage::directory_changed, this));
+               
+               _isdcf_metadata_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DefaultsPage::edit_isdcf_metadata_clicked, this, parent));
+               
+               vector<Ratio const *> ratio = Ratio::all ();
+               int n = 0;
+               for (vector<Ratio const *>::iterator i = ratio.begin(); i != ratio.end(); ++i) {
+                       _scale->Append (std_to_wx ((*i)->nickname ()));
+                       if (*i == config->default_scale ()) {
+                               _scale->SetSelection (n);
+                       }
+                       _container->Append (std_to_wx ((*i)->nickname ()));
+                       if (*i == config->default_container ()) {
+                               _container->SetSelection (n);
+                       }
+                       ++n;
+               }
+               
+               _scale->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DefaultsPage::scale_changed, this));
+               _container->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DefaultsPage::container_changed, this));
+               
+               vector<DCPContentType const *> const ct = DCPContentType::all ();
+               n = 0;
+               for (vector<DCPContentType const *>::const_iterator i = ct.begin(); i != ct.end(); ++i) {
+                       _dcp_content_type->Append (std_to_wx ((*i)->pretty_name ()));
+                       if (*i == config->default_dcp_content_type ()) {
+                               _dcp_content_type->SetSelection (n);
+                       }
+                       ++n;
+               }
+               
+               _dcp_content_type->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DefaultsPage::dcp_content_type_changed, this));
+               
+               _j2k_bandwidth->SetRange (50, 250);
+               _j2k_bandwidth->SetValue (config->default_j2k_bandwidth() / 1000000);
+               _j2k_bandwidth->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&DefaultsPage::j2k_bandwidth_changed, this));
+               
+               _audio_delay->SetRange (-1000, 1000);
+               _audio_delay->SetValue (config->default_audio_delay ());
+               _audio_delay->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&DefaultsPage::audio_delay_changed, this));
+
+               _issuer->SetValue (std_to_wx (config->dcp_metadata().issuer));
+               _issuer->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&DefaultsPage::issuer_changed, this));
+               _creator->SetValue (std_to_wx (config->dcp_metadata().creator));
+               _creator->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&DefaultsPage::creator_changed, this));
+
+               return panel;
+       }
 
+private:
+       void j2k_bandwidth_changed ()
        {
-               add_label_to_sizer (table, _misc_panel, _("Default JPEG2000 bandwidth"), true);
-               wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-               _default_j2k_bandwidth = new wxSpinCtrl (_misc_panel);
-               s->Add (_default_j2k_bandwidth);
-               add_label_to_sizer (s, _misc_panel, _("MBps"), false);
-               table->Add (s, 1);
+               Config::instance()->set_default_j2k_bandwidth (_j2k_bandwidth->GetValue() * 1000000);
        }
        
-       Config* config = Config::instance ();
+       void audio_delay_changed ()
+       {
+               Config::instance()->set_default_audio_delay (_audio_delay->GetValue());
+       }
 
-       _set_language->SetValue (config->language ());
+       void directory_changed ()
+       {
+               Config::instance()->set_default_directory (wx_to_std (_directory->GetPath ()));
+       }
 
-       if (config->language().get_value_or ("") == "fr") {
-               _language->SetSelection (1);
-       } else if (config->language().get_value_or ("") == "it") {
-               _language->SetSelection (2);
-       } else if (config->language().get_value_or ("") == "es") {
-               _language->SetSelection (3);
-       } else if (config->language().get_value_or ("") == "sv") {
-               _language->SetSelection (4);
-       } else {
-               _language->SetSelection (0);
+       void edit_isdcf_metadata_clicked (wxWindow* parent)
+       {
+               ISDCFMetadataDialog* d = new ISDCFMetadataDialog (parent, Config::instance()->default_isdcf_metadata ());
+               d->ShowModal ();
+               Config::instance()->set_default_isdcf_metadata (d->isdcf_metadata ());
+               d->Destroy ();
        }
 
-       setup_language_sensitivity ();
+       void still_length_changed ()
+       {
+               Config::instance()->set_default_still_length (_still_length->GetValue ());
+       }
 
-       _set_language->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&ConfigDialog::set_language_changed, this));
-       _language->Bind     (wxEVT_COMMAND_CHOICE_SELECTED,  boost::bind (&ConfigDialog::language_changed,     this));
+       void scale_changed ()
+       {
+               vector<Ratio const *> ratio = Ratio::all ();
+               Config::instance()->set_default_scale (ratio[_scale->GetSelection()]);
+       }
+       
+       void container_changed ()
+       {
+               vector<Ratio const *> ratio = Ratio::all ();
+               Config::instance()->set_default_container (ratio[_container->GetSelection()]);
+       }
+       
+       void dcp_content_type_changed ()
+       {
+               vector<DCPContentType const *> ct = DCPContentType::all ();
+               Config::instance()->set_default_dcp_content_type (ct[_dcp_content_type->GetSelection()]);
+       }
 
-       _num_local_encoding_threads->SetRange (1, 128);
-       _num_local_encoding_threads->SetValue (config->num_local_encoding_threads ());
-       _num_local_encoding_threads->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&ConfigDialog::num_local_encoding_threads_changed, this));
+       void issuer_changed ()
+       {
+               dcp::XMLMetadata m = Config::instance()->dcp_metadata ();
+               m.issuer = wx_to_std (_issuer->GetValue ());
+               Config::instance()->set_dcp_metadata (m);
+       }
+       
+       void creator_changed ()
+       {
+               dcp::XMLMetadata m = Config::instance()->dcp_metadata ();
+               m.creator = wx_to_std (_creator->GetValue ());
+               Config::instance()->set_dcp_metadata (m);
+       }
+       
+       wxSpinCtrl* _j2k_bandwidth;
+       wxSpinCtrl* _audio_delay;
+       wxButton* _isdcf_metadata_button;
+       wxSpinCtrl* _still_length;
+#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
+       DirPickerCtrl* _directory;
+#else
+       wxDirPickerCtrl* _directory;
+#endif
+       wxChoice* _scale;
+       wxChoice* _container;
+       wxChoice* _dcp_content_type;
+       wxTextCtrl* _issuer;
+       wxTextCtrl* _creator;
+};
+
+class EncodingServersPage : public wxPreferencesPage, public Page
+{
+public:
+       EncodingServersPage (wxSize panel_size, int border)
+               : Page (panel_size, border)
+       {}
+       
+       wxString GetName () const
+       {
+               return _("Servers");
+       }
 
-       _mail_server->SetValue (std_to_wx (config->mail_server ()));
-       _mail_server->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ConfigDialog::mail_server_changed, this));
-       _kdm_from->SetValue (std_to_wx (config->kdm_from ()));
-       _kdm_from->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ConfigDialog::kdm_from_changed, this));
+#ifdef DCPOMATIC_OSX   
+       wxBitmap GetLargeIcon () const
+       {
+               return wxBitmap ("servers", wxBITMAP_TYPE_PNG_RESOURCE);
+       }
+#endif 
 
-       _default_still_length->SetRange (1, 3600);
-       _default_still_length->SetValue (config->default_still_length ());
-       _default_still_length->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&ConfigDialog::default_still_length_changed, this));
+       wxWindow* CreateWindow (wxWindow* parent)
+       {
+               wxPanel* panel = new wxPanel (parent, wxID_ANY, wxDefaultPosition, _panel_size);
+               wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
+               panel->SetSizer (s);
+               
+               _use_any_servers = new wxCheckBox (panel, wxID_ANY, _("Use all servers"));
+               s->Add (_use_any_servers, 0, wxALL, _border);
+               
+               vector<string> columns;
+               columns.push_back (wx_to_std (_("IP address / host name")));
+               _servers_list = new EditableList<string, ServerDialog> (
+                       panel,
+                       columns,
+                       boost::bind (&Config::servers, Config::instance()),
+                       boost::bind (&Config::set_servers, Config::instance(), _1),
+                       boost::bind (&EncodingServersPage::server_column, this, _1)
+                       );
+               
+               s->Add (_servers_list, 1, wxEXPAND | wxALL, _border);
+               
+               _use_any_servers->SetValue (Config::instance()->use_any_servers ());
+               _use_any_servers->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&EncodingServersPage::use_any_servers_changed, this));
+
+               return panel;
+       }
 
-       _default_directory->SetPath (std_to_wx (config->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir())).string ()));
-       _default_directory->Bind (wxEVT_COMMAND_DIRPICKER_CHANGED, boost::bind (&ConfigDialog::default_directory_changed, this));
+private:       
 
-       _default_dci_metadata_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ConfigDialog::edit_default_dci_metadata_clicked, this));
+       void use_any_servers_changed ()
+       {
+               Config::instance()->set_use_any_servers (_use_any_servers->GetValue ());
+       }
 
-       vector<Ratio const *> ratio = Ratio::all ();
-       int n = 0;
-       for (vector<Ratio const *>::iterator i = ratio.begin(); i != ratio.end(); ++i) {
-               _default_container->Append (std_to_wx ((*i)->nickname ()));
-               if (*i == config->default_container ()) {
-                       _default_container->SetSelection (n);
-               }
-               ++n;
+       string server_column (string s)
+       {
+               return s;
        }
 
-       _default_container->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&ConfigDialog::default_container_changed, this));
+       wxCheckBox* _use_any_servers;
+       EditableList<string, ServerDialog>* _servers_list;
+};
+
+class ColourConversionsPage : public wxPreferencesPage, public Page
+{
+public:
+       ColourConversionsPage (wxSize panel_size, int border)
+               : Page (panel_size, border)
+       {}
        
-       vector<DCPContentType const *> const ct = DCPContentType::all ();
-       n = 0;
-       for (vector<DCPContentType const *>::const_iterator i = ct.begin(); i != ct.end(); ++i) {
-               _default_dcp_content_type->Append (std_to_wx ((*i)->pretty_name ()));
-               if (*i == config->default_dcp_content_type ()) {
-                       _default_dcp_content_type->SetSelection (n);
-               }
-               ++n;
+       wxString GetName () const
+       {
+               return _("Colour Conversions");
        }
 
-       _default_dcp_content_type->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&ConfigDialog::default_dcp_content_type_changed, this));
+#ifdef DCPOMATIC_OSX   
+       wxBitmap GetLargeIcon () const
+       {
+               return wxBitmap ("colour_conversions", wxBITMAP_TYPE_PNG_RESOURCE);
+       }
+#endif 
+       wxWindow* CreateWindow (wxWindow* parent)
+       {
+               wxPanel* panel = new wxPanel (parent, wxID_ANY, wxDefaultPosition, _panel_size);
+               wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
+               panel->SetSizer (s);
+
+               vector<string> columns;
+               columns.push_back (wx_to_std (_("Name")));
+               wxPanel* list = new EditableList<PresetColourConversion, PresetColourConversionDialog> (
+                       panel,
+                       columns,
+                       boost::bind (&Config::colour_conversions, Config::instance()),
+                       boost::bind (&Config::set_colour_conversions, Config::instance(), _1),
+                       boost::bind (&ColourConversionsPage::colour_conversion_column, this, _1),
+                       300
+                       );
+
+               s->Add (list, 1, wxEXPAND | wxALL, _border);
+               return panel;
+       }
 
-       _default_j2k_bandwidth->SetRange (50, 250);
-       _default_j2k_bandwidth->SetValue (config->default_j2k_bandwidth() / 1000000);
-       _default_j2k_bandwidth->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&ConfigDialog::default_j2k_bandwidth_changed, this));
-}
+private:
+       string colour_conversion_column (PresetColourConversion c)
+       {
+               return c.name;
+       }
+};
 
-void
-ConfigDialog::make_tms_panel ()
+class KeysPage : public wxPreferencesPage, public Page
 {
-       _tms_panel = new wxPanel (_notebook);
-       wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
-       _tms_panel->SetSizer (s);
+public:
+       KeysPage (wxSize panel_size, int border)
+               : Page (panel_size, border)
+       {}
+
+       wxString GetName () const
+       {
+               return _("Keys");
+       }
+
+#ifdef DCPOMATIC_OSX
+       wxBitmap GetLargeIcon () const
+       {
+               return wxBitmap ("keys", wxBITMAP_TYPE_PNG_RESOURCE);
+       }
+#endif 
 
-       wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-       table->AddGrowableCol (1, 1);
-       s->Add (table, 1, wxALL | wxEXPAND, 8);
+       wxWindow* CreateWindow (wxWindow* parent)
+       {
+               _panel = new wxPanel (parent, wxID_ANY, wxDefaultPosition, _panel_size);
+               wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
+               _panel->SetSizer (overall_sizer);
+
+               wxStaticText* m = new wxStaticText (_panel, wxID_ANY, _("Certificate chain for signing DCPs and KDMs:"));
+               overall_sizer->Add (m, 0, wxALL, _border);
+               
+               wxBoxSizer* certificates_sizer = new wxBoxSizer (wxHORIZONTAL);
+               overall_sizer->Add (certificates_sizer, 0, wxLEFT | wxRIGHT, _border);
+               
+               _certificates = new wxListCtrl (_panel, wxID_ANY, wxDefaultPosition, wxSize (400, 200), wxLC_REPORT | wxLC_SINGLE_SEL);
+
+               {
+                       wxListItem ip;
+                       ip.SetId (0);
+                       ip.SetText (_("Type"));
+                       ip.SetWidth (100);
+                       _certificates->InsertColumn (0, ip);
+               }
 
-       add_label_to_sizer (table, _tms_panel, _("IP address"), true);
-       _tms_ip = new wxTextCtrl (_tms_panel, wxID_ANY);
-       table->Add (_tms_ip, 1, wxEXPAND);
+               {
+                       wxListItem ip;
+                       ip.SetId (1);
+                       ip.SetText (_("Thumbprint"));
+                       ip.SetWidth (300);
+
+                       wxFont font = ip.GetFont ();
+                       font.SetFamily (wxFONTFAMILY_TELETYPE);
+                       ip.SetFont (font);
+                       
+                       _certificates->InsertColumn (1, ip);
+               }
 
-       add_label_to_sizer (table, _tms_panel, _("Target path"), true);
-       _tms_path = new wxTextCtrl (_tms_panel, wxID_ANY);
-       table->Add (_tms_path, 1, wxEXPAND);
+               certificates_sizer->Add (_certificates, 1, wxEXPAND);
 
-       add_label_to_sizer (table, _tms_panel, _("User name"), true);
-       _tms_user = new wxTextCtrl (_tms_panel, wxID_ANY);
-       table->Add (_tms_user, 1, wxEXPAND);
+               {
+                       wxSizer* s = new wxBoxSizer (wxVERTICAL);
+                       _add_certificate = new wxButton (_panel, wxID_ANY, _("Add..."));
+                       s->Add (_add_certificate, 0, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
+                       _remove_certificate = new wxButton (_panel, wxID_ANY, _("Remove"));
+                       s->Add (_remove_certificate, 0, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
+                       certificates_sizer->Add (s, 0, wxLEFT, DCPOMATIC_SIZER_X_GAP);
+               }
 
-       add_label_to_sizer (table, _tms_panel, _("Password"), true);
-       _tms_password = new wxTextCtrl (_tms_panel, wxID_ANY);
-       table->Add (_tms_password, 1, wxEXPAND);
+               wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+               table->AddGrowableCol (1, 1);
+               overall_sizer->Add (table, 1, wxALL | wxEXPAND, _border);
+
+               add_label_to_sizer (table, _panel, _("Private key for leaf certificate"), true);
+               {
+                       wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+                       _signer_private_key = new wxStaticText (_panel, wxID_ANY, wxT (""));
+                       wxFont font = _signer_private_key->GetFont ();
+                       font.SetFamily (wxFONTFAMILY_TELETYPE);
+                       _signer_private_key->SetFont (font);
+                       s->Add (_signer_private_key, 1, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
+                       _load_signer_private_key = new wxButton (_panel, wxID_ANY, _("Load..."));
+                       s->Add (_load_signer_private_key, 0, wxLEFT, DCPOMATIC_SIZER_X_GAP);
+                       table->Add (s, 0);
+               }
 
-       Config* config = Config::instance ();
-       
-       _tms_ip->SetValue (std_to_wx (config->tms_ip ()));
-       _tms_ip->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ConfigDialog::tms_ip_changed, this));
-       _tms_path->SetValue (std_to_wx (config->tms_path ()));
-       _tms_path->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ConfigDialog::tms_path_changed, this));
-       _tms_user->SetValue (std_to_wx (config->tms_user ()));
-       _tms_user->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ConfigDialog::tms_user_changed, this));
-       _tms_password->SetValue (std_to_wx (config->tms_password ()));
-       _tms_password->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ConfigDialog::tms_password_changed, this));
-}
+               add_label_to_sizer (table, _panel, _("Certificate for decrypting DCPs"), true);
+               {
+                       wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+                       _decryption_certificate = new wxStaticText (_panel, wxID_ANY, wxT (""));
+                       wxFont font = _decryption_certificate->GetFont ();
+                       font.SetFamily (wxFONTFAMILY_TELETYPE);
+                       _decryption_certificate->SetFont (font);
+                       s->Add (_decryption_certificate, 1, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
+                       _load_decryption_certificate = new wxButton (_panel, wxID_ANY, _("Load..."));
+                       s->Add (_load_decryption_certificate, 0, wxLEFT, DCPOMATIC_SIZER_X_GAP);
+                       table->Add (s, 0);
+               }
 
-void
-ConfigDialog::make_metadata_panel ()
-{
-       _metadata_panel = new wxPanel (_notebook);
-       wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
-       _metadata_panel->SetSizer (s);
+               add_label_to_sizer (table, _panel, _("Private key for decrypting DCPs"), true);
+               {
+                       wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+                       _decryption_private_key = new wxStaticText (_panel, wxID_ANY, wxT (""));
+                       wxFont font = _decryption_private_key->GetFont ();
+                       font.SetFamily (wxFONTFAMILY_TELETYPE);
+                       _decryption_private_key->SetFont (font);
+                       s->Add (_decryption_private_key, 1, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
+                       _load_decryption_private_key = new wxButton (_panel, wxID_ANY, _("Load..."));
+                       s->Add (_load_decryption_private_key, 0, wxLEFT, DCPOMATIC_SIZER_X_GAP);
+                       table->Add (s, 0);
+               }
 
-       wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-       table->AddGrowableCol (1, 1);
-       s->Add (table, 1, wxALL | wxEXPAND, 8);
+               _export_decryption_certificate = new wxButton (_panel, wxID_ANY, _("Export DCP decryption certificate..."));
+               table->Add (_export_decryption_certificate);
+               table->AddSpacer (0);
+               
+               _add_certificate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KeysPage::add_certificate, this));
+               _remove_certificate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KeysPage::remove_certificate, this));
+               _certificates->Bind (wxEVT_COMMAND_LIST_ITEM_SELECTED, boost::bind (&KeysPage::update_sensitivity, this));
+               _certificates->Bind (wxEVT_COMMAND_LIST_ITEM_DESELECTED, boost::bind (&KeysPage::update_sensitivity, this));
+               _load_signer_private_key->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KeysPage::load_signer_private_key, this));
+               _load_decryption_certificate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KeysPage::load_decryption_certificate, this));
+               _load_decryption_private_key->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KeysPage::load_decryption_private_key, this));
+               _export_decryption_certificate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KeysPage::export_decryption_certificate, this));
+
+               _signer.reset (new dcp::Signer (*Config::instance()->signer().get ()));
+
+               update_certificate_list ();
+               update_signer_private_key ();
+               update_decryption_certificate ();
+               update_decryption_private_key ();
+               update_sensitivity ();
+
+               return _panel;
+       }
 
-       add_label_to_sizer (table, _metadata_panel, _("Issuer"), true);
-       _issuer = new wxTextCtrl (_metadata_panel, wxID_ANY);
-       table->Add (_issuer, 1, wxEXPAND);
+private:
+       void add_certificate ()
+       {
+               wxFileDialog* d = new wxFileDialog (_panel, _("Select Certificate File"));
+               
+               if (d->ShowModal() == wxID_OK) {
+                       try {
+                               dcp::Certificate c (dcp::file_to_string (wx_to_std (d->GetPath ())));
+                               _signer->certificates().add (c);
+                               Config::instance()->set_signer (_signer);
+                               update_certificate_list ();
+                       } catch (dcp::MiscError& e) {
+                               error_dialog (_panel, wxString::Format (_("Could not read certificate file (%s)"), e.what ()));
+                       }
+               }
+               
+               d->Destroy ();
 
-       add_label_to_sizer (table, _metadata_panel, _("Creator"), true);
-       _creator = new wxTextCtrl (_metadata_panel, wxID_ANY);
-       table->Add (_creator, 1, wxEXPAND);
+               update_sensitivity ();
+       }
 
-       Config* config = Config::instance ();
+       void remove_certificate ()
+       {
+               int i = _certificates->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+               if (i == -1) {
+                       return;
+               }
+               
+               _certificates->DeleteItem (i);
+               _signer->certificates().remove (i);
+               Config::instance()->set_signer (_signer);
 
-       _issuer->SetValue (std_to_wx (config->dcp_metadata().issuer));
-       _issuer->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ConfigDialog::issuer_changed, this));
-       _creator->SetValue (std_to_wx (config->dcp_metadata().creator));
-       _creator->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ConfigDialog::creator_changed, this));
-}
+               update_sensitivity ();
+       }
 
-static std::string
-server_column (ServerDescription s, int c)
-{
-       switch (c) {
-       case 0:
-               return s.host_name ();
-       case 1:
-               return lexical_cast<string> (s.threads ());
+       void update_certificate_list ()
+       {
+               _certificates->DeleteAllItems ();
+               dcp::CertificateChain::List certs = _signer->certificates().root_to_leaf ();
+               size_t n = 0;
+               for (dcp::CertificateChain::List::const_iterator i = certs.begin(); i != certs.end(); ++i) {
+                       wxListItem item;
+                       item.SetId (n);
+                       _certificates->InsertItem (item);
+                       _certificates->SetItem (n, 1, std_to_wx (i->thumbprint ()));
+
+                       if (n == 0) {
+                               _certificates->SetItem (n, 0, _("Root"));
+                       } else if (n == (certs.size() - 1)) {
+                               _certificates->SetItem (n, 0, _("Leaf"));
+                       } else {
+                               _certificates->SetItem (n, 0, _("Intermediate"));
+                       }
+
+                       ++n;
+               }
        }
 
-       return "";
-}
+       void update_sensitivity ()
+       {
+               _remove_certificate->Enable (_certificates->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED) != -1);
+       }
 
-void
-ConfigDialog::make_servers_panel ()
-{
-       vector<string> columns;
-       columns.push_back (wx_to_std (_("IP address")));
-       columns.push_back (wx_to_std (_("Threads")));
-       _servers_panel = new EditableList<ServerDescription, ServerDialog> (
-               _notebook,
-               columns,
-               boost::bind (&Config::servers, Config::instance()),
-               boost::bind (&Config::set_servers, Config::instance(), _1),
-               boost::bind (&server_column, _1, _2)
-               );
-}
+       void update_signer_private_key ()
+       {
+               _signer_private_key->SetLabel (std_to_wx (dcp::private_key_fingerprint (_signer->key ())));
+       }       
+
+       void load_signer_private_key ()
+       {
+               wxFileDialog* d = new wxFileDialog (_panel, _("Select Key File"));
+
+               if (d->ShowModal() == wxID_OK) {
+                       try {
+                               boost::filesystem::path p (wx_to_std (d->GetPath ()));
+                               if (boost::filesystem::file_size (p) > 1024) {
+                                       error_dialog (_panel, wxString::Format (_("Could not read key file (%s)"), std_to_wx (p.string ())));
+                                       return;
+                               }
+                               
+                               _signer->set_key (dcp::file_to_string (p));
+                               Config::instance()->set_signer (_signer);
+                               update_signer_private_key ();
+                       } catch (dcp::MiscError& e) {
+                               error_dialog (_panel, wxString::Format (_("Could not read certificate file (%s)"), e.what ()));
+                       }
+               }
+               
+               d->Destroy ();
+
+               update_sensitivity ();
 
-void
-ConfigDialog::language_changed ()
-{
-       switch (_language->GetSelection ()) {
-       case 0:
-               Config::instance()->set_language ("en");
-               break;
-       case 1:
-               Config::instance()->set_language ("fr");
-               break;
-       case 2:
-               Config::instance()->set_language ("it");
-               break;
-       case 3:
-               Config::instance()->set_language ("es");
-               break;
-       case 4:
-               Config::instance()->set_language ("sv");
-               break;
        }
-}
 
-void
-ConfigDialog::tms_ip_changed ()
-{
-       Config::instance()->set_tms_ip (wx_to_std (_tms_ip->GetValue ()));
-}
+       void load_decryption_certificate ()
+       {
+               wxFileDialog* d = new wxFileDialog (_panel, _("Select Certificate File"));
+               
+               if (d->ShowModal() == wxID_OK) {
+                       try {
+                               dcp::Certificate c (dcp::file_to_string (wx_to_std (d->GetPath ())));
+                               Config::instance()->set_decryption_certificate (c);
+                               update_decryption_certificate ();
+                       } catch (dcp::MiscError& e) {
+                               error_dialog (_panel, wxString::Format (_("Could not read certificate file (%s)"), e.what ()));
+                       }
+               }
+               
+               d->Destroy ();
+       }
 
-void
-ConfigDialog::tms_path_changed ()
-{
-       Config::instance()->set_tms_path (wx_to_std (_tms_path->GetValue ()));
-}
+       void update_decryption_certificate ()
+       {
+               _decryption_certificate->SetLabel (std_to_wx (Config::instance()->decryption_certificate().thumbprint ()));
+       }
 
-void
-ConfigDialog::tms_user_changed ()
-{
-       Config::instance()->set_tms_user (wx_to_std (_tms_user->GetValue ()));
-}
+       void load_decryption_private_key ()
+       {
+               wxFileDialog* d = new wxFileDialog (_panel, _("Select Key File"));
+
+               if (d->ShowModal() == wxID_OK) {
+                       try {
+                               boost::filesystem::path p (wx_to_std (d->GetPath ()));
+                               Config::instance()->set_decryption_private_key (dcp::file_to_string (p));
+                               update_decryption_private_key ();
+                       } catch (dcp::MiscError& e) {
+                               error_dialog (_panel, wxString::Format (_("Could not read key file (%s)"), e.what ()));
+                       }
+               }
+               
+               d->Destroy ();
+       }
 
-void
-ConfigDialog::tms_password_changed ()
-{
-       Config::instance()->set_tms_password (wx_to_std (_tms_password->GetValue ()));
-}
+       void update_decryption_private_key ()
+       {
+               _decryption_private_key->SetLabel (std_to_wx (dcp::private_key_fingerprint (Config::instance()->decryption_private_key())));
+       }
 
-void
-ConfigDialog::num_local_encoding_threads_changed ()
-{
-       Config::instance()->set_num_local_encoding_threads (_num_local_encoding_threads->GetValue ());
-}
+       void export_decryption_certificate ()
+       {
+               wxFileDialog* d = new wxFileDialog (
+                       _panel, _("Select Certificate 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 ()));
+                       }
+
+                       string const s = Config::instance()->decryption_certificate().certificate (true);
+                       fwrite (s.c_str(), 1, s.length(), f);
+                       fclose (f);
+               }
+               d->Destroy ();
+       }
 
-void
-ConfigDialog::default_directory_changed ()
+       wxPanel* _panel;
+       wxListCtrl* _certificates;
+       wxButton* _add_certificate;
+       wxButton* _remove_certificate;
+       wxStaticText* _signer_private_key;
+       wxButton* _load_signer_private_key;
+       wxStaticText* _decryption_certificate;
+       wxButton* _load_decryption_certificate;
+       wxStaticText* _decryption_private_key;
+       wxButton* _load_decryption_private_key;
+       wxButton* _export_decryption_certificate;
+       shared_ptr<dcp::Signer> _signer;
+};
+
+class TMSPage : public wxPreferencesPage, public Page
 {
-       Config::instance()->set_default_directory (wx_to_std (_default_directory->GetPath ()));
-}
+public:
+       TMSPage (wxSize panel_size, int border)
+               : Page (panel_size, border)
+       {}
 
-void
-ConfigDialog::edit_default_dci_metadata_clicked ()
-{
-       DCIMetadataDialog* d = new DCIMetadataDialog (this, Config::instance()->default_dci_metadata ());
-       d->ShowModal ();
-       Config::instance()->set_default_dci_metadata (d->dci_metadata ());
-       d->Destroy ();
-}
+       wxString GetName () const
+       {
+               return _("TMS");
+       }
 
-void
-ConfigDialog::set_language_changed ()
-{
-       setup_language_sensitivity ();
-       if (_set_language->GetValue ()) {
-               language_changed ();
-       } else {
-               Config::instance()->unset_language ();
+#ifdef DCPOMATIC_OSX   
+       wxBitmap GetLargeIcon () const
+       {
+               return wxBitmap ("tms", wxBITMAP_TYPE_PNG_RESOURCE);
        }
-}
+#endif 
 
-void
-ConfigDialog::setup_language_sensitivity ()
-{
-       _language->Enable (_set_language->GetValue ());
-}
+       wxWindow* CreateWindow (wxWindow* parent)
+       {
+               wxPanel* panel = new wxPanel (parent, wxID_ANY, wxDefaultPosition, _panel_size);
+               wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
+               panel->SetSizer (s);
+
+               wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+               table->AddGrowableCol (1, 1);
+               s->Add (table, 1, wxALL | wxEXPAND, _border);
+               
+               add_label_to_sizer (table, panel, _("IP address"), true);
+               _tms_ip = new wxTextCtrl (panel, wxID_ANY);
+               table->Add (_tms_ip, 1, wxEXPAND);
+               
+               add_label_to_sizer (table, panel, _("Target path"), true);
+               _tms_path = new wxTextCtrl (panel, wxID_ANY);
+               table->Add (_tms_path, 1, wxEXPAND);
+               
+               add_label_to_sizer (table, panel, _("User name"), true);
+               _tms_user = new wxTextCtrl (panel, wxID_ANY);
+               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);
+               
+               Config* config = Config::instance ();
+               
+               _tms_ip->SetValue (std_to_wx (config->tms_ip ()));
+               _tms_ip->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&TMSPage::tms_ip_changed, this));
+               _tms_path->SetValue (std_to_wx (config->tms_path ()));
+               _tms_path->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&TMSPage::tms_path_changed, this));
+               _tms_user->SetValue (std_to_wx (config->tms_user ()));
+               _tms_user->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&TMSPage::tms_user_changed, this));
+               _tms_password->SetValue (std_to_wx (config->tms_password ()));
+               _tms_password->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&TMSPage::tms_password_changed, this));
+
+               return panel;
+       }
 
-void
-ConfigDialog::default_still_length_changed ()
-{
-       Config::instance()->set_default_still_length (_default_still_length->GetValue ());
-}
+private:
+       void tms_ip_changed ()
+       {
+               Config::instance()->set_tms_ip (wx_to_std (_tms_ip->GetValue ()));
+       }
+       
+       void tms_path_changed ()
+       {
+               Config::instance()->set_tms_path (wx_to_std (_tms_path->GetValue ()));
+       }
+       
+       void tms_user_changed ()
+       {
+               Config::instance()->set_tms_user (wx_to_std (_tms_user->GetValue ()));
+       }
+       
+       void tms_password_changed ()
+       {
+               Config::instance()->set_tms_password (wx_to_std (_tms_password->GetValue ()));
+       }
 
-void
-ConfigDialog::default_container_changed ()
-{
-       vector<Ratio const *> ratio = Ratio::all ();
-       Config::instance()->set_default_container (ratio[_default_container->GetSelection()]);
-}
+       wxTextCtrl* _tms_ip;
+       wxTextCtrl* _tms_path;
+       wxTextCtrl* _tms_user;
+       wxTextCtrl* _tms_password;
+};
 
-void
-ConfigDialog::default_dcp_content_type_changed ()
+class KDMEmailPage : public wxPreferencesPage, public Page
 {
-       vector<DCPContentType const *> ct = DCPContentType::all ();
-       Config::instance()->set_default_dcp_content_type (ct[_default_dcp_content_type->GetSelection()]);
-}
+public:
 
-void
-ConfigDialog::issuer_changed ()
-{
-       libdcp::XMLMetadata m = Config::instance()->dcp_metadata ();
-       m.issuer = wx_to_std (_issuer->GetValue ());
-       Config::instance()->set_dcp_metadata (m);
-}
+       KDMEmailPage (wxSize panel_size, int border)
+               : Page (panel_size, border)
+       {}
+       
+       wxString GetName () const
+       {
+               return _("KDM Email");
+       }
 
-void
-ConfigDialog::creator_changed ()
-{
-       libdcp::XMLMetadata m = Config::instance()->dcp_metadata ();
-       m.creator = wx_to_std (_creator->GetValue ());
-       Config::instance()->set_dcp_metadata (m);
-}
+#ifdef DCPOMATIC_OSX   
+       wxBitmap GetLargeIcon () const
+       {
+               return wxBitmap ("kdm_email", wxBITMAP_TYPE_PNG_RESOURCE);
+       }
+#endif 
 
-void
-ConfigDialog::default_j2k_bandwidth_changed ()
-{
-       Config::instance()->set_default_j2k_bandwidth (_default_j2k_bandwidth->GetValue() * 1000000);
-}
+       wxWindow* CreateWindow (wxWindow* parent)
+       {
+               /* We have to force both width and height of this one */
+#ifdef DCPOMATIC_OSX
+               wxPanel* panel = new wxPanel (parent, wxID_ANY, wxDefaultPosition, wxSize (480, 128));
+#else          
+               wxPanel* panel = new wxPanel (parent);
+#endif         
+               wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
+               panel->SetSizer (s);
+
+               wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+               table->AddGrowableCol (1, 1);
+               s->Add (table, 1, wxEXPAND | wxALL, _border);
+
+               add_label_to_sizer (table, panel, _("Outgoing mail server"), true);
+               _mail_server = new wxTextCtrl (panel, wxID_ANY);
+               table->Add (_mail_server, 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, _("Mail password"), true);
+               _mail_password = new wxTextCtrl (panel, wxID_ANY);
+               table->Add (_mail_password, 1, wxEXPAND | wxALL);
+               
+               wxStaticText* plain = add_label_to_sizer (table, panel, _("(password will be stored on disk in plaintext)"), false);
+               wxFont font = plain->GetFont();
+               font.SetStyle (wxFONTSTYLE_ITALIC);
+               font.SetPointSize (font.GetPointSize() - 1);
+               plain->SetFont (font);
+               table->AddSpacer (0);
+
+               add_label_to_sizer (table, panel, _("Subject"), true);
+               _kdm_subject = new wxTextCtrl (panel, wxID_ANY);
+               table->Add (_kdm_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);
+
+               add_label_to_sizer (table, panel, _("CC address"), true);
+               _kdm_cc = new wxTextCtrl (panel, wxID_ANY);
+               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);
+               s->Add (_kdm_email, 1, wxEXPAND | wxALL, _border);
+
+               _reset_kdm_email = new wxButton (panel, wxID_ANY, _("Reset to default text"));
+               s->Add (_reset_kdm_email, 0, wxEXPAND | wxALL, _border);
+
+               Config* config = Config::instance ();
+               _mail_server->SetValue (std_to_wx (config->mail_server ()));
+               _mail_server->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::mail_server_changed, this));
+               _mail_user->SetValue (std_to_wx (config->mail_user ()));
+               _mail_user->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::mail_user_changed, this));
+               _mail_password->SetValue (std_to_wx (config->mail_password ()));
+               _mail_password->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::mail_password_changed, this));
+               _kdm_subject->SetValue (std_to_wx (config->kdm_subject ()));
+               _kdm_subject->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_subject_changed, this));
+               _kdm_from->SetValue (std_to_wx (config->kdm_from ()));
+               _kdm_from->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_from_changed, this));
+               _kdm_cc->SetValue (std_to_wx (config->kdm_cc ()));
+               _kdm_cc->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_cc_changed, this));
+               _kdm_bcc->SetValue (std_to_wx (config->kdm_bcc ()));
+               _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));
+               _kdm_email->SetValue (std_to_wx (Config::instance()->kdm_email ()));
+               _reset_kdm_email->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KDMEmailPage::reset_kdm_email, this));
+
+               return panel;
+       }
 
-static std::string
-colour_conversion_column (PresetColourConversion c)
-{
-       return c.name;
-}
+private:
+       void mail_server_changed ()
+       {
+               Config::instance()->set_mail_server (wx_to_std (_mail_server->GetValue ()));
+       }
+       
+       void mail_user_changed ()
+       {
+               Config::instance()->set_mail_user (wx_to_std (_mail_user->GetValue ()));
+       }
+       
+       void mail_password_changed ()
+       {
+               Config::instance()->set_mail_password (wx_to_std (_mail_password->GetValue ()));
+       }
 
-void
-ConfigDialog::make_colour_conversions_panel ()
-{
-       vector<string> columns;
-       columns.push_back (wx_to_std (_("Name")));
-       _colour_conversions_panel = new EditableList<PresetColourConversion, PresetColourConversionDialog> (
-               _notebook,
-               columns,
-               boost::bind (&Config::colour_conversions, Config::instance()),
-               boost::bind (&Config::set_colour_conversions, Config::instance(), _1),
-               boost::bind (&colour_conversion_column, _1)
-               );
-}
+       void kdm_subject_changed ()
+       {
+               Config::instance()->set_kdm_subject (wx_to_std (_kdm_subject->GetValue ()));
+       }
+       
+       void kdm_from_changed ()
+       {
+               Config::instance()->set_kdm_from (wx_to_std (_kdm_from->GetValue ()));
+       }
 
-void
-ConfigDialog::mail_server_changed ()
-{
-       Config::instance()->set_mail_server (wx_to_std (_mail_server->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 ()));
+       }
+       
+       void kdm_email_changed ()
+       {
+               Config::instance()->set_kdm_email (wx_to_std (_kdm_email->GetValue ()));
+       }
 
+       void reset_kdm_email ()
+       {
+               Config::instance()->reset_kdm_email ();
+               _kdm_email->SetValue (wx_to_std (Config::instance()->kdm_email ()));
+       }
 
-void
-ConfigDialog::kdm_from_changed ()
+       wxTextCtrl* _mail_server;
+       wxTextCtrl* _mail_user;
+       wxTextCtrl* _mail_password;
+       wxTextCtrl* _kdm_subject;
+       wxTextCtrl* _kdm_from;
+       wxTextCtrl* _kdm_cc;
+       wxTextCtrl* _kdm_bcc;
+       wxTextCtrl* _kdm_email;
+       wxButton* _reset_kdm_email;
+};
+
+class AdvancedPage : public wxStockPreferencesPage, public Page
 {
-       Config::instance()->set_kdm_from (wx_to_std (_kdm_from->GetValue ()));
-}
+public:
 
-void
-ConfigDialog::make_kdm_email_panel ()
-{
-       _kdm_email_panel = new wxPanel (_notebook);
-       wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
-       _kdm_email_panel->SetSizer (s);
+       AdvancedPage (wxSize panel_size, int border)
+               : wxStockPreferencesPage (Kind_Advanced)
+               , Page (panel_size, border)
+       {}
+       
+       wxWindow* CreateWindow (wxWindow* parent)
+       {
+               wxPanel* panel = new wxPanel (parent);
+
+               wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
+               panel->SetSizer (s);
+
+               wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+               table->AddGrowableCol (1, 1);
+               s->Add (table, 1, wxALL | wxEXPAND, _border);
+
+               {
+                       add_label_to_sizer (table, panel, _("Maximum JPEG2000 bandwidth"), true);
+                       wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+                       _maximum_j2k_bandwidth = new wxSpinCtrl (panel);
+                       s->Add (_maximum_j2k_bandwidth, 1);
+                       add_label_to_sizer (s, panel, _("Mbit/s"), false);
+                       table->Add (s, 1);
+               }
 
-       _kdm_email = new wxTextCtrl (_kdm_email_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE);
-       s->Add (_kdm_email, 1, wxEXPAND | wxALL);
+               _allow_any_dcp_frame_rate = new wxCheckBox (panel, wxID_ANY, _("Allow any DCP frame rate"));
+               table->Add (_allow_any_dcp_frame_rate, 1, wxEXPAND | wxALL);
+               table->AddSpacer (0);
+
+               add_label_to_sizer (table, panel, _("Log"), true);
+               _log_general = new wxCheckBox (panel, wxID_ANY, _("General"));
+               table->Add (_log_general, 1, wxEXPAND | wxALL);
+               _log_warning = new wxCheckBox (panel, wxID_ANY, _("Warnings"));
+               table->AddSpacer (0);
+               table->Add (_log_warning, 1, wxEXPAND | wxALL);
+               _log_error = new wxCheckBox (panel, wxID_ANY, _("Errors"));
+               table->AddSpacer (0);
+               table->Add (_log_error, 1, wxEXPAND | wxALL);
+               _log_timing = new wxCheckBox (panel, wxID_ANY, S_("Config|Timing"));
+               table->AddSpacer (0);
+               table->Add (_log_timing, 1, wxEXPAND | wxALL);
+
+               Config* config = Config::instance ();
+               
+               _maximum_j2k_bandwidth->SetRange (1, 500);
+               _maximum_j2k_bandwidth->SetValue (config->maximum_j2k_bandwidth() / 1000000);
+               _maximum_j2k_bandwidth->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&AdvancedPage::maximum_j2k_bandwidth_changed, this));
+               _allow_any_dcp_frame_rate->SetValue (config->allow_any_dcp_frame_rate ());
+               _allow_any_dcp_frame_rate->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::allow_any_dcp_frame_rate_changed, this));
+               _log_general->SetValue (config->log_types() & Log::TYPE_GENERAL);
+               _log_general->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::log_changed, this));
+               _log_warning->SetValue (config->log_types() & Log::TYPE_WARNING);
+               _log_warning->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::log_changed, this));
+               _log_error->SetValue (config->log_types() & Log::TYPE_ERROR);
+               _log_error->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::log_changed, this));
+               _log_timing->SetValue (config->log_types() & Log::TYPE_TIMING);
+               _log_timing->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::log_changed, this));
+               
+               return panel;
+       }
 
-       _kdm_email->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ConfigDialog::kdm_email_changed, this));
-       _kdm_email->SetValue (wx_to_std (Config::instance()->kdm_email ()));
-}
+private:
+
+       void maximum_j2k_bandwidth_changed ()
+       {
+               Config::instance()->set_maximum_j2k_bandwidth (_maximum_j2k_bandwidth->GetValue() * 1000000);
+       }
+
+       void allow_any_dcp_frame_rate_changed ()
+       {
+               Config::instance()->set_allow_any_dcp_frame_rate (_allow_any_dcp_frame_rate->GetValue ());
+       }
 
-void
-ConfigDialog::kdm_email_changed ()
+       void log_changed ()
+       {
+               int types = 0;
+               if (_log_general->GetValue ()) {
+                       types |= Log::TYPE_GENERAL;
+               }
+               if (_log_warning->GetValue ()) {
+                       types |= Log::TYPE_WARNING;
+               }
+               if (_log_error->GetValue ())  {
+                       types |= Log::TYPE_ERROR;
+               }
+               if (_log_timing->GetValue ()) {
+                       types |= Log::TYPE_TIMING;
+               }
+               Config::instance()->set_log_types (types);
+       }
+       
+       wxSpinCtrl* _maximum_j2k_bandwidth;
+       wxCheckBox* _allow_any_dcp_frame_rate;
+       wxCheckBox* _log_general;
+       wxCheckBox* _log_warning;
+       wxCheckBox* _log_error;
+       wxCheckBox* _log_timing;
+};
+       
+wxPreferencesEditor*
+create_config_dialog ()
 {
-       Config::instance()->set_kdm_email (wx_to_std (_kdm_email->GetValue ()));
+       wxPreferencesEditor* e = new wxPreferencesEditor ();
+
+#ifdef DCPOMATIC_OSX
+       /* Width that we force some of the config panels to be on OSX so that
+          the containing window doesn't shrink too much when we select those panels.
+          This is obviously an unpleasant hack.
+       */
+       wxSize ps = wxSize (480, -1);
+       int const border = 16;
+#else
+       wxSize ps = wxSize (-1, -1);
+       int const border = 8;
+#endif
+       
+       e->AddPage (new GeneralPage (ps, border));
+       e->AddPage (new DefaultsPage (ps, border));
+       e->AddPage (new EncodingServersPage (ps, border));
+       e->AddPage (new ColourConversionsPage (ps, border));
+       e->AddPage (new KeysPage (ps, border));
+       e->AddPage (new TMSPage (ps, border));
+       e->AddPage (new KDMEmailPage (ps, border));
+       e->AddPage (new AdvancedPage (ps, border));
+       return e;
 }