X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fscreen_dialog.cc;h=b985888ea75972ec194f433fd64bccd00f6f4ee3;hb=5063594e6836cfabed7d55f4963da9c8cf3b9f11;hp=716f9e9eb3db91dbdb16546a19447e0084e0558f;hpb=c103d8c1306e5fb3937b3a6c430a3fff32653fa3;p=dcpomatic.git diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc index 716f9e9eb..b985888ea 100644 --- a/src/wx/screen_dialog.cc +++ b/src/wx/screen_dialog.cc @@ -21,11 +21,14 @@ #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_ptr.h" #include "wx_util.h" #include "lib/compose.hpp" +#include "lib/scope_guard.h" #include "lib/util.h" #include #include @@ -34,14 +37,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 @@ -64,14 +65,16 @@ public: 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()))); - } + auto dialog = make_wx(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())); + } catch (dcp::MiscError& e) { + error_dialog(this, wxString::Format(_("Could not load certificate (%s)"), std_to_wx(e.what()))); } } @@ -140,7 +143,6 @@ ScreenDialog::ScreenDialog ( auto s = new wxBoxSizer (wxHORIZONTAL); _recipient_thumbprint = new StaticText (this, wxT (""), wxDefaultPosition, size); _recipient_thumbprint->SetFont (font); - set_recipient (recipient); _get_recipient_from_file = new Button (this, _("Get from file...")); _download_recipient = new Button (this, _("Download...")); @@ -151,11 +153,33 @@ ScreenDialog::ScreenDialog ( ++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("")); + _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_label_to_sizer(_sizer, this, _("Subject common name"), true, wxGBPosition(r, 0)); + _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)); + _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)); + _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)); + _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; + + set_recipient (recipient); + { int flags = wxALIGN_CENTER_VERTICAL | wxTOP; #ifdef __WXOSX__ @@ -191,7 +215,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 +270,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 +280,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()))); + auto dialog = make_wx(this, _("Select Certificate File"), wxEmptyString, wxFD_DEFAULT_STYLE , "SelectCertificatePath"); + if (dialog->show()) { + load_recipient(dialog->paths()[0]); } - d->Destroy (); setup_sensitivity (); } @@ -269,12 +292,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()); + auto dialog = make_wx(this); + if (dialog->ShowModal() == wxID_OK) { + set_recipient(dialog->certificate()); + set_recipient_file(dialog->url()); } - d->Destroy (); setup_sensitivity (); } @@ -296,6 +318,19 @@ 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())); _sizer->Layout (); } } + + +void +ScreenDialog::set_recipient_file(string file) +{ + checked_set(_recipient_file, file); + _recipient_file->SetToolTip(std_to_wx(file)); +} +