X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fconfig_dialog.cc;h=1cbad576c07fc1475039b5f20b44774f36484b14;hp=e1ffd393cca7af1d476aec1c7e272e9a700b6f72;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hpb=c450fb19ea21dba0a6cade81e829262e7078e9df diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc index e1ffd393c..1cbad576c 100644 --- a/src/wx/config_dialog.cc +++ b/src/wx/config_dialog.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -26,9 +27,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 +45,8 @@ #include #include #include -#include #include -#include +#include #include #include #include @@ -53,10 +55,13 @@ using std::vector; using std::string; using std::list; using std::cout; +using std::pair; +using std::make_pair; +using std::map; using boost::bind; using boost::shared_ptr; -using boost::lexical_cast; using boost::function; +using boost::optional; class Page { @@ -149,97 +154,156 @@ public: private: void setup () { - wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); - table->AddGrowableCol (1, 1); + wxGridBagSizer* table = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); _panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border); + int r = 0; _set_language = new wxCheckBox (_panel, wxID_ANY, _("Set language")); - table->Add (_set_language, 1); + table->Add (_set_language, wxGBPosition (r, 0)); _language = new wxChoice (_panel, wxID_ANY); - _language->Append (wxT ("Deutsch")); - _language->Append (wxT ("English")); - _language->Append (wxT ("Español")); - _language->Append (wxT ("Français")); - _language->Append (wxT ("Italiano")); - _language->Append (wxT ("Nederlands")); - _language->Append (wxT ("Svenska")); - _language->Append (wxT ("Русский")); - _language->Append (wxT ("Polski")); - _language->Append (wxT ("Danske")); - table->Add (_language); - - wxStaticText* restart = add_label_to_sizer (table, _panel, _("(restart DCP-o-matic to see language changes)"), false); + vector > languages; + languages.push_back (make_pair ("Čeština", "cs_CZ")); + languages.push_back (make_pair ("汉语/漢語", "zh_CN")); + languages.push_back (make_pair ("Dansk", "da_DK")); + languages.push_back (make_pair ("Deutsch", "de_DE")); + languages.push_back (make_pair ("English", "en_GB")); + languages.push_back (make_pair ("Español", "es_ES")); + languages.push_back (make_pair ("Français", "fr_FR")); + languages.push_back (make_pair ("Italiano", "it_IT")); + languages.push_back (make_pair ("Nederlands", "nl_NL")); + languages.push_back (make_pair ("Русский", "ru_RU")); + languages.push_back (make_pair ("Polski", "pl_PL")); + languages.push_back (make_pair ("Português europeu", "pt_PT")); + languages.push_back (make_pair ("Português do Brasil", "pt_BR")); + languages.push_back (make_pair ("Svenska", "sv_SE")); + languages.push_back (make_pair ("Slovenský jazyk", "sk_SK")); + languages.push_back (make_pair ("українська мова", "uk_UA")); + checked_set (_language, languages); + table->Add (_language, wxGBPosition (r, 1)); + ++r; + + 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(); font.SetStyle (wxFONTSTYLE_ITALIC); font.SetPointSize (font.GetPointSize() - 1); restart->SetFont (font); - table->AddSpacer (0); + ++r; - add_label_to_sizer (table, _panel, _("Threads to use for encoding on this host"), true); + 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, 1); + 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_EBUR128_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; _check_for_updates = new wxCheckBox (_panel, wxID_ANY, _("Check for updates on startup")); - table->Add (_check_for_updates, 1, wxEXPAND | wxALL); - table->AddSpacer (0); + 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")); - table->Add (_check_for_test_updates, 1, wxEXPAND | wxALL); - table->AddSpacer (0); + _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; + + 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); - _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)); + 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; + + _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_EBUR128_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)); + + _issuer->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&GeneralPage::issuer_changed, this)); + _creator->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&GeneralPage::creator_changed, this)); } void config_changed () { Config* config = Config::instance (); - checked_set (_set_language, config->language ()); - - if (config->language().get_value_or ("") == "fr") { - checked_set (_language, 3); - } else if (config->language().get_value_or ("") == "it") { - checked_set (_language, 4); - } else if (config->language().get_value_or ("") == "es") { - checked_set (_language, 2); - } else if (config->language().get_value_or ("") == "sv") { - checked_set (_language, 6); - } else if (config->language().get_value_or ("") == "de") { - checked_set (_language, 0); - } else if (config->language().get_value_or ("") == "nl") { - checked_set (_language, 5); - } else if (config->language().get_value_or ("") == "ru") { - checked_set (_language, 7); - } else if (config->language().get_value_or ("") == "pl") { - checked_set (_language, 8); - } else if (config->language().get_value_or ("") == "da") { - checked_set (_language, 9); - } else { - _language->SetSelection (1); + checked_set (_set_language, static_cast(config->language())); + + /* Backwards compatibility of config file */ + + map compat_map; + compat_map["fr"] = "fr_FR"; + compat_map["it"] = "it_IT"; + compat_map["es"] = "es_ES"; + compat_map["sv"] = "sv_SE"; + compat_map["de"] = "de_DE"; + compat_map["nl"] = "nl_NL"; + compat_map["ru"] = "ru_RU"; + compat_map["pl"] = "pl_PL"; + compat_map["da"] = "da_DK"; + compat_map["pt"] = "pt_PT"; + compat_map["sk"] = "sk_SK"; + compat_map["cs"] = "cs_CZ"; + compat_map["uk"] = "uk_UA"; + + string lang = config->language().get_value_or ("en_GB"); + if (compat_map.find (lang) != compat_map.end ()) { + lang = compat_map[lang]; } - setup_language_sensitivity (); + checked_set (_language, lang); checked_set (_num_local_encoding_threads, config->num_local_encoding_threads ()); +#ifdef DCPOMATIC_HAVE_EBUR128_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 { @@ -249,40 +313,26 @@ private: void language_changed () { - switch (_language->GetSelection ()) { - case 0: - Config::instance()->set_language ("de"); - break; - case 1: - Config::instance()->set_language ("en"); - break; - case 2: - Config::instance()->set_language ("es"); - break; - case 3: - Config::instance()->set_language ("fr"); - break; - case 4: - Config::instance()->set_language ("it"); - break; - case 5: - Config::instance()->set_language ("nl"); - break; - case 6: - Config::instance()->set_language ("sv"); - break; - case 7: - Config::instance()->set_language ("ru"); - break; - case 8: - Config::instance()->set_language ("pl"); - break; - case 9: - Config::instance()->set_language ("da"); - break; + int const sel = _language->GetSelection (); + if (sel != -1) { + Config::instance()->set_language (string_client_data (_language->GetClientObject (sel))); + } else { + Config::instance()->unset_language (); } } +#ifdef DCPOMATIC_HAVE_EBUR128_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 ()); + } + void check_for_updates_changed () { Config::instance()->set_check_for_updates (_check_for_updates->GetValue ()); @@ -298,11 +348,33 @@ private: Config::instance()->set_num_local_encoding_threads (_num_local_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 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_EBUR128_PATCHED_FFMPEG + wxCheckBox* _analyse_ebur128; +#endif + wxCheckBox* _automatic_audio_analysis; wxCheckBox* _check_for_updates; wxCheckBox* _check_for_test_updates; + wxTextCtrl* _issuer; + wxTextCtrl* _creator; }; class DefaultsPage : public StandardPage @@ -341,7 +413,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); @@ -378,13 +450,9 @@ private: table->Add (s, 1); } - add_label_to_sizer (table, _panel, _("Default issuer"), true); - _issuer = new wxTextCtrl (_panel, wxID_ANY); - table->Add (_issuer, 1, wxEXPAND); - - add_label_to_sizer (table, _panel, _("Default creator"), true); - _creator = new wxTextCtrl (_panel, wxID_ANY); - table->Add (_creator, 1, wxEXPAND); + add_label_to_sizer (table, _panel, _("Default standard"), true); + _standard = new wxChoice (_panel, wxID_ANY); + table->Add (_standard); _still_length->SetRange (1, 3600); _still_length->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&DefaultsPage::still_length_changed, this)); @@ -413,8 +481,9 @@ private: _audio_delay->SetRange (-1000, 1000); _audio_delay->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&DefaultsPage::audio_delay_changed, this)); - _issuer->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&DefaultsPage::issuer_changed, this)); - _creator->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&DefaultsPage::creator_changed, this)); + _standard->Append (_("SMPTE")); + _standard->Append (_("Interop")); + _standard->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DefaultsPage::standard_changed, this)); } void config_changed () @@ -440,8 +509,7 @@ private: checked_set (_j2k_bandwidth, config->default_j2k_bandwidth() / 1000000); _j2k_bandwidth->SetRange (50, config->maximum_j2k_bandwidth() / 1000000); checked_set (_audio_delay, config->default_audio_delay ()); - checked_set (_issuer, config->dcp_issuer ()); - checked_set (_creator, config->dcp_creator ()); + checked_set (_standard, config->default_interop() ? 1 : 0); } void j2k_bandwidth_changed () @@ -484,29 +552,23 @@ private: Config::instance()->set_default_dcp_content_type (ct[_dcp_content_type->GetSelection()]); } - void issuer_changed () + void standard_changed () { - Config::instance()->set_dcp_issuer (wx_to_std (_issuer->GetValue ())); - } - - void creator_changed () - { - Config::instance()->set_dcp_creator (wx_to_std (_creator->GetValue ())); + Config::instance()->set_default_interop (_standard->GetSelection() == 1); } wxSpinCtrl* _j2k_bandwidth; 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; #endif wxChoice* _container; wxChoice* _dcp_content_type; - wxTextCtrl* _issuer; - wxTextCtrl* _creator; + wxChoice* _standard; }; class EncodingServersPage : public StandardPage @@ -531,7 +593,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; @@ -541,6 +603,7 @@ private: columns, boost::bind (&Config::servers, Config::instance()), boost::bind (&Config::set_servers, Config::instance(), _1), + boost::bind (&always_valid), boost::bind (&EncodingServersPage::server_column, this, _1) ); @@ -597,7 +660,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; @@ -611,7 +674,7 @@ public: wxListItem ip; ip.SetId (1); ip.SetText (_("Thumbprint")); - ip.SetWidth (300); + ip.SetWidth (340); wxFont font = ip.GetFont (); font.SetFamily (wxFONTFAMILY_TELETYPE); @@ -628,6 +691,8 @@ public: s->Add (_add_certificate, 0, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); _remove_certificate = new wxButton (this, wxID_ANY, _("Remove")); s->Add (_remove_certificate, 0, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); + _export_certificate = new wxButton (this, wxID_ANY, _("Export")); + s->Add (_export_certificate, 0, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); certificates_sizer->Add (s, 0, wxLEFT, DCPOMATIC_SIZER_X_GAP); } @@ -635,7 +700,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); @@ -643,20 +708,24 @@ 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)); _remove_certificate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&CertificateChainEditor::remove_certificate, this)); + _export_certificate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&CertificateChainEditor::export_certificate, this)); _certificates->Bind (wxEVT_COMMAND_LIST_ITEM_SELECTED, boost::bind (&CertificateChainEditor::update_sensitivity, this)); _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); } @@ -684,6 +753,13 @@ private: if (d->ShowModal() == wxID_OK) { try { dcp::Certificate c (dcp::file_to_string (wx_to_std (d->GetPath ()))); + if (c.extra_data ()) { + message_dialog ( + this, + _("This file contains other certificates (or other data) after its first certificate. " + "Only the first certificate will be used.") + ); + } _chain->add (c); _set (_chain); update_certificate_list (); @@ -711,6 +787,37 @@ private: update_sensitivity (); } + void export_certificate () + { + int i = _certificates->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); + if (i == -1) { + return; + } + + wxFileDialog* d = new wxFileDialog ( + this, _("Select Certificate File"), wxEmptyString, wxEmptyString, wxT ("PEM files (*.pem)|*.pem"), + wxFD_SAVE | wxFD_OVERWRITE_PROMPT + ); + + dcp::CertificateChain::List all = _chain->root_to_leaf (); + dcp::CertificateChain::List::iterator j = all.begin (); + for (int k = 0; k < i; ++k) { + ++j; + } + + 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 = j->certificate (true); + fwrite (s.c_str(), 1, s.length(), f); + fclose (f); + } + d->Destroy (); + } + void update_certificate_list () { _certificates->DeleteAllItems (); @@ -738,9 +845,28 @@ private: { shared_ptr chain = _get (); + string subject_organization_name; + string subject_organizational_unit_name; + string root_common_name; string intermediate_common_name; - if (chain->root_to_leaf().size() >= 3) { - dcp::CertificateChain::List all = chain->root_to_leaf (); + string leaf_common_name; + + dcp::CertificateChain::List all = chain->root_to_leaf (); + + if (all.size() >= 1) { + /* Have a root */ + subject_organization_name = chain->root().subject_organization_name (); + subject_organizational_unit_name = chain->root().subject_organizational_unit_name (); + root_common_name = chain->root().subject_common_name (); + } + + if (all.size() >= 2) { + /* Have a leaf */ + leaf_common_name = chain->leaf().subject_common_name (); + } + + if (all.size() >= 3) { + /* Have an intermediate */ dcp::CertificateChain::List::iterator i = all.begin (); ++i; intermediate_common_name = i->subject_common_name (); @@ -748,11 +874,11 @@ private: MakeChainDialog* d = new MakeChainDialog ( this, - chain->root().subject_organization_name (), - chain->root().subject_organizational_unit_name (), - chain->root().subject_common_name (), + subject_organization_name, + subject_organizational_unit_name, + root_common_name, intermediate_common_name, - chain->leaf().subject_common_name () + leaf_common_name ); if (d->ShowModal () == wxID_OK) { @@ -778,6 +904,7 @@ private: void update_sensitivity () { _remove_certificate->Enable (_certificates->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED) != -1); + _export_certificate->Enable (_certificates->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED) != -1); } void update_private_key () @@ -793,8 +920,11 @@ private: if (d->ShowModal() == wxID_OK) { try { boost::filesystem::path p (wx_to_std (d->GetPath ())); - if (boost::filesystem::file_size (p) > 1024) { - error_dialog (this, wxString::Format (_("Could not read key file (%s)"), std_to_wx (p.string ()))); + if (boost::filesystem::file_size (p) > 8192) { + error_dialog ( + this, + wxString::Format (_("Could not read key file; file is too long (%s)"), std_to_wx (p.string ())) + ); return; } @@ -811,12 +941,39 @@ 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; wxButton* _remove_certificate; wxButton* _remake_certificates; wxStaticText* _private_key; wxButton* _load_private_key; + wxButton* _export_private_key; wxSizer* _sizer; wxBoxSizer* _button_sizer; shared_ptr _chain; @@ -946,7 +1103,7 @@ private: _tms_password = new wxTextCtrl (_panel, wxID_ANY); table->Add (_tms_password, 1, wxEXPAND); - _tms_protocol->Append (_("SCP (for AAM)")); + _tms_protocol->Append (_("SCP (for AAM and Doremi)")); _tms_protocol->Append (_("FTP (for Dolby)")); _tms_protocol->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&TMSPage::tms_protocol_changed, this)); @@ -999,6 +1156,12 @@ private: wxTextCtrl* _tms_password; }; +static string +column (string s) +{ + return s; +} + class KDMEmailPage : public StandardPage { public: @@ -1008,7 +1171,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 {} @@ -1059,27 +1222,37 @@ 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 (&string_not_empty, _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)); @@ -1095,7 +1268,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 ()); } @@ -1130,11 +1302,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 ())); @@ -1163,7 +1330,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; @@ -1186,6 +1353,7 @@ public: , _log_timing (0) , _log_debug_decode (0) , _log_debug_encode (0) + , _log_debug_email (0) {} private: @@ -1228,12 +1396,15 @@ private: t->Add (_log_warning, 1, wxEXPAND | wxALL); _log_error = new wxCheckBox (_panel, wxID_ANY, _("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")); 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")); 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); } @@ -1253,6 +1424,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 @@ -1265,12 +1437,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 @@ -1295,22 +1468,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); } @@ -1331,6 +1507,7 @@ private: wxCheckBox* _log_timing; wxCheckBox* _log_debug_decode; wxCheckBox* _log_debug_encode; + wxCheckBox* _log_debug_email; #ifdef DCPOMATIC_WINDOWS wxCheckBox* _win32_console; #endif