projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op: remove all trailing whitespace.
[dcpomatic.git]
/
src
/
wx
/
screen_dialog.h
diff --git
a/src/wx/screen_dialog.h
b/src/wx/screen_dialog.h
index 1bd4a89a92cb976002ac735bd3371b1be26d579f..69d0fff81b7f7e29da6a11310bfae1245ceef8c6 100644
(file)
--- a/
src/wx/screen_dialog.h
+++ b/
src/wx/screen_dialog.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012
-2014
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-19,22
+19,30
@@
#include <wx/wx.h>
#include <boost/shared_ptr.hpp>
#include <wx/wx.h>
#include <boost/shared_ptr.hpp>
-#include <libdcp/certificates.h>
+#include <dcp/certificates.h>
+#include "table_dialog.h"
-class ScreenDialog : public wxDialog
+class Progress;
+
+class ScreenDialog : public TableDialog
{
public:
{
public:
- ScreenDialog (wxWindow *, std::string, std::string name = "", boost::
shared_ptr<libdcp::Certificate> c = boost::shared_ptr<lib
dcp::Certificate> ());
+ ScreenDialog (wxWindow *, std::string, std::string name = "", boost::
optional<dcp::Certificate> c = boost::optional<
dcp::Certificate> ());
std::string name () const;
std::string name () const;
- boost::
shared_ptr<lib
dcp::Certificate> certificate () const;
-
+ boost::
optional<
dcp::Certificate> certificate () const;
+
private:
private:
- void load_certificate (wxCommandEvent &);
-
+ void select_certificate ();
+ void load_certificate (boost::filesystem::path);
+ void download_certificate ();
+ void setup_sensitivity ();
+
wxTextCtrl* _name;
wxTextCtrl* _name;
- wxButton* _certificate_load;
+ wxChoice* _manufacturer;
+ wxButton* _load_certificate;
+ wxButton* _download_certificate;
wxTextCtrl* _certificate_text;
wxTextCtrl* _certificate_text;
- boost::
shared_ptr<lib
dcp::Certificate> _certificate;
+ boost::
optional<
dcp::Certificate> _certificate;
};
};