X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Fconfig_dialog.h;h=948bf0571e2f95e347dd3440a6303a9ebc878f87;hb=8bfb6ae0780b0bf3318c345df78518ad3fabc9fc;hp=000cf7d6906130cc922914d8187a13471660608e;hpb=91dd8a42f88fec7e7e30a529af05e5ff5d77538a;p=dcpomatic.git

diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index 000cf7d69..948bf0571 100644
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -24,9 +24,11 @@
 #include <wx/wx.h>
 #include <wx/spinctrl.h>
 #include <wx/listctrl.h>
+#include <wx/filepicker.h>
 
-class Screen;
-class Server;
+class DirPickerCtrl;
+
+class ServerDescription;
 
 /** @class ConfigDialog
  *  @brief A dialogue to edit DVD-o-matic configuration.
@@ -42,29 +44,35 @@ private:
 	void tms_user_changed (wxCommandEvent &);
 	void tms_password_changed (wxCommandEvent &);
 	void num_local_encoding_threads_changed (wxCommandEvent &);
-	void colour_lut_changed (wxCommandEvent &);
-	void j2k_bandwidth_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 add_server_to_control (Server *);
+	void add_server_to_control (ServerDescription *);
 	
 	wxTextCtrl* _tms_ip;
 	wxTextCtrl* _tms_path;
 	wxTextCtrl* _tms_user;
 	wxTextCtrl* _tms_password;
 	wxSpinCtrl* _num_local_encoding_threads;
-	wxComboBox* _colour_lut;
-	wxSpinCtrl* _j2k_bandwidth;
-	wxComboBox* _reference_scaler;
+#ifdef __WXMSW__	
+	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;
 };