projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Supporters update.
[dcpomatic.git]
/
src
/
wx
/
screen_dialog.h
diff --git
a/src/wx/screen_dialog.h
b/src/wx/screen_dialog.h
index 6740b35a3b8557d0058723803c6c514514930047..51721866972bb2779152f130be3a9c2e98935937 100644
(file)
--- a/
src/wx/screen_dialog.h
+++ b/
src/wx/screen_dialog.h
@@
-1,30
+1,37
@@
/*
/*
- Copyright (C) 2012-20
16
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
22
Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
+
#include "editable_list.h"
#include "editable_list.h"
+#include "lib/screen.h"
#include <dcp/certificate.h>
#include <dcp/certificate.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
-#include <boost/shared_ptr.hpp>
+LIBDCP_ENABLE_WARNINGS
#include <boost/optional.hpp>
#include <boost/optional.hpp>
+
class Progress;
class Progress;
-class CertificateFileDialogWrapper;
+class TrustedDeviceDialog;
+
class ScreenDialog : public wxDialog
{
class ScreenDialog : public wxDialog
{
@@
-34,14
+41,16
@@
public:
wxString,
std::string name = "",
std::string notes = "",
wxString,
std::string name = "",
std::string notes = "",
- boost::optional<dcp::Certificate> c = boost::optional<dcp::Certificate> (),
- std::vector<dcp::Certificate> d = std::vector<dcp::Certificate> ()
+ boost::optional<dcp::Certificate> c = {},
+ boost::optional<std::string> f = {},
+ std::vector<TrustedDevice> d = {}
);
std::string name () const;
std::string notes () const;
boost::optional<dcp::Certificate> recipient () const;
);
std::string name () const;
std::string notes () const;
boost::optional<dcp::Certificate> recipient () const;
- std::vector<dcp::Certificate> trusted_devices () {
+ boost::optional<std::string> recipient_file () const;
+ std::vector<TrustedDevice> trusted_devices () {
return _trusted_devices;
}
return _trusted_devices;
}
@@
-52,7
+61,7
@@
private:
void setup_sensitivity ();
void set_recipient (boost::optional<dcp::Certificate>);
void setup_sensitivity ();
void set_recipient (boost::optional<dcp::Certificate>);
- void set_trusted_devices (std::vector<
dcp::Certificat
e> d) {
+ void set_trusted_devices (std::vector<
TrustedDevic
e> d) {
_trusted_devices = d;
}
_trusted_devices = d;
}
@@
-60,10
+69,11
@@
private:
wxTextCtrl* _name;
wxTextCtrl* _notes;
wxStaticText* _recipient_thumbprint;
wxTextCtrl* _name;
wxTextCtrl* _notes;
wxStaticText* _recipient_thumbprint;
+ wxStaticText* _recipient_file;
wxButton* _get_recipient_from_file;
wxButton* _download_recipient;
wxButton* _get_recipient_from_file;
wxButton* _download_recipient;
- EditableList<
dcp::Certificate, CertificateFileDialogWrapper
>* _trusted_device_list;
+ EditableList<
TrustedDevice, TrustedDeviceDialog
>* _trusted_device_list;
boost::optional<dcp::Certificate> _recipient;
boost::optional<dcp::Certificate> _recipient;
- std::vector<
dcp::Certificat
e> _trusted_devices;
+ std::vector<
TrustedDevic
e> _trusted_devices;
};
};