X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fconfig_dialog.cc;h=f35c9adc9fc8288eea5944176de7c9ef01dd5dfb;hp=5d1b32038290549b5263b2fc0f83aac43b6db454;hb=c658aec3ffd5009cbe7fa2540da5a0579e2f2e8c;hpb=ab3d0c5040bbf4d40790ad91990f0f2b6aa8e838 diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc index 5d1b32038..f35c9adc9 100644 --- a/src/wx/config_dialog.cc +++ b/src/wx/config_dialog.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,28 +21,33 @@ * @brief A dialogue to edit DCP-o-matic configuration. */ -#include -#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 "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 "preset_colour_conversion_dialog.h" #include "server_dialog.h" +#include "make_chain_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 +#include +#include +#include +#include +#include +#include +#include +#include +#include using std::vector; using std::string; @@ -51,41 +56,106 @@ using std::cout; using boost::bind; using boost::shared_ptr; using boost::lexical_cast; +using boost::function; class Page { public: Page (wxSize panel_size, int border) - : _panel_size (panel_size) - , _border (border) - {} + : _border (border) + , _panel (0) + , _panel_size (panel_size) + , _window_exists (false) + { + _config_connection = Config::instance()->Changed.connect (boost::bind (&Page::config_changed_wrapper, this)); + } + + virtual ~Page () {} protected: - wxSize _panel_size; + wxWindow* create_window (wxWindow* parent) + { + _panel = new wxPanel (parent, wxID_ANY, wxDefaultPosition, _panel_size); + wxBoxSizer* s = new wxBoxSizer (wxVERTICAL); + _panel->SetSizer (s); + + setup (); + _window_exists = true; + config_changed (); + + _panel->Bind (wxEVT_DESTROY, boost::bind (&Page::window_destroyed, this)); + + return _panel; + } + int _border; + wxPanel* _panel; + +private: + virtual void config_changed () = 0; + virtual void setup () = 0; + + void config_changed_wrapper () + { + if (_window_exists) { + config_changed (); + } + } + + void window_destroyed () + { + _window_exists = false; + } + + wxSize _panel_size; + boost::signals2::scoped_connection _config_connection; + bool _window_exists; }; -class GeneralPage : public wxStockPreferencesPage, public Page +class StockPage : public wxStockPreferencesPage, public Page { public: - GeneralPage (wxSize panel_size, int border) - : wxStockPreferencesPage (Kind_General) + StockPage (Kind kind, wxSize panel_size, int border) + : wxStockPreferencesPage (kind) , Page (panel_size, border) {} wxWindow* CreateWindow (wxWindow* parent) { - wxPanel* panel = new wxPanel (parent); - wxBoxSizer* s = new wxBoxSizer (wxVERTICAL); - panel->SetSizer (s); + return create_window (parent); + } +}; - wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); - table->AddGrowableCol (1, 1); - s->Add (table, 1, wxALL | wxEXPAND, _border); - - _set_language = new wxCheckBox (panel, wxID_ANY, _("Set language")); - table->Add (_set_language, 1); - _language = new wxChoice (panel, wxID_ANY); +class StandardPage : public wxPreferencesPage, public Page +{ +public: + StandardPage (wxSize panel_size, int border) + : Page (panel_size, border) + {} + + wxWindow* CreateWindow (wxWindow* parent) + { + return create_window (parent); + } +}; + +class GeneralPage : public StockPage +{ +public: + GeneralPage (wxSize panel_size, int border) + : StockPage (Kind_General, panel_size, border) + {} + +private: + void setup () + { + 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, wxGBPosition (r, 0)); + _language = new wxChoice (_panel, wxID_ANY); _language->Append (wxT ("Deutsch")); _language->Append (wxT ("English")); _language->Append (wxT ("Español")); @@ -93,66 +163,104 @@ public: _language->Append (wxT ("Italiano")); _language->Append (wxT ("Nederlands")); _language->Append (wxT ("Svenska")); - table->Add (_language); - - wxStaticText* restart = add_label_to_sizer (table, panel, _("(restart DCP-o-matic to see language changes)"), false); + _language->Append (wxT ("Русский")); + _language->Append (wxT ("Polski")); + _language->Append (wxT ("Danske")); + table->Add (_language, wxGBPosition (r, 1)); + ++r; + + wxStaticText* restart = add_label_to_grid_bag_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); - - add_label_to_sizer (table, panel, _("Threads to use for encoding on this host"), true); - _num_local_encoding_threads = new wxSpinCtrl (panel); - table->Add (_num_local_encoding_threads, 1); - - - _check_for_updates = new wxCheckBox (panel, wxID_ANY, _("Check for updates on startup")); - table->Add (_check_for_updates, 1, wxEXPAND | wxALL); - table->AddSpacer (0); - - _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); - + ++r; + + add_label_to_grid_bag_sizer (table, _panel, _("Threads to use for encoding on this host"), true, wxGBPosition (r, 0)); + _num_local_encoding_threads = new wxSpinCtrl (_panel); + table->Add (_num_local_encoding_threads, wxGBPosition (r, 1)); + ++r; + + _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, 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, 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; + + _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)); + + _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)); + + _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 (); - - _set_language->SetValue (config->language ()); - + + checked_set (_set_language, static_cast(config->language())); + if (config->language().get_value_or ("") == "fr") { - _language->SetSelection (3); + checked_set (_language, 3); } else if (config->language().get_value_or ("") == "it") { - _language->SetSelection (4); + checked_set (_language, 4); } else if (config->language().get_value_or ("") == "es") { - _language->SetSelection (2); + checked_set (_language, 2); } else if (config->language().get_value_or ("") == "sv") { - _language->SetSelection (6); + checked_set (_language, 6); } else if (config->language().get_value_or ("") == "de") { - _language->SetSelection (0); + checked_set (_language, 0); } else if (config->language().get_value_or ("") == "nl") { - _language->SetSelection (5); + 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); } - + setup_language_sensitivity (); - - _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)); - - _num_local_encoding_threads->SetRange (1, 128); - _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)); - _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 ()); - _check_for_test_updates->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&GeneralPage::check_for_test_updates_changed, this)); - - return panel; + checked_set (_num_local_encoding_threads, config->num_local_encoding_threads ()); + 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 ()); } -private: void setup_language_sensitivity () { _language->Enable (_set_language->GetValue ()); @@ -192,14 +300,28 @@ private: 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; } } - + + 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 ()); } - + void check_for_test_updates_changed () { Config::instance()->set_check_for_test_updates (_check_for_test_updates->GetValue ()); @@ -210,154 +332,166 @@ 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 ())); + } + wxCheckBox* _set_language; wxChoice* _language; wxSpinCtrl* _num_local_encoding_threads; + wxCheckBox* _automatic_audio_analysis; wxCheckBox* _check_for_updates; wxCheckBox* _check_for_test_updates; + wxTextCtrl* _issuer; + wxTextCtrl* _creator; }; -class DefaultsPage : public wxPreferencesPage, public Page +class DefaultsPage : public StandardPage { public: DefaultsPage (wxSize panel_size, int border) - : Page (panel_size, border) + : StandardPage (panel_size, border) {} - + wxString GetName () const { return _("Defaults"); } -#ifdef DCPOMATIC_OSX +#ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const { return wxBitmap ("defaults", wxBITMAP_TYPE_PNG_RESOURCE); } -#endif +#endif - wxWindow* CreateWindow (wxWindow* parent) +private: + void setup () { - wxPanel* panel = new wxPanel (parent); - 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, wxALL | wxEXPAND, _border); - + _panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border); + { - add_label_to_sizer (table, panel, _("Default duration of still images"), true); + add_label_to_sizer (table, _panel, _("Default duration of still images"), true); wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - _still_length = new wxSpinCtrl (panel); + _still_length = new wxSpinCtrl (_panel); s->Add (_still_length); - add_label_to_sizer (s, panel, _("s"), false); + add_label_to_sizer (s, _panel, _("s"), false); table->Add (s, 1); } - - add_label_to_sizer (table, panel, _("Default directory for new films"), true); -#ifdef DCPOMATIC_USE_OWN_DIR_PICKER - _directory = new DirPickerCtrl (panel); -#else - _directory = new wxDirPickerCtrl (panel, wxDD_DIR_MUST_EXIST); + + add_label_to_sizer (table, _panel, _("Default directory for new films"), true); +#ifdef DCPOMATIC_USE_OWN_PICKER + _directory = new DirPickerCtrl (_panel); +#else + _directory = new wxDirPickerCtrl (_panel, wxDD_DIR_MUST_EXIST); #endif table->Add (_directory, 1, wxEXPAND); - - add_label_to_sizer (table, panel, _("Default ISDCF name details"), true); - _isdcf_metadata_button = new wxButton (panel, wxID_ANY, _("Edit...")); + + add_label_to_sizer (table, _panel, _("Default ISDCF name details"), true); + _isdcf_metadata_button = new wxButton (_panel, wxID_ANY, _("Edit...")); table->Add (_isdcf_metadata_button); - - add_label_to_sizer (table, panel, _("Default container"), true); - _container = new wxChoice (panel, wxID_ANY); + + add_label_to_sizer (table, _panel, _("Default container"), true); + _container = new wxChoice (_panel, wxID_ANY); table->Add (_container); - - add_label_to_sizer (table, panel, _("Default content type"), true); - _dcp_content_type = new wxChoice (panel, wxID_ANY); + + add_label_to_sizer (table, _panel, _("Default content type"), true); + _dcp_content_type = new wxChoice (_panel, wxID_ANY); table->Add (_dcp_content_type); - + { - add_label_to_sizer (table, panel, _("Default JPEG2000 bandwidth"), true); + add_label_to_sizer (table, _panel, _("Default JPEG2000 bandwidth"), true); wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - _j2k_bandwidth = new wxSpinCtrl (panel); + _j2k_bandwidth = new wxSpinCtrl (_panel); s->Add (_j2k_bandwidth); - add_label_to_sizer (s, panel, _("Mbit/s"), false); + add_label_to_sizer (s, _panel, _("Mbit/s"), false); table->Add (s, 1); } - + { - add_label_to_sizer (table, panel, _("Default audio delay"), true); + add_label_to_sizer (table, _panel, _("Default audio delay"), true); wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - _audio_delay = new wxSpinCtrl (panel); + _audio_delay = new wxSpinCtrl (_panel); s->Add (_audio_delay); - add_label_to_sizer (s, panel, _("ms"), false); + add_label_to_sizer (s, _panel, _("ms"), false); 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); - add_label_to_sizer (table, panel, _("Default creator"), true); - _creator = new wxTextCtrl (panel, wxID_ANY); - table->Add (_creator, 1, wxEXPAND); - - Config* config = Config::instance (); - _still_length->SetRange (1, 3600); - _still_length->SetValue (config->default_still_length ()); _still_length->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&DefaultsPage::still_length_changed, this)); - - _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)); - - _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) { - _container->Append (std_to_wx ((*i)->nickname ())); - if (*i == config->default_container ()) { - _container->SetSelection (n); - } - ++n; + + _isdcf_metadata_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DefaultsPage::edit_isdcf_metadata_clicked, this)); + + vector ratios = Ratio::all (); + for (size_t i = 0; i < ratios.size(); ++i) { + _container->Append (std_to_wx (ratios[i]->nickname ())); } - + _container->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DefaultsPage::container_changed, this)); - + vector const ct = DCPContentType::all (); - n = 0; - for (vector::const_iterator i = ct.begin(); i != ct.end(); ++i) { - _dcp_content_type->Append (std_to_wx ((*i)->pretty_name ())); - if (*i == config->default_dcp_content_type ()) { - _dcp_content_type->SetSelection (n); - } - ++n; + for (size_t i = 0; i < ct.size(); ++i) { + _dcp_content_type->Append (std_to_wx (ct[i]->pretty_name ())); } - + _dcp_content_type->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DefaultsPage::dcp_content_type_changed, this)); - + _j2k_bandwidth->SetRange (50, 250); - _j2k_bandwidth->SetValue (config->default_j2k_bandwidth() / 1000000); _j2k_bandwidth->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&DefaultsPage::j2k_bandwidth_changed, this)); - + _audio_delay->SetRange (-1000, 1000); - _audio_delay->SetValue (config->default_audio_delay ()); _audio_delay->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&DefaultsPage::audio_delay_changed, this)); - _issuer->SetValue (std_to_wx (config->dcp_metadata().issuer)); - _issuer->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&DefaultsPage::issuer_changed, this)); - _creator->SetValue (std_to_wx (config->dcp_metadata().creator)); - _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 () + { + Config* config = Config::instance (); + + vector ratios = Ratio::all (); + for (size_t i = 0; i < ratios.size(); ++i) { + if (ratios[i] == config->default_container ()) { + _container->SetSelection (i); + } + } - return panel; + vector const ct = DCPContentType::all (); + for (size_t i = 0; i < ct.size(); ++i) { + if (ct[i] == config->default_dcp_content_type ()) { + _dcp_content_type->SetSelection (i); + } + } + + checked_set (_still_length, config->default_still_length ()); + _directory->SetPath (std_to_wx (config->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir())).string ())); + 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 (_standard, config->default_interop() ? 1 : 0); } -private: void j2k_bandwidth_changed () { Config::instance()->set_default_j2k_bandwidth (_j2k_bandwidth->GetValue() * 1000000); } - + void audio_delay_changed () { Config::instance()->set_default_audio_delay (_audio_delay->GetValue()); @@ -368,9 +502,9 @@ private: Config::instance()->set_default_directory (wx_to_std (_directory->GetPath ())); } - void edit_isdcf_metadata_clicked (wxWindow* parent) + void edit_isdcf_metadata_clicked () { - ISDCFMetadataDialog* d = new ISDCFMetadataDialog (parent, 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 (); @@ -380,95 +514,83 @@ private: { Config::instance()->set_default_still_length (_still_length->GetValue ()); } - + void container_changed () { vector ratio = Ratio::all (); Config::instance()->set_default_container (ratio[_container->GetSelection()]); } - + void dcp_content_type_changed () { vector ct = DCPContentType::all (); Config::instance()->set_default_dcp_content_type (ct[_dcp_content_type->GetSelection()]); } - void issuer_changed () - { - libdcp::XMLMetadata m = Config::instance()->dcp_metadata (); - m.issuer = wx_to_std (_issuer->GetValue ()); - Config::instance()->set_dcp_metadata (m); - } - - void creator_changed () + void standard_changed () { - libdcp::XMLMetadata m = Config::instance()->dcp_metadata (); - m.creator = wx_to_std (_creator->GetValue ()); - Config::instance()->set_dcp_metadata (m); + 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 wxPreferencesPage, public Page +class EncodingServersPage : public StandardPage { public: EncodingServersPage (wxSize panel_size, int border) - : Page (panel_size, border) + : StandardPage (panel_size, border) {} - + wxString GetName () const { return _("Servers"); } -#ifdef DCPOMATIC_OSX +#ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const { return wxBitmap ("servers", wxBITMAP_TYPE_PNG_RESOURCE); } -#endif +#endif - wxWindow* CreateWindow (wxWindow* parent) +private: + void setup () { - wxPanel* panel = new wxPanel (parent, wxID_ANY, wxDefaultPosition, _panel_size); - wxBoxSizer* s = new wxBoxSizer (wxVERTICAL); - panel->SetSizer (s); - - _use_any_servers = new wxCheckBox (panel, wxID_ANY, _("Use all servers")); - s->Add (_use_any_servers, 0, wxALL, _border); - + _use_any_servers = new wxCheckBox (_panel, wxID_ANY, _("Use all servers")); + _panel->GetSizer()->Add (_use_any_servers, 0, wxALL, _border); + vector columns; columns.push_back (wx_to_std (_("IP address / host name"))); _servers_list = new EditableList ( - panel, + _panel, columns, boost::bind (&Config::servers, Config::instance()), boost::bind (&Config::set_servers, Config::instance(), _1), boost::bind (&EncodingServersPage::server_column, this, _1) ); - - s->Add (_servers_list, 1, wxEXPAND | wxALL, _border); - - _use_any_servers->SetValue (Config::instance()->use_any_servers ()); - _use_any_servers->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&EncodingServersPage::use_any_servers_changed, this)); - return panel; + _panel->GetSizer()->Add (_servers_list, 1, wxEXPAND | wxALL, _border); + + _use_any_servers->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&EncodingServersPage::use_any_servers_changed, this)); } -private: + void config_changed () + { + checked_set (_use_any_servers, Config::instance()->use_any_servers ()); + _servers_list->refresh (); + } void use_any_servers_changed () { @@ -484,57 +606,397 @@ private: EditableList* _servers_list; }; -class ColourConversionsPage : public wxPreferencesPage, public Page +class CertificateChainEditor : public wxPanel { public: - ColourConversionsPage (wxSize panel_size, int border) - : Page (panel_size, border) + CertificateChainEditor ( + wxWindow* parent, + wxString title, + int border, + function)> set, + function (void)> get + ) + : wxPanel (parent) + , _set (set) + , _get (get) + { + wxFont subheading_font (*wxNORMAL_FONT); + subheading_font.SetWeight (wxFONTWEIGHT_BOLD); + + _sizer = new wxBoxSizer (wxVERTICAL); + + { + wxStaticText* m = new wxStaticText (this, wxID_ANY, title); + m->SetFont (subheading_font); + _sizer->Add (m, 0, wxALL, border); + } + + 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); + + { + 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 (this, wxID_ANY, _("Add...")); + 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); + } + + wxGridBagSizer* table = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + _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)); + _private_key = new wxStaticText (this, wxID_ANY, wxT ("")); + wxFont font = _private_key->GetFont (); + font.SetFamily (wxFONTFAMILY_TELETYPE); + _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)); + ++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)); + ++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)); + + SetSizerAndFit (_sizer); + } + + void config_changed () + { + _chain.reset (new dcp::CertificateChain (*_get().get ())); + + update_certificate_list (); + update_private_key (); + update_sensitivity (); + } + + void add_button (wxWindow* button) + { + _button_sizer->Add (button); + _sizer->Layout (); + } + +private: + void add_certificate () + { + 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 ()))); + _chain->add (c); + _set (_chain); + update_certificate_list (); + } catch (dcp::MiscError& e) { + error_dialog (this, 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); + _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 (); + size_t n = 0; + 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 ())); + + 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 remake_certificates () + { + shared_ptr 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) { + _chain.reset ( + new dcp::CertificateChain ( + openssl_path (), + d->organisation (), + d->organisational_unit (), + d->root_common_name (), + d->intermediate_common_name (), + d->leaf_common_name () + ) + ); + + _set (_chain); + update_certificate_list (); + 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_private_key () + { + checked_set (_private_key, dcp::private_key_fingerprint (_chain->key().get ())); + _sizer->Layout (); + } + + void load_private_key () + { + 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 (this, wxString::Format (_("Could not read key file (%s)"), std_to_wx (p.string ()))); + return; + } + + _chain->set_key (dcp::file_to_string (p)); + _set (_chain); + update_private_key (); + } catch (dcp::MiscError& e) { + error_dialog (this, wxString::Format (_("Could not read certificate file (%s)"), e.what ())); + } + } + + d->Destroy (); + + update_sensitivity (); + } + + wxListCtrl* _certificates; + wxButton* _add_certificate; + wxButton* _export_certificate; + wxButton* _remove_certificate; + wxButton* _remake_certificates; + wxStaticText* _private_key; + wxButton* _load_private_key; + wxSizer* _sizer; + wxBoxSizer* _button_sizer; + shared_ptr _chain; + boost::function)> _set; + boost::function (void)> _get; +}; + +class KeysPage : public StandardPage +{ +public: + KeysPage (wxSize panel_size, int border) + : StandardPage (panel_size, border) {} - + wxString GetName () const { - return _("Colour Conversions"); + return _("Keys"); } -#ifdef DCPOMATIC_OSX +#ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const { - return wxBitmap ("colour_conversions", wxBITMAP_TYPE_PNG_RESOURCE); + return wxBitmap ("keys", wxBITMAP_TYPE_PNG_RESOURCE); } -#endif - wxWindow* CreateWindow (wxWindow* parent) +#endif + +private: + + void setup () { - wxPanel* panel = new wxPanel (parent, wxID_ANY, wxDefaultPosition, _panel_size); - wxBoxSizer* s = new wxBoxSizer (wxVERTICAL); - panel->SetSizer (s); + _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 ()) + ); - vector columns; - columns.push_back (wx_to_std (_("Name"))); - wxPanel* list = new EditableList ( - panel, - columns, - boost::bind (&Config::colour_conversions, Config::instance()), - boost::bind (&Config::set_colour_conversions, Config::instance(), _1), - boost::bind (&ColourConversionsPage::colour_conversion_column, this, _1), - 300 + _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 ()) ); - s->Add (list, 1, wxEXPAND | wxALL, _border); - return panel; + _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)); } -private: - string colour_conversion_column (PresetColourConversion c) + 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_chain()->leaf().certificate (true); + fwrite (s.c_str(), 1, s.length(), f); + fclose (f); + } + d->Destroy (); + } + + void config_changed () { - return c.name; + _signer->config_changed (); + _decryption->config_changed (); } + + CertificateChainEditor* _signer; + CertificateChainEditor* _decryption; + wxButton* _export_decryption_certificate; }; -class TMSPage : public wxPreferencesPage, public Page +class TMSPage : public StandardPage { public: TMSPage (wxSize panel_size, int border) - : Page (panel_size, border) + : StandardPage (panel_size, border) {} wxString GetName () const @@ -542,183 +1004,209 @@ public: return _("TMS"); } -#ifdef DCPOMATIC_OSX +#ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const { return wxBitmap ("tms", wxBITMAP_TYPE_PNG_RESOURCE); } -#endif +#endif - wxWindow* CreateWindow (wxWindow* parent) +private: + void setup () { - wxPanel* panel = new wxPanel (parent, wxID_ANY, wxDefaultPosition, _panel_size); - 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, wxALL | wxEXPAND, _border); - - add_label_to_sizer (table, panel, _("IP address"), true); - _tms_ip = new wxTextCtrl (panel, wxID_ANY); + _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); - - add_label_to_sizer (table, panel, _("Target path"), true); - _tms_path = new wxTextCtrl (panel, wxID_ANY); + + add_label_to_sizer (table, _panel, _("Target path"), true); + _tms_path = new wxTextCtrl (_panel, wxID_ANY); table->Add (_tms_path, 1, wxEXPAND); - - add_label_to_sizer (table, panel, _("User name"), true); - _tms_user = new wxTextCtrl (panel, wxID_ANY); + + add_label_to_sizer (table, _panel, _("User name"), true); + _tms_user = new wxTextCtrl (_panel, wxID_ANY); table->Add (_tms_user, 1, wxEXPAND); - - add_label_to_sizer (table, panel, _("Password"), true); - _tms_password = new wxTextCtrl (panel, wxID_ANY); + + add_label_to_sizer (table, _panel, _("Password"), true); + _tms_password = new wxTextCtrl (_panel, wxID_ANY); table->Add (_tms_password, 1, wxEXPAND); - - Config* config = Config::instance (); - - _tms_ip->SetValue (std_to_wx (config->tms_ip ())); + + _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->SetValue (std_to_wx (config->tms_path ())); _tms_path->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&TMSPage::tms_path_changed, this)); - _tms_user->SetValue (std_to_wx (config->tms_user ())); _tms_user->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&TMSPage::tms_user_changed, this)); - _tms_password->SetValue (std_to_wx (config->tms_password ())); _tms_password->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&TMSPage::tms_password_changed, this)); + } - return panel; + void config_changed () + { + 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 (_tms_protocol->GetSelection ())); } -private: void tms_ip_changed () { Config::instance()->set_tms_ip (wx_to_std (_tms_ip->GetValue ())); } - + void tms_path_changed () { Config::instance()->set_tms_path (wx_to_std (_tms_path->GetValue ())); } - + void tms_user_changed () { Config::instance()->set_tms_user (wx_to_std (_tms_user->GetValue ())); } - + void tms_password_changed () { 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; }; -class KDMEmailPage : public wxPreferencesPage, public Page +class KDMEmailPage : public StandardPage { public: KDMEmailPage (wxSize panel_size, int border) - : Page (panel_size, border) +#ifdef DCPOMATIC_OSX + /* We have to force both width and height of this one */ + : StandardPage (wxSize (480, 128), border) +#else + : StandardPage (panel_size, border) +#endif {} - + wxString GetName () const { return _("KDM Email"); } -#ifdef DCPOMATIC_OSX +#ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const { return wxBitmap ("kdm_email", wxBITMAP_TYPE_PNG_RESOURCE); } -#endif +#endif - wxWindow* CreateWindow (wxWindow* parent) +private: + void setup () { - /* We have to force both width and height of this one */ -#ifdef DCPOMATIC_OSX - wxPanel* panel = new wxPanel (parent, wxID_ANY, wxDefaultPosition, wxSize (480, 128)); -#else - wxPanel* panel = new wxPanel (parent); -#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); + _panel->GetSizer()->Add (table, 1, wxEXPAND | wxALL, _border); + + add_label_to_sizer (table, _panel, _("Outgoing mail server"), true); + { + wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + _mail_server = new wxTextCtrl (_panel, wxID_ANY); + s->Add (_mail_server, 1, wxEXPAND | wxALL); + add_label_to_sizer (s, _panel, _("port"), false); + _mail_port = new wxSpinCtrl (_panel, wxID_ANY); + _mail_port->SetRange (0, 65535); + s->Add (_mail_port); + table->Add (s, 1, wxEXPAND | wxALL); + } + + add_label_to_sizer (table, _panel, _("Mail user name"), true); + _mail_user = new wxTextCtrl (_panel, wxID_ANY); table->Add (_mail_user, 1, wxEXPAND | wxALL); - - add_label_to_sizer (table, panel, _("Mail password"), true); - _mail_password = new wxTextCtrl (panel, wxID_ANY); + + 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); + 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); + + 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); + 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.5, wxEXPAND | wxALL, _border); - _reset_kdm_email = new wxButton (panel, wxID_ANY, _("Reset to default text")); - s->Add (_reset_kdm_email, 0, wxEXPAND | wxALL, _border); + 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); + + _reset_kdm_email = new wxButton (_panel, wxID_ANY, _("Reset to default text")); + _panel->GetSizer()->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_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->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_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)); - _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)); + } + + void config_changed () + { + Config* config = Config::instance (); - return panel; + 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 ()); } -private: void mail_server_changed () { 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 ())); } - + void mail_password_changed () { Config::instance()->set_mail_password (wx_to_std (_mail_password->GetValue ())); @@ -728,7 +1216,7 @@ private: { 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 ())); @@ -738,94 +1226,152 @@ private: { 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 ())); + } + void kdm_email_changed () { + if (_kdm_email->GetValue().IsEmpty ()) { + /* Sometimes we get sent an erroneous notification that the email + is empty; I don't know why. + */ + return; + } Config::instance()->set_kdm_email (wx_to_std (_kdm_email->GetValue ())); } void reset_kdm_email () { Config::instance()->reset_kdm_email (); - _kdm_email->SetValue (wx_to_std (Config::instance()->kdm_email ())); + checked_set (_kdm_email, Config::instance()->kdm_email ()); } wxTextCtrl* _mail_server; + wxSpinCtrl* _mail_port; wxTextCtrl* _mail_user; wxTextCtrl* _mail_password; wxTextCtrl* _kdm_subject; wxTextCtrl* _kdm_from; wxTextCtrl* _kdm_cc; + wxTextCtrl* _kdm_bcc; wxTextCtrl* _kdm_email; wxButton* _reset_kdm_email; }; -class AdvancedPage : public wxStockPreferencesPage, public Page +/** @class AdvancedPage + * @brief Advanced page of the preferences dialog. + */ +class AdvancedPage : public StockPage { public: - AdvancedPage (wxSize panel_size, int border) - : wxStockPreferencesPage (Kind_Advanced) - , Page (panel_size, border) + : 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) {} - - wxWindow* CreateWindow (wxWindow* parent) - { - wxPanel* panel = new wxPanel (parent); - - wxBoxSizer* s = new wxBoxSizer (wxVERTICAL); - panel->SetSizer (s); +private: + void setup () + { wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); table->AddGrowableCol (1, 1); - s->Add (table, 1, wxALL | wxEXPAND, _border); + _panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border); { - add_label_to_sizer (table, panel, _("Maximum JPEG2000 bandwidth"), true); + add_label_to_sizer (table, _panel, _("Maximum JPEG2000 bandwidth"), true); wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - _maximum_j2k_bandwidth = new wxSpinCtrl (panel); + _maximum_j2k_bandwidth = new wxSpinCtrl (_panel); s->Add (_maximum_j2k_bandwidth, 1); - add_label_to_sizer (s, panel, _("Mbit/s"), false); + 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")); + _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); table->AddSpacer (0); - add_label_to_sizer (table, panel, _("Log"), true); - _log_general = new wxCheckBox (panel, wxID_ANY, _("General")); - table->Add (_log_general, 1, wxEXPAND | wxALL); - _log_warning = new wxCheckBox (panel, wxID_ANY, _("Warnings")); - table->AddSpacer (0); - table->Add (_log_warning, 1, wxEXPAND | wxALL); - _log_error = new wxCheckBox (panel, wxID_ANY, _("Errors")); + _only_servers_encode = new wxCheckBox (_panel, wxID_ANY, _("Only servers encode")); + table->Add (_only_servers_encode, 1, wxEXPAND | wxALL); table->AddSpacer (0); - table->Add (_log_error, 1, wxEXPAND | wxALL); - _log_timing = new wxCheckBox (panel, wxID_ANY, S_("Config|Timing")); + +#ifdef __WXOSX__ + wxStaticText* m = new wxStaticText (_panel, wxID_ANY, _("Log:")); + table->Add (m, 0, wxALIGN_TOP | wxLEFT | wxRIGHT | wxEXPAND | wxALL | wxALIGN_RIGHT, 6); +#else + wxStaticText* m = new wxStaticText (_panel, wxID_ANY, _("Log")); + table->Add (m, 0, wxALIGN_TOP | wxLEFT | wxRIGHT | wxEXPAND | wxALL, 6); +#endif + + { + wxBoxSizer* t = new wxBoxSizer (wxVERTICAL); + _log_general = new wxCheckBox (_panel, wxID_ANY, _("General")); + t->Add (_log_general, 1, wxEXPAND | wxALL); + _log_warning = new wxCheckBox (_panel, wxID_ANY, _("Warnings")); + t->Add (_log_warning, 1, wxEXPAND | wxALL); + _log_error = new wxCheckBox (_panel, wxID_ANY, _("Errors")); + t->Add (_log_error, 1, wxEXPAND | wxALL); + _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); + } + +#ifdef DCPOMATIC_WINDOWS + _win32_console = new wxCheckBox (_panel, wxID_ANY, _("Open console window")); + table->Add (_win32_console, 1, wxEXPAND | wxALL); table->AddSpacer (0); - table->Add (_log_timing, 1, wxEXPAND | wxALL); +#endif - Config* config = Config::instance (); - - _maximum_j2k_bandwidth->SetRange (1, 500); - _maximum_j2k_bandwidth->SetValue (config->maximum_j2k_bandwidth() / 1000000); + _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->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::TYPE_GENERAL); + _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->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::TYPE_ERROR); _log_error->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::log_changed, this)); - _log_timing->SetValue (config->log_types() & Log::TYPE_TIMING); _log_timing->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::log_changed, this)); - - return panel; + _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 } -private: + void config_changed () + { + Config* config = Config::instance (); + + 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() & 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 + } void maximum_j2k_bandwidth_changed () { @@ -837,32 +1383,60 @@ private: 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 |= LogEntry::TYPE_DEBUG_DECODE; + } + if (_log_debug_encode->GetValue ()) { + types |= LogEntry::TYPE_DEBUG_ENCODE; + } + if (_log_debug_email->GetValue ()) { + types |= LogEntry::TYPE_DEBUG_EMAIL; } Config::instance()->set_log_types (types); } - + +#ifdef DCPOMATIC_WINDOWS + void win32_console_changed () + { + Config::instance()->set_win32_console (_win32_console->GetValue ()); + } +#endif + 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 }; - + wxPreferencesEditor* create_config_dialog () { @@ -873,17 +1447,17 @@ create_config_dialog () the containing window doesn't shrink too much when we select those panels. This is obviously an unpleasant hack. */ - wxSize ps = wxSize (480, -1); + wxSize ps = wxSize (520, -1); int const border = 16; #else wxSize ps = wxSize (-1, -1); int const border = 8; #endif - + e->AddPage (new GeneralPage (ps, border)); 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));