No-op: remove all trailing whitespace.
[dcpomatic.git] / src / wx / config_dialog.cc
index 67ce701f9c95153f1fcdbb23d5499019d0b4ccfc..036172bb7eaa45f381e4b91b7e4ed7f22d1e4696 100644 (file)
 #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/ratio.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"
@@ -46,7 +44,6 @@
 #include "filter_dialog.h"
 #include "dir_picker_ctrl.h"
 #include "isdcf_metadata_dialog.h"
-#include "preset_colour_conversion_dialog.h"
 #include "server_dialog.h"
 #include "make_signer_chain_dialog.h"
 
@@ -84,10 +81,10 @@ protected:
                config_changed ();
 
                _panel->Bind (wxEVT_DESTROY, boost::bind (&Page::window_destroyed, this));
-               
+
                return _panel;
        }
-       
+
        int _border;
        wxPanel* _panel;
 
@@ -146,13 +143,13 @@ public:
                : StockPage (Kind_General, panel_size, border)
        {}
 
-private:       
+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, wxALL | wxEXPAND, _border);
-               
+
                _set_language = new wxCheckBox (_panel, wxID_ANY, _("Set language"));
                table->Add (_set_language, 1);
                _language = new wxChoice (_panel, wxID_ANY);
@@ -163,15 +160,16 @@ private:
                _language->Append (wxT ("Italiano"));
                _language->Append (wxT ("Nederlands"));
                _language->Append (wxT ("Svenska"));
+               _language->Append (wxT ("Русский"));
                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);
@@ -179,14 +177,14 @@ private:
                _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);
 
                _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->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&GeneralPage::num_local_encoding_threads_changed, this));
 
@@ -197,9 +195,9 @@ private:
        void config_changed ()
        {
                Config* config = Config::instance ();
-               
-               _set_language->SetValue (config->language ());
-               
+
+               checked_set (_set_language, config->language ());
+
                if (config->language().get_value_or ("") == "fr") {
                        _language->SetSelection (3);
                } else if (config->language().get_value_or ("") == "it") {
@@ -212,15 +210,17 @@ private:
                        _language->SetSelection (0);
                } else if (config->language().get_value_or ("") == "nl") {
                        _language->SetSelection (5);
+               } else if (config->language().get_value_or ("") == "ru") {
+                       _language->SetSelection (7);
                } else {
                        _language->SetSelection (1);
                }
 
                setup_language_sensitivity ();
-               
-               _num_local_encoding_threads->SetValue (config->num_local_encoding_threads ());
-               _check_for_updates->SetValue (config->check_for_updates ());
-               _check_for_test_updates->SetValue (config->check_for_test_updates ());
+
+               checked_set (_num_local_encoding_threads, config->num_local_encoding_threads ());
+               checked_set (_check_for_updates, config->check_for_updates ());
+               checked_set (_check_for_test_updates, config->check_for_test_updates ());
        }
 
        void setup_language_sensitivity ()
@@ -262,14 +262,17 @@ private:
                case 6:
                        Config::instance()->set_language ("sv");
                        break;
+               case 7:
+                       Config::instance()->set_language ("ru");
+                       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 ());
@@ -293,26 +296,26 @@ public:
        DefaultsPage (wxSize panel_size, int border)
                : StandardPage (panel_size, border)
        {}
-       
+
        wxString GetName () const
        {
                return _("Defaults");
        }
 
-#ifdef DCPOMATIC_OSX   
+#ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {
                return wxBitmap ("defaults", wxBITMAP_TYPE_PNG_RESOURCE);
        }
-#endif 
+#endif
 
-private:       
+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, wxALL | wxEXPAND, _border);
-               
+
                {
                        add_label_to_sizer (table, _panel, _("Default duration of still images"), true);
                        wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
@@ -321,15 +324,15 @@ private:
                        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
                _directory = new DirPickerCtrl (_panel);
-#else  
+#else
                _directory = new wxDirPickerCtrl (_panel, wxDD_DIR_MUST_EXIST);
 #endif
                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);
@@ -337,11 +340,11 @@ private:
                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);
@@ -350,7 +353,7 @@ private:
                        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);
