projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
wx
/
screen_dialog.h
diff --git
a/src/wx/screen_dialog.h
b/src/wx/screen_dialog.h
index 0cd7d3c4963f77da9ab7eb0f0bcb7b1cc073d1f2..3e110d230bb4c48bfa6e9fe16e8de939c12efb33 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
@@
-20,22
+20,29
@@
#include <wx/wx.h>
#include <boost/shared_ptr.hpp>
#include <dcp/certificates.h>
#include <wx/wx.h>
#include <boost/shared_ptr.hpp>
#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<dcp::Certificate> c = boost::shared_ptr
<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
<dcp::Certificate> certificate () const;
+ boost::
optional
<dcp::Certificate> certificate () const;
private:
private:
- void load_certificate ();
+ void select_certificate ();
+ void load_certificate (boost::filesystem::path);
+ void download_certificate ();
void setup_sensitivity ();
wxTextCtrl* _name;
void setup_sensitivity ();
wxTextCtrl* _name;
- wxButton* _certificate_load;
+ wxChoice* _manufacturer;
+ wxButton* _load_certificate;
+ wxButton* _download_certificate;
wxTextCtrl* _certificate_text;
wxTextCtrl* _certificate_text;
- boost::
shared_ptr
<dcp::Certificate> _certificate;
+ boost::
optional
<dcp::Certificate> _certificate;
};
};