Colour in 'masking' in GL mode.

[dcpomatic.git] / src / wx / config_dialog.h

diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index b76f8bc355fa9d597b2dbc4b217d19615122d4e4..ac90cd42da2af4ae7a2356485a2aedde6ceb1858 100644 (file)
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -107,6 +107,7 @@ private:
        wxChoice* _language;
        wxCheckBox* _sound;
        wxChoice* _sound_output;
+       wxStaticText* _sound_output_details;
        wxCheckBox* _check_for_updates;
        wxCheckBox* _check_for_test_updates;
 };
@@ -120,7 +121,7 @@ public:
                int border,
                boost::function<void (boost::shared_ptr<dcp::CertificateChain>)> set,
                boost::function<boost::shared_ptr<const dcp::CertificateChain> (void)> get,
-               boost::function<bool (void)> nag_remake
+               boost::function<bool (void)> nag_alter
                );
 
        void add_button (wxWindow* button);
@@ -135,6 +136,7 @@ private:
        void update_private_key ();
        void import_private_key ();
        void export_private_key ();
+       void export_chain ();
 
        wxListCtrl* _certificates;
        wxButton* _add_certificate;
@@ -144,20 +146,20 @@ private:
        wxStaticText* _private_key;
        wxButton* _import_private_key;
        wxButton* _export_private_key;
+       wxButton* _export_chain;
        wxStaticText* _private_key_bad;
        wxSizer* _sizer;
        wxBoxSizer* _button_sizer;
        boost::function<void (boost::shared_ptr<dcp::CertificateChain>)> _set;
        boost::function<boost::shared_ptr<const dcp::CertificateChain> (void)> _get;
-       boost::function<bool (void)> _nag_remake;
+       boost::function<bool (void)> _nag_alter;
 };
 
 class KeysPage : public StandardPage
 {
 public:
-       KeysPage (wxSize panel_size, int border, bool sign)
+       KeysPage (wxSize panel_size, int border)
                : StandardPage (panel_size, border)
-               , _sign (sign)
        {}
 
        wxString GetName () const;
@@ -174,15 +176,12 @@ private:
        void setup ();
 
        void export_decryption_certificate ();
-       void export_decryption_chain ();
        void config_changed () {}
-       bool nag_remake_decryption_chain ();
+       bool nag_alter_decryption_chain ();
        void decryption_advanced ();
        void signing_advanced ();
        void export_decryption_chain_and_key ();
        void import_decryption_chain_and_key ();
-
-       bool _sign;
 };