@@ -366,28 +369,28 @@ private:
 
                _still_length->SetRange (1, 3600);
                _still_length->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&DefaultsPage::still_length_changed, this));
-               
+
                _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));
-               
+
                vector<Ratio const *> ratios = Ratio::all ();
                for (size_t i = 0; i < ratios.size(); ++i) {
                        _container->Append (std_to_wx (ratios[i]->nickname ()));
                }
-               
+
                _container->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DefaultsPage::container_changed, this));
-               
+
                vector<DCPContentType const *> const ct = DCPContentType::all ();
                for (size_t i = 0; i < ct.size(); ++i) {
                        _dcp_content_type->Append (std_to_wx (ct[i]->pretty_name ()));
                }
-               
+
                _dcp_content_type->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DefaultsPage::dcp_content_type_changed, this));
-               
+
                _j2k_bandwidth->SetRange (50, 250);
                _j2k_bandwidth->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&DefaultsPage::j2k_bandwidth_changed, this));
-               
+
                _audio_delay->SetRange (-1000, 1000);
                _audio_delay->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&DefaultsPage::audio_delay_changed, this));
 
@@ -411,20 +414,20 @@ private:
                                _dcp_content_type->SetSelection (i);
                        }
                }
-               
-               _still_length->SetValue (config->default_still_length ());
+
+               checked_set (_still_length, config->default_still_length ());
                _directory->SetPath (std_to_wx (config->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir())).string ()));
-               _j2k_bandwidth->SetValue (config->default_j2k_bandwidth() / 1000000);
+               checked_set (_j2k_bandwidth, config->default_j2k_bandwidth() / 1000000);
                _j2k_bandwidth->SetRange (50, config->maximum_j2k_bandwidth() / 1000000);
-               _audio_delay->SetValue (config->default_audio_delay ());
-               _issuer->SetValue (std_to_wx (config->dcp_issuer ()));
+               checked_set (_audio_delay, config->default_audio_delay ());
+               checked_set (_issuer, config->dcp_issuer ());
        }
-               
+
        void j2k_bandwidth_changed ()
        {
                Config::instance()->set_default_j2k_bandwidth (_j2k_bandwidth->GetValue() * 1000000);
        }
-       
+
        void audio_delay_changed ()
        {
                Config::instance()->set_default_audio_delay (_audio_delay->GetValue());
@@ -453,7 +456,7 @@ private:
                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 ();
@@ -464,7 +467,7 @@ private:
        {
                Config::instance()->set_dcp_issuer (wx_to_std (_issuer->GetValue ()));
        }
-       
+
        wxSpinCtrl* _j2k_bandwidth;
        wxSpinCtrl* _audio_delay;
        wxButton* _isdcf_metadata_button;
@@ -485,25 +488,25 @@ public:
        EncodingServersPage (wxSize panel_size, int border)
                : StandardPage (panel_size, border)
        {}
-       
+
        wxString GetName () const
        {
                return _("Servers");
        }
 
-#ifdef DCPOMATIC_OSX   
+#ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {
                return wxBitmap ("servers", wxBITMAP_TYPE_PNG_RESOURCE);
        }
-#endif 
+#endif
 
-private:       
+private:
        void setup ()
        {
                _use_any_servers = new wxCheckBox (_panel, wxID_ANY, _("Use all servers"));
                _panel->GetSizer()->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> (
@@ -513,18 +516,18 @@ private:
                        boost::bind (&Config::set_servers, Config::instance(), _1),
                        boost::bind (&EncodingServersPage::server_column, this, _1)
                        );
-               
+
                _panel->GetSizer()->Add (_servers_list, 1, wxEXPAND | wxALL, _border);
-               
+
                _use_any_servers->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&EncodingServersPage::use_any_servers_changed, this));
        }
 
        void config_changed ()
        {
-               _use_any_servers->SetValue (Config::instance()->use_any_servers ());
+               checked_set (_use_any_servers, Config::instance()->use_any_servers ());
                _servers_list->refresh ();
        }
-       
+
        void use_any_servers_changed ()
        {
                Config::instance()->set_use_any_servers (_use_any_servers->GetValue ());
@@ -539,55 +542,6 @@ private:
        EditableList<string, ServerDialog>* _servers_list;
 };
 
