X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fscreen_dialog.cc;h=7578ca4ca9f7d856f6df44b193a31a13db300291;hb=a66c4f957d50e93e01912810876fbdd883ac5d6a;hp=716f9e9eb3db91dbdb16546a19447e0084e0558f;hpb=c103d8c1306e5fb3937b3a6c430a3fff32653fa3;p=dcpomatic.git diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc index 716f9e9eb..7578ca4ca 100644 --- a/src/wx/screen_dialog.cc +++ b/src/wx/screen_dialog.cc @@ -21,11 +21,13 @@ #include "dcpomatic_button.h" #include "download_certificate_dialog.h" +#include "file_dialog.h" #include "screen_dialog.h" #include "static_text.h" #include "table_dialog.h" #include "wx_util.h" #include "lib/compose.hpp" +#include "lib/scope_guard.h" #include "lib/util.h" #include #include @@ -34,14 +36,12 @@ LIBDCP_DISABLE_WARNINGS #include #include LIBDCP_ENABLE_WARNINGS -#include using std::string; -using std::cout; using std::vector; -using boost::optional; using boost::bind; +using boost::optional; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif @@ -54,24 +54,29 @@ 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 () { - auto d = new wxFileDialog (this, _("Trusted Device certificate")); - if (d->ShowModal() == wxID_OK) { - try { - _certificate = dcp::Certificate(dcp::file_to_string(wx_to_std(d->GetPath()))); - _thumbprint->SetValue (std_to_wx(_certificate->thumbprint())); - } catch (dcp::MiscError& e) { - error_dialog(this, wxString::Format(_("Could not load certificate (%s)"), std_to_wx(e.what()))); - } + FileDialog dialog(this, _("Trusted Device certificate"), wxEmptyString, wxFD_DEFAULT_STYLE, "SelectCertificatePath"); + if (!dialog.show()) { + return; + } + + try { + _certificate = dcp::Certificate(dcp::file_to_string(dialog.paths()[0])); + _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()))); } } @@ -79,6 +84,7 @@ public: { _certificate = t.certificate (); _thumbprint->SetValue (std_to_wx(t.thumbprint())); + setup_sensitivity(); } optional get () @@ -94,6 +100,13 @@ public: } private: + void setup_sensitivity() + { + auto ok = dynamic_cast(FindWindowById(wxID_OK, this)); + DCPOMATIC_ASSERT(ok); + ok->Enable(static_cast(_certificate)); + } + wxTextCtrl* _thumbprint; wxButton* _file; boost::optional _certificate; @@ -119,43 +132,69 @@ ScreenDialog::ScreenDialog ( _sizer = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); int r = 0; - add_label_to_sizer (_sizer, this, _("Name"), true, wxGBPosition(r, 0)); + wxFont subheading_font(*wxNORMAL_FONT); + subheading_font.SetWeight(wxFONTWEIGHT_BOLD); + + auto subheading = new StaticText(this, _("Details")); + subheading->SetFont(subheading_font); + _sizer->Add(subheading, wxGBPosition(r, 0), wxGBSpan(1, 2)); + ++r; + + add_label_to_sizer(_sizer, this, _("Name"), true, wxGBPosition(r, 0), wxDefaultSpan, true); _name = new wxTextCtrl (this, wxID_ANY, std_to_wx (name), wxDefaultPosition, wxSize (320, -1)); _sizer->Add (_name, wxGBPosition (r, 1)); ++r; - add_label_to_sizer (_sizer, this, _("Notes"), true, wxGBPosition(r, 0)); + add_label_to_sizer(_sizer, this, _("Notes"), true, wxGBPosition(r, 0), wxDefaultSpan, true); _notes = new wxTextCtrl (this, wxID_ANY, std_to_wx(notes), wxDefaultPosition, wxSize(320, -1)); _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); - - add_label_to_sizer (_sizer, this, _("Recipient certificate"), true, wxGBPosition(r, 0)); - auto s = new wxBoxSizer (wxHORIZONTAL); - _recipient_thumbprint = new StaticText (this, wxT (""), wxDefaultPosition, size); - _recipient_thumbprint->SetFont (font); - set_recipient (recipient); + subheading = new StaticText(this, _("Recipient")); + subheading->SetFont(subheading_font); + _sizer->Add(subheading, wxGBPosition(r, 0), wxGBSpan(1, 2), wxTOP, DCPOMATIC_SUBHEADING_TOP_PAD); + ++r; _get_recipient_from_file = new Button (this, _("Get from file...")); _download_recipient = new Button (this, _("Download...")); - s->Add (_recipient_thumbprint, 1, wxRIGHT | wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT, DCPOMATIC_SIZER_X_GAP); + auto s = new wxBoxSizer (wxHORIZONTAL); s->Add (_get_recipient_from_file, 0, wxLEFT | wxRIGHT | wxEXPAND, DCPOMATIC_SIZER_X_GAP); s->Add (_download_recipient, 0, wxLEFT | wxRIGHT | wxEXPAND, DCPOMATIC_SIZER_X_GAP); - _sizer->Add (s, wxGBPosition (r, 1)); + _sizer->Add(s, wxGBPosition(r, 0), wxGBSpan(1, 2)); ++r; - add_label_to_sizer (_sizer, this, _("Filename"), true, wxGBPosition(r, 0)); - _recipient_file = new wxStaticText (this, wxID_ANY, wxT("")); - checked_set (_recipient_file, recipient_file.get_value_or("")); + 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); + set_recipient_file(recipient_file.get_value_or("")); _sizer->Add (_recipient_file, 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); + { int flags = wxALIGN_CENTER_VERTICAL | wxTOP; #ifdef __WXOSX__ @@ -164,7 +203,8 @@ ScreenDialog::ScreenDialog ( #else auto m = new StaticText (this, _("Other trusted devices")); #endif - _sizer->Add (m, wxGBPosition(r, 0), wxDefaultSpan, flags, DCPOMATIC_SIZER_Y_GAP); + m->SetFont(subheading_font); + _sizer->Add(m, wxGBPosition(r, 0), wxDefaultSpan, flags, DCPOMATIC_SUBHEADING_TOP_PAD); } ++r; @@ -182,7 +222,7 @@ ScreenDialog::ScreenDialog ( EditableListButton::NEW | EditableListButton::EDIT | EditableListButton::REMOVE ); - _sizer->Add (_trusted_device_list, wxGBPosition (r, 0), wxGBSpan (1, 3), wxEXPAND); + _sizer->Add(_trusted_device_list, wxGBPosition (r, 0), wxGBSpan (1, 3), wxEXPAND | wxLEFT, DCPOMATIC_SIZER_X_GAP); ++r; _name->Bind (wxEVT_TEXT, boost::bind (&ScreenDialog::setup_sensitivity, this)); @@ -191,7 +231,7 @@ ScreenDialog::ScreenDialog ( overall_sizer->Add (_sizer, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER); - wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL); + auto buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL); if (buttons) { overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder()); } @@ -246,7 +286,7 @@ ScreenDialog::load_recipient (boost::filesystem::path file) return; } set_recipient (c.leaf ()); - checked_set (_recipient_file, file.string()); + set_recipient_file(file.string()); } catch (dcp::MiscError& e) { error_dialog (this, _("Could not read certificate file."), std_to_wx(e.what())); } @@ -256,11 +296,10 @@ ScreenDialog::load_recipient (boost::filesystem::path file) void ScreenDialog::get_recipient_from_file () { - auto d = new wxFileDialog (this, _("Select Certificate File")); - if (d->ShowModal() == wxID_OK) { - load_recipient (boost::filesystem::path(wx_to_std(d->GetPath()))); + FileDialog dialog(this, _("Select Certificate File"), wxEmptyString, wxFD_DEFAULT_STYLE , "SelectCertificatePath"); + if (dialog.show()) { + load_recipient(dialog.paths()[0]); } - d->Destroy (); setup_sensitivity (); } @@ -269,12 +308,11 @@ ScreenDialog::get_recipient_from_file () void ScreenDialog::download_recipient () { - auto d = new DownloadCertificateDialog (this); - if (d->ShowModal() == wxID_OK) { - set_recipient (d->certificate()); - checked_set (_recipient_file, d->url()); + DownloadCertificateDialog dialog(this); + if (dialog.ShowModal() == wxID_OK) { + set_recipient(dialog.certificate()); + set_recipient_file(dialog.url()); } - d->Destroy (); setup_sensitivity (); } @@ -296,6 +334,21 @@ ScreenDialog::set_recipient (optional r) if (_recipient) { _recipient_thumbprint->SetLabel (std_to_wx (_recipient->thumbprint ())); + _subject_common_name->SetLabel(std_to_wx(_recipient->subject_common_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 (); } } + + +void +ScreenDialog::set_recipient_file(string file) +{ + checked_set(_recipient_file, file); + _recipient_file->SetToolTip(std_to_wx(file)); +} +