/*
- Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
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
* @brief A dialogue to edit DCP-o-matic configuration.
*/
-#include <iostream>
-#include <boost/lexical_cast.hpp>
-#include <boost/filesystem.hpp>
-#include <wx/stdpaths.h>
-#include <wx/preferences.h>
-#include <wx/filepicker.h>
-#include <wx/spinctrl.h>
-#include <dcp/exceptions.h>
-#include <dcp/signer.h>
+#include "config_dialog.h"
+#include "wx_util.h"
+#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"
#include "lib/dcp_content_type.h"
#include "lib/log.h"
#include "lib/util.h"
+#include "lib/raw_convert.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 "isdcf_metadata_dialog.h"
-#include "server_dialog.h"
-#include "make_signer_chain_dialog.h"
+#include "lib/jpeg2000_encoder.h"
+#include <dcp/exceptions.h>
+#include <dcp/certificate_chain.h>
+#include <wx/stdpaths.h>
+#include <wx/preferences.h>
+#include <wx/spinctrl.h>
+#include <wx/filepicker.h>
+#include <boost/filesystem.hpp>
+#include <boost/foreach.hpp>
+#include <iostream>
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
{
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"));
- table->Add (_language);
-
- wxStaticText* restart = add_label_to_sizer (table, _panel, _("(restart DCP-o-matic to see language changes)"), false);
+ vector<pair<string, string> > 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_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);
+
+ 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;
+
+ add_label_to_sizer (table, _panel, _("JPEG2000 encoder"), true, wxGBPosition (r, 0));
+ _encoder = new wxChoice (_panel, wxID_ANY);
+ BOOST_FOREACH (shared_ptr<JPEG2000Encoder> i, JPEG2000Encoder::all()) {
+ _encoder->Append (std_to_wx (i->name ()));
+ }
+ table->Add (_encoder, wxGBPosition (r, 1));
+ ++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_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") {
- _language->SetSelection (3);
- } else if (config->language().get_value_or ("") == "it") {
- _language->SetSelection (4);
- } else if (config->language().get_value_or ("") == "es") {
- _language->SetSelection (2);
- } else if (config->language().get_value_or ("") == "sv") {
- _language->SetSelection (6);
- } else if (config->language().get_value_or ("") == "de") {
- _language->SetSelection (0);
- } else if (config->language().get_value_or ("") == "nl") {
- _language->SetSelection (5);
- } else if (config->language().get_value_or ("") == "ru") {
- _language->SetSelection (7);
- } else if (config->language().get_value_or ("") == "pl") {
- checked_set (_language, 8);
- } else {
- _language->SetSelection (1);
+ checked_set (_set_language, static_cast<bool>(config->language()));
+
+ /* Backwards compatibility of config file */
+
+ map<string, string> 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_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 ();
+
+ if (!config->encoder ()) {
+ checked_set (_encoder, 0);
+ } else {
+ vector<shared_ptr<JPEG2000Encoder> > encoders = JPEG2000Encoder::all ();
+ for (size_t i = 0; i < encoders.size(); ++i) {
+ if (encoders[i]->id() == config->encoder().get ()) {
+ checked_set (_encoder, i);
+ }
+ }
+ }
}
- 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 {
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;
+ 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_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 ());
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_PATCHED_FFMPEG
+ wxCheckBox* _analyse_ebur128;
+#endif
+ wxCheckBox* _automatic_audio_analysis;
wxCheckBox* _check_for_updates;
wxCheckBox* _check_for_test_updates;
+ wxTextCtrl* _issuer;
+ wxTextCtrl* _creator;
+ wxChoice* _encoder;
};
class DefaultsPage : public StandardPage
}
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);
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 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));
_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));
+ _standard->Append (_("SMPTE"));
+ _standard->Append (_("Interop"));
+ _standard->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DefaultsPage::standard_changed, this));
}
void config_changed ()
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 (_standard, config->default_interop() ? 1 : 0);
}
void j2k_bandwidth_changed ()
void edit_isdcf_metadata_clicked ()
{
- ISDCFMetadataDialog* d = new ISDCFMetadataDialog (_panel, Config::instance()->default_isdcf_metadata ());
+ ISDCFMetadataDialog* d = new ISDCFMetadataDialog (_panel, Config::instance()->default_isdcf_metadata (), false);
d->ShowModal ();
Config::instance()->set_default_isdcf_metadata (d->isdcf_metadata ());
d->Destroy ();
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 ()));
+ 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;
+ wxChoice* _standard;
};
class EncodingServersPage : public StandardPage
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<string> columns;
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)
);
EditableList<string, ServerDialog>* _servers_list;
};
-class KeysPage : public StandardPage
+class CertificateChainEditor : public wxPanel
{
public:
- KeysPage (wxSize panel_size, int border)
- : StandardPage (panel_size, border)
- {}
+ CertificateChainEditor (
+ wxWindow* parent,
+ wxString title,
+ int border,
+ function<void (shared_ptr<dcp::CertificateChain>)> set,
+ function<shared_ptr<const dcp::CertificateChain> (void)> get
+ )
+ : wxPanel (parent)
+ , _set (set)
+ , _get (get)
+ {
+ wxFont subheading_font (*wxNORMAL_FONT);
+ subheading_font.SetWeight (wxFONTWEIGHT_BOLD);
+
+ _sizer = new wxBoxSizer (wxVERTICAL);
- wxString GetName () const
- {
- return _("Keys");
- }
-
-#ifdef DCPOMATIC_OSX
- wxBitmap GetLargeIcon () const
- {
- return wxBitmap ("keys", wxBITMAP_TYPE_PNG_RESOURCE);
- }
-#endif
-
-private:
- void setup ()
- {
- wxStaticText* m = new wxStaticText (_panel, wxID_ANY, _("Certificate chain for signing DCPs and KDMs:"));
- _panel->GetSizer()->Add (m, 0, wxALL, _border);
+ {
+ wxStaticText* m = new wxStaticText (this, wxID_ANY, title);
+ m->SetFont (subheading_font);
+ _sizer->Add (m, 0, wxALL, border);
+ }
wxBoxSizer* certificates_sizer = new wxBoxSizer (wxHORIZONTAL);
- _panel->GetSizer()->Add (certificates_sizer, 0, wxLEFT | wxRIGHT, _border);
+ _sizer->Add (certificates_sizer, 0, wxLEFT | wxRIGHT, border);
- _certificates = new wxListCtrl (_panel, wxID_ANY, wxDefaultPosition, wxSize (400, 200), wxLC_REPORT | wxLC_SINGLE_SEL);
+ _certificates = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize (440, 150), wxLC_REPORT | wxLC_SINGLE_SEL);
{
wxListItem ip;
wxListItem ip;
ip.SetId (1);
ip.SetText (_("Thumbprint"));
- ip.SetWidth (300);
+ ip.SetWidth (340);
wxFont font = ip.GetFont ();
font.SetFamily (wxFONTFAMILY_TELETYPE);
{
wxSizer* s = new wxBoxSizer (wxVERTICAL);
- _add_certificate = new wxButton (_panel, wxID_ANY, _("Add..."));
+ _add_certificate = new wxButton (this, wxID_ANY, _("Add..."));
s->Add (_add_certificate, 0, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
- _remove_certificate = new wxButton (_panel, wxID_ANY, _("Remove"));
+ _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);
}
wxGridBagSizer* table = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
- _panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border);
-
+ _sizer->Add (table, 1, wxALL | wxEXPAND, border);
int r = 0;
- _remake_certificates = new wxButton (_panel, wxID_ANY, _("Re-make certificates..."));
- table->Add (_remake_certificates, wxGBPosition (r, 0), wxGBSpan (1, 3));
- ++r;
-
- add_label_to_grid_bag_sizer (table, _panel, _("Private key for leaf certificate"), true, wxGBPosition (r, 0));
- _signer_private_key = new wxStaticText (_panel, wxID_ANY, wxT (""));
- wxFont font = _signer_private_key->GetFont ();
+ 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);
- _signer_private_key->SetFont (font);
- table->Add (_signer_private_key, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
- _load_signer_private_key = new wxButton (_panel, wxID_ANY, _("Load..."));
- table->Add (_load_signer_private_key, wxGBPosition (r, 2));
- ++r;
-
- add_label_to_grid_bag_sizer (table, _panel, _("Certificate for decrypting DCPs"), true, wxGBPosition (r, 0));
- _decryption_certificate = new wxStaticText (_panel, wxID_ANY, wxT (""));
- _decryption_certificate->SetFont (font);
- table->Add (_decryption_certificate, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
- _load_decryption_certificate = new wxButton (_panel, wxID_ANY, _("Load..."));
- table->Add (_load_decryption_certificate, wxGBPosition (r, 2));
+ _private_key->SetFont (font);
+ 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;
- add_label_to_grid_bag_sizer (table, _panel, _("Private key for decrypting DCPs"), true, wxGBPosition (r, 0));
- _decryption_private_key = new wxStaticText (_panel, wxID_ANY, wxT (""));
- _decryption_private_key->SetFont (font);
- table->Add (_decryption_private_key, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
- _load_decryption_private_key = new wxButton (_panel, wxID_ANY, _("Load..."));
- table->Add (_load_decryption_private_key, wxGBPosition (r, 2));
+ _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, 4));
++r;
- _export_decryption_certificate = new wxButton (_panel, wxID_ANY, _("Export DCP decryption certificate..."));
- table->Add (_export_decryption_certificate, wxGBPosition (r, 0), wxGBSpan (1, 3));
- ++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));
- _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));
- _remake_certificates->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KeysPage::remake_certificates, 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));
+ SetSizerAndFit (_sizer);
}
void config_changed ()
{
- _signer.reset (new dcp::Signer (*Config::instance()->signer().get ()));
+ _chain.reset (new dcp::CertificateChain (*_get().get ()));
update_certificate_list ();
- update_signer_private_key ();
- update_decryption_certificate ();
- update_decryption_private_key ();
+ update_private_key ();
update_sensitivity ();
}
+ void add_button (wxWindow* button)
+ {
+ _button_sizer->Add (button);
+ _sizer->Layout ();
+ }
+
+private:
void add_certificate ()
{
- wxFileDialog* d = new wxFileDialog (_panel, _("Select Certificate File"));
+ wxFileDialog* d = new wxFileDialog (this, _("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);
+ _chain->add (c);
+ _set (_chain);
update_certificate_list ();
} catch (dcp::MiscError& e) {
- error_dialog (_panel, wxString::Format (_("Could not read certificate file (%s)"), e.what ()));
+ error_dialog (this, wxString::Format (_("Could not read certificate file (%s)"), e.what ()));
}
}
}
_certificates->DeleteItem (i);
- _signer->certificates().remove (i);
- Config::instance()->set_signer (_signer);
+ _chain->remove (i);
+ _set (_chain);
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 ();
- 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) {
+ dcp::CertificateChain::List certs = _chain->root_to_leaf ();
+ BOOST_FOREACH (dcp::Certificate const & i, certs) {
wxListItem item;
item.SetId (n);
_certificates->InsertItem (item);
- _certificates->SetItem (n, 1, std_to_wx (i->thumbprint ()));
+ _certificates->SetItem (n, 1, std_to_wx (i.thumbprint ()));
if (n == 0) {
_certificates->SetItem (n, 0, _("Root"));
void remake_certificates ()
{
- MakeSignerChainDialog* d = new MakeSignerChainDialog (_panel);
+ shared_ptr<const dcp::CertificateChain> chain = _get ();
+
+ string subject_organization_name;
+ string subject_organizational_unit_name;
+ string root_common_name;
+ string intermediate_common_name;
+ 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 ();
+ }
+
+ MakeChainDialog* d = new MakeChainDialog (
+ this,
+ subject_organization_name,
+ subject_organizational_unit_name,
+ root_common_name,
+ intermediate_common_name,
+ leaf_common_name
+ );
+
if (d->ShowModal () == wxID_OK) {
- _signer.reset (
- new dcp::Signer (
+ _chain.reset (
+ new dcp::CertificateChain (
openssl_path (),
d->organisation (),
d->organisational_unit (),
)
);
- Config::instance()->set_signer (_signer);
+ _set (_chain);
update_certificate_list ();
- update_signer_private_key ();
+ update_private_key ();
}
d->Destroy ();
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_signer_private_key ()
+ void update_private_key ()
{
- checked_set (_signer_private_key, dcp::private_key_fingerprint (_signer->key ()));
+ checked_set (_private_key, dcp::private_key_fingerprint (_chain->key().get ()));
+ _sizer->Layout ();
}
- void load_signer_private_key ()
+ void load_private_key ()
{
- wxFileDialog* d = new wxFileDialog (_panel, _("Select Key File"));
+ wxFileDialog* d = new wxFileDialog (this, _("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 ())));
+ error_dialog (this, 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 ();
+ _chain->set_key (dcp::file_to_string (p));
+ _set (_chain);
+ update_private_key ();
} catch (dcp::MiscError& e) {
- error_dialog (_panel, wxString::Format (_("Could not read certificate file (%s)"), e.what ()));
+ error_dialog (this, wxString::Format (_("Could not read certificate file (%s)"), e.what ()));
}
}
d->Destroy ();
update_sensitivity ();
-
}
- void load_decryption_certificate ()
+ void export_private_key ()
{
- wxFileDialog* d = new wxFileDialog (_panel, _("Select Certificate File"));
+ optional<string> key = _chain->key ();
+ if (!key) {
+ return;
+ }
- 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 ()));
+ 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 ();
}
- void update_decryption_certificate ()
+ 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<dcp::CertificateChain> _chain;
+ boost::function<void (shared_ptr<dcp::CertificateChain>)> _set;
+ boost::function<shared_ptr<const dcp::CertificateChain> (void)> _get;
+};
+
+class KeysPage : public StandardPage
+{
+public:
+ KeysPage (wxSize panel_size, int border)
+ : StandardPage (panel_size, border)
+ {}
+
+ wxString GetName () const
{
- checked_set (_decryption_certificate, Config::instance()->decryption_certificate().thumbprint ());
+ return _("Keys");
}
- void load_decryption_private_key ()
+#ifdef DCPOMATIC_OSX
+ wxBitmap GetLargeIcon () const
{
- 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 ();
+ return wxBitmap ("keys", wxBITMAP_TYPE_PNG_RESOURCE);
}
+#endif
- void update_decryption_private_key ()
+private:
+
+ void setup ()
{
- checked_set (_decryption_private_key, dcp::private_key_fingerprint (Config::instance()->decryption_private_key()));
+ _signer = new CertificateChainEditor (
+ _panel, _("Signing DCPs and KDMs"), _border,
+ boost::bind (&Config::set_signer_chain, Config::instance (), _1),
+ boost::bind (&Config::signer_chain, Config::instance ())
+ );
+
+ _panel->GetSizer()->Add (_signer);
+
+ _decryption = new CertificateChainEditor (
+ _panel, _("Decrypting DCPs"), _border,
+ boost::bind (&Config::set_decryption_chain, Config::instance (), _1),
+ boost::bind (&Config::decryption_chain, Config::instance ())
+ );
+
+ _panel->GetSizer()->Add (_decryption);
+
+ _export_decryption_certificate = new wxButton (_decryption, wxID_ANY, _("Export DCP decryption certificate..."));
+ _decryption->add_button (_export_decryption_certificate);
+
+ _export_decryption_certificate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KeysPage::export_decryption_certificate, this));
}
void export_decryption_certificate ()
throw OpenFileError (wx_to_std (d->GetPath ()));
}
- string const s = Config::instance()->decryption_certificate().certificate (true);
+ string const s = Config::instance()->decryption_chain()->leaf().certificate (true);
fwrite (s.c_str(), 1, s.length(), f);
fclose (f);
}
d->Destroy ();
}
- wxListCtrl* _certificates;
- wxButton* _add_certificate;
- wxButton* _remove_certificate;
- wxButton* _remake_certificates;
- 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;
+ void config_changed ()
+ {
+ _signer->config_changed ();
+ _decryption->config_changed ();
+ }
+
+ CertificateChainEditor* _signer;
+ CertificateChainEditor* _decryption;
wxButton* _export_decryption_certificate;
- shared_ptr<dcp::Signer> _signer;
};
class TMSPage : public StandardPage
table->AddGrowableCol (1, 1);
_panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border);
+ add_label_to_sizer (table, _panel, _("Protocol"), true);
+ _tms_protocol = new wxChoice (_panel, wxID_ANY);
+ table->Add (_tms_protocol, 1, wxEXPAND);
+
add_label_to_sizer (table, _panel, _("IP address"), true);
_tms_ip = new wxTextCtrl (_panel, wxID_ANY);
table->Add (_tms_ip, 1, wxEXPAND);
_tms_password = new wxTextCtrl (_panel, wxID_ANY);
table->Add (_tms_password, 1, wxEXPAND);
+ _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));
_tms_ip->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&TMSPage::tms_ip_changed, this));
_tms_path->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&TMSPage::tms_path_changed, this));
_tms_user->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&TMSPage::tms_user_changed, this));
{
Config* config = Config::instance ();
+ checked_set (_tms_protocol, config->tms_protocol ());
checked_set (_tms_ip, config->tms_ip ());
checked_set (_tms_path, config->tms_path ());
checked_set (_tms_user, config->tms_user ());
checked_set (_tms_password, config->tms_password ());
}
+ void tms_protocol_changed ()
+ {
+ Config::instance()->set_tms_protocol (static_cast<Protocol> (_tms_protocol->GetSelection ()));
+ }
+
void tms_ip_changed ()
{
Config::instance()->set_tms_ip (wx_to_std (_tms_ip->GetValue ()));
Config::instance()->set_tms_password (wx_to_std (_tms_password->GetValue ()));
}
+ wxChoice* _tms_protocol;
wxTextCtrl* _tms_ip;
wxTextCtrl* _tms_path;
wxTextCtrl* _tms_user;
wxTextCtrl* _tms_password;
};
+static string
+column (string s)
+{
+ return s;
+}
+
class KDMEmailPage : public StandardPage
{
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
{}
_panel->GetSizer()->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);
+ {
+ 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);
_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);
_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<string> columns;
+ columns.push_back (wx_to_std (_("Address")));
+ add_label_to_sizer (table, _panel, _("CC addresses"), true);
+ _kdm_cc = new EditableList<string, EmailDialog> (
+ _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));
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_cc, config->kdm_cc ());
checked_set (_kdm_bcc, config->kdm_bcc ());
checked_set (_kdm_email, Config::instance()->kdm_email ());
}
Config::instance()->set_mail_server (wx_to_std (_mail_server->GetValue ()));
}
+ void mail_port_changed ()
+ {
+ Config::instance()->set_mail_port (_mail_port->GetValue ());
+ }
+
void mail_user_changed ()
{
Config::instance()->set_mail_user (wx_to_std (_mail_user->GetValue ()));
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 ()));
}
wxTextCtrl* _mail_server;
+ wxSpinCtrl* _mail_port;
wxTextCtrl* _mail_user;
wxTextCtrl* _mail_password;
wxTextCtrl* _kdm_subject;
wxTextCtrl* _kdm_from;
- wxTextCtrl* _kdm_cc;
+ EditableList<string, EmailDialog>* _kdm_cc;
wxTextCtrl* _kdm_bcc;
wxTextCtrl* _kdm_email;
wxButton* _reset_kdm_email;
: StockPage (Kind_Advanced, panel_size, border)
, _maximum_j2k_bandwidth (0)
, _allow_any_dcp_frame_rate (0)
+ , _only_servers_encode (0)
, _log_general (0)
, _log_warning (0)
, _log_error (0)
, _log_timing (0)
, _log_debug_decode (0)
, _log_debug_encode (0)
+ , _log_debug_email (0)
{}
private:
table->Add (_allow_any_dcp_frame_rate, 1, wxEXPAND | wxALL);
table->AddSpacer (0);
+ _only_servers_encode = new wxCheckBox (_panel, wxID_ANY, _("Only servers encode"));
+ table->Add (_only_servers_encode, 1, wxEXPAND | wxALL);
+ table->AddSpacer (0);
+
#ifdef __WXOSX__
wxStaticText* m = new wxStaticText (_panel, wxID_ANY, _("Log:"));
table->Add (m, 0, wxALIGN_TOP | wxLEFT | wxRIGHT | wxEXPAND | wxALL | wxALIGN_RIGHT, 6);
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);
}
_maximum_j2k_bandwidth->SetRange (1, 1000);
_maximum_j2k_bandwidth->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&AdvancedPage::maximum_j2k_bandwidth_changed, this));
_allow_any_dcp_frame_rate->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::allow_any_dcp_frame_rate_changed, this));
+ _only_servers_encode->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::only_servers_encode_changed, this));
_log_general->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::log_changed, this));
_log_warning->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::log_changed, this));
_log_error->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::log_changed, this));
_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
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 (_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 (_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_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
Config::instance()->set_allow_any_dcp_frame_rate (_allow_any_dcp_frame_rate->GetValue ());
}
+ void only_servers_encode_changed ()
+ {
+ Config::instance()->set_only_servers_encode (_only_servers_encode->GetValue ());
+ }
+
void log_changed ()
{
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);
}
wxSpinCtrl* _maximum_j2k_bandwidth;
wxCheckBox* _allow_any_dcp_frame_rate;
+ wxCheckBox* _only_servers_encode;
wxCheckBox* _log_general;
wxCheckBox* _log_warning;
wxCheckBox* _log_error;
wxCheckBox* _log_timing;
wxCheckBox* _log_debug_decode;
wxCheckBox* _log_debug_encode;
+ wxCheckBox* _log_debug_email;
#ifdef DCPOMATIC_WINDOWS
wxCheckBox* _win32_console;
#endif