-class ColourConversionsPage : public StandardPage
-{
-public:
-       ColourConversionsPage (wxSize panel_size, int border)
-               : StandardPage (panel_size, border)
-       {}
-       
-       wxString GetName () const
-       {
-               return _("Colour Conversions");
-       }
-
-#ifdef DCPOMATIC_OSX   
-       wxBitmap GetLargeIcon () const
-       {
-               return wxBitmap ("colour_conversions", wxBITMAP_TYPE_PNG_RESOURCE);
-       }
-#endif
-
-private:       
-       void setup ()
-       {
-               vector<string> columns;
-               columns.push_back (wx_to_std (_("Name")));
-               _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
-                       );
-
-               _panel->GetSizer()->Add (_list, 1, wxEXPAND | wxALL, _border);
-       }
-
-       void config_changed ()
-       {
-               _list->refresh ();
-       }
-
-       string colour_conversion_column (PresetColourConversion c)
-       {
-               return c.name;
-       }
-
-       EditableList<PresetColourConversion, PresetColourConversionDialog>* _list;
-};
-
 class KeysPage : public StandardPage
 {
 public:
@@ -605,17 +559,17 @@ public:
        {
                return wxBitmap ("keys", wxBITMAP_TYPE_PNG_RESOURCE);
        }
-#endif 
+#endif
 
 private:
        void setup ()
        {
                wxStaticText* m = new wxStaticText (_panel, wxID_ANY, _("Certificate chain for signing DCPs and KDMs:"));
                _panel->GetSizer()->Add (m, 0, wxALL, _border);
-               
+
                wxBoxSizer* certificates_sizer = new wxBoxSizer (wxHORIZONTAL);
                _panel->GetSizer()->Add (certificates_sizer, 0, wxLEFT | wxRIGHT, _border);
-               
+
                _certificates = new wxListCtrl (_panel, wxID_ANY, wxDefaultPosition, wxSize (400, 200), wxLC_REPORT | wxLC_SINGLE_SEL);
 
                {
@@ -635,7 +589,7 @@ private:
                        wxFont font = ip.GetFont ();
                        font.SetFamily (wxFONTFAMILY_TELETYPE);
                        ip.SetFont (font);
-                       
+
                        _certificates->InsertColumn (1, ip);
                }
 
@@ -650,57 +604,45 @@ private:
                        certificates_sizer->Add (s, 0, wxLEFT, DCPOMATIC_SIZER_X_GAP);
                }
 
-               wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-               table->AddGrowableCol (1, 1);
+               wxGridBagSizer* table = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
                _panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border);
 
-               _remake_certificates = new wxButton (_panel, wxID_ANY, _("Re-make certificates..."));
-               table->Add (_remake_certificates, 0);
-               table->AddSpacer (0);
-
-               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);
-               }
-
-               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);
-               }
+               int r = 0;
 
-               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);
-               }
+               _remake_certificates = new wxButton (_panel, wxID_ANY, _("Re-make certificates..."));
+               table->Add (_remake_certificates, wxGBPosition (r, 0), wxGBSpan (1, 3));
+               ++r;
+
+               add_label_to_grid_bag_sizer (table, _panel, _("Private key for leaf certificate"), true, wxGBPosition (r, 0));
+               _signer_private_key = new wxStaticText (_panel, wxID_ANY, wxT (""));
+               wxFont font = _signer_private_key->GetFont ();
+               font.SetFamily (wxFONTFAMILY_TELETYPE);
+               _signer_private_key->SetFont (font);
+               table->Add (_signer_private_key, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+               _load_signer_private_key = new wxButton (_panel, wxID_ANY, _("Load..."));
+               table->Add (_load_signer_private_key, wxGBPosition (r, 2));
+               ++r;
+
+               add_label_to_grid_bag_sizer (table, _panel, _("Certificate for decrypting DCPs"), true, wxGBPosition (r, 0));
+               _decryption_certificate = new wxStaticText (_panel, wxID_ANY, wxT (""));
+               _decryption_certificate->SetFont (font);
+               table->Add (_decryption_certificate, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+               _load_decryption_certificate = new wxButton (_panel, wxID_ANY, _("Load..."));
+               table->Add (_load_decryption_certificate, wxGBPosition (r, 2));
+               ++r;
+
+               add_label_to_grid_bag_sizer (table, _panel, _("Private key for decrypting DCPs"), true, wxGBPosition (r, 0));
+               _decryption_private_key = new wxStaticText (_panel, wxID_ANY, wxT (""));
+               _decryption_private_key->SetFont (font);
+               table->Add (_decryption_private_key, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+               _load_decryption_private_key = new wxButton (_panel, wxID_ANY, _("Load..."));
+               table->Add (_load_decryption_private_key, wxGBPosition (r, 2));
+               ++r;
 
                _export_decryption_certificate = new wxButton (_panel, wxID_ANY, _("Export DCP decryption certificate..."));
-               table->Add (_export_decryption_certificate);
-               table->AddSpacer (0);
-               
+               table->Add (_export_decryption_certificate, wxGBPosition (r, 0), wxGBSpan (1, 3));
+               ++r;
+
                _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));
@@ -722,11 +664,11 @@ private:
                update_decryption_private_key ();
                update_sensitivity ();
        }
