X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fconfig_dialog.h;h=ac90cd42da2af4ae7a2356485a2aedde6ceb1858;hb=3044ef060894c62e8a1cef15ad14078001093982;hp=9a73d4e614722445c87e6ea11bad1e351493b5c8;hpb=15a5f157f7867a05211ce494d9d86b9c47fdf72b;p=dcpomatic.git diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h index 9a73d4e61..ac90cd42d 100644 --- 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)> set, boost::function (void)> get, - boost::function nag_remake + boost::function 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)> _set; boost::function (void)> _get; - boost::function _nag_remake; + boost::function _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 () {} - void 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; };