X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fscreen_dialog.h;h=3e110d230bb4c48bfa6e9fe16e8de939c12efb33;hb=12efbd5938f08eb445b43f539fa4f27aa5caccfb;hp=72a315062fbfdfaadcc59423f147704a6b94a61f;hpb=c28b3d6f168607aca9995282b96647eb64a26dc9;p=dcpomatic.git

diff --git a/src/wx/screen_dialog.h b/src/wx/screen_dialog.h
index 72a315062..3e110d230 100644
--- 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
@@ -19,23 +19,30 @@
 
 #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:
-	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;
-	boost::shared_ptr<dcp::Certificate> certificate () const;
+	boost::optional<dcp::Certificate> certificate () const;
 	
 private:
-	void load_certificate ();
+	void select_certificate ();
+	void load_certificate (boost::filesystem::path);
+	void download_certificate ();
 	void setup_sensitivity ();
 	
 	wxTextCtrl* _name;
-	wxButton* _certificate_load;
+	wxChoice* _manufacturer;
+	wxButton* _load_certificate;
+	wxButton* _download_certificate;
 	wxTextCtrl* _certificate_text;
 
-	boost::shared_ptr<dcp::Certificate> _certificate;
+	boost::optional<dcp::Certificate> _certificate;
 };