X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fconfig_dialog.cc;h=7e70326dcaa874eba764371acddde8307fef06b3;hb=6bdf43931787f1f0b9f7dad2d5636ac78d29cdf2;hp=dcafee4caff7ae207e499f3bdcac6b5899f4583d;hpb=cb693715a22afa1cc56c1839b228314b597df6f3;p=dcpomatic.git diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc index dcafee4ca..7e70326dc 100644 --- a/src/wx/config_dialog.cc +++ b/src/wx/config_dialog.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2016 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -26,9 +26,11 @@ #include "editable_list.h" #include "filter_dialog.h" #include "dir_picker_ctrl.h" +#include "file_picker_ctrl.h" #include "isdcf_metadata_dialog.h" #include "server_dialog.h" #include "make_chain_dialog.h" +#include "email_dialog.h" #include "lib/config.h" #include "lib/ratio.h" #include "lib/filter.h" @@ -42,9 +44,8 @@ #include #include #include -#include #include -#include +#include #include #include #include @@ -55,8 +56,8 @@ using std::list; using std::cout; using boost::bind; using boost::shared_ptr; -using boost::lexical_cast; using boost::function; +using boost::optional; class Page { @@ -165,11 +166,15 @@ private: _language->Append (wxT ("Svenska")); _language->Append (wxT ("Русский")); _language->Append (wxT ("Polski")); - _language->Append (wxT ("Danske")); + _language->Append (wxT ("Dansk")); + _language->Append (wxT ("Português europeu")); + _language->Append (wxT ("Slovenský jazyk")); + _language->Append (wxT ("Čeština")); + _language->Append (wxT ("українська мова")); table->Add (_language, wxGBPosition (r, 1)); ++r; - wxStaticText* restart = add_label_to_grid_bag_sizer ( + wxStaticText* restart = add_label_to_sizer ( table, _panel, _("(restart DCP-o-matic to see language changes)"), false, wxGBPosition (r, 0), wxGBSpan (1, 2) ); wxFont font = restart->GetFont(); @@ -178,11 +183,22 @@ private: restart->SetFont (font); ++r; - add_label_to_grid_bag_sizer (table, _panel, _("Threads to use for encoding on this host"), true, wxGBPosition (r, 0)); + add_label_to_sizer (table, _panel, _("Threads to use for encoding on this host"), true, wxGBPosition (r, 0)); _num_local_encoding_threads = new wxSpinCtrl (_panel); table->Add (_num_local_encoding_threads, 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"); + table->Add (_cinemas_file, wxGBPosition (r, 1)); + ++r; + +#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG + _analyse_ebur128 = new wxCheckBox (_panel, wxID_ANY, _("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")); table->Add (_automatic_audio_analysis, wxGBPosition (r, 0), wxGBSpan (1, 2)); ++r; @@ -191,7 +207,7 @@ private: table->Add (_check_for_updates, wxGBPosition (r, 0), wxGBSpan (1, 2)); ++r; - _check_for_test_updates = new wxCheckBox (_panel, wxID_ANY, _("Check for testing updates as well as stable ones")); + _check_for_test_updates = new wxCheckBox (_panel, wxID_ANY, _("Check for testing updates on startup")); table->Add (_check_for_test_updates, wxGBPosition (r, 0), wxGBSpan (1, 2)); ++r; @@ -209,12 +225,16 @@ private: table->Add (bottom_table, wxGBPosition (r, 0), wxGBSpan (2, 2), wxEXPAND); ++r; - _set_language->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&GeneralPage::set_language_changed, this)); - _language->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&GeneralPage::language_changed, this)); + _set_language->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&GeneralPage::set_language_changed, this)); + _language->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&GeneralPage::language_changed, this)); + _cinemas_file->Bind (wxEVT_COMMAND_FILEPICKER_CHANGED, boost::bind (&GeneralPage::cinemas_file_changed, this)); _num_local_encoding_threads->SetRange (1, 128); _num_local_encoding_threads->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&GeneralPage::num_local_encoding_threads_changed, this)); +#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG + _analyse_ebur128->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&GeneralPage::analyse_ebur128_changed, this)); +#endif _automatic_audio_analysis->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&GeneralPage::automatic_audio_analysis_changed, this)); _check_for_updates->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&GeneralPage::check_for_updates_changed, this)); _check_for_test_updates->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&GeneralPage::check_for_test_updates_changed, this)); @@ -247,28 +267,41 @@ private: checked_set (_language, 8); } else if (config->language().get_value_or ("") == "da") { checked_set (_language, 9); + } else if (config->language().get_value_or ("") == "pt") { + checked_set (_language, 10); + } else if (config->language().get_value_or ("") == "sk") { + checked_set (_language, 11); + } else if (config->language().get_value_or ("") == "cs") { + checked_set (_language, 12); + } else if (config->language().get_value_or ("") == "uk") { + checked_set (_language, 13); } else { _language->SetSelection (1); } - setup_language_sensitivity (); - checked_set (_num_local_encoding_threads, config->num_local_encoding_threads ()); +#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG + checked_set (_analyse_ebur128, config->analyse_ebur128 ()); +#endif checked_set (_automatic_audio_analysis, config->automatic_audio_analysis ()); checked_set (_check_for_updates, config->check_for_updates ()); checked_set (_check_for_test_updates, config->check_for_test_updates ()); checked_set (_issuer, config->dcp_issuer ()); checked_set (_creator, config->dcp_creator ()); + checked_set (_cinemas_file, config->cinemas_file()); + + setup_sensitivity (); } - void setup_language_sensitivity () + void setup_sensitivity () { _language->Enable (_set_language->GetValue ()); + _check_for_test_updates->Enable (_check_for_updates->GetValue ()); } void set_language_changed () { - setup_language_sensitivity (); + setup_sensitivity (); if (_set_language->GetValue ()) { language_changed (); } else { @@ -309,9 +342,28 @@ private: case 9: Config::instance()->set_language ("da"); break; + case 10: + Config::instance()->set_language ("pt"); + break; + case 11: + Config::instance()->set_language ("sk"); + break; + case 12: + Config::instance()->set_language ("cs"); + break; + case 13: + Config::instance()->set_language ("uk"); + break; } } +#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG + void analyse_ebur128_changed () + { + Config::instance()->set_analyse_ebur128 (_analyse_ebur128->GetValue ()); + } +#endif + void automatic_audio_analysis_changed () { Config::instance()->set_automatic_audio_analysis (_automatic_audio_analysis->GetValue ()); @@ -342,9 +394,18 @@ private: Config::instance()->set_dcp_creator (wx_to_std (_creator->GetValue ())); } + void cinemas_file_changed () + { + Config::instance()->set_cinemas_file (wx_to_std (_cinemas_file->GetPath ())); + } + wxCheckBox* _set_language; wxChoice* _language; wxSpinCtrl* _num_local_encoding_threads; + FilePickerCtrl* _cinemas_file; +#ifdef DCPOMATIC_HAVE_PATCHED_FFMPEG + wxCheckBox* _analyse_ebur128; +#endif wxCheckBox* _automatic_audio_analysis; wxCheckBox* _check_for_updates; wxCheckBox* _check_for_test_updates; @@ -388,7 +449,7 @@ private: } add_label_to_sizer (table, _panel, _("Default directory for new films"), true); -#ifdef DCPOMATIC_USE_OWN_DIR_PICKER +#ifdef DCPOMATIC_USE_OWN_PICKER _directory = new DirPickerCtrl (_panel); #else _directory = new wxDirPickerCtrl (_panel, wxDD_DIR_MUST_EXIST); @@ -536,7 +597,7 @@ private: wxSpinCtrl* _audio_delay; wxButton* _isdcf_metadata_button; wxSpinCtrl* _still_length; -#ifdef DCPOMATIC_USE_OWN_DIR_PICKER +#ifdef DCPOMATIC_USE_OWN_PICKER DirPickerCtrl* _directory; #else wxDirPickerCtrl* _directory; @@ -568,7 +629,7 @@ public: private: void setup () { - _use_any_servers = new wxCheckBox (_panel, wxID_ANY, _("Use all servers")); + _use_any_servers = new wxCheckBox (_panel, wxID_ANY, _("Search network for servers")); _panel->GetSizer()->Add (_use_any_servers, 0, wxALL, _border); vector columns; @@ -634,7 +695,7 @@ public: wxBoxSizer* certificates_sizer = new wxBoxSizer (wxHORIZONTAL); _sizer->Add (certificates_sizer, 0, wxLEFT | wxRIGHT, border); - _certificates = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize (400, 150), wxLC_REPORT | wxLC_SINGLE_SEL); + _certificates = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize (440, 150), wxLC_REPORT | wxLC_SINGLE_SEL); { wxListItem ip; @@ -648,7 +709,7 @@ public: wxListItem ip; ip.SetId (1); ip.SetText (_("Thumbprint")); - ip.SetWidth (300); + ip.SetWidth (340); wxFont font = ip.GetFont (); font.SetFamily (wxFONTFAMILY_TELETYPE); @@ -674,7 +735,7 @@ public: _sizer->Add (table, 1, wxALL | wxEXPAND, border); int r = 0; - add_label_to_grid_bag_sizer (table, this, _("Leaf private key"), true, wxGBPosition (r, 0)); + add_label_to_sizer (table, this, _("Leaf private key"), true, wxGBPosition (r, 0)); _private_key = new wxStaticText (this, wxID_ANY, wxT ("")); wxFont font = _private_key->GetFont (); font.SetFamily (wxFONTFAMILY_TELETYPE); @@ -682,12 +743,14 @@ public: table->Add (_private_key, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); _load_private_key = new wxButton (this, wxID_ANY, _("Load...")); table->Add (_load_private_key, wxGBPosition (r, 2)); + _export_private_key = new wxButton (this, wxID_ANY, _("Export...")); + table->Add (_export_private_key, wxGBPosition (r, 3)); ++r; _button_sizer = new wxBoxSizer (wxHORIZONTAL); _remake_certificates = new wxButton (this, wxID_ANY, _("Re-make certificates and key...")); _button_sizer->Add (_remake_certificates, 1, wxRIGHT, border); - table->Add (_button_sizer, wxGBPosition (r, 0), wxGBSpan (1, 3)); + table->Add (_button_sizer, wxGBPosition (r, 0), wxGBSpan (1, 4)); ++r; _add_certificate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&CertificateChainEditor::add_certificate, this)); @@ -697,6 +760,7 @@ public: _certificates->Bind (wxEVT_COMMAND_LIST_ITEM_DESELECTED, boost::bind (&CertificateChainEditor::update_sensitivity, this)); _remake_certificates->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&CertificateChainEditor::remake_certificates, this)); _load_private_key->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&CertificateChainEditor::load_private_key, this)); + _export_private_key->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&CertificateChainEditor::export_private_key, this)); SetSizerAndFit (_sizer); } @@ -902,6 +966,31 @@ private: update_sensitivity (); } + void export_private_key () + { + optional key = _chain->key (); + if (!key) { + return; + } + + wxFileDialog* d = new wxFileDialog ( + this, _("Select Key File"), wxEmptyString, wxEmptyString, wxT ("PEM files (*.pem)|*.pem"), + wxFD_SAVE | wxFD_OVERWRITE_PROMPT + ); + + if (d->ShowModal () == wxID_OK) { + FILE* f = fopen_boost (wx_to_std (d->GetPath ()), "w"); + if (!f) { + throw OpenFileError (wx_to_std (d->GetPath ())); + } + + string const s = _chain->key().get (); + fwrite (s.c_str(), 1, s.length(), f); + fclose (f); + } + d->Destroy (); + } + wxListCtrl* _certificates; wxButton* _add_certificate; wxButton* _export_certificate; @@ -909,6 +998,7 @@ private: wxButton* _remake_certificates; wxStaticText* _private_key; wxButton* _load_private_key; + wxButton* _export_private_key; wxSizer* _sizer; wxBoxSizer* _button_sizer; shared_ptr _chain; @@ -1091,6 +1181,12 @@ private: wxTextCtrl* _tms_password; }; +static string +column (string s) +{ + return s; +} + class KDMEmailPage : public StandardPage { public: @@ -1100,7 +1196,7 @@ public: /* We have to force both width and height of this one */ : StandardPage (wxSize (480, 128), border) #else - : StandardPage (panel_size, border) + : StandardPage (panel_size, border) #endif {} @@ -1151,27 +1247,32 @@ private: _kdm_from = new wxTextCtrl (_panel, wxID_ANY); table->Add (_kdm_from, 1, wxEXPAND | wxALL); - add_label_to_sizer (table, _panel, _("CC address"), true); - _kdm_cc = new wxTextCtrl (_panel, wxID_ANY); + vector columns; + columns.push_back (wx_to_std (_("Address"))); + add_label_to_sizer (table, _panel, _("CC addresses"), true); + _kdm_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); add_label_to_sizer (table, _panel, _("BCC address"), true); _kdm_bcc = new wxTextCtrl (_panel, wxID_ANY); table->Add (_kdm_bcc, 1, wxEXPAND | wxALL); - _kdm_email = new wxTextCtrl (_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (480, 128), wxTE_MULTILINE); - _panel->GetSizer()->Add (_kdm_email, 1, wxEXPAND | wxALL, _border); + _kdm_email = new wxTextCtrl (_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (-1, 200), wxTE_MULTILINE); + _panel->GetSizer()->Add (_kdm_email, 0, wxEXPAND | wxALL, _border); - _reset_kdm_email = new wxButton (_panel, wxID_ANY, _("Reset to default text")); + _reset_kdm_email = new wxButton (_panel, wxID_ANY, _("Reset to default subject and text")); _panel->GetSizer()->Add (_reset_kdm_email, 0, wxEXPAND | wxALL, _border); + _kdm_cc->layout (); + _mail_server->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::mail_server_changed, this)); _mail_port->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&KDMEmailPage::mail_port_changed, this)); _mail_user->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::mail_user_changed, this)); _mail_password->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::mail_password_changed, this)); _kdm_subject->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_subject_changed, this)); _kdm_from->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_from_changed, this)); - _kdm_cc->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_cc_changed, this)); _kdm_bcc->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_bcc_changed, this)); _kdm_email->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_email_changed, this)); _reset_kdm_email->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KDMEmailPage::reset_kdm_email, this)); @@ -1187,7 +1288,6 @@ private: checked_set (_mail_password, config->mail_password ()); checked_set (_kdm_subject, config->kdm_subject ()); checked_set (_kdm_from, config->kdm_from ()); - checked_set (_kdm_cc, config->kdm_cc ()); checked_set (_kdm_bcc, config->kdm_bcc ()); checked_set (_kdm_email, Config::instance()->kdm_email ()); } @@ -1222,11 +1322,6 @@ private: Config::instance()->set_kdm_from (wx_to_std (_kdm_from->GetValue ())); } - void kdm_cc_changed () - { - Config::instance()->set_kdm_cc (wx_to_std (_kdm_cc->GetValue ())); - } - void kdm_bcc_changed () { Config::instance()->set_kdm_bcc (wx_to_std (_kdm_bcc->GetValue ())); @@ -1255,7 +1350,7 @@ private: wxTextCtrl* _mail_password; wxTextCtrl* _kdm_subject; wxTextCtrl* _kdm_from; - wxTextCtrl* _kdm_cc; + EditableList* _kdm_cc; wxTextCtrl* _kdm_bcc; wxTextCtrl* _kdm_email; wxButton* _reset_kdm_email; @@ -1278,6 +1373,7 @@ public: , _log_timing (0) , _log_debug_decode (0) , _log_debug_encode (0) + , _log_debug_email (0) {} private: @@ -1326,6 +1422,8 @@ private: t->Add (_log_debug_decode, 1, wxEXPAND | wxALL); _log_debug_encode = new wxCheckBox (_panel, wxID_ANY, _("Debug: encode")); t->Add (_log_debug_encode, 1, wxEXPAND | wxALL); + _log_debug_email = new wxCheckBox (_panel, wxID_ANY, _("Debug: email sending")); + t->Add (_log_debug_email, 1, wxEXPAND | wxALL); table->Add (t, 0, wxALL, 6); } @@ -1345,6 +1443,7 @@ private: _log_timing->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::log_changed, this)); _log_debug_decode->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::log_changed, this)); _log_debug_encode->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::log_changed, this)); + _log_debug_email->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::log_changed, this)); #ifdef DCPOMATIC_WINDOWS _win32_console->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::win32_console_changed, this)); #endif @@ -1357,12 +1456,13 @@ private: checked_set (_maximum_j2k_bandwidth, config->maximum_j2k_bandwidth() / 1000000); checked_set (_allow_any_dcp_frame_rate, config->allow_any_dcp_frame_rate ()); checked_set (_only_servers_encode, config->only_servers_encode ()); - checked_set (_log_general, config->log_types() & Log::TYPE_GENERAL); - checked_set (_log_warning, config->log_types() & Log::TYPE_WARNING); - checked_set (_log_error, config->log_types() & Log::TYPE_ERROR); - checked_set (_log_timing, config->log_types() & Log::TYPE_TIMING); - checked_set (_log_debug_decode, config->log_types() & Log::TYPE_DEBUG_DECODE); - checked_set (_log_debug_encode, config->log_types() & Log::TYPE_DEBUG_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_encode, config->log_types() & LogEntry::TYPE_DEBUG_ENCODE); + checked_set (_log_debug_email, config->log_types() & LogEntry::TYPE_DEBUG_EMAIL); #ifdef DCPOMATIC_WINDOWS checked_set (_win32_console, config->win32_console()); #endif @@ -1387,22 +1487,25 @@ private: { int types = 0; if (_log_general->GetValue ()) { - types |= Log::TYPE_GENERAL; + types |= LogEntry::TYPE_GENERAL; } if (_log_warning->GetValue ()) { - types |= Log::TYPE_WARNING; + types |= LogEntry::TYPE_WARNING; } if (_log_error->GetValue ()) { - types |= Log::TYPE_ERROR; + types |= LogEntry::TYPE_ERROR; } if (_log_timing->GetValue ()) { - types |= Log::TYPE_TIMING; + types |= LogEntry::TYPE_TIMING; } if (_log_debug_decode->GetValue ()) { - types |= Log::TYPE_DEBUG_DECODE; + types |= LogEntry::TYPE_DEBUG_DECODE; } if (_log_debug_encode->GetValue ()) { - types |= Log::TYPE_DEBUG_ENCODE; + types |= LogEntry::TYPE_DEBUG_ENCODE; + } + if (_log_debug_email->GetValue ()) { + types |= LogEntry::TYPE_DEBUG_EMAIL; } Config::instance()->set_log_types (types); } @@ -1423,6 +1526,7 @@ private: wxCheckBox* _log_timing; wxCheckBox* _log_debug_decode; wxCheckBox* _log_debug_encode; + wxCheckBox* _log_debug_email; #ifdef DCPOMATIC_WINDOWS wxCheckBox* _win32_console; #endif