X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fconfig_dialog.cc;h=8e27dc540856829651788014866674e54a335112;hb=2d8f0f782ccabfa49a14f5fd82c8a5dea521e3cd;hp=109ff9f87b065a734e6eaf4014589580932034ba;hpb=71d8cf20889a3c419c9a3e485f461236e5317423;p=dcpomatic.git diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc index 109ff9f87..8e27dc540 100644 --- a/src/wx/config_dialog.cc +++ b/src/wx/config_dialog.cc @@ -28,19 +28,25 @@ #include #include #include -#include +#include +#include +#include #include "lib/config.h" #include "lib/ratio.h" #include "lib/scaler.h" #include "lib/filter.h" #include "lib/dcp_content_type.h" #include "lib/colour_conversion.h" +#include "lib/log.h" +#include "lib/util.h" +#include "lib/cross.h" +#include "lib/exceptions.h" #include "config_dialog.h" #include "wx_util.h" #include "editable_list.h" #include "filter_dialog.h" #include "dir_picker_ctrl.h" -#include "dci_metadata_dialog.h" +#include "isdcf_metadata_dialog.h" #include "preset_colour_conversion_dialog.h" #include "server_dialog.h" @@ -106,26 +112,6 @@ public: _num_local_encoding_threads = new wxSpinCtrl (panel); table->Add (_num_local_encoding_threads, 1); - add_label_to_sizer (table, panel, _("Outgoing mail server"), true); - _mail_server = new wxTextCtrl (panel, wxID_ANY); - table->Add (_mail_server, 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); - - wxStaticText* plain = add_label_to_sizer (table, panel, _("(password will be stored on disk in plaintext)"), false); - plain->SetFont (font); - table->AddSpacer (0); - - add_label_to_sizer (table, panel, _("From address for KDM emails"), true); - _kdm_from = new wxTextCtrl (panel, wxID_ANY); - table->Add (_kdm_from, 1, wxEXPAND | wxALL); - _check_for_updates = new wxCheckBox (panel, wxID_ANY, _("Check for updates on startup")); table->Add (_check_for_updates, 1, wxEXPAND | wxALL); table->AddSpacer (0); @@ -163,14 +149,6 @@ public: _num_local_encoding_threads->SetValue (config->num_local_encoding_threads ()); _num_local_encoding_threads->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&GeneralPage::num_local_encoding_threads_changed, this)); - _mail_server->SetValue (std_to_wx (config->mail_server ())); - _mail_server->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&GeneralPage::mail_server_changed, this)); - _mail_user->SetValue (std_to_wx (config->mail_user ())); - _mail_user->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&GeneralPage::mail_user_changed, this)); - _mail_password->SetValue (std_to_wx (config->mail_password ())); - _mail_password->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&GeneralPage::mail_password_changed, this)); - _kdm_from->SetValue (std_to_wx (config->kdm_from ())); - _kdm_from->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&GeneralPage::kdm_from_changed, this)); _check_for_updates->SetValue (config->check_for_updates ()); _check_for_updates->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&GeneralPage::check_for_updates_changed, this)); _check_for_test_updates->SetValue (config->check_for_test_updates ()); @@ -222,26 +200,6 @@ private: } } - void mail_server_changed () - { - Config::instance()->set_mail_server (wx_to_std (_mail_server->GetValue ())); - } - - void mail_user_changed () - { - Config::instance()->set_mail_user (wx_to_std (_mail_user->GetValue ())); - } - - void mail_password_changed () - { - Config::instance()->set_mail_password (wx_to_std (_mail_password->GetValue ())); - } - - void kdm_from_changed () - { - Config::instance()->set_kdm_from (wx_to_std (_kdm_from->GetValue ())); - } - void check_for_updates_changed () { Config::instance()->set_check_for_updates (_check_for_updates->GetValue ()); @@ -260,10 +218,6 @@ private: wxCheckBox* _set_language; wxChoice* _language; wxSpinCtrl* _num_local_encoding_threads; - wxTextCtrl* _mail_server; - wxTextCtrl* _mail_user; - wxTextCtrl* _mail_password; - wxTextCtrl* _kdm_from; wxCheckBox* _check_for_updates; wxCheckBox* _check_for_test_updates; }; @@ -314,9 +268,13 @@ public: #endif table->Add (_directory, 1, wxEXPAND); - add_label_to_sizer (table, panel, _("Default DCI name details"), true); - _dci_metadata_button = new wxButton (panel, wxID_ANY, _("Edit...")); - table->Add (_dci_metadata_button); + add_label_to_sizer (table, panel, _("Default ISDCF name details"), true); + _isdcf_metadata_button = new wxButton (panel, wxID_ANY, _("Edit...")); + table->Add (_isdcf_metadata_button); + + add_label_to_sizer (table, panel, _("Default scale to"), true); + _scale = new wxChoice (panel, wxID_ANY); + table->Add (_scale); add_label_to_sizer (table, panel, _("Default container"), true); _container = new wxChoice (panel, wxID_ANY); @@ -361,11 +319,15 @@ public: _directory->SetPath (std_to_wx (config->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir())).string ())); _directory->Bind (wxEVT_COMMAND_DIRPICKER_CHANGED, boost::bind (&DefaultsPage::directory_changed, this)); - _dci_metadata_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DefaultsPage::edit_dci_metadata_clicked, this, parent)); + _isdcf_metadata_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DefaultsPage::edit_isdcf_metadata_clicked, this, parent)); vector ratio = Ratio::all (); int n = 0; for (vector::iterator i = ratio.begin(); i != ratio.end(); ++i) { + _scale->Append (std_to_wx ((*i)->nickname ())); + if (*i == config->default_scale ()) { + _scale->SetSelection (n); + } _container->Append (std_to_wx ((*i)->nickname ())); if (*i == config->default_container ()) { _container->SetSelection (n); @@ -373,6 +335,7 @@ public: ++n; } + _scale->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DefaultsPage::scale_changed, this)); _container->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DefaultsPage::container_changed, this)); vector const ct = DCPContentType::all (); @@ -419,11 +382,11 @@ private: Config::instance()->set_default_directory (wx_to_std (_directory->GetPath ())); } - void edit_dci_metadata_clicked (wxWindow* parent) + void edit_isdcf_metadata_clicked (wxWindow* parent) { - DCIMetadataDialog* d = new DCIMetadataDialog (parent, Config::instance()->default_dci_metadata ()); + ISDCFMetadataDialog* d = new ISDCFMetadataDialog (parent, Config::instance()->default_isdcf_metadata ()); d->ShowModal (); - Config::instance()->set_default_dci_metadata (d->dci_metadata ()); + Config::instance()->set_default_isdcf_metadata (d->isdcf_metadata ()); d->Destroy (); } @@ -431,6 +394,12 @@ private: { Config::instance()->set_default_still_length (_still_length->GetValue ()); } + + void scale_changed () + { + vector ratio = Ratio::all (); + Config::instance()->set_default_scale (ratio[_scale->GetSelection()]); + } void container_changed () { @@ -446,27 +415,28 @@ private: void issuer_changed () { - libdcp::XMLMetadata m = Config::instance()->dcp_metadata (); + dcp::XMLMetadata m = Config::instance()->dcp_metadata (); m.issuer = wx_to_std (_issuer->GetValue ()); Config::instance()->set_dcp_metadata (m); } void creator_changed () { - libdcp::XMLMetadata m = Config::instance()->dcp_metadata (); + dcp::XMLMetadata m = Config::instance()->dcp_metadata (); m.creator = wx_to_std (_creator->GetValue ()); Config::instance()->set_dcp_metadata (m); } wxSpinCtrl* _j2k_bandwidth; wxSpinCtrl* _audio_delay; - wxButton* _dci_metadata_button; + wxButton* _isdcf_metadata_button; wxSpinCtrl* _still_length; #ifdef DCPOMATIC_USE_OWN_DIR_PICKER DirPickerCtrl* _directory; #else wxDirPickerCtrl* _directory; #endif + wxChoice* _scale; wxChoice* _container; wxChoice* _dcp_content_type; wxTextCtrl* _issuer; @@ -581,6 +551,310 @@ private: } }; +class KeysPage : public wxPreferencesPage, public Page +{ +public: + KeysPage (wxSize panel_size, int border) + : Page (panel_size, border) + {} + + wxString GetName () const + { + return _("Keys"); + } + +#ifdef DCPOMATIC_OSX + wxBitmap GetLargeIcon () const + { + return wxBitmap ("keys", wxBITMAP_TYPE_PNG_RESOURCE); + } +#endif + + wxWindow* CreateWindow (wxWindow* parent) + { + _panel = new wxPanel (parent, wxID_ANY, wxDefaultPosition, _panel_size); + wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL); + _panel->SetSizer (overall_sizer); + + wxStaticText* m = new wxStaticText (_panel, wxID_ANY, _("Certificate chain for signing DCPs and KDMs:")); + overall_sizer->Add (m, 0, wxALL, _border); + + wxBoxSizer* certificates_sizer = new wxBoxSizer (wxHORIZONTAL); + overall_sizer->Add (certificates_sizer, 0, wxLEFT | wxRIGHT, _border); + + _certificates = new wxListCtrl (_panel, wxID_ANY, wxDefaultPosition, wxSize (400, 200), wxLC_REPORT | wxLC_SINGLE_SEL); + + { + wxListItem ip; + ip.SetId (0); + ip.SetText (_("Type")); + ip.SetWidth (100); + _certificates->InsertColumn (0, ip); + } + + { + wxListItem ip; + ip.SetId (1); + ip.SetText (_("Thumbprint")); + ip.SetWidth (300); + + wxFont font = ip.GetFont (); + font.SetFamily (wxFONTFAMILY_TELETYPE); + ip.SetFont (font); + + _certificates->InsertColumn (1, ip); + } + + certificates_sizer->Add (_certificates, 1, wxEXPAND); + + { + wxSizer* s = new wxBoxSizer (wxVERTICAL); + _add_certificate = new wxButton (_panel, wxID_ANY, _("Add...")); + s->Add (_add_certificate, 0, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); + _remove_certificate = new wxButton (_panel, wxID_ANY, _("Remove")); + s->Add (_remove_certificate, 0, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); + certificates_sizer->Add (s, 0, wxLEFT, DCPOMATIC_SIZER_X_GAP); + } + + wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + table->AddGrowableCol (1, 1); + overall_sizer->Add (table, 1, wxALL | wxEXPAND, _border); + + add_label_to_sizer (table, _panel, _("Private key for leaf certificate"), true); + { + wxSizer* s = new wxBoxSizer (wxHORIZONTAL); + _signer_private_key = new wxStaticText (_panel, wxID_ANY, wxT ("")); + wxFont font = _signer_private_key->GetFont (); + font.SetFamily (wxFONTFAMILY_TELETYPE); + _signer_private_key->SetFont (font); + s->Add (_signer_private_key, 1, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP); + _load_signer_private_key = new wxButton (_panel, wxID_ANY, _("Load...")); + s->Add (_load_signer_private_key, 0, wxLEFT, DCPOMATIC_SIZER_X_GAP); + table->Add (s, 0); + } + + add_label_to_sizer (table, _panel, _("Certificate for decrypting DCPs"), true); + { + wxSizer* s = new wxBoxSizer (wxHORIZONTAL); + _decryption_certificate = new wxStaticText (_panel, wxID_ANY, wxT ("")); + wxFont font = _decryption_certificate->GetFont (); + font.SetFamily (wxFONTFAMILY_TELETYPE); + _decryption_certificate->SetFont (font); + s->Add (_decryption_certificate, 1, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP); + _load_decryption_certificate = new wxButton (_panel, wxID_ANY, _("Load...")); + s->Add (_load_decryption_certificate, 0, wxLEFT, DCPOMATIC_SIZER_X_GAP); + table->Add (s, 0); + } + + add_label_to_sizer (table, _panel, _("Private key for decrypting DCPs"), true); + { + wxSizer* s = new wxBoxSizer (wxHORIZONTAL); + _decryption_private_key = new wxStaticText (_panel, wxID_ANY, wxT ("")); + wxFont font = _decryption_private_key->GetFont (); + font.SetFamily (wxFONTFAMILY_TELETYPE); + _decryption_private_key->SetFont (font); + s->Add (_decryption_private_key, 1, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP); + _load_decryption_private_key = new wxButton (_panel, wxID_ANY, _("Load...")); + s->Add (_load_decryption_private_key, 0, wxLEFT, DCPOMATIC_SIZER_X_GAP); + table->Add (s, 0); + } + + _export_decryption_certificate = new wxButton (_panel, wxID_ANY, _("Export DCP decryption certificate...")); + table->Add (_export_decryption_certificate); + table->AddSpacer (0); + + _add_certificate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KeysPage::add_certificate, this)); + _remove_certificate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KeysPage::remove_certificate, this)); + _certificates->Bind (wxEVT_COMMAND_LIST_ITEM_SELECTED, boost::bind (&KeysPage::update_sensitivity, this)); + _certificates->Bind (wxEVT_COMMAND_LIST_ITEM_DESELECTED, boost::bind (&KeysPage::update_sensitivity, this)); + _load_signer_private_key->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KeysPage::load_signer_private_key, this)); + _load_decryption_certificate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KeysPage::load_decryption_certificate, this)); + _load_decryption_private_key->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KeysPage::load_decryption_private_key, this)); + _export_decryption_certificate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KeysPage::export_decryption_certificate, this)); + + _signer.reset (new dcp::Signer (*Config::instance()->signer().get ())); + + update_certificate_list (); + update_signer_private_key (); + update_decryption_certificate (); + update_decryption_private_key (); + update_sensitivity (); + + return _panel; + } + +private: + void add_certificate () + { + wxFileDialog* d = new wxFileDialog (_panel, _("Select Certificate File")); + + if (d->ShowModal() == wxID_OK) { + try { + dcp::Certificate c (dcp::file_to_string (wx_to_std (d->GetPath ()))); + _signer->certificates().add (c); + Config::instance()->set_signer (_signer); + update_certificate_list (); + } catch (dcp::MiscError& e) { + error_dialog (_panel, wxString::Format (_("Could not read certificate file (%s)"), e.what ())); + } + } + + d->Destroy (); + + update_sensitivity (); + } + + void remove_certificate () + { + int i = _certificates->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); + if (i == -1) { + return; + } + + _certificates->DeleteItem (i); + _signer->certificates().remove (i); + Config::instance()->set_signer (_signer); + + update_sensitivity (); + } + + void update_certificate_list () + { + _certificates->DeleteAllItems (); + dcp::CertificateChain::List certs = _signer->certificates().root_to_leaf (); + size_t n = 0; + for (dcp::CertificateChain::List::const_iterator i = certs.begin(); i != certs.end(); ++i) { + wxListItem item; + item.SetId (n); + _certificates->InsertItem (item); + _certificates->SetItem (n, 1, std_to_wx (i->thumbprint ())); + + if (n == 0) { + _certificates->SetItem (n, 0, _("Root")); + } else if (n == (certs.size() - 1)) { + _certificates->SetItem (n, 0, _("Leaf")); + } else { + _certificates->SetItem (n, 0, _("Intermediate")); + } + + ++n; + } + } + + void update_sensitivity () + { + _remove_certificate->Enable (_certificates->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED) != -1); + } + + void update_signer_private_key () + { + _signer_private_key->SetLabel (std_to_wx (dcp::private_key_fingerprint (_signer->key ()))); + } + + void load_signer_private_key () + { + wxFileDialog* d = new wxFileDialog (_panel, _("Select Key File")); + + if (d->ShowModal() == wxID_OK) { + try { + boost::filesystem::path p (wx_to_std (d->GetPath ())); + if (boost::filesystem::file_size (p) > 1024) { + error_dialog (_panel, wxString::Format (_("Could not read key file (%s)"), std_to_wx (p.string ()))); + return; + } + + _signer->set_key (dcp::file_to_string (p)); + Config::instance()->set_signer (_signer); + update_signer_private_key (); + } catch (dcp::MiscError& e) { + error_dialog (_panel, wxString::Format (_("Could not read certificate file (%s)"), e.what ())); + } + } + + d->Destroy (); + + update_sensitivity (); + + } + + void load_decryption_certificate () + { + wxFileDialog* d = new wxFileDialog (_panel, _("Select Certificate File")); + + if (d->ShowModal() == wxID_OK) { + try { + dcp::Certificate c (dcp::file_to_string (wx_to_std (d->GetPath ()))); + Config::instance()->set_decryption_certificate (c); + update_decryption_certificate (); + } catch (dcp::MiscError& e) { + error_dialog (_panel, wxString::Format (_("Could not read certificate file (%s)"), e.what ())); + } + } + + d->Destroy (); + } + + void update_decryption_certificate () + { + _decryption_certificate->SetLabel (std_to_wx (Config::instance()->decryption_certificate().thumbprint ())); + } + + void load_decryption_private_key () + { + wxFileDialog* d = new wxFileDialog (_panel, _("Select Key File")); + + if (d->ShowModal() == wxID_OK) { + try { + boost::filesystem::path p (wx_to_std (d->GetPath ())); + Config::instance()->set_decryption_private_key (dcp::file_to_string (p)); + update_decryption_private_key (); + } catch (dcp::MiscError& e) { + error_dialog (_panel, wxString::Format (_("Could not read key file (%s)"), e.what ())); + } + } + + d->Destroy (); + } + + void update_decryption_private_key () + { + _decryption_private_key->SetLabel (std_to_wx (dcp::private_key_fingerprint (Config::instance()->decryption_private_key()))); + } + + void export_decryption_certificate () + { + wxFileDialog* d = new wxFileDialog ( + _panel, _("Select Certificate 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 = Config::instance()->decryption_certificate().certificate (true); + fwrite (s.c_str(), 1, s.length(), f); + fclose (f); + } + d->Destroy (); + } + + wxPanel* _panel; + wxListCtrl* _certificates; + wxButton* _add_certificate; + wxButton* _remove_certificate; + wxStaticText* _signer_private_key; + wxButton* _load_signer_private_key; + wxStaticText* _decryption_certificate; + wxButton* _load_decryption_certificate; + wxStaticText* _decryption_private_key; + wxButton* _load_decryption_private_key; + wxButton* _export_decryption_certificate; + shared_ptr _signer; +}; + class TMSPage : public wxPreferencesPage, public Page { public: @@ -697,23 +971,118 @@ public: #endif wxBoxSizer* s = new wxBoxSizer (wxVERTICAL); panel->SetSizer (s); + + wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + table->AddGrowableCol (1, 1); + s->Add (table, 1, wxEXPAND | wxALL, _border); + + add_label_to_sizer (table, panel, _("Outgoing mail server"), true); + _mail_server = new wxTextCtrl (panel, wxID_ANY); + table->Add (_mail_server, 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); + + wxStaticText* plain = add_label_to_sizer (table, panel, _("(password will be stored on disk in plaintext)"), false); + wxFont font = plain->GetFont(); + font.SetStyle (wxFONTSTYLE_ITALIC); + font.SetPointSize (font.GetPointSize() - 1); + plain->SetFont (font); + table->AddSpacer (0); + + 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); + _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); + table->Add (_kdm_cc, 1, wxEXPAND | wxALL); _kdm_email = new wxTextCtrl (panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (480, 128), wxTE_MULTILINE); s->Add (_kdm_email, 1, wxEXPAND | wxALL, _border); - + + _reset_kdm_email = new wxButton (panel, wxID_ANY, _("Reset to default text")); + s->Add (_reset_kdm_email, 0, wxEXPAND | wxALL, _border); + + Config* config = Config::instance (); + _mail_server->SetValue (std_to_wx (config->mail_server ())); + _mail_server->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::mail_server_changed, this)); + _mail_user->SetValue (std_to_wx (config->mail_user ())); + _mail_user->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::mail_user_changed, this)); + _mail_password->SetValue (std_to_wx (config->mail_password ())); + _mail_password->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::mail_password_changed, this)); + _kdm_subject->SetValue (std_to_wx (config->kdm_subject ())); + _kdm_subject->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_subject_changed, this)); + _kdm_from->SetValue (std_to_wx (config->kdm_from ())); + _kdm_from->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_from_changed, this)); + _kdm_cc->SetValue (std_to_wx (config->kdm_cc ())); + _kdm_cc->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_cc_changed, this)); _kdm_email->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_email_changed, this)); - _kdm_email->SetValue (wx_to_std (Config::instance()->kdm_email ())); + _kdm_email->SetValue (std_to_wx (Config::instance()->kdm_email ())); + _reset_kdm_email->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KDMEmailPage::reset_kdm_email, this)); return panel; } -private: +private: + void mail_server_changed () + { + Config::instance()->set_mail_server (wx_to_std (_mail_server->GetValue ())); + } + + void mail_user_changed () + { + Config::instance()->set_mail_user (wx_to_std (_mail_user->GetValue ())); + } + + void mail_password_changed () + { + Config::instance()->set_mail_password (wx_to_std (_mail_password->GetValue ())); + } + + void kdm_subject_changed () + { + Config::instance()->set_kdm_subject (wx_to_std (_kdm_subject->GetValue ())); + } + + void kdm_from_changed () + { + 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_email_changed () { Config::instance()->set_kdm_email (wx_to_std (_kdm_email->GetValue ())); } + void reset_kdm_email () + { + Config::instance()->reset_kdm_email (); + _kdm_email->SetValue (wx_to_std (Config::instance()->kdm_email ())); + } + + wxTextCtrl* _mail_server; + wxTextCtrl* _mail_user; + wxTextCtrl* _mail_password; + wxTextCtrl* _kdm_subject; + wxTextCtrl* _kdm_from; + wxTextCtrl* _kdm_cc; wxTextCtrl* _kdm_email; + wxButton* _reset_kdm_email; }; class AdvancedPage : public wxStockPreferencesPage, public Page @@ -735,10 +1104,15 @@ public: wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); table->AddGrowableCol (1, 1); s->Add (table, 1, wxALL | wxEXPAND, _border); - - add_label_to_sizer (table, panel, _("Maximum JPEG2000 bandwidth"), true); - _maximum_j2k_bandwidth = new wxSpinCtrl (panel); - table->Add (_maximum_j2k_bandwidth, 1); + + { + add_label_to_sizer (table, panel, _("Maximum JPEG2000 bandwidth"), true); + wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + _maximum_j2k_bandwidth = new wxSpinCtrl (panel); + s->Add (_maximum_j2k_bandwidth, 1); + add_label_to_sizer (s, panel, _("Mbit/s"), false); + table->Add (s, 1); + } _allow_any_dcp_frame_rate = new wxCheckBox (panel, wxID_ANY, _("Allow any DCP frame rate")); table->Add (_allow_any_dcp_frame_rate, 1, wxEXPAND | wxALL); @@ -753,7 +1127,7 @@ public: _log_error = new wxCheckBox (panel, wxID_ANY, _("Errors")); table->AddSpacer (0); table->Add (_log_error, 1, wxEXPAND | wxALL); - _log_timing = new wxCheckBox (panel, wxID_ANY, _("Timing")); + _log_timing = new wxCheckBox (panel, wxID_ANY, S_("Config|Timing")); table->AddSpacer (0); table->Add (_log_timing, 1, wxEXPAND | wxALL); @@ -764,13 +1138,13 @@ public: _maximum_j2k_bandwidth->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&AdvancedPage::maximum_j2k_bandwidth_changed, this)); _allow_any_dcp_frame_rate->SetValue (config->allow_any_dcp_frame_rate ()); _allow_any_dcp_frame_rate->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::allow_any_dcp_frame_rate_changed, this)); - _log_general->SetValue (config->log_types() & Log::GENERAL); + _log_general->SetValue (config->log_types() & Log::TYPE_GENERAL); _log_general->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::log_changed, this)); - _log_warning->SetValue (config->log_types() & Log::WARNING); + _log_warning->SetValue (config->log_types() & Log::TYPE_WARNING); _log_warning->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::log_changed, this)); - _log_error->SetValue (config->log_types() & Log::ERROR); + _log_error->SetValue (config->log_types() & Log::TYPE_ERROR); _log_error->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::log_changed, this)); - _log_timing->SetValue (config->log_types() & Log::TIMING); + _log_timing->SetValue (config->log_types() & Log::TYPE_TIMING); _log_timing->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::log_changed, this)); return panel; @@ -792,16 +1166,16 @@ private: { int types = 0; if (_log_general->GetValue ()) { - types |= Log::GENERAL; + types |= Log::TYPE_GENERAL; } if (_log_warning->GetValue ()) { - types |= Log::WARNING; + types |= Log::TYPE_WARNING; } if (_log_error->GetValue ()) { - types |= Log::ERROR; + types |= Log::TYPE_ERROR; } if (_log_timing->GetValue ()) { - types |= Log::TIMING; + types |= Log::TYPE_TIMING; } Config::instance()->set_log_types (types); } @@ -827,10 +1201,7 @@ create_config_dialog () wxSize ps = wxSize (480, -1); int const border = 16; #else - /* We seem to need to specify height here, otherwise the general panel - is too short (at least on Linux). - */ - wxSize ps = wxSize (-1, 400); + wxSize ps = wxSize (-1, -1); int const border = 8; #endif @@ -838,6 +1209,7 @@ create_config_dialog () e->AddPage (new DefaultsPage (ps, border)); e->AddPage (new EncodingServersPage (ps, border)); e->AddPage (new ColourConversionsPage (ps, border)); + e->AddPage (new KeysPage (ps, border)); e->AddPage (new TMSPage (ps, border)); e->AddPage (new KDMEmailPage (ps, border)); e->AddPage (new AdvancedPage (ps, border));