projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add option to set project properties from a DCP loaded as content (#1688).
[dcpomatic.git]
/
src
/
wx
/
screen_dialog.h
diff --git
a/src/wx/screen_dialog.h
b/src/wx/screen_dialog.h
index 5ae369415e001cdf9cf145adeafdbf1bcb0d1573..913480d76be734e0b7febfb930b80bf904e4a02a 100644
(file)
--- a/
src/wx/screen_dialog.h
+++ b/
src/wx/screen_dialog.h
@@
-1,45
+1,49
@@
/*
/*
- Copyright (C) 2012-201
4
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
8
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 <wx/wx.h>
#include <boost/shared_ptr.hpp>
#include <boost/optional.hpp>
class Progress;
#include <dcp/certificate.h>
#include <wx/wx.h>
#include <boost/shared_ptr.hpp>
#include <boost/optional.hpp>
class Progress;
-class
CertificateFileDialogWrapper
;
+class
TrustedDeviceDialog
;
class ScreenDialog : public wxDialog
{
public:
ScreenDialog (
wxWindow *,
class ScreenDialog : public wxDialog
{
public:
ScreenDialog (
wxWindow *,
-
std::s
tring,
+
wxS
tring,
std::string name = "",
std::string name = "",
+ std::string notes = "",
boost::optional<dcp::Certificate> c = boost::optional<dcp::Certificate> (),
boost::optional<dcp::Certificate> c = boost::optional<dcp::Certificate> (),
- std::vector<
dcp::Certificate> d = std::vector<dcp::Certificate>
()
+ std::vector<
TrustedDevice> d = std::vector<TrustedDevice>
()
);
std::string name () const;
);
std::string name () const;
+ std::string notes () const;
boost::optional<dcp::Certificate> recipient () const;
boost::optional<dcp::Certificate> recipient () const;
- std::vector<
dcp::Certificat
e> trusted_devices () {
+ std::vector<
TrustedDevic
e> trusted_devices () {
return _trusted_devices;
}
return _trusted_devices;
}
@@
-50,17
+54,18
@@
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;
}
wxGridBagSizer* _sizer;
wxTextCtrl* _name;
_trusted_devices = d;
}
wxGridBagSizer* _sizer;
wxTextCtrl* _name;
+ wxTextCtrl* _notes;
wxStaticText* _recipient_thumbprint;
wxButton* _get_recipient_from_file;
wxButton* _download_recipient;
wxStaticText* _recipient_thumbprint;
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;
};
};