X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fconfig_dialog.h;fp=src%2Fwx%2Fconfig_dialog.h;h=459d64dd701327c2e8bd07f6f5f9e027aae58ebd;hp=a97788942654fdf6e560750094775f86c1efbda0;hb=89115db77729a2c99f1a09ff6a461720e16f889e;hpb=d2ff6a6b0256e256b6df416f280c846072f7682f diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h index a97788942..459d64dd7 100644 --- a/src/wx/config_dialog.h +++ b/src/wx/config_dialog.h @@ -48,16 +48,14 @@ private: void tms_user_changed (wxCommandEvent &); void tms_password_changed (wxCommandEvent &); void num_local_encoding_threads_changed (wxCommandEvent &); + void default_still_length_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); 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_container_changed (wxCommandEvent &); void default_dcp_content_type_changed (wxCommandEvent &); void issuer_changed (wxCommandEvent &); void creator_changed (wxCommandEvent &); @@ -68,33 +66,29 @@ private: void make_misc_panel (); void make_tms_panel (); void make_metadata_panel (); - void make_ab_panel (); void make_servers_panel (); wxNotebook* _notebook; wxPanel* _misc_panel; wxPanel* _tms_panel; - wxPanel* _ab_panel; wxPanel* _servers_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 DVDOMATIC_USE_OWN_DIR_PICKER + 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;