Bump libdcp to 1.8.67.

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

diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index 1ea9bf877a4d8d0e3b95f16527c0ae3eede0bcb3..3b2a1bd8560f502eb970f3315e8fc1dfb5b9c3fc 100644 (file)
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -54,12 +54,14 @@ public:
                : TableDialog (parent, _("Trusted Device"), 3, 1, true)
        {
                add (_("Thumbprint"), true);
-               _thumbprint = add (new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(300, -1)));
+               _thumbprint = add(new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(300, -1), wxTE_READONLY));
                _file = add (new Button(this, _("Load certificate...")));
 
                layout ();
 
                _file->Bind (wxEVT_BUTTON, bind(&TrustedDeviceDialog::load_certificate, this));
+
+               setup_sensitivity();
        }
 
        void load_certificate ()
@@ -70,8 +72,9 @@ public:
                }
 
                try {
-                       _certificate = dcp::Certificate(dcp::file_to_string(dialog.paths()[0]));
+                       _certificate = dcp::CertificateChain(dcp::file_to_string(dialog.paths()[0])).leaf();
                        _thumbprint->SetValue (std_to_wx(_certificate->thumbprint()));
+                       setup_sensitivity();
                } catch (dcp::MiscError& e) {
                        error_dialog(this, wxString::Format(_("Could not load certificate (%s)"), std_to_wx(e.what())));
                }
@@ -81,6 +84,7 @@ public:
        {
                _certificate = t.certificate ();
                _thumbprint->SetValue (std_to_wx(t.thumbprint()));
+               setup_sensitivity();
        }
 
        optional<TrustedDevice> get ()
@@ -96,6 +100,13 @@ public:
        }
 
 private:
+       void setup_sensitivity()
+       {
+               auto ok = dynamic_cast<wxButton*>(FindWindowById(wxID_OK, this));
+               DCPOMATIC_ASSERT(ok);
+               ok->Enable(static_cast<bool>(_certificate));
+       }
+
        wxTextCtrl* _thumbprint;
        wxButton* _file;
        boost::optional<dcp::Certificate> _certificate;
@@ -139,13 +150,6 @@ ScreenDialog::ScreenDialog (
        _sizer->Add (_notes, wxGBPosition(r, 1));
        ++r;
 
-        wxClientDC dc (this);
-       wxFont font = _name->GetFont ();
-       font.SetFamily (wxFONTFAMILY_TELETYPE);
-       dc.SetFont (font);
-        wxSize size = dc.GetTextExtent (wxT("1234567890123456789012345678"));
-        size.SetHeight (-1);
-
        subheading = new StaticText(this, _("Recipient"));
        subheading->SetFont(subheading_font);
        _sizer->Add(subheading, wxGBPosition(r, 0), wxGBSpan(1, 2), wxTOP, DCPOMATIC_SUBHEADING_TOP_PAD);
@@ -159,11 +163,22 @@ ScreenDialog::ScreenDialog (
        _sizer->Add(s, wxGBPosition(r, 0), wxGBSpan(1, 2));
        ++r;
 
-       add_label_to_sizer(_sizer, this, _("Thumbprint"), true, wxGBPosition(r, 0), wxDefaultSpan, true);
-       _recipient_thumbprint = new StaticText (this, wxT (""), wxDefaultPosition, size);
-       _recipient_thumbprint->SetFont (font);
-       _sizer->Add(_recipient_thumbprint, wxGBPosition(r, 1));
-       ++r;
+       auto add_certificate_detail = [&r, this](wxString name, wxStaticText** value, wxSize size = wxDefaultSize) {
+               add_label_to_sizer(_sizer, this, name, true, wxGBPosition(r, 0), wxDefaultSpan, true);
+               *value = new StaticText(this, wxT (""), wxDefaultPosition, size);
+               _sizer->Add(*value, wxGBPosition(r, 1));
+               ++r;
+       };
+
+        wxClientDC dc (this);
+       wxFont teletype_font = _name->GetFont();
+       teletype_font.SetFamily(wxFONTFAMILY_TELETYPE);
+       dc.SetFont(teletype_font);
+        wxSize size = dc.GetTextExtent (wxT("1234567890123456789012345678"));
+        size.SetHeight (-1);
+
+       add_certificate_detail(_("Thumbprint"), &_recipient_thumbprint, size);
+       _recipient_thumbprint->SetFont(teletype_font);
 
        add_label_to_sizer(_sizer, this, _("Filename"), true, wxGBPosition(r, 0), wxDefaultSpan, true);
        _recipient_file = new wxStaticText(this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(600, -1), wxST_ELLIPSIZE_MIDDLE | wxST_NO_AUTORESIZE);
@@ -171,25 +186,12 @@ ScreenDialog::ScreenDialog (
        _sizer->Add (_recipient_file, wxGBPosition(r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP);
        ++r;
 
-       add_label_to_sizer(_sizer, this, _("Subject common name"), true, wxGBPosition(r, 0), wxDefaultSpan, true);
-       _subject_common_name = new wxStaticText(this, wxID_ANY, wxT(""));
-       _sizer->Add(_subject_common_name, wxGBPosition(r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP);
-       ++r;
-
-       add_label_to_sizer(_sizer, this, _("Subject organization name"), true, wxGBPosition(r, 0), wxDefaultSpan, true);
-       _subject_organization_name = new wxStaticText(this, wxID_ANY, wxT(""));
-       _sizer->Add(_subject_organization_name, wxGBPosition(r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP);
-       ++r;
-
-       add_label_to_sizer(_sizer, this, _("Issuer common name"), true, wxGBPosition(r, 0), wxDefaultSpan, true);
-       _issuer_common_name = new wxStaticText(this, wxID_ANY, wxT(""));
-       _sizer->Add(_issuer_common_name, wxGBPosition(r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP);
-       ++r;
-
-       add_label_to_sizer(_sizer, this, _("Issuer organization name"), true, wxGBPosition(r, 0), wxDefaultSpan, true);
-       _issuer_organization_name = new wxStaticText(this, wxID_ANY, wxT(""));
-       _sizer->Add(_issuer_organization_name, wxGBPosition(r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP);
-       ++r;
+       add_certificate_detail(_("Subject common name"), &_subject_common_name);
+       add_certificate_detail(_("Subject organization name"), &_subject_organization_name);
+       add_certificate_detail(_("Issuer common name"), &_issuer_common_name);
+       add_certificate_detail(_("Issuer organization name"), &_issuer_organization_name);
+       add_certificate_detail(_("Not valid before"), &_not_valid_before);
+       add_certificate_detail(_("Not valid after"), &_not_valid_after);
 
        set_recipient (recipient);
 
@@ -336,6 +338,8 @@ ScreenDialog::set_recipient (optional<dcp::Certificate> r)
                _subject_organization_name->SetLabel(std_to_wx(_recipient->subject_organization_name()));
                _issuer_common_name->SetLabel(std_to_wx(_recipient->issuer_common_name()));
                _issuer_organization_name->SetLabel(std_to_wx(_recipient->issuer_organization_name()));
+               _not_valid_before->SetLabel(std_to_wx(_recipient->not_before().as_string()));
+               _not_valid_after->SetLabel(std_to_wx(_recipient->not_after().as_string()));
                _sizer->Layout ();
        }
 }