projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
wx
/
config_dialog.h
diff --git
a/src/wx/config_dialog.h
b/src/wx/config_dialog.h
index 852925e1da1ca0bb45e92f842c18b5e9193e9e47..459d64dd701327c2e8bd07f6f5f9e027aae58ebd 100644
(file)
--- a/
src/wx/config_dialog.h
+++ b/
src/wx/config_dialog.h
@@
-25,6
+25,7
@@
#include <wx/spinctrl.h>
#include <wx/listctrl.h>
#include <wx/filepicker.h>
#include <wx/spinctrl.h>
#include <wx/listctrl.h>
#include <wx/filepicker.h>
+#include "wx_util.h"
class DirPickerCtrl;
class wxNotebook;
class DirPickerCtrl;
class wxNotebook;
@@
-50,47
+51,49
@@
private:
void default_still_length_changed (wxCommandEvent &);
void default_directory_changed (wxCommandEvent &);
void edit_default_dci_metadata_clicked (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<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_clicked (wxCommandEvent &);
void edit_server_clicked (wxCommandEvent &);
void remove_server_clicked (wxCommandEvent &);
void server_selection_changed (wxListEvent &);
+ void default_container_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 add_server_to_control (ServerDescription *);
void setup_language_sensitivity ();
void make_misc_panel ();
void make_tms_panel ();
- void make_
ab
_panel ();
+ void make_
metadata
_panel ();
void make_servers_panel ();
wxNotebook* _notebook;
wxPanel* _misc_panel;
wxPanel* _tms_panel;
void make_servers_panel ();
wxNotebook* _notebook;
wxPanel* _misc_panel;
wxPanel* _tms_panel;
- wxPanel* _ab_panel;
wxPanel* _servers_panel;
wxPanel* _servers_panel;
+ wxPanel* _metadata_panel;
wxCheckBox* _set_language;
wxChoice* _language;
wxCheckBox* _set_language;
wxChoice* _language;
+ 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;
wxSpinCtrl* _default_still_length;
wxTextCtrl* _tms_ip;
wxTextCtrl* _tms_path;
wxTextCtrl* _tms_user;
wxTextCtrl* _tms_password;
wxSpinCtrl* _num_local_encoding_threads;
wxSpinCtrl* _default_still_length;
-#ifdef
__WXMSW__
+#ifdef
DCPOMATIC_USE_OWN_DIR_PICKER
DirPickerCtrl* _default_directory;
#else
wxDirPickerCtrl* _default_directory;
#endif
wxButton* _default_dci_metadata_button;
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;
wxListCtrl* _servers;
wxButton* _add_server;
wxButton* _edit_server;
wxButton* _remove_server;
+ wxTextCtrl* _issuer;
+ wxTextCtrl* _creator;
};
};