-       
+
        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 ())));
@@ -737,7 +679,7 @@ private:
                                error_dialog (_panel, wxString::Format (_("Could not read certificate file (%s)"), e.what ()));
                        }
                }
-               
+
                d->Destroy ();
 
                update_sensitivity ();
@@ -749,7 +691,7 @@ private:
                if (i == -1) {
                        return;
                }
-               
+
                _certificates->DeleteItem (i);
                _signer->certificates().remove (i);
                Config::instance()->set_signer (_signer);
@@ -799,7 +741,7 @@ private:
                        update_certificate_list ();
                        update_signer_private_key ();
                }
-               
+
                d->Destroy ();
        }
 
@@ -810,8 +752,8 @@ private:
 
        void update_signer_private_key ()
        {
-               _signer_private_key->SetLabel (std_to_wx (dcp::private_key_fingerprint (_signer->key ())));
-       }       
+               checked_set (_signer_private_key, dcp::private_key_fingerprint (_signer->key ()));
+       }
 
        void load_signer_private_key ()
        {
@@ -824,7 +766,7 @@ private:
                                        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 ();
@@ -832,7 +774,7 @@ private:
                                error_dialog (_panel, wxString::Format (_("Could not read certificate file (%s)"), e.what ()));
                        }
                }
-               
+
                d->Destroy ();
 
                update_sensitivity ();
@@ -842,7 +784,7 @@ private:
        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 ())));
@@ -852,13 +794,13 @@ private:
                                error_dialog (_panel, wxString::Format (_("Could not read certificate file (%s)"), e.what ()));
                        }
                }
-               
+
                d->Destroy ();
        }
 
        void update_decryption_certificate ()
        {
-               _decryption_certificate->SetLabel (std_to_wx (Config::instance()->decryption_certificate().thumbprint ()));
+               checked_set (_decryption_certificate, Config::instance()->decryption_certificate().thumbprint ());
        }
 
        void load_decryption_private_key ()
@@ -874,13 +816,13 @@ private:
                                error_dialog (_panel, wxString::Format (_("Could not read key file (%s)"), e.what ()));
                        }
                }
-               
+
                d->Destroy ();
        }
 
        void update_decryption_private_key ()
        {
-               _decryption_private_key->SetLabel (std_to_wx (dcp::private_key_fingerprint (Config::instance()->decryption_private_key())));
+               checked_set (_decryption_private_key, dcp::private_key_fingerprint (Config::instance()->decryption_private_key()));
        }
 
        void export_decryption_certificate ()
@@ -889,7 +831,7 @@ private:
                        _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) {
@@ -929,36 +871,36 @@ public:
                return _("TMS");
        }
 
-#ifdef DCPOMATIC_OSX   
+#ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {
                return wxBitmap ("tms", wxBITMAP_TYPE_PNG_RESOURCE);
        }
-#endif 
+#endif
 
-private:       
+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, 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);
-               
+
                _tms_ip->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&TMSPage::tms_ip_changed, this));
                _tms_path->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&TMSPage::tms_path_changed, this));
                _tms_user->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&TMSPage::tms_user_changed, this));
