Merge master.

1 files changed, 10 insertions, 0 deletions

diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index 852925e1d..5df1a634f 100644
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -57,12 +57,17 @@ private:
 	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 add_server_to_control (ServerDescription *);
 	void setup_language_sensitivity ();
 
 	void make_misc_panel ();
 	void make_tms_panel ();
+	void make_metadata_panel ();
 	void make_ab_panel ();
 	void make_servers_panel ();
 
@@ -71,8 +76,11 @@ private:
 	wxPanel* _tms_panel;
 	wxPanel* _ab_panel;
 	wxPanel* _servers_panel;
+	wxPanel* _metadata_panel;
 	wxCheckBox* _set_language;
 	wxChoice* _language;
+	wxChoice* _default_format;
+	wxChoice* _default_dcp_content_type;
 	wxTextCtrl* _tms_ip;
 	wxTextCtrl* _tms_path;
 	wxTextCtrl* _tms_user;
@@ -92,5 +100,7 @@ private:
 	wxButton* _add_server;
 	wxButton* _edit_server;
 	wxButton* _remove_server;
+	wxTextCtrl* _issuer;
+	wxTextCtrl* _creator;
 };