class CertificateFileDialogWrapper : public FileDialogWrapper<dcp::Certificate>
{
public:
- CertificateFileDialogWrapper (wxWindow* parent)
+ explicit CertificateFileDialogWrapper (wxWindow* parent)
: FileDialogWrapper<dcp::Certificate> (parent, _("Select certificate file"))
{
columns,
bind (&ScreenDialog::trusted_devices, this),
bind (&ScreenDialog::set_trusted_devices, this, _1),
- bind (&always_valid),
bind (&column, _1),
false
);
_sizer->Add (_trusted_device_list, wxGBPosition (r, 0), wxGBSpan (1, 3), wxEXPAND);
++r;
- _name->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ScreenDialog::setup_sensitivity, this));
- _get_recipient_from_file->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ScreenDialog::get_recipient_from_file, this));
- _download_recipient->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ScreenDialog::download_recipient, this));
+ _name->Bind (wxEVT_TEXT, boost::bind (&ScreenDialog::setup_sensitivity, this));
+ _get_recipient_from_file->Bind (wxEVT_BUTTON, boost::bind (&ScreenDialog::get_recipient_from_file, this));
+ _download_recipient->Bind (wxEVT_BUTTON, boost::bind (&ScreenDialog::download_recipient, this));
overall_sizer->Add (_sizer, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
try {
/* Load this as a chain, in case it is one, and then pick the leaf certificate */
dcp::CertificateChain c (dcp::file_to_string (file));
+ if (c.unordered().empty()) {
+ error_dialog (this, _("Could not read certificate file."));
+ return;
+ }
set_recipient (c.leaf ());
} catch (dcp::MiscError& e) {
- error_dialog (this, wxString::Format (_("Could not read certificate file (%s)"), std_to_wx(e.what()).data()));
+ error_dialog (this, _("Could not read certificate file."), std_to_wx(e.what()));
}
}