#include "dcpomatic_button.h"
#include "download_certificate_dialog.h"
-#include "file_dialog_wrapper.h"
#include "screen_dialog.h"
#include "static_text.h"
#include "table_dialog.h"
#include "wx_util.h"
#include "lib/compose.hpp"
#include "lib/util.h"
-#include "lib/warnings.h"
+#include <dcp/warnings.h>
#include <dcp/exceptions.h>
#include <dcp/certificate_chain.h>
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
#include <wx/filepicker.h>
#include <wx/validate.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
#include <iostream>
ScreenDialog::ScreenDialog (
- wxWindow* parent, wxString title, string name, string notes, optional<dcp::Certificate> recipient, vector<TrustedDevice> trusted_devices
+ wxWindow* parent,
+ wxString title,
+ string name,
+ string notes,
+ optional<dcp::Certificate> recipient,
+ optional<string> recipient_file,
+ vector<TrustedDevice> trusted_devices
)
: wxDialog (parent, wxID_ANY, title)
, _recipient (recipient)
_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..."));
- s->Add (_recipient_thumbprint, 1, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
+ s->Add (_recipient_thumbprint, 1, wxRIGHT | wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT, DCPOMATIC_SIZER_X_GAP);
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));
++r;
- add_label_to_sizer (_sizer, this, _("Other trusted devices"), true, wxGBPosition (r, 0));
+ 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(""));
+ _sizer->Add (_recipient_file, wxGBPosition(r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP);
+ ++r;
+
+ {
+ int flags = wxALIGN_CENTER_VERTICAL | wxTOP;
+#ifdef __WXOSX__
+ flags |= wxALIGN_RIGHT;
+ auto m = new StaticText (this, _("Other trusted devices") + wxT(":"));
+#else
+ auto m = new StaticText (this, _("Other trusted devices"));
+#endif
+ _sizer->Add (m, wxGBPosition(r, 0), wxDefaultSpan, flags, DCPOMATIC_SIZER_Y_GAP);
+ }
++r;
vector<EditableListColumn> columns;
[] (TrustedDevice const& d, int) {
return d.thumbprint();
},
+ EditableListButton::NEW | EditableListButton::EDIT | EditableListButton::REMOVE,
false
);
}
+optional<string>
+ScreenDialog::recipient_file () const
+{
+ auto const f = wx_to_std(_recipient_file->GetLabel());
+ if (f.empty()) {
+ return {};
+ }
+ return f;
+}
+
+
void
ScreenDialog::load_recipient (boost::filesystem::path file)
{
return;
}
set_recipient (c.leaf ());
+ checked_set (_recipient_file, file.string());
} catch (dcp::MiscError& e) {
error_dialog (this, _("Could not read certificate file."), std_to_wx(e.what()));
}
auto d = new DownloadCertificateDialog (this);
if (d->ShowModal() == wxID_OK) {
set_recipient (d->certificate());
+ checked_set (_recipient_file, d->url());
}
d->Destroy ();
setup_sensitivity ();