projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix duplicate translations.
[dcpomatic.git]
/
src
/
wx
/
screen_dialog.h
diff --git
a/src/wx/screen_dialog.h
b/src/wx/screen_dialog.h
index 5ae369415e001cdf9cf145adeafdbf1bcb0d1573..9bb7d863ea6ea5724c609eff8dca061c270e3fab 100644
(file)
--- a/
src/wx/screen_dialog.h
+++ b/
src/wx/screen_dialog.h
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2012-201
4
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
6
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/>.
*/
*/
@@
-31,13
+32,15
@@
class ScreenDialog : public wxDialog
public:
ScreenDialog (
wxWindow *,
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> (),
std::vector<dcp::Certificate> d = std::vector<dcp::Certificate> ()
);
std::string name () const;
boost::optional<dcp::Certificate> c = boost::optional<dcp::Certificate> (),
std::vector<dcp::Certificate> d = std::vector<dcp::Certificate> ()
);
std::string name () const;
+ std::string notes () const;
boost::optional<dcp::Certificate> recipient () const;
std::vector<dcp::Certificate> trusted_devices () {
return _trusted_devices;
boost::optional<dcp::Certificate> recipient () const;
std::vector<dcp::Certificate> trusted_devices () {
return _trusted_devices;
@@
-56,6
+59,7
@@
private:
wxGridBagSizer* _sizer;
wxTextCtrl* _name;
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;