X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ffull_config_dialog.cc;h=c41236096c9466d2896b23cbe0e202e58297bca3;hp=35f6f1f23117994c7eae4692857f01a7fa24ddf2;hb=44da1840ca17d0945cb1886bb17218990850894c;hpb=35c0a33f8da3b1f99ec32a8c42f578cbc063e7e4 diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc index 35f6f1f23..c41236096 100644 --- a/src/wx/full_config_dialog.cc +++ b/src/wx/full_config_dialog.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Carl Hetherington + Copyright (C) 2012-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -36,6 +36,10 @@ #include "nag_dialog.h" #include "config_move_dialog.h" #include "config_dialog.h" +#include "static_text.h" +#include "check_box.h" +#include "dcpomatic_button.h" +#include "password_entry.h" #include "lib/config.h" #include "lib/ratio.h" #include "lib/filter.h" @@ -67,6 +71,9 @@ using boost::bind; using boost::shared_ptr; using boost::function; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using dcp::locale_convert; class FullGeneralPage : public GeneralPage @@ -96,43 +103,29 @@ private: ++r; add_label_to_sizer (table, _panel, _("Configuration file"), true, wxGBPosition (r, 0)); - _config_file = new FilePickerCtrl (_panel, _("Select configuration file"), "*.xml", true); + _config_file = new FilePickerCtrl (_panel, _("Select configuration file"), "*.xml", true, true); table->Add (_config_file, wxGBPosition (r, 1)); ++r; add_label_to_sizer (table, _panel, _("Cinema and screen database file"), true, wxGBPosition (r, 0)); - _cinemas_file = new FilePickerCtrl (_panel, _("Select cinema and screen database file"), "*.xml", true); + _cinemas_file = new FilePickerCtrl (_panel, _("Select cinema and screen database file"), "*.xml", true, true); table->Add (_cinemas_file, wxGBPosition (r, 1)); + Button* export_cinemas = new Button (_panel, _("Export...")); + table->Add (export_cinemas, wxGBPosition (r, 2)); ++r; - add_play_sound_controls (table, r); - #ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG - _analyse_ebur128 = new wxCheckBox (_panel, wxID_ANY, _("Find integrated loudness, true peak and loudness range when analysing audio")); + _analyse_ebur128 = new CheckBox (_panel, _("Find integrated loudness, true peak and loudness range when analysing audio")); table->Add (_analyse_ebur128, wxGBPosition (r, 0), wxGBSpan (1, 2)); ++r; #endif - _automatic_audio_analysis = new wxCheckBox (_panel, wxID_ANY, _("Automatically analyse content audio")); + _automatic_audio_analysis = new CheckBox (_panel, _("Automatically analyse content audio")); table->Add (_automatic_audio_analysis, wxGBPosition (r, 0), wxGBSpan (1, 2)); ++r; add_update_controls (table, r); - wxFlexGridSizer* bottom_table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); - bottom_table->AddGrowableCol (1, 1); - - add_label_to_sizer (bottom_table, _panel, _("Issuer"), true); - _issuer = new wxTextCtrl (_panel, wxID_ANY); - bottom_table->Add (_issuer, 1, wxALL | wxEXPAND); - - add_label_to_sizer (bottom_table, _panel, _("Creator"), true); - _creator = new wxTextCtrl (_panel, wxID_ANY); - bottom_table->Add (_creator, 1, wxALL | wxEXPAND); - - table->Add (bottom_table, wxGBPosition (r, 0), wxGBSpan (2, 2), wxEXPAND); - ++r; - _config_file->Bind (wxEVT_FILEPICKER_CHANGED, boost::bind (&FullGeneralPage::config_file_changed, this)); _cinemas_file->Bind (wxEVT_FILEPICKER_CHANGED, boost::bind (&FullGeneralPage::cinemas_file_changed, this)); @@ -140,14 +133,12 @@ private: _master_encoding_threads->Bind (wxEVT_SPINCTRL, boost::bind (&FullGeneralPage::master_encoding_threads_changed, this)); _server_encoding_threads->SetRange (1, 128); _server_encoding_threads->Bind (wxEVT_SPINCTRL, boost::bind (&FullGeneralPage::server_encoding_threads_changed, this)); + export_cinemas->Bind (wxEVT_BUTTON, boost::bind (&FullGeneralPage::export_cinemas_file, this)); #ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG _analyse_ebur128->Bind (wxEVT_CHECKBOX, boost::bind (&FullGeneralPage::analyse_ebur128_changed, this)); #endif _automatic_audio_analysis->Bind (wxEVT_CHECKBOX, boost::bind (&FullGeneralPage::automatic_audio_analysis_changed, this)); - - _issuer->Bind (wxEVT_TEXT, boost::bind (&FullGeneralPage::issuer_changed, this)); - _creator->Bind (wxEVT_TEXT, boost::bind (&FullGeneralPage::creator_changed, this)); } void config_changed () @@ -160,14 +151,24 @@ private: checked_set (_analyse_ebur128, config->analyse_ebur128 ()); #endif checked_set (_automatic_audio_analysis, config->automatic_audio_analysis ()); - checked_set (_issuer, config->dcp_issuer ()); - checked_set (_creator, config->dcp_creator ()); checked_set (_config_file, config->config_file()); checked_set (_cinemas_file, config->cinemas_file()); GeneralPage::config_changed (); } + void export_cinemas_file () + { + wxFileDialog* d = new wxFileDialog ( + _panel, _("Select Cinemas File"), wxEmptyString, wxEmptyString, wxT ("XML files (*.xml)|*.xml"), + wxFD_SAVE | wxFD_OVERWRITE_PROMPT + ); + + if (d->ShowModal () == wxID_OK) { + boost::filesystem::copy_file (Config::instance()->cinemas_file(), wx_to_std(d->GetPath())); + } + d->Destroy (); + } #ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG void analyse_ebur128_changed () @@ -191,16 +192,6 @@ private: Config::instance()->set_server_encoding_threads (_server_encoding_threads->GetValue ()); } - void issuer_changed () - { - Config::instance()->set_dcp_issuer (wx_to_std (_issuer->GetValue ())); - } - - void creator_changed () - { - Config::instance()->set_dcp_creator (wx_to_std (_creator->GetValue ())); - } - void config_file_changed () { Config* config = Config::instance(); @@ -240,15 +231,13 @@ private: wxCheckBox* _analyse_ebur128; #endif wxCheckBox* _automatic_audio_analysis; - wxTextCtrl* _issuer; - wxTextCtrl* _creator; }; -class DefaultsPage : public StandardPage +class DefaultsPage : public Page { public: DefaultsPage (wxSize panel_size, int border) - : StandardPage (panel_size, border) + : Page (panel_size, border) {} wxString GetName () const @@ -271,15 +260,15 @@ private: _panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border); { - add_label_to_sizer (table, _panel, _("Default duration of still images"), true); + add_label_to_sizer (table, _panel, _("Default duration of still images"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); _still_length = new wxSpinCtrl (_panel); s->Add (_still_length); - add_label_to_sizer (s, _panel, _("s"), false); + add_label_to_sizer (s, _panel, _("s"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); table->Add (s, 1); } - add_label_to_sizer (table, _panel, _("Default directory for new films"), true); + add_label_to_sizer (table, _panel, _("Default directory for new films"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); #ifdef DCPOMATIC_USE_OWN_PICKER _directory = new DirPickerCtrl (_panel); #else @@ -287,54 +276,51 @@ private: #endif table->Add (_directory, 1, wxEXPAND); - add_label_to_sizer (table, _panel, _("Default ISDCF name details"), true); - _isdcf_metadata_button = new wxButton (_panel, wxID_ANY, _("Edit...")); + add_label_to_sizer (table, _panel, _("Default ISDCF name details"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); + _isdcf_metadata_button = new Button (_panel, _("Edit...")); table->Add (_isdcf_metadata_button); - add_label_to_sizer (table, _panel, _("Default container"), true); + add_label_to_sizer (table, _panel, _("Default container"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); _container = new wxChoice (_panel, wxID_ANY); table->Add (_container); - add_label_to_sizer (table, _panel, _("Default scale-to"), true); - _scale_to = new wxChoice (_panel, wxID_ANY); - table->Add (_scale_to); - - add_label_to_sizer (table, _panel, _("Default content type"), true); + add_label_to_sizer (table, _panel, _("Default content type"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); _dcp_content_type = new wxChoice (_panel, wxID_ANY); table->Add (_dcp_content_type); - add_label_to_sizer (table, _panel, _("Default DCP audio channels"), true); + add_label_to_sizer (table, _panel, _("Default DCP audio channels"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); _dcp_audio_channels = new wxChoice (_panel, wxID_ANY); table->Add (_dcp_audio_channels); { - add_label_to_sizer (table, _panel, _("Default JPEG2000 bandwidth"), true); + add_label_to_sizer (table, _panel, _("Default JPEG2000 bandwidth"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); _j2k_bandwidth = new wxSpinCtrl (_panel); s->Add (_j2k_bandwidth); - add_label_to_sizer (s, _panel, _("Mbit/s"), false); + add_label_to_sizer (s, _panel, _("Mbit/s"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); table->Add (s, 1); } { - add_label_to_sizer (table, _panel, _("Default audio delay"), true); + add_label_to_sizer (table, _panel, _("Default audio delay"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); _audio_delay = new wxSpinCtrl (_panel); s->Add (_audio_delay); - add_label_to_sizer (s, _panel, _("ms"), false); + add_label_to_sizer (s, _panel, _("ms"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); table->Add (s, 1); } - add_label_to_sizer (table, _panel, _("Default standard"), true); + add_label_to_sizer (table, _panel, _("Default standard"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); _standard = new wxChoice (_panel, wxID_ANY); table->Add (_standard); - add_label_to_sizer (table, _panel, _("Default KDM directory"), true); + add_label_to_sizer (table, _panel, _("Default KDM directory"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); #ifdef DCPOMATIC_USE_OWN_PICKER _kdm_directory = new DirPickerCtrl (_panel); #else _kdm_directory = new wxDirPickerCtrl (_panel, wxDD_DIR_MUST_EXIST); #endif + table->Add (_kdm_directory, 1, wxEXPAND); _still_length->SetRange (1, 3600); @@ -351,14 +337,6 @@ private: _container->Bind (wxEVT_CHOICE, boost::bind (&DefaultsPage::container_changed, this)); - _scale_to->Append (_("Guess from content")); - - BOOST_FOREACH (Ratio const * i, Ratio::all()) { - _scale_to->Append (std_to_wx(i->image_nickname())); - } - - _scale_to->Bind (wxEVT_CHOICE, boost::bind (&DefaultsPage::scale_to_changed, this)); - BOOST_FOREACH (DCPContentType const * i, DCPContentType::all()) { _dcp_content_type->Append (std_to_wx (i->pretty_name ())); } @@ -390,17 +368,6 @@ private: } } - vector ratios = Ratio::all (); - for (size_t i = 0; i < ratios.size(); ++i) { - if (ratios[i] == config->default_scale_to ()) { - _scale_to->SetSelection (i + 1); - } - } - - if (!config->default_scale_to()) { - _scale_to->SetSelection (0); - } - vector const ct = DCPContentType::all (); for (size_t i = 0; i < ct.size(); ++i) { if (ct[i] == config->default_dcp_content_type ()) { @@ -467,17 +434,6 @@ private: Config::instance()->set_default_container (ratio[_container->GetSelection()]); } - void scale_to_changed () - { - int const s = _scale_to->GetSelection (); - if (s == 0) { - Config::instance()->set_default_scale_to (0); - } else { - vector ratio = Ratio::all (); - Config::instance()->set_default_scale_to (ratio[s - 1]); - } - } - void dcp_content_type_changed () { vector ct = DCPContentType::all (); @@ -501,17 +457,16 @@ private: wxDirPickerCtrl* _kdm_directory; #endif wxChoice* _container; - wxChoice* _scale_to; wxChoice* _dcp_content_type; wxChoice* _dcp_audio_channels; wxChoice* _standard; }; -class EncodingServersPage : public StandardPage +class EncodingServersPage : public Page { public: EncodingServersPage (wxSize panel_size, int border) - : StandardPage (panel_size, border) + : Page (panel_size, border) {} wxString GetName () const @@ -529,11 +484,11 @@ public: private: void setup () { - _use_any_servers = new wxCheckBox (_panel, wxID_ANY, _("Search network for servers")); + _use_any_servers = new CheckBox (_panel, _("Search network for servers")); _panel->GetSizer()->Add (_use_any_servers, 0, wxALL, _border); - vector columns; - columns.push_back (wx_to_std (_("IP address / host name"))); + vector columns; + columns.push_back (EditableListColumn(_("IP address / host name"))); _servers_list = new EditableList ( _panel, columns, @@ -567,11 +522,11 @@ private: EditableList* _servers_list; }; -class TMSPage : public StandardPage +class TMSPage : public Page { public: TMSPage (wxSize panel_size, int border) - : StandardPage (panel_size, border) + : Page (panel_size, border) {} wxString GetName () const @@ -589,44 +544,49 @@ public: private: void setup () { + _upload = new CheckBox (_panel, _("Upload DCP to TMS after creation")); + _panel->GetSizer()->Add (_upload, 0, wxALL | wxEXPAND, _border); + wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); table->AddGrowableCol (1, 1); _panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border); - add_label_to_sizer (table, _panel, _("Protocol"), true); + add_label_to_sizer (table, _panel, _("Protocol"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); _tms_protocol = new wxChoice (_panel, wxID_ANY); table->Add (_tms_protocol, 1, wxEXPAND); - add_label_to_sizer (table, _panel, _("IP address"), true); + add_label_to_sizer (table, _panel, _("IP address"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); _tms_ip = new wxTextCtrl (_panel, wxID_ANY); table->Add (_tms_ip, 1, wxEXPAND); - add_label_to_sizer (table, _panel, _("Target path"), true); + add_label_to_sizer (table, _panel, _("Target path"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); _tms_path = new wxTextCtrl (_panel, wxID_ANY); table->Add (_tms_path, 1, wxEXPAND); - add_label_to_sizer (table, _panel, _("User name"), true); + add_label_to_sizer (table, _panel, _("User name"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); _tms_user = new wxTextCtrl (_panel, wxID_ANY); table->Add (_tms_user, 1, wxEXPAND); - add_label_to_sizer (table, _panel, _("Password"), true); - _tms_password = new wxTextCtrl (_panel, wxID_ANY); - table->Add (_tms_password, 1, wxEXPAND); + add_label_to_sizer (table, _panel, _("Password"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); + _tms_password = new PasswordEntry (_panel); + table->Add (_tms_password->get_panel(), 1, wxEXPAND); _tms_protocol->Append (_("SCP (for AAM and Doremi)")); _tms_protocol->Append (_("FTP (for Dolby)")); + _upload->Bind (wxEVT_CHECKBOX, boost::bind(&TMSPage::upload_changed, this)); _tms_protocol->Bind (wxEVT_CHOICE, boost::bind (&TMSPage::tms_protocol_changed, this)); _tms_ip->Bind (wxEVT_TEXT, boost::bind (&TMSPage::tms_ip_changed, this)); _tms_path->Bind (wxEVT_TEXT, boost::bind (&TMSPage::tms_path_changed, this)); _tms_user->Bind (wxEVT_TEXT, boost::bind (&TMSPage::tms_user_changed, this)); - _tms_password->Bind (wxEVT_TEXT, boost::bind (&TMSPage::tms_password_changed, this)); + _tms_password->Changed.connect (boost::bind (&TMSPage::tms_password_changed, this)); } void config_changed () { Config* config = Config::instance (); + checked_set (_upload, config->upload_after_make_dcp()); checked_set (_tms_protocol, config->tms_protocol ()); checked_set (_tms_ip, config->tms_ip ()); checked_set (_tms_path, config->tms_path ()); @@ -634,9 +594,14 @@ private: checked_set (_tms_password, config->tms_password ()); } + void upload_changed () + { + Config::instance()->set_upload_after_make_dcp (_upload->GetValue()); + } + void tms_protocol_changed () { - Config::instance()->set_tms_protocol (static_cast (_tms_protocol->GetSelection ())); + Config::instance()->set_tms_protocol(static_cast(_tms_protocol->GetSelection())); } void tms_ip_changed () @@ -656,14 +621,15 @@ private: void tms_password_changed () { - Config::instance()->set_tms_password (wx_to_std (_tms_password->GetValue ())); + Config::instance()->set_tms_password (_tms_password->get()); } + CheckBox* _upload; wxChoice* _tms_protocol; wxTextCtrl* _tms_ip; wxTextCtrl* _tms_path; wxTextCtrl* _tms_user; - wxTextCtrl* _tms_password; + PasswordEntry* _tms_password; }; static string @@ -672,16 +638,146 @@ column (string s) return s; } -class KDMEmailPage : public StandardPage +class EmailPage : public Page +{ +public: + EmailPage (wxSize panel_size, int border) + : Page (panel_size, border) + {} + + wxString GetName () const + { + return _("Email"); + } + +#ifdef DCPOMATIC_OSX + wxBitmap GetLargeIcon () const + { + return wxBitmap ("email", wxBITMAP_TYPE_PNG_RESOURCE); + } +#endif + +private: + void setup () + { + wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + table->AddGrowableCol (1, 1); + _panel->GetSizer()->Add (table, 1, wxEXPAND | wxALL, _border); + + add_label_to_sizer (table, _panel, _("Outgoing mail server"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); + { + wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + _server = new wxTextCtrl (_panel, wxID_ANY); + s->Add (_server, 1, wxEXPAND | wxALL); + add_label_to_sizer (s, _panel, _("port"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); + _port = new wxSpinCtrl (_panel, wxID_ANY); + _port->SetRange (0, 65535); + s->Add (_port); + add_label_to_sizer (s, _panel, _("protocol"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); + _protocol = new wxChoice (_panel, wxID_ANY); + /* Make sure this matches the switches in config_changed and port_changed below */ + _protocol->Append (_("Auto")); + _protocol->Append (_("Plain")); + _protocol->Append (_("STARTTLS")); + _protocol->Append (_("SSL")); + s->Add (_protocol); + table->Add (s, 1, wxEXPAND | wxALL); + } + + add_label_to_sizer (table, _panel, _("User name"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); + _user = new wxTextCtrl (_panel, wxID_ANY); + table->Add (_user, 1, wxEXPAND | wxALL); + + add_label_to_sizer (table, _panel, _("Password"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); + _password = new PasswordEntry (_panel); + table->Add (_password->get_panel(), 1, wxEXPAND | wxALL); + + _server->Bind (wxEVT_TEXT, boost::bind (&EmailPage::server_changed, this)); + _port->Bind (wxEVT_SPINCTRL, boost::bind (&EmailPage::port_changed, this)); + _protocol->Bind (wxEVT_CHOICE, boost::bind (&EmailPage::protocol_changed, this)); + _user->Bind (wxEVT_TEXT, boost::bind (&EmailPage::user_changed, this)); + _password->Changed.connect (boost::bind (&EmailPage::password_changed, this)); + } + + void config_changed () + { + Config* config = Config::instance (); + + checked_set (_server, config->mail_server ()); + checked_set (_port, config->mail_port ()); + switch (config->mail_protocol()) { + case EMAIL_PROTOCOL_AUTO: + checked_set (_protocol, 0); + break; + case EMAIL_PROTOCOL_PLAIN: + checked_set (_protocol, 1); + break; + case EMAIL_PROTOCOL_STARTTLS: + checked_set (_protocol, 2); + break; + case EMAIL_PROTOCOL_SSL: + checked_set (_protocol, 3); + break; + } + checked_set (_user, config->mail_user ()); + checked_set (_password, config->mail_password()); + } + + void server_changed () + { + Config::instance()->set_mail_server (wx_to_std (_server->GetValue ())); + } + + void port_changed () + { + Config::instance()->set_mail_port (_port->GetValue ()); + } + + void protocol_changed () + { + switch (_protocol->GetSelection()) { + case 0: + Config::instance()->set_mail_protocol(EMAIL_PROTOCOL_AUTO); + break; + case 1: + Config::instance()->set_mail_protocol(EMAIL_PROTOCOL_PLAIN); + break; + case 2: + Config::instance()->set_mail_protocol(EMAIL_PROTOCOL_STARTTLS); + break; + case 3: + Config::instance()->set_mail_protocol(EMAIL_PROTOCOL_SSL); + break; + } + } + + void user_changed () + { + Config::instance()->set_mail_user (wx_to_std (_user->GetValue ())); + } + + void password_changed () + { + Config::instance()->set_mail_password(_password->get()); + } + + wxTextCtrl* _server; + wxSpinCtrl* _port; + wxChoice* _protocol; + wxTextCtrl* _user; + PasswordEntry* _password; +}; + +class KDMEmailPage : public Page { public: KDMEmailPage (wxSize panel_size, int border) #ifdef DCPOMATIC_OSX /* We have to force both width and height of this one */ - : StandardPage (wxSize (480, 128), border) + : Page (wxSize (panel_size.GetWidth(), 128), border) #else - : StandardPage (panel_size, border) + : Page (panel_size, border) #endif {} @@ -704,157 +800,275 @@ private: table->AddGrowableCol (1, 1); _panel->GetSizer()->Add (table, 1, wxEXPAND | wxALL, _border); - add_label_to_sizer (table, _panel, _("Outgoing mail server"), true); - { - wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - _mail_server = new wxTextCtrl (_panel, wxID_ANY); - s->Add (_mail_server, 1, wxEXPAND | wxALL); - add_label_to_sizer (s, _panel, _("port"), false); - _mail_port = new wxSpinCtrl (_panel, wxID_ANY); - _mail_port->SetRange (0, 65535); - s->Add (_mail_port); - table->Add (s, 1, wxEXPAND | wxALL); - } - - add_label_to_sizer (table, _panel, _("Mail user name"), true); - _mail_user = new wxTextCtrl (_panel, wxID_ANY); - table->Add (_mail_user, 1, wxEXPAND | wxALL); - - add_label_to_sizer (table, _panel, _("Mail password"), true); - _mail_password = new wxTextCtrl (_panel, wxID_ANY); - table->Add (_mail_password, 1, wxEXPAND | wxALL); + add_label_to_sizer (table, _panel, _("Subject"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); + _subject = new wxTextCtrl (_panel, wxID_ANY); + table->Add (_subject, 1, wxEXPAND | wxALL); - add_label_to_sizer (table, _panel, _("Subject"), true); - _kdm_subject = new wxTextCtrl (_panel, wxID_ANY); - table->Add (_kdm_subject, 1, wxEXPAND | wxALL); + add_label_to_sizer (table, _panel, _("From address"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); + _from = new wxTextCtrl (_panel, wxID_ANY); + table->Add (_from, 1, wxEXPAND | wxALL); - add_label_to_sizer (table, _panel, _("From address"), true); - _kdm_from = new wxTextCtrl (_panel, wxID_ANY); - table->Add (_kdm_from, 1, wxEXPAND | wxALL); - - vector columns; - columns.push_back (wx_to_std (_("Address"))); - add_label_to_sizer (table, _panel, _("CC addresses"), true); - _kdm_cc = new EditableList ( + vector columns; + columns.push_back (EditableListColumn(_("Address"))); + add_label_to_sizer (table, _panel, _("CC addresses"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); + _cc = new EditableList ( _panel, columns, bind (&Config::kdm_cc, Config::instance()), bind (&Config::set_kdm_cc, Config::instance(), _1), bind (&column, _1) ); - table->Add (_kdm_cc, 1, wxEXPAND | wxALL); + table->Add (_cc, 1, wxEXPAND | wxALL); - add_label_to_sizer (table, _panel, _("BCC address"), true); - _kdm_bcc = new wxTextCtrl (_panel, wxID_ANY); - table->Add (_kdm_bcc, 1, wxEXPAND | wxALL); + add_label_to_sizer (table, _panel, _("BCC address"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); + _bcc = new wxTextCtrl (_panel, wxID_ANY); + table->Add (_bcc, 1, wxEXPAND | wxALL); - _kdm_email = new wxTextCtrl (_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (-1, 200), wxTE_MULTILINE); - _panel->GetSizer()->Add (_kdm_email, 0, wxEXPAND | wxALL, _border); + _email = new wxTextCtrl (_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (-1, 200), wxTE_MULTILINE); + _panel->GetSizer()->Add (_email, 0, wxEXPAND | wxALL, _border); - _reset_kdm_email = new wxButton (_panel, wxID_ANY, _("Reset to default subject and text")); - _panel->GetSizer()->Add (_reset_kdm_email, 0, wxEXPAND | wxALL, _border); + _reset_email = new Button (_panel, _("Reset to default subject and text")); + _panel->GetSizer()->Add (_reset_email, 0, wxEXPAND | wxALL, _border); - _kdm_cc->layout (); + _cc->layout (); - _mail_server->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::mail_server_changed, this)); - _mail_port->Bind (wxEVT_SPINCTRL, boost::bind (&KDMEmailPage::mail_port_changed, this)); - _mail_user->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::mail_user_changed, this)); - _mail_password->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::mail_password_changed, this)); - _kdm_subject->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::kdm_subject_changed, this)); - _kdm_from->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::kdm_from_changed, this)); - _kdm_bcc->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::kdm_bcc_changed, this)); - _kdm_email->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::kdm_email_changed, this)); - _reset_kdm_email->Bind (wxEVT_BUTTON, boost::bind (&KDMEmailPage::reset_kdm_email, this)); + _subject->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::kdm_subject_changed, this)); + _from->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::kdm_from_changed, this)); + _bcc->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::kdm_bcc_changed, this)); + _email->Bind (wxEVT_TEXT, boost::bind (&KDMEmailPage::kdm_email_changed, this)); + _reset_email->Bind (wxEVT_BUTTON, boost::bind (&KDMEmailPage::reset_email, this)); } void config_changed () { Config* config = Config::instance (); - checked_set (_mail_server, config->mail_server ()); - checked_set (_mail_port, config->mail_port ()); - checked_set (_mail_user, config->mail_user ()); - checked_set (_mail_password, config->mail_password ()); - checked_set (_kdm_subject, config->kdm_subject ()); - checked_set (_kdm_from, config->kdm_from ()); - checked_set (_kdm_bcc, config->kdm_bcc ()); - checked_set (_kdm_email, Config::instance()->kdm_email ()); + checked_set (_subject, config->kdm_subject ()); + checked_set (_from, config->kdm_from ()); + checked_set (_bcc, config->kdm_bcc ()); + checked_set (_email, Config::instance()->kdm_email ()); } - void mail_server_changed () + void kdm_subject_changed () { - Config::instance()->set_mail_server (wx_to_std (_mail_server->GetValue ())); + Config::instance()->set_kdm_subject (wx_to_std (_subject->GetValue ())); } - void mail_port_changed () + void kdm_from_changed () { - Config::instance()->set_mail_port (_mail_port->GetValue ()); + Config::instance()->set_kdm_from (wx_to_std (_from->GetValue ())); } - void mail_user_changed () + void kdm_bcc_changed () { - Config::instance()->set_mail_user (wx_to_std (_mail_user->GetValue ())); + Config::instance()->set_kdm_bcc (wx_to_std (_bcc->GetValue ())); } - void mail_password_changed () + void kdm_email_changed () { - Config::instance()->set_mail_password (wx_to_std (_mail_password->GetValue ())); + if (_email->GetValue().IsEmpty ()) { + /* Sometimes we get sent an erroneous notification that the email + is empty; I don't know why. + */ + return; + } + Config::instance()->set_kdm_email (wx_to_std (_email->GetValue ())); } - void kdm_subject_changed () + void reset_email () { - Config::instance()->set_kdm_subject (wx_to_std (_kdm_subject->GetValue ())); + Config::instance()->reset_kdm_email (); + checked_set (_email, Config::instance()->kdm_email ()); } - void kdm_from_changed () + wxTextCtrl* _subject; + wxTextCtrl* _from; + EditableList* _cc; + wxTextCtrl* _bcc; + wxTextCtrl* _email; + wxButton* _reset_email; +}; + +class NotificationsPage : public Page +{ +public: + NotificationsPage (wxSize panel_size, int border) +#ifdef DCPOMATIC_OSX + /* We have to force both width and height of this one */ + : Page (wxSize (panel_size.GetWidth(), 128), border) +#else + : Page (panel_size, border) +#endif + {} + + wxString GetName () const { - Config::instance()->set_kdm_from (wx_to_std (_kdm_from->GetValue ())); + return _("Notifications"); } - void kdm_bcc_changed () +#ifdef DCPOMATIC_OSX + wxBitmap GetLargeIcon () const { - Config::instance()->set_kdm_bcc (wx_to_std (_kdm_bcc->GetValue ())); + return wxBitmap ("notifications", wxBITMAP_TYPE_PNG_RESOURCE); } +#endif - void kdm_email_changed () +private: + void setup () { - if (_kdm_email->GetValue().IsEmpty ()) { + wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + table->AddGrowableCol (1, 1); + _panel->GetSizer()->Add (table, 1, wxEXPAND | wxALL, _border); + + _enable_message_box = new CheckBox (_panel, _("Message box")); + table->Add (_enable_message_box, 1, wxEXPAND | wxALL); + table->AddSpacer (0); + + _enable_email = new CheckBox (_panel, _("Email")); + table->Add (_enable_email, 1, wxEXPAND | wxALL); + table->AddSpacer (0); + + add_label_to_sizer (table, _panel, _("Subject"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); + _subject = new wxTextCtrl (_panel, wxID_ANY); + table->Add (_subject, 1, wxEXPAND | wxALL); + + add_label_to_sizer (table, _panel, _("From address"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); + _from = new wxTextCtrl (_panel, wxID_ANY); + table->Add (_from, 1, wxEXPAND | wxALL); + + add_label_to_sizer (table, _panel, _("To address"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); + _to = new wxTextCtrl (_panel, wxID_ANY); + table->Add (_to, 1, wxEXPAND | wxALL); + + vector columns; + columns.push_back (EditableListColumn(_("Address"))); + add_label_to_sizer (table, _panel, _("CC addresses"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); + _cc = new EditableList ( + _panel, + columns, + bind (&Config::notification_cc, Config::instance()), + bind (&Config::set_notification_cc, Config::instance(), _1), + bind (&column, _1) + ); + table->Add (_cc, 1, wxEXPAND | wxALL); + + add_label_to_sizer (table, _panel, _("BCC address"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); + _bcc = new wxTextCtrl (_panel, wxID_ANY); + table->Add (_bcc, 1, wxEXPAND | wxALL); + + _email = new wxTextCtrl (_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (-1, 200), wxTE_MULTILINE); + _panel->GetSizer()->Add (_email, 0, wxEXPAND | wxALL, _border); + + _reset_email = new Button (_panel, _("Reset to default subject and text")); + _panel->GetSizer()->Add (_reset_email, 0, wxEXPAND | wxALL, _border); + + _cc->layout (); + + _enable_message_box->Bind (wxEVT_CHECKBOX, boost::bind (&NotificationsPage::type_changed, this, _enable_message_box, Config::MESSAGE_BOX)); + _enable_email->Bind (wxEVT_CHECKBOX, boost::bind (&NotificationsPage::type_changed, this, _enable_email, Config::EMAIL)); + + _subject->Bind (wxEVT_TEXT, boost::bind (&NotificationsPage::notification_subject_changed, this)); + _from->Bind (wxEVT_TEXT, boost::bind (&NotificationsPage::notification_from_changed, this)); + _to->Bind (wxEVT_TEXT, boost::bind (&NotificationsPage::notification_to_changed, this)); + _bcc->Bind (wxEVT_TEXT, boost::bind (&NotificationsPage::notification_bcc_changed, this)); + _email->Bind (wxEVT_TEXT, boost::bind (&NotificationsPage::notification_email_changed, this)); + _reset_email->Bind (wxEVT_BUTTON, boost::bind (&NotificationsPage::reset_email, this)); + + update_sensitivity (); + } + + void update_sensitivity () + { + bool const s = _enable_email->GetValue(); + _subject->Enable(s); + _from->Enable(s); + _to->Enable(s); + _cc->Enable(s); + _bcc->Enable(s); + _email->Enable(s); + _reset_email->Enable(s); + } + + void config_changed () + { + Config* config = Config::instance (); + + checked_set (_enable_message_box, config->notification(Config::MESSAGE_BOX)); + checked_set (_enable_email, config->notification(Config::EMAIL)); + checked_set (_subject, config->notification_subject ()); + checked_set (_from, config->notification_from ()); + checked_set (_to, config->notification_to ()); + checked_set (_bcc, config->notification_bcc ()); + checked_set (_email, Config::instance()->notification_email ()); + + update_sensitivity (); + } + + void notification_subject_changed () + { + Config::instance()->set_notification_subject (wx_to_std (_subject->GetValue ())); + } + + void notification_from_changed () + { + Config::instance()->set_notification_from (wx_to_std (_from->GetValue ())); + } + + void notification_to_changed () + { + Config::instance()->set_notification_to (wx_to_std (_to->GetValue ())); + } + + void notification_bcc_changed () + { + Config::instance()->set_notification_bcc (wx_to_std (_bcc->GetValue ())); + } + + void notification_email_changed () + { + if (_email->GetValue().IsEmpty ()) { /* Sometimes we get sent an erroneous notification that the email is empty; I don't know why. */ return; } - Config::instance()->set_kdm_email (wx_to_std (_kdm_email->GetValue ())); + Config::instance()->set_notification_email (wx_to_std (_email->GetValue ())); } - void reset_kdm_email () + void reset_email () { - Config::instance()->reset_kdm_email (); - checked_set (_kdm_email, Config::instance()->kdm_email ()); - } - - wxTextCtrl* _mail_server; - wxSpinCtrl* _mail_port; - wxTextCtrl* _mail_user; - wxTextCtrl* _mail_password; - wxTextCtrl* _kdm_subject; - wxTextCtrl* _kdm_from; - EditableList* _kdm_cc; - wxTextCtrl* _kdm_bcc; - wxTextCtrl* _kdm_email; - wxButton* _reset_kdm_email; + Config::instance()->reset_notification_email (); + checked_set (_email, Config::instance()->notification_email ()); + } + + void type_changed (wxCheckBox* b, Config::Notification n) + { + Config::instance()->set_notification(n, b->GetValue()); + update_sensitivity (); + } + + wxCheckBox* _enable_message_box; + wxCheckBox* _enable_email; + + wxTextCtrl* _subject; + wxTextCtrl* _from; + wxTextCtrl* _to; + EditableList* _cc; + wxTextCtrl* _bcc; + wxTextCtrl* _email; + wxButton* _reset_email; }; -class CoverSheetPage : public StandardPage +class CoverSheetPage : public Page { public: CoverSheetPage (wxSize panel_size, int border) #ifdef DCPOMATIC_OSX /* We have to force both width and height of this one */ - : StandardPage (wxSize (480, 128), border) + : Page (wxSize (panel_size.GetWidth(), 128), border) #else - : StandardPage (panel_size, border) + : Page (panel_size, border) #endif {} @@ -876,7 +1090,7 @@ private: _cover_sheet = new wxTextCtrl (_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (-1, 200), wxTE_MULTILINE); _panel->GetSizer()->Add (_cover_sheet, 0, wxEXPAND | wxALL, _border); - _reset_cover_sheet = new wxButton (_panel, wxID_ANY, _("Reset to default text")); + _reset_cover_sheet = new Button (_panel, _("Reset to default text")); _panel->GetSizer()->Add (_reset_cover_sheet, 0, wxEXPAND | wxALL, _border); _cover_sheet->Bind (wxEVT_TEXT, boost::bind (&CoverSheetPage::cover_sheet_changed, this)); @@ -910,26 +1124,158 @@ private: }; +class IdentifiersPage : public Page +{ +public: + IdentifiersPage (wxSize panel_size, int border) + : Page (panel_size, border) + {} + + wxString GetName () const + { + return _("Identifiers"); + } + +#ifdef DCPOMATIC_OSX + wxBitmap GetLargeIcon () const + { + return wxBitmap ("identifiers", wxBITMAP_TYPE_PNG_RESOURCE); + } +#endif + +private: + void setup () + { + wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + table->AddGrowableCol (1, 1); + + add_label_to_sizer (table, _panel, _("Issuer"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); + _issuer = new wxTextCtrl (_panel, wxID_ANY); + _issuer->SetToolTip (_("This will be written to the DCP's XML files as the . If it is blank, a default value mentioning DCP-o-matic will be used.")); + table->Add (_issuer, 1, wxALL | wxEXPAND); + + add_label_to_sizer (table, _panel, _("Creator"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); + _creator = new wxTextCtrl (_panel, wxID_ANY); + _creator->SetToolTip (_("This will be written to the DCP's XML files as the . If it is blank, a default value mentioning DCP-o-matic will be used.")); + table->Add (_creator, 1, wxALL | wxEXPAND); + + add_label_to_sizer (table, _panel, _("Company name"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); + _company_name = new wxTextCtrl (_panel, wxID_ANY); + _company_name->SetToolTip (_("This will be written to the DCP's MXF files as the 'company name'. If it is blank, a default value mentioning libdcp (an internal DCP-o-matic library) will be used.")); + table->Add (_company_name, 1, wxALL | wxEXPAND); + + add_label_to_sizer (table, _panel, _("Product name"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); + _product_name = new wxTextCtrl (_panel, wxID_ANY); + _product_name->SetToolTip (_("This will be written to the DCP's MXF files as the 'product name'. If it is blank, a default value mentioning libdcp (an internal DCP-o-matic library) will be used.")); + table->Add (_product_name, 1, wxALL | wxEXPAND); + + add_label_to_sizer (table, _panel, _("Product version"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); + _product_version = new wxTextCtrl (_panel, wxID_ANY); + _product_version->SetToolTip (_("This will be written to the DCP's MXF files as the 'product version'. If it is blank, a default value mentioning libdcp (an internal DCP-o-matic library) will be used.")); + table->Add (_product_version, 1, wxALL | wxEXPAND); + + add_label_to_sizer (table, _panel, _("JPEG2000 comment"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); + _j2k_comment = new wxTextCtrl (_panel, wxID_ANY); + _j2k_comment->SetToolTip (_("This will be written to the DCP's JPEG2000 data as a comment. If it is blank, a default value mentioning libdcp (an internal DCP-o-matic library) will be used.")); + table->Add (_j2k_comment, 1, wxALL | wxEXPAND); + + _panel->GetSizer()->Add (table, 0, wxEXPAND | wxALL, _border); + + _issuer->Bind (wxEVT_TEXT, boost::bind(&IdentifiersPage::issuer_changed, this)); + _creator->Bind (wxEVT_TEXT, boost::bind(&IdentifiersPage::creator_changed, this)); + _company_name->Bind (wxEVT_TEXT, boost::bind(&IdentifiersPage::company_name_changed, this)); + _product_name->Bind (wxEVT_TEXT, boost::bind(&IdentifiersPage::product_name_changed, this)); + _product_version->Bind (wxEVT_TEXT, boost::bind(&IdentifiersPage::product_version_changed, this)); + _j2k_comment->Bind (wxEVT_TEXT, boost::bind(&IdentifiersPage::j2k_comment_changed, this)); + } + + void config_changed () + { + Config* config = Config::instance (); + checked_set (_issuer, config->dcp_issuer ()); + checked_set (_creator, config->dcp_creator ()); + checked_set (_company_name, config->dcp_company_name ()); + checked_set (_product_name, config->dcp_product_name ()); + checked_set (_product_version, config->dcp_product_version ()); + checked_set (_j2k_comment, config->dcp_j2k_comment ()); + } + + void issuer_changed () + { + Config::instance()->set_dcp_issuer (wx_to_std (_issuer->GetValue ())); + } + + void creator_changed () + { + Config::instance()->set_dcp_creator (wx_to_std (_creator->GetValue ())); + } + + void company_name_changed () + { + Config::instance()->set_dcp_company_name (wx_to_std(_company_name->GetValue())); + } + + void product_name_changed () + { + Config::instance()->set_dcp_product_name (wx_to_std(_product_name->GetValue())); + } + + void product_version_changed () + { + Config::instance()->set_dcp_product_version (wx_to_std(_product_version->GetValue())); + } + + void j2k_comment_changed () + { + Config::instance()->set_dcp_j2k_comment (wx_to_std(_j2k_comment->GetValue())); + } + + wxTextCtrl* _issuer; + wxTextCtrl* _creator; + wxTextCtrl* _company_name; + wxTextCtrl* _product_name; + wxTextCtrl* _product_version; + wxTextCtrl* _j2k_comment; +}; + + /** @class AdvancedPage * @brief Advanced page of the preferences dialog. */ -class AdvancedPage : public StockPage +class AdvancedPage : public Page { public: AdvancedPage (wxSize panel_size, int border) - : StockPage (Kind_Advanced, panel_size, border) + : Page (panel_size, border) , _maximum_j2k_bandwidth (0) , _allow_any_dcp_frame_rate (0) + , _allow_any_container (0) + , _show_experimental_audio_processors (0) , _only_servers_encode (0) , _log_general (0) , _log_warning (0) , _log_error (0) , _log_timing (0) - , _log_debug_decode (0) + , _log_debug_threed (0) , _log_debug_encode (0) , _log_debug_email (0) + , _log_debug_video_view (0) + , _log_debug_player (0) + , _log_debug_audio_analysis (0) {} + wxString GetName () const + { + return _("Advanced"); + } + +#ifdef DCPOMATIC_OSX + wxBitmap GetLargeIcon () const + { + return wxBitmap ("advanced", wxBITMAP_TYPE_PNG_RESOURCE); + } +#endif + private: void add_top_aligned_label_to_sizer (wxSizer* table, wxWindow* parent, wxString text) { @@ -938,7 +1284,7 @@ private: flags |= wxALIGN_RIGHT; text += wxT (":"); #endif - wxStaticText* m = new wxStaticText (parent, wxID_ANY, text); + wxStaticText* m = new StaticText (parent, text); table->Add (m, 0, flags, DCPOMATIC_SIZER_Y_GAP); } @@ -949,7 +1295,7 @@ private: _panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border); { - add_label_to_sizer (table, _panel, _("Maximum JPEG2000 bandwidth"), true); + add_label_to_sizer (table, _panel, _("Maximum JPEG2000 bandwidth"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); _maximum_j2k_bandwidth = new wxSpinCtrl (_panel); s->Add (_maximum_j2k_bandwidth, 1); @@ -957,16 +1303,39 @@ private: table->Add (s, 1); } - _allow_any_dcp_frame_rate = new wxCheckBox (_panel, wxID_ANY, _("Allow any DCP frame rate")); + add_label_to_sizer (table, _panel, _("Video display mode"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); + _video_display_mode = new wxChoice (_panel, wxID_ANY); + table->Add (_video_display_mode); + + wxStaticText* restart = add_label_to_sizer (table, _panel, _("(restart DCP-o-matic to change display mode)"), false); + wxFont font = restart->GetFont(); + font.SetStyle (wxFONTSTYLE_ITALIC); + font.SetPointSize (font.GetPointSize() - 1); + restart->SetFont (font); + table->AddSpacer (0); + + _allow_any_dcp_frame_rate = new CheckBox (_panel, _("Allow any DCP frame rate")); table->Add (_allow_any_dcp_frame_rate, 1, wxEXPAND | wxALL); table->AddSpacer (0); - _only_servers_encode = new wxCheckBox (_panel, wxID_ANY, _("Only servers encode")); + _allow_any_container = new CheckBox (_panel, _("Allow full-frame and non-standard container ratios")); + table->Add (_allow_any_container, 1, wxEXPAND | wxALL); + table->AddSpacer (0); + + restart = add_label_to_sizer (table, _panel, _("(restart DCP-o-matic to see all ratios)"), false); + restart->SetFont (font); + table->AddSpacer (0); + + _show_experimental_audio_processors = new CheckBox (_panel, _("Show experimental audio processors")); + table->Add (_show_experimental_audio_processors, 1, wxEXPAND | wxALL); + table->AddSpacer (0); + + _only_servers_encode = new CheckBox (_panel, _("Only servers encode")); table->Add (_only_servers_encode, 1, wxEXPAND | wxALL); table->AddSpacer (0); { - add_label_to_sizer (table, _panel, _("Maximum number of frames to store per thread"), true); + add_label_to_sizer (table, _panel, _("Maximum number of frames to store per thread"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); _frames_in_memory_multiplier = new wxSpinCtrl (_panel); s->Add (_frames_in_memory_multiplier, 1); @@ -976,7 +1345,7 @@ private: { add_top_aligned_label_to_sizer (table, _panel, _("DCP metadata filename format")); dcp::NameFormat::Map titles; - titles['t'] = "type (cpl/pkl)"; + titles['t'] = wx_to_std (_("type (cpl/pkl)")); dcp::NameFormat::Map examples; examples['t'] = "cpl"; _dcp_metadata_filename_format = new NameFormatEditor ( @@ -988,10 +1357,10 @@ private: { add_top_aligned_label_to_sizer (table, _panel, _("DCP asset filename format")); dcp::NameFormat::Map titles; - titles['t'] = "type (j2c/pcm/sub)"; - titles['r'] = "reel number"; - titles['n'] = "number of reels"; - titles['c'] = "content filename"; + titles['t'] = wx_to_std (_("type (j2c/pcm/sub)")); + titles['r'] = wx_to_std (_("reel number")); + titles['n'] = wx_to_std (_("number of reels")); + titles['c'] = wx_to_std (_("content filename")); dcp::NameFormat::Map examples; examples['t'] = "j2c"; examples['r'] = "1"; @@ -1006,33 +1375,44 @@ private: { add_top_aligned_label_to_sizer (table, _panel, _("Log")); wxBoxSizer* t = new wxBoxSizer (wxVERTICAL); - _log_general = new wxCheckBox (_panel, wxID_ANY, _("General")); + _log_general = new CheckBox (_panel, _("General")); t->Add (_log_general, 1, wxEXPAND | wxALL); - _log_warning = new wxCheckBox (_panel, wxID_ANY, _("Warnings")); + _log_warning = new CheckBox (_panel, _("Warnings")); t->Add (_log_warning, 1, wxEXPAND | wxALL); - _log_error = new wxCheckBox (_panel, wxID_ANY, _("Errors")); + _log_error = new CheckBox (_panel, _("Errors")); t->Add (_log_error, 1, wxEXPAND | wxALL); /// TRANSLATORS: translate the word "Timing" here; do not include the "Config|" prefix - _log_timing = new wxCheckBox (_panel, wxID_ANY, S_("Config|Timing")); + _log_timing = new CheckBox (_panel, S_("Config|Timing")); t->Add (_log_timing, 1, wxEXPAND | wxALL); - _log_debug_decode = new wxCheckBox (_panel, wxID_ANY, _("Debug: decode")); - t->Add (_log_debug_decode, 1, wxEXPAND | wxALL); - _log_debug_encode = new wxCheckBox (_panel, wxID_ANY, _("Debug: encode")); + _log_debug_threed = new CheckBox (_panel, _("Debug: 3D")); + t->Add (_log_debug_threed, 1, wxEXPAND | wxALL); + _log_debug_encode = new CheckBox (_panel, _("Debug: encode")); t->Add (_log_debug_encode, 1, wxEXPAND | wxALL); - _log_debug_email = new wxCheckBox (_panel, wxID_ANY, _("Debug: email sending")); + _log_debug_email = new CheckBox (_panel, _("Debug: email sending")); t->Add (_log_debug_email, 1, wxEXPAND | wxALL); + _log_debug_video_view = new CheckBox (_panel, _("Debug: video view")); + t->Add (_log_debug_video_view, 1, wxEXPAND | wxALL); + _log_debug_player = new CheckBox (_panel, _("Debug: player")); + t->Add (_log_debug_player, 1, wxEXPAND | wxALL); + _log_debug_audio_analysis = new CheckBox (_panel, _("Debug: audio analysis")); + t->Add (_log_debug_audio_analysis, 1, wxEXPAND | wxALL); table->Add (t, 0, wxALL, 6); } #ifdef DCPOMATIC_WINDOWS - _win32_console = new wxCheckBox (_panel, wxID_ANY, _("Open console window")); + _win32_console = new CheckBox (_panel, _("Open console window")); table->Add (_win32_console, 1, wxEXPAND | wxALL); table->AddSpacer (0); #endif _maximum_j2k_bandwidth->SetRange (1, 1000); _maximum_j2k_bandwidth->Bind (wxEVT_SPINCTRL, boost::bind (&AdvancedPage::maximum_j2k_bandwidth_changed, this)); + _video_display_mode->Append (_("Simple (safer)")); + _video_display_mode->Append (_("OpenGL (faster)")); + _video_display_mode->Bind (wxEVT_CHOICE, boost::bind(&AdvancedPage::video_display_mode_changed, this)); _allow_any_dcp_frame_rate->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::allow_any_dcp_frame_rate_changed, this)); + _allow_any_container->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::allow_any_container_changed, this)); + _show_experimental_audio_processors->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::show_experimental_audio_processors_changed, this)); _only_servers_encode->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::only_servers_encode_changed, this)); _frames_in_memory_multiplier->Bind (wxEVT_SPINCTRL, boost::bind(&AdvancedPage::frames_in_memory_multiplier_changed, this)); _dcp_metadata_filename_format->Changed.connect (boost::bind (&AdvancedPage::dcp_metadata_filename_format_changed, this)); @@ -1041,9 +1421,12 @@ private: _log_warning->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this)); _log_error->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this)); _log_timing->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this)); - _log_debug_decode->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this)); + _log_debug_threed->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this)); _log_debug_encode->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this)); _log_debug_email->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this)); + _log_debug_video_view->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this)); + _log_debug_player->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this)); + _log_debug_audio_analysis->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this)); #ifdef DCPOMATIC_WINDOWS _win32_console->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::win32_console_changed, this)); #endif @@ -1054,15 +1437,28 @@ private: Config* config = Config::instance (); checked_set (_maximum_j2k_bandwidth, config->maximum_j2k_bandwidth() / 1000000); + switch (config->video_view_type()) { + case Config::VIDEO_VIEW_SIMPLE: + checked_set (_video_display_mode, 0); + break; + case Config::VIDEO_VIEW_OPENGL: + checked_set (_video_display_mode, 1); + break; + } checked_set (_allow_any_dcp_frame_rate, config->allow_any_dcp_frame_rate ()); + checked_set (_allow_any_container, config->allow_any_container ()); + checked_set (_show_experimental_audio_processors, config->show_experimental_audio_processors ()); checked_set (_only_servers_encode, config->only_servers_encode ()); checked_set (_log_general, config->log_types() & LogEntry::TYPE_GENERAL); checked_set (_log_warning, config->log_types() & LogEntry::TYPE_WARNING); checked_set (_log_error, config->log_types() & LogEntry::TYPE_ERROR); checked_set (_log_timing, config->log_types() & LogEntry::TYPE_TIMING); - checked_set (_log_debug_decode, config->log_types() & LogEntry::TYPE_DEBUG_DECODE); + checked_set (_log_debug_threed, config->log_types() & LogEntry::TYPE_DEBUG_THREED); checked_set (_log_debug_encode, config->log_types() & LogEntry::TYPE_DEBUG_ENCODE); checked_set (_log_debug_email, config->log_types() & LogEntry::TYPE_DEBUG_EMAIL); + checked_set (_log_debug_video_view, config->log_types() & LogEntry::TYPE_DEBUG_VIDEO_VIEW); + checked_set (_log_debug_player, config->log_types() & LogEntry::TYPE_DEBUG_PLAYER); + checked_set (_log_debug_audio_analysis, config->log_types() & LogEntry::TYPE_DEBUG_AUDIO_ANALYSIS); checked_set (_frames_in_memory_multiplier, config->frames_in_memory_multiplier()); #ifdef DCPOMATIC_WINDOWS checked_set (_win32_console, config->win32_console()); @@ -1074,6 +1470,15 @@ private: Config::instance()->set_maximum_j2k_bandwidth (_maximum_j2k_bandwidth->GetValue() * 1000000); } + void video_display_mode_changed () + { + if (_video_display_mode->GetSelection() == 0) { + Config::instance()->set_video_view_type (Config::VIDEO_VIEW_SIMPLE); + } else { + Config::instance()->set_video_view_type (Config::VIDEO_VIEW_OPENGL); + } + } + void frames_in_memory_multiplier_changed () { Config::instance()->set_frames_in_memory_multiplier (_frames_in_memory_multiplier->GetValue()); @@ -1084,6 +1489,16 @@ private: Config::instance()->set_allow_any_dcp_frame_rate (_allow_any_dcp_frame_rate->GetValue ()); } + void allow_any_container_changed () + { + Config::instance()->set_allow_any_container (_allow_any_container->GetValue ()); + } + + void show_experimental_audio_processors_changed () + { + Config::instance()->set_show_experimental_audio_processors (_show_experimental_audio_processors->GetValue ()); + } + void only_servers_encode_changed () { Config::instance()->set_only_servers_encode (_only_servers_encode->GetValue ()); @@ -1114,8 +1529,8 @@ private: if (_log_timing->GetValue ()) { types |= LogEntry::TYPE_TIMING; } - if (_log_debug_decode->GetValue ()) { - types |= LogEntry::TYPE_DEBUG_DECODE; + if (_log_debug_threed->GetValue ()) { + types |= LogEntry::TYPE_DEBUG_THREED; } if (_log_debug_encode->GetValue ()) { types |= LogEntry::TYPE_DEBUG_ENCODE; @@ -1123,6 +1538,15 @@ private: if (_log_debug_email->GetValue ()) { types |= LogEntry::TYPE_DEBUG_EMAIL; } + if (_log_debug_video_view->GetValue()) { + types |= LogEntry::TYPE_DEBUG_VIDEO_VIEW; + } + if (_log_debug_player->GetValue()) { + types |= LogEntry::TYPE_DEBUG_PLAYER; + } + if (_log_debug_audio_analysis->GetValue()) { + types |= LogEntry::TYPE_DEBUG_AUDIO_ANALYSIS; + } Config::instance()->set_log_types (types); } @@ -1134,8 +1558,11 @@ private: #endif wxSpinCtrl* _maximum_j2k_bandwidth; + wxChoice* _video_display_mode; wxSpinCtrl* _frames_in_memory_multiplier; wxCheckBox* _allow_any_dcp_frame_rate; + wxCheckBox* _allow_any_container; + wxCheckBox* _show_experimental_audio_processors; wxCheckBox* _only_servers_encode; NameFormatEditor* _dcp_metadata_filename_format; NameFormatEditor* _dcp_asset_filename_format; @@ -1143,9 +1570,12 @@ private: wxCheckBox* _log_warning; wxCheckBox* _log_error; wxCheckBox* _log_timing; - wxCheckBox* _log_debug_decode; + wxCheckBox* _log_debug_threed; wxCheckBox* _log_debug_encode; wxCheckBox* _log_debug_email; + wxCheckBox* _log_debug_video_view; + wxCheckBox* _log_debug_player; + wxCheckBox* _log_debug_audio_analysis; #ifdef DCPOMATIC_WINDOWS wxCheckBox* _win32_console; #endif @@ -1161,7 +1591,7 @@ create_full_config_dialog () the containing window doesn't shrink too much when we select those panels. This is obviously an unpleasant hack. */ - wxSize ps = wxSize (520, -1); + wxSize ps = wxSize (700, -1); int const border = 16; #else wxSize ps = wxSize (-1, -1); @@ -1169,12 +1599,16 @@ create_full_config_dialog () #endif e->AddPage (new FullGeneralPage (ps, border)); + e->AddPage (new SoundPage (ps, border)); e->AddPage (new DefaultsPage (ps, border)); e->AddPage (new EncodingServersPage (ps, border)); - e->AddPage (new KeysPage (ps, border, true)); + e->AddPage (new KeysPage (ps, border)); e->AddPage (new TMSPage (ps, border)); + e->AddPage (new EmailPage (ps, border)); e->AddPage (new KDMEmailPage (ps, border)); + e->AddPage (new NotificationsPage (ps, border)); e->AddPage (new CoverSheetPage (ps, border)); + e->AddPage (new IdentifiersPage (ps, border)); e->AddPage (new AdvancedPage (ps, border)); return e; }