Rename Config::_signer to Config::_signer_chain.

[dcpomatic.git] / src / wx / config_dialog.cc

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 53adcd0a067a3296df8206eba5604c1d2d81c532..da6a94bbe17b458bff2c8c89f6d7b9a07c8a080e 100644 (file)
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -39,7 +39,7 @@
 #include "lib/cross.h"
 #include "lib/exceptions.h"
 #include <dcp/exceptions.h>
-#include <dcp/signer.h>
+#include <dcp/certificate_chain.h>
 #include <wx/stdpaths.h>
 #include <wx/preferences.h>
 #include <wx/filepicker.h>
@@ -163,6 +163,7 @@ private:
                _language->Append (wxT ("Svenska"));
                _language->Append (wxT ("Русский"));
                _language->Append (wxT ("Polski"));
+               _language->Append (wxT ("Danske"));
                table->Add (_language);
 
                wxStaticText* restart = add_label_to_sizer (table, _panel, _("(restart DCP-o-matic to see language changes)"), false);
@@ -201,21 +202,23 @@ private:
                checked_set (_set_language, config->language ());
 
                if (config->language().get_value_or ("") == "fr") {
-                       _language->SetSelection (3);
+                       checked_set (_language, 3);
                } else if (config->language().get_value_or ("") == "it") {
-                       _language->SetSelection (4);
+                       checked_set (_language, 4);
                } else if (config->language().get_value_or ("") == "es") {
-                       _language->SetSelection (2);
+                       checked_set (_language, 2);
                } else if (config->language().get_value_or ("") == "sv") {
-                       _language->SetSelection (6);
+                       checked_set (_language, 6);
                } else if (config->language().get_value_or ("") == "de") {
-                       _language->SetSelection (0);
+                       checked_set (_language, 0);
                } else if (config->language().get_value_or ("") == "nl") {
-                       _language->SetSelection (5);
+                       checked_set (_language, 5);
                } else if (config->language().get_value_or ("") == "ru") {
-                       _language->SetSelection (7);
+                       checked_set (_language, 7);
                } else if (config->language().get_value_or ("") == "pl") {
                        checked_set (_language, 8);
+               } else if (config->language().get_value_or ("") == "da") {
+                       checked_set (_language, 9);
                } else {
                        _language->SetSelection (1);
                }
@@ -272,6 +275,9 @@ private:
                case 8:
                        Config::instance()->set_language ("pl");
                        break;
+               case 9:
+                       Config::instance()->set_language ("da");
+                       break;
                }
        }
 
@@ -676,7 +682,7 @@ private:
 
        void config_changed ()
        {
-               _signer.reset (new dcp::Signer (*Config::instance()->signer().get ()));
+               _signer.reset (new dcp::CertificateChain (*Config::instance()->signer_chain().get ()));
 
                update_certificate_list ();
                update_signer_private_key ();
@@ -692,8 +698,8 @@ private:
                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);
+                               _signer->add (c);
+                               Config::instance()->set_signer_chain (_signer);
                                update_certificate_list ();
                        } catch (dcp::MiscError& e) {
                                error_dialog (_panel, wxString::Format (_("Could not read certificate file (%s)"), e.what ()));
@@ -713,8 +719,8 @@ private:
                }
 
                _certificates->DeleteItem (i);
-               _signer->certificates().remove (i);
-               Config::instance()->set_signer (_signer);
+               _signer->remove (i);
+               Config::instance()->set_signer_chain (_signer);
 
                update_sensitivity ();
        }
@@ -722,7 +728,7 @@ private:
        void update_certificate_list ()
        {
                _certificates->DeleteAllItems ();
-               dcp::CertificateChain::List certs = _signer->certificates().root_to_leaf ();
+               dcp::CertificateChain::List certs = _signer->root_to_leaf ();
                size_t n = 0;
                for (dcp::CertificateChain::List::const_iterator i = certs.begin(); i != certs.end(); ++i) {
                        wxListItem item;
@@ -744,11 +750,11 @@ private:
 
        void remake_certificates ()
        {
-               dcp::CertificateChain chain = Config::instance()->signer()->certificates ();
+               shared_ptr<const dcp::CertificateChain> chain = Config::instance()->signer_chain ();
 
                string intermediate_common_name;
-               if (chain.root_to_leaf().size() >= 3) {
-                       dcp::CertificateChain::List all = chain.root_to_leaf ();
+               if (chain->root_to_leaf().size() >= 3) {
+                       dcp::CertificateChain::List all = chain->root_to_leaf ();
                        dcp::CertificateChain::List::iterator i = all.begin ();
                        ++i;
                        intermediate_common_name = i->subject_common_name ();
@@ -756,16 +762,16 @@ private:
 
                MakeSignerChainDialog* d = new MakeSignerChainDialog (
                        _panel,
-                       chain.root().subject_organization_name (),
-                       chain.root().subject_organizational_unit_name (),
-                       chain.root().subject_common_name (),
+                       chain->root().subject_organization_name (),
+                       chain->root().subject_organizational_unit_name (),
+                       chain->root().subject_common_name (),
                        intermediate_common_name,
-                       chain.leaf().subject_common_name ()
+                       chain->leaf().subject_common_name ()
                        );
 
                if (d->ShowModal () == wxID_OK) {
                        _signer.reset (
-                               new dcp::Signer (
+                               new dcp::CertificateChain (
                                        openssl_path (),
                                        d->organisation (),
                                        d->organisational_unit (),
@@ -775,7 +781,7 @@ private:
                                        )
                                );
 
-                       Config::instance()->set_signer (_signer);
+                       Config::instance()->set_signer_chain (_signer);
                        update_certificate_list ();
                        update_signer_private_key ();
                }
@@ -790,7 +796,7 @@ private:
 
        void update_signer_private_key ()
        {
-               checked_set (_signer_private_key, dcp::private_key_fingerprint (_signer->key ()));
+               checked_set (_signer_private_key, dcp::private_key_fingerprint (_signer->key().get ()));
        }
 
        void load_signer_private_key ()
@@ -806,7 +812,7 @@ private:
                                }
 
                                _signer->set_key (dcp::file_to_string (p));
-                               Config::instance()->set_signer (_signer);
+                               Config::instance()->set_signer_chain (_signer);
                                update_signer_private_key ();
                        } catch (dcp::MiscError& e) {
                                error_dialog (_panel, wxString::Format (_("Could not read certificate file (%s)"), e.what ()));
@@ -894,7 +900,7 @@ private:
        wxStaticText* _decryption_private_key;
        wxButton* _load_decryption_private_key;
        wxButton* _export_decryption_certificate;
-       shared_ptr<dcp::Signer> _signer;
+       shared_ptr<dcp::CertificateChain> _signer;
 };
 
 class TMSPage : public StandardPage