projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove old symlink.
[dcpomatic.git]
/
src
/
wx
/
screen_dialog.h
diff --git
a/src/wx/screen_dialog.h
b/src/wx/screen_dialog.h
index 0cd7d3c4963f77da9ab7eb0f0bcb7b1cc073d1f2..9bb7d863ea6ea5724c609eff8dca061c270e3fab 100644
(file)
--- a/
src/wx/screen_dialog.h
+++ b/
src/wx/screen_dialog.h
@@
-1,41
+1,70
@@
/*
/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012
-2016
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 <dcp/certificate.h>
#include <wx/wx.h>
#include <boost/shared_ptr.hpp>
#include <wx/wx.h>
#include <boost/shared_ptr.hpp>
-#include <dcp/certificates.h>
+#include <boost/optional.hpp>
+
+class Progress;
+class CertificateFileDialogWrapper;
class ScreenDialog : public wxDialog
{
public:
class ScreenDialog : public wxDialog
{
public:
- ScreenDialog (wxWindow *, std::string, std::string name = "", boost::shared_ptr<dcp::Certificate> c = boost::shared_ptr<dcp::Certificate> ());
+ ScreenDialog (
+ wxWindow *,
+ 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> ()
+ );
std::string name () const;
std::string name () const;
- boost::shared_ptr<dcp::Certificate> certificate () const;
-
+ std::string notes () const;
+ boost::optional<dcp::Certificate> recipient () const;
+ std::vector<dcp::Certificate> trusted_devices () {
+ return _trusted_devices;
+ }
+
private:
private:
- void load_certificate ();
+ void get_recipient_from_file ();
+ void load_recipient (boost::filesystem::path);
+ void download_recipient ();
void setup_sensitivity ();
void setup_sensitivity ();
-
+ void set_recipient (boost::optional<dcp::Certificate>);
+
+ void set_trusted_devices (std::vector<dcp::Certificate> d) {
+ _trusted_devices = d;
+ }
+
+ wxGridBagSizer* _sizer;
wxTextCtrl* _name;
wxTextCtrl* _name;
- wxButton* _certificate_load;
- wxTextCtrl* _certificate_text;
+ wxTextCtrl* _notes;
+ wxStaticText* _recipient_thumbprint;
+ wxButton* _get_recipient_from_file;
+ wxButton* _download_recipient;
+ EditableList<dcp::Certificate, CertificateFileDialogWrapper>* _trusted_device_list;
- boost::shared_ptr<dcp::Certificate> _certificate;
+ boost::optional<dcp::Certificate> _recipient;
+ std::vector<dcp::Certificate> _trusted_devices;
};
};