X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fconfig_dialog.h;h=3a196cce309d031b742a1da39fcbfd692fe91089;hb=13f17a79c3ff5fb7201534e64228a54314ab1619;hp=526480912abade4c92ef56030b65f07bf928cd59;hpb=1738f2e7336734190bed7e94ce3d691d4a9c9e4c;p=dcpomatic.git

diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index 526480912..3a196cce3 100644
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -25,11 +25,14 @@
 #include <wx/spinctrl.h>
 #include <wx/listctrl.h>
 #include <wx/filepicker.h>
+#include "wx_util.h"
+#include "editable_list.h"
 
 class DirPickerCtrl;
 class wxNotebook;
-
-class ServerDescription;
+class PresetColourConversion;
+class PresetColourConversionDialog;
+class ServerDialog;
 
 /** @class ConfigDialog
  *  @brief A dialogue to edit DCP-o-matic configuration.
@@ -40,65 +43,65 @@ public:
 	ConfigDialog (wxWindow *);
 
 private:
-	void set_language_changed (wxCommandEvent &);
-	void language_changed (wxCommandEvent &);
-	void tms_ip_changed (wxCommandEvent &);
-	void tms_path_changed (wxCommandEvent &);
-	void tms_user_changed (wxCommandEvent &);
-	void tms_password_changed (wxCommandEvent &);
-	void num_local_encoding_threads_changed (wxCommandEvent &);
-	void default_directory_changed (wxCommandEvent &);
-	void edit_default_dci_metadata_clicked (wxCommandEvent &);
-	void reference_scaler_changed (wxCommandEvent &);
-	void edit_reference_filters_clicked (wxCommandEvent &);
-	void reference_filters_changed (std::vector<Filter const *>);
-	void add_server_clicked (wxCommandEvent &);
-	void edit_server_clicked (wxCommandEvent &);
-	void remove_server_clicked (wxCommandEvent &);
-	void server_selection_changed (wxListEvent &);
-	void default_format_changed (wxCommandEvent &);
-	void default_dcp_content_type_changed (wxCommandEvent &);
-	void issuer_changed (wxCommandEvent &);
-	void creator_changed (wxCommandEvent &);
+	void set_language_changed ();
+	void language_changed ();
+	void tms_ip_changed ();
+	void tms_path_changed ();
+	void tms_user_changed ();
+	void tms_password_changed ();
+	void num_local_encoding_threads_changed ();
+	void default_still_length_changed ();
+	void default_directory_changed ();
+	void edit_default_dci_metadata_clicked ();
+	void default_container_changed ();
+	void default_dcp_content_type_changed ();
+	void issuer_changed ();
+	void creator_changed ();
+	void default_j2k_bandwidth_changed ();
+	void mail_server_changed ();
+	void kdm_from_changed ();
+	void kdm_email_changed ();
+	void use_any_servers_changed ();
 
-	void add_server_to_control (ServerDescription *);
 	void setup_language_sensitivity ();
 
 	void make_misc_panel ();
+	void make_servers_panel ();
 	void make_tms_panel ();
 	void make_metadata_panel ();
-	void make_ab_panel ();
-	void make_servers_panel ();
+	void make_colour_conversions_panel ();
+	void make_kdm_email_panel ();
 
 	wxNotebook* _notebook;
 	wxPanel* _misc_panel;
-	wxPanel* _tms_panel;
-	wxPanel* _ab_panel;
 	wxPanel* _servers_panel;
+	wxPanel* _tms_panel;
+	EditableList<PresetColourConversion, PresetColourConversionDialog>* _colour_conversions_panel;
 	wxPanel* _metadata_panel;
 	wxCheckBox* _set_language;
 	wxChoice* _language;
-	wxChoice* _default_format;
+	wxChoice* _default_container;
 	wxChoice* _default_dcp_content_type;
 	wxTextCtrl* _tms_ip;
 	wxTextCtrl* _tms_path;
 	wxTextCtrl* _tms_user;
 	wxTextCtrl* _tms_password;
 	wxSpinCtrl* _num_local_encoding_threads;
-#ifdef __WXMSW__	
+	wxTextCtrl* _mail_server;
+	wxTextCtrl* _kdm_from;
+	wxSpinCtrl* _default_still_length;
+#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
 	DirPickerCtrl* _default_directory;
 #else
 	wxDirPickerCtrl* _default_directory;
 #endif
 	wxButton* _default_dci_metadata_button;
-	wxChoice* _reference_scaler;
-	wxStaticText* _reference_filters;
-	wxButton* _reference_filters_button;
-	wxListCtrl* _servers;
-	wxButton* _add_server;
-	wxButton* _edit_server;
-	wxButton* _remove_server;
 	wxTextCtrl* _issuer;
 	wxTextCtrl* _creator;
+	wxSpinCtrl* _default_j2k_bandwidth;
+	wxPanel* _kdm_email_panel;
+	wxTextCtrl* _kdm_email;
+	wxCheckBox* _use_any_servers;
+	EditableList<std::string, ServerDialog>* _servers_list;
 };