X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fscreen_dialog.h;h=69d0fff81b7f7e29da6a11310bfae1245ceef8c6;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=0cd7d3c4963f77da9ab7eb0f0bcb7b1cc073d1f2;hpb=79ce26d031d109177ba4b0f637fa2960345a37a3;p=dcpomatic.git diff --git a/src/wx/screen_dialog.h b/src/wx/screen_dialog.h index 0cd7d3c49..69d0fff81 100644 --- a/src/wx/screen_dialog.h +++ b/src/wx/screen_dialog.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2014 Carl Hetherington 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 #include #include +#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 c = boost::shared_ptr ()); + ScreenDialog (wxWindow *, std::string, std::string name = "", boost::optional c = boost::optional ()); std::string name () const; - boost::shared_ptr certificate () const; - + boost::optional 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 _certificate; + boost::optional _certificate; };