Add certificate validity period to the screen dialog.

diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index 37edb9ae9cad97c3eaad9a88fd4b51de2bdfd847..0ad8d9cf2e705136b518dc8c7a1d41ff4e6cd9dc 100644 (file)
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -179,6 +179,8 @@ ScreenDialog::ScreenDialog (
        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(_("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);
 
 
        set_recipient (recipient);
 


@@ -325,6 +327,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()));
                _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 ();
        }
 }
                _sizer->Layout ();
        }
 }

diff --git a/src/wx/screen_dialog.h b/src/wx/screen_dialog.h
index 0069b9fa321d56e0685d534d73f1fd8d2ea28e32..3435bf71109fde814bd62aea75f6b36e8224e905 100644 (file)
--- a/src/wx/screen_dialog.h
+++ b/src/wx/screen_dialog.h
@@ -75,6 +75,8 @@ private:
        wxStaticText* _subject_organization_name;
        wxStaticText* _issuer_common_name;
        wxStaticText* _issuer_organization_name;
        wxStaticText* _subject_organization_name;
        wxStaticText* _issuer_common_name;
        wxStaticText* _issuer_organization_name;

+       wxStaticText* _not_valid_before;
+       wxStaticText* _not_valid_after;

        wxButton* _get_recipient_from_file;
        wxButton* _download_recipient;
        EditableList<TrustedDevice, TrustedDeviceDialog>* _trusted_device_list;
        wxButton* _get_recipient_from_file;
        wxButton* _download_recipient;
        EditableList<TrustedDevice, TrustedDeviceDialog>* _trusted_device_list;