/*
- Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2022 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
+
+#include "dcpomatic_button.h"
+#include "download_certificate_dialog.h"
#include "screen_dialog.h"
-#include "wx_util.h"
-#include "file_dialog_wrapper.h"
#include "static_text.h"
-#include "download_certificate_dialog.h"
#include "table_dialog.h"
-#include "dcpomatic_button.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>
+
using std::string;
using std::cout;
using std::vector;
using namespace boost::placeholders;
#endif
-static string
-column (TrustedDevice d)
-{
- return d.thumbprint ();
-}
class TrustedDeviceDialog : public TableDialog
{
void load_certificate ()
{
- wxFileDialog* d = new wxFileDialog (this, _("Trusted Device 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 certficate (%s)"), std_to_wx(e.what())));
+ error_dialog(this, wxString::Format(_("Could not load certificate (%s)"), std_to_wx(e.what())));
}
}
}
optional<TrustedDevice> get ()
{
- string const t = wx_to_std (_thumbprint->GetValue ());
+ auto const t = wx_to_std (_thumbprint->GetValue());
if (_certificate && _certificate->thumbprint() == t) {
return TrustedDevice (*_certificate);
} else if (t.length() == 28) {
return TrustedDevice (t);
}
- return optional<TrustedDevice> ();
+ return {};
}
private:
boost::optional<dcp::Certificate> _certificate;
};
+
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)
, _trusted_devices (trusted_devices)
{
- wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
+ auto overall_sizer = new wxBoxSizer (wxVERTICAL);
SetSizer (overall_sizer);
_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));
+ add_label_to_sizer (_sizer, this, _("Name"), true, wxGBPosition(r, 0));
_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));
- _notes = new wxTextCtrl (this, wxID_ANY, std_to_wx (notes), wxDefaultPosition, wxSize (320, -1));
- _sizer->Add (_notes, wxGBPosition (r, 1));
+ add_label_to_sizer (_sizer, this, _("Notes"), true, wxGBPosition(r, 0));
+ _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"));
+ wxSize size = dc.GetTextExtent (wxT("1234567890123456789012345678"));
size.SetHeight (-1);
- add_label_to_sizer (_sizer, this, _("Recipient certificate"), true, wxGBPosition (r, 0));
- wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+ 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);
+
_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;
columns,
bind (&ScreenDialog::trusted_devices, this),
bind (&ScreenDialog::set_trusted_devices, this, _1),
- bind (&column, _1),
- false
+ [] (TrustedDevice const& d, int) {
+ return d.thumbprint();
+ },
+ EditableListTitle::INVISIBLE,
+ EditableListButton::NEW | EditableListButton::EDIT | EditableListButton::REMOVE
);
_sizer->Add (_trusted_device_list, wxGBPosition (r, 0), wxGBSpan (1, 3), wxEXPAND);
setup_sensitivity ();
}
+
string
ScreenDialog::name () const
{
return wx_to_std (_name->GetValue());
}
+
string
ScreenDialog::notes () const
{
return wx_to_std (_notes->GetValue());
}
+
optional<dcp::Certificate>
ScreenDialog::recipient () const
{
return _recipient;
}
+
+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)
{
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));
+ 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 ());
+ checked_set (_recipient_file, file.string());
} catch (dcp::MiscError& e) {
error_dialog (this, _("Could not read certificate file."), std_to_wx(e.what()));
}
}
+
void
ScreenDialog::get_recipient_from_file ()
{
- wxFileDialog* d = new wxFileDialog (this, _("Select Certificate File"));
- if (d->ShowModal () == wxID_OK) {
- load_recipient (boost::filesystem::path (wx_to_std (d->GetPath ())));
+ auto d = new wxFileDialog (this, _("Select Certificate File"));
+ if (d->ShowModal() == wxID_OK) {
+ load_recipient (boost::filesystem::path(wx_to_std(d->GetPath())));
}
d->Destroy ();
setup_sensitivity ();
}
+
void
ScreenDialog::download_recipient ()
{
- DownloadCertificateDialog* d = new DownloadCertificateDialog (this);
+ auto d = new DownloadCertificateDialog (this);
if (d->ShowModal() == wxID_OK) {
- set_recipient (d->certificate ());
+ set_recipient (d->certificate());
+ checked_set (_recipient_file, d->url());
}
d->Destroy ();
setup_sensitivity ();
}
+
void
ScreenDialog::setup_sensitivity ()
{
- wxButton* ok = dynamic_cast<wxButton*> (FindWindowById (wxID_OK, this));
+ auto ok = dynamic_cast<wxButton*> (FindWindowById(wxID_OK, this));
if (ok) {
ok->Enable (static_cast<bool>(_recipient) && !_name->GetValue().IsEmpty());
}
}
+
void
ScreenDialog::set_recipient (optional<dcp::Certificate> r)
{
projects / dcpomatic.git / blobdiff