@@ -968,28 +910,28 @@ private:
        void config_changed ()
        {
                Config* config = Config::instance ();
-               
-               _tms_ip->SetValue (std_to_wx (config->tms_ip ()));
-               _tms_path->SetValue (std_to_wx (config->tms_path ()));
-               _tms_user->SetValue (std_to_wx (config->tms_user ()));
-               _tms_password->SetValue (std_to_wx (config->tms_password ()));
+
+               checked_set (_tms_ip, config->tms_ip ());
+               checked_set (_tms_path, config->tms_path ());
+               checked_set (_tms_user, config->tms_user ());
+               checked_set (_tms_password, config->tms_password ());
        }
-       
+
        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 ()));
@@ -1006,27 +948,27 @@ class KDMEmailPage : public StandardPage
 public:
 
        KDMEmailPage (wxSize panel_size, int border)
-#ifdef DCPOMATIC_OSX           
+#ifdef DCPOMATIC_OSX
                /* We have to force both width and height of this one */
                : StandardPage (wxSize (480, 128), border)
 #else
                 : StandardPage (panel_size, border)
-#endif                 
+#endif
        {}
-       
+
        wxString GetName () const
        {
                return _("KDM Email");
        }
 
-#ifdef DCPOMATIC_OSX   
+#ifdef DCPOMATIC_OSX
        wxBitmap GetLargeIcon () const
        {
                return wxBitmap ("kdm_email", wxBITMAP_TYPE_PNG_RESOURCE);
        }
-#endif 
+#endif
 
-private:       
+private:
        void setup ()
        {
                wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
@@ -1036,15 +978,15 @@ private:
                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);
@@ -1055,7 +997,7 @@ private:
                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);
@@ -1067,7 +1009,7 @@ private:
                add_label_to_sizer (table, _panel, _("BCC address"), true);
                _kdm_bcc = new wxTextCtrl (_panel, wxID_ANY);
                table->Add (_kdm_bcc, 1, wxEXPAND | wxALL);
-               
+
                _kdm_email = new wxTextCtrl (_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (480, 128), wxTE_MULTILINE);
                _panel->GetSizer()->Add (_kdm_email, 1, wxEXPAND | wxALL, _border);
 
@@ -1088,27 +1030,27 @@ private:
        void config_changed ()
        {
                Config* config = Config::instance ();
-               
-               _mail_server->SetValue (std_to_wx (config->mail_server ()));
-               _mail_user->SetValue (std_to_wx (config->mail_user ()));
-               _mail_password->SetValue (std_to_wx (config->mail_password ()));
-               _kdm_subject->SetValue (std_to_wx (config->kdm_subject ()));
-               _kdm_from->SetValue (std_to_wx (config->kdm_from ()));
-               _kdm_cc->SetValue (std_to_wx (config->kdm_cc ()));
-               _kdm_bcc->SetValue (std_to_wx (config->kdm_bcc ()));
-               _kdm_email->SetValue (std_to_wx (Config::instance()->kdm_email ()));
-       }
-       
+
+               checked_set (_mail_server, config->mail_server ());
+               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_cc, config->kdm_cc ());
+               checked_set (_kdm_bcc, config->kdm_bcc ());
+               checked_set (_kdm_email, Config::instance()->kdm_email ());
+       }
+
        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 ()));
@@ -1118,7 +1060,7 @@ private:
        {
                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 ()));
@@ -1133,7 +1075,7 @@ private:
        {
                Config::instance()->set_kdm_bcc (wx_to_std (_kdm_bcc->GetValue ()));
        }
