Merge master.

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

diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index 2492f4899bdb7d90251bd50cf8d8eb6fd52ce7af..8a17de58db9b460abf130692bf1a7a9fa7a656b4 100644 (file)
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -32,6 +32,7 @@ class DirPickerCtrl;
 class wxNotebook;
 class PresetColourConversion;
 class PresetColourConversionDialog;
+class ServerDialog;
 
 /** @class ConfigDialog
  *  @brief A dialogue to edit DCP-o-matic configuration.
@@ -57,20 +58,31 @@ private:
        void issuer_changed ();
        void creator_changed ();
        void default_j2k_bandwidth_changed ();
+       void default_audio_delay_changed ();
        void mail_server_changed ();
+       void mail_user_changed ();
+       void mail_password_changed ();
        void kdm_from_changed ();
        void kdm_email_changed ();
+       void use_any_servers_changed ();
 
        void setup_language_sensitivity ();
 
        void make_misc_panel ();
+       void make_defaults_panel ();
+       void make_servers_panel ();
        void make_tms_panel ();
        void make_metadata_panel ();
        void make_colour_conversions_panel ();
        void make_kdm_email_panel ();
 
+       void check_for_updates_changed ();
+       void check_for_test_updates_changed ();
+
        wxNotebook* _notebook;
        wxPanel* _misc_panel;
+       wxPanel* _defaults_panel;
+       wxPanel* _servers_panel;
        wxPanel* _tms_panel;
        EditableList<PresetColourConversion, PresetColourConversionDialog>* _colour_conversions_panel;
        wxPanel* _metadata_panel;
@@ -84,6 +96,8 @@ private:
        wxTextCtrl* _tms_password;
        wxSpinCtrl* _num_local_encoding_threads;
        wxTextCtrl* _mail_server;
+       wxTextCtrl* _mail_user;
+       wxTextCtrl* _mail_password;
        wxTextCtrl* _kdm_from;
        wxSpinCtrl* _default_still_length;
 #ifdef DCPOMATIC_USE_OWN_DIR_PICKER
@@ -95,7 +109,12 @@ private:
        wxTextCtrl* _issuer;
        wxTextCtrl* _creator;
        wxSpinCtrl* _default_j2k_bandwidth;
+       wxSpinCtrl* _default_audio_delay;
        wxPanel* _kdm_email_panel;
        wxTextCtrl* _kdm_email;
+       wxCheckBox* _use_any_servers;
+       wxCheckBox* _check_for_updates;
+       wxCheckBox* _check_for_test_updates;
+       EditableList<std::string, ServerDialog>* _servers_list;
 };