-       
+
        void kdm_email_changed ()
        {
                if (_kdm_email->GetValue().IsEmpty ()) {
@@ -1148,7 +1090,7 @@ private:
        void reset_kdm_email ()
        {
                Config::instance()->reset_kdm_email ();
-               _kdm_email->SetValue (wx_to_std (Config::instance()->kdm_email ()));
+               checked_set (_kdm_email, Config::instance()->kdm_email ());
        }
 
        wxTextCtrl* _mail_server;
@@ -1178,7 +1120,7 @@ public:
                , _log_timing (0)
        {}
 
-private:       
+private:
        void setup ()
        {
                wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
@@ -1201,11 +1143,11 @@ private:
 #ifdef __WXOSX__
                wxStaticText* m = new wxStaticText (_panel, wxID_ANY, _("Log:"));
                table->Add (m, 0, wxALIGN_TOP | wxLEFT | wxRIGHT | wxEXPAND | wxALL | wxALIGN_RIGHT, 6);
-#else          
+#else
                wxStaticText* m = new wxStaticText (_panel, wxID_ANY, _("Log"));
                table->Add (m, 0, wxALIGN_TOP | wxLEFT | wxRIGHT | wxEXPAND | wxALL, 6);
-#endif         
-               
+#endif
+
                {
                        wxBoxSizer* t = new wxBoxSizer (wxVERTICAL);
                        _log_general = new wxCheckBox (_panel, wxID_ANY, _("General"));
@@ -1219,12 +1161,12 @@ private:
                        table->Add (t, 0, wxALL, 6);
                }
 
-#ifdef DCPOMATIC_WINDOWS               
+#ifdef DCPOMATIC_WINDOWS
                _win32_console = new wxCheckBox (_panel, wxID_ANY, _("Open console window"));
                table->Add (_win32_console, 1, wxEXPAND | wxALL);
                table->AddSpacer (0);
-#endif         
-               
+#endif
+
                _maximum_j2k_bandwidth->SetRange (1, 1000);
                _maximum_j2k_bandwidth->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&AdvancedPage::maximum_j2k_bandwidth_changed, this));
                _allow_any_dcp_frame_rate->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::allow_any_dcp_frame_rate_changed, this));
@@ -1234,21 +1176,21 @@ private:
                _log_timing->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::log_changed, this));
 #ifdef DCPOMATIC_WINDOWS
                _win32_console->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::win32_console_changed, this));
-#endif         
+#endif
        }
 
        void config_changed ()
        {
                Config* config = Config::instance ();
-               
-               _maximum_j2k_bandwidth->SetValue (config->maximum_j2k_bandwidth() / 1000000);
-               _allow_any_dcp_frame_rate->SetValue (config->allow_any_dcp_frame_rate ());
-               _log_general->SetValue (config->log_types() & Log::TYPE_GENERAL);
-               _log_warning->SetValue (config->log_types() & Log::TYPE_WARNING);
-               _log_error->SetValue (config->log_types() & Log::TYPE_ERROR);
-               _log_timing->SetValue (config->log_types() & Log::TYPE_TIMING);
+
+               checked_set (_maximum_j2k_bandwidth, config->maximum_j2k_bandwidth() / 1000000);
+               checked_set (_allow_any_dcp_frame_rate, config->allow_any_dcp_frame_rate ());
+               checked_set (_log_general, config->log_types() & Log::TYPE_GENERAL);
+               checked_set (_log_warning, config->log_types() & Log::TYPE_WARNING);
+               checked_set (_log_error, config->log_types() & Log::TYPE_ERROR);
+               checked_set (_log_timing, config->log_types() & Log::TYPE_TIMING);
 #ifdef DCPOMATIC_WINDOWS
-               _win32_console->SetValue (config->win32_console());
+               checked_set (_win32_console, config->win32_console());
 #endif
        }
 
@@ -1280,24 +1222,24 @@ private:
                Config::instance()->set_log_types (types);
        }
 
-#ifdef DCPOMATIC_WINDOWS       
+#ifdef DCPOMATIC_WINDOWS
        void win32_console_changed ()
        {
                Config::instance()->set_win32_console (_win32_console->GetValue ());
        }
-#endif 
-       
+#endif
+
        wxSpinCtrl* _maximum_j2k_bandwidth;
        wxCheckBox* _allow_any_dcp_frame_rate;
        wxCheckBox* _log_general;
        wxCheckBox* _log_warning;
        wxCheckBox* _log_error;
        wxCheckBox* _log_timing;
-#ifdef DCPOMATIC_WINDOWS       
+#ifdef DCPOMATIC_WINDOWS
        wxCheckBox* _win32_console;
-#endif 
+#endif
 };
-       
+
 wxPreferencesEditor*
 create_config_dialog ()
 {
@@ -1314,11 +1256,10 @@ create_config_dialog ()
        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));