X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffull_config_dialog.cc;h=e39a10f09632516a15952bd0653954b6fee07adc;hb=08b44e380c8be3a8cb2dacbd94049f09942dabc1;hp=eba81507c7526b8af79bebf4dd92115c270cc318;hpb=bfcfda264d12e42facce6f59e7cada9574ca7f2e;p=dcpomatic.git diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc index eba81507c..e39a10f09 100644 --- a/src/wx/full_config_dialog.cc +++ b/src/wx/full_config_dialog.cc @@ -34,16 +34,19 @@ #include "file_picker_ctrl.h" #include "filter_dialog.h" #include "full_config_dialog.h" +#include "kdm_choice.h" #include "make_chain_dialog.h" #include "nag_dialog.h" #include "name_format_editor.h" #include "password_entry.h" +#include "send_test_email_dialog.h" #include "server_dialog.h" #include "static_text.h" #include "wx_util.h" #include "lib/config.h" #include "lib/cross.h" #include "lib/dcp_content_type.h" +#include "lib/emailer.h" #include "lib/exceptions.h" #include "lib/filter.h" #include "lib/log.h" @@ -52,10 +55,13 @@ #include #include #include +#include +LIBDCP_DISABLE_WARNINGS #include #include #include #include +LIBDCP_ENABLE_WARNINGS #include #include #include @@ -86,7 +92,7 @@ public: {} private: - void setup () + void setup () override { auto table = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); _panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border); @@ -143,7 +149,7 @@ private: _automatic_audio_analysis->Bind (wxEVT_CHECKBOX, boost::bind (&FullGeneralPage::automatic_audio_analysis_changed, this)); } - void config_changed () + void config_changed () override { auto config = Config::instance (); @@ -243,20 +249,20 @@ public: : Page (panel_size, border) {} - wxString GetName () const + wxString GetName () const override { return _("Defaults"); } #ifdef DCPOMATIC_OSX - wxBitmap GetLargeIcon () const + wxBitmap GetLargeIcon () const override { return wxBitmap(bitmap_path("defaults"), wxBITMAP_TYPE_PNG); } #endif private: - void setup () + void setup () override { auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); table->AddGrowableCol (1, 1); @@ -331,14 +337,22 @@ private: #else _kdm_directory = new wxDirPickerCtrl (_panel, wxDD_DIR_MUST_EXIST); #endif - table->Add (_kdm_directory, 1, wxEXPAND); + add_label_to_sizer (table, _panel, _("Default KDM type"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); + _kdm_type = new KDMChoice (_panel); + table->Add (_kdm_type, 1, wxEXPAND); + + table->Add (_use_isdcf_name_by_default = new CheckBox(_panel, _("Use ISDCF name by default")), 0, wxALIGN_CENTRE_VERTICAL); + _still_length->SetRange (1, 3600); _still_length->Bind (wxEVT_SPINCTRL, boost::bind (&DefaultsPage::still_length_changed, this)); _directory->Bind (wxEVT_DIRPICKER_CHANGED, boost::bind (&DefaultsPage::directory_changed, this)); _kdm_directory->Bind (wxEVT_DIRPICKER_CHANGED, boost::bind (&DefaultsPage::kdm_directory_changed, this)); + _kdm_type->Bind (wxEVT_CHOICE, boost::bind(&DefaultsPage::kdm_type_changed, this)); + + _use_isdcf_name_by_default->Bind (wxEVT_CHECKBOX, boost::bind(&DefaultsPage::use_isdcf_name_by_default_changed, this)); for (auto i: Ratio::containers()) { _container->Append (std_to_wx(i->container_nickname())); @@ -374,7 +388,7 @@ private: } } - void config_changed () + void config_changed () override { auto config = Config::instance (); @@ -395,6 +409,8 @@ private: checked_set (_still_length, config->default_still_length ()); _directory->SetPath (std_to_wx (config->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir())).string ())); _kdm_directory->SetPath (std_to_wx (config->default_kdm_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir())).string ())); + _kdm_type->set (config->default_kdm_type()); + checked_set (_use_isdcf_name_by_default, config->use_isdcf_name_by_default()); checked_set (_j2k_bandwidth, config->default_j2k_bandwidth() / 1000000); _j2k_bandwidth->SetRange (50, config->maximum_j2k_bandwidth() / 1000000); checked_set (_dcp_audio_channels, locale_convert (config->default_dcp_audio_channels())); @@ -453,6 +469,16 @@ private: Config::instance()->set_default_kdm_directory (wx_to_std (_kdm_directory->GetPath ())); } + void kdm_type_changed () + { + Config::instance()->set_default_kdm_type(_kdm_type->get()); + } + + void use_isdcf_name_by_default_changed () + { + Config::instance()->set_use_isdcf_name_by_default (_use_isdcf_name_by_default->GetValue()); + } + void still_length_changed () { Config::instance()->set_default_still_length (_still_length->GetValue ()); @@ -504,6 +530,8 @@ private: wxDirPickerCtrl* _directory; wxDirPickerCtrl* _kdm_directory; #endif + KDMChoice* _kdm_type; + wxCheckBox* _use_isdcf_name_by_default; wxChoice* _container; wxChoice* _dcp_content_type; wxChoice* _dcp_audio_channels; @@ -520,20 +548,20 @@ public: : Page (panel_size, border) {} - wxString GetName () const + wxString GetName () const override { return _("Servers"); } #ifdef DCPOMATIC_OSX - wxBitmap GetLargeIcon () const + wxBitmap GetLargeIcon () const override { return wxBitmap(bitmap_path("servers"), wxBITMAP_TYPE_PNG); } #endif private: - void setup () + void setup () override { _use_any_servers = new CheckBox (_panel, _("Search network for servers")); _panel->GetSizer()->Add (_use_any_servers, 0, wxALL, _border); @@ -553,7 +581,7 @@ private: _use_any_servers->Bind (wxEVT_CHECKBOX, boost::bind(&EncodingServersPage::use_any_servers_changed, this)); } - void config_changed () + void config_changed () override { checked_set (_use_any_servers, Config::instance()->use_any_servers ()); _servers_list->refresh (); @@ -581,20 +609,20 @@ public: : Page (panel_size, border) {} - wxString GetName () const + wxString GetName () const override { return _("TMS"); } #ifdef DCPOMATIC_OSX - wxBitmap GetLargeIcon () const + wxBitmap GetLargeIcon () const override { return wxBitmap(bitmap_path("tms"), wxBITMAP_TYPE_PNG); } #endif private: - void setup () + void setup () override { _upload = new CheckBox (_panel, _("Upload DCP to TMS after creation")); _panel->GetSizer()->Add (_upload, 0, wxALL | wxEXPAND, _border); @@ -634,7 +662,7 @@ private: _tms_password->Changed.connect (boost::bind (&TMSPage::tms_password_changed, this)); } - void config_changed () + void config_changed () override { auto config = Config::instance (); @@ -692,20 +720,20 @@ public: : Page (panel_size, border) {} - wxString GetName () const + wxString GetName () const override { return _("Email"); } #ifdef DCPOMATIC_OSX - wxBitmap GetLargeIcon () const + wxBitmap GetLargeIcon () const override { return wxBitmap(bitmap_path("email"), wxBITMAP_TYPE_PNG); } #endif private: - void setup () + void setup () override { auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); table->AddGrowableCol (1, 1); @@ -739,14 +767,19 @@ private: _password = new PasswordEntry (_panel); table->Add (_password->get_panel(), 1, wxEXPAND | wxALL); + table->AddSpacer (0); + _send_test_email = new Button (_panel, _("Send test email...")); + table->Add (_send_test_email); + _server->Bind (wxEVT_TEXT, boost::bind(&EmailPage::server_changed, this)); _port->Bind (wxEVT_SPINCTRL, boost::bind(&EmailPage::port_changed, this)); _protocol->Bind (wxEVT_CHOICE, boost::bind(&EmailPage::protocol_changed, this)); _user->Bind (wxEVT_TEXT, boost::bind(&EmailPage::user_changed, this)); _password->Changed.connect (boost::bind(&EmailPage::password_changed, this)); + _send_test_email->Bind (wxEVT_BUTTON, boost::bind(&EmailPage::send_test_email_clicked, this)); } - void config_changed () + void config_changed () override { auto config = Config::instance (); @@ -808,11 +841,41 @@ private: Config::instance()->set_mail_password(_password->get()); } + void send_test_email_clicked () + { + auto dialog = new SendTestEmailDialog(_panel); + auto result = dialog->ShowModal(); + dialog->Destroy(); + if (result == wxID_OK) { + Emailer emailer( + wx_to_std(dialog->from()), + { wx_to_std(dialog->to()) }, + wx_to_std(_("DCP-o-matic test email")), + wx_to_std(_("This is a test email from DCP-o-matic.")) + ); + auto config = Config::instance(); + try { + emailer.send (config->mail_server(), config->mail_port(), config->mail_protocol(), config->mail_user(), config->mail_password()); + } catch (NetworkError& e) { + error_dialog (_panel, std_to_wx(e.summary()), std_to_wx(e.detail().get_value_or(""))); + return; + } catch (std::exception& e) { + error_dialog (_panel, _("Test email sending failed."), std_to_wx(e.what())); + return; + } catch (...) { + error_dialog (_panel, _("Test email sending failed.")); + return; + } + message_dialog (_panel, _("Test email sent.")); + } + } + wxTextCtrl* _server; wxSpinCtrl* _port; wxChoice* _protocol; wxTextCtrl* _user; PasswordEntry* _password; + Button* _send_test_email; }; @@ -829,20 +892,20 @@ public: #endif {} - wxString GetName () const + wxString GetName () const override { return _("KDM Email"); } #ifdef DCPOMATIC_OSX - wxBitmap GetLargeIcon () const + wxBitmap GetLargeIcon () const override { return wxBitmap(bitmap_path("kdm_email"), wxBITMAP_TYPE_PNG); } #endif private: - void setup () + void setup () override { auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); table->AddGrowableCol (1, 1); @@ -888,9 +951,9 @@ private: _reset_email->Bind (wxEVT_BUTTON, boost::bind (&KDMEmailPage::reset_email, this)); } - void config_changed () + void config_changed () override { - Config* config = Config::instance (); + auto config = Config::instance (); checked_set (_subject, config->kdm_subject ()); checked_set (_from, config->kdm_from ()); @@ -951,20 +1014,20 @@ public: #endif {} - wxString GetName () const + wxString GetName () const override { return _("Notifications"); } #ifdef DCPOMATIC_OSX - wxBitmap GetLargeIcon () const + wxBitmap GetLargeIcon () const override { return wxBitmap(bitmap_path("notifications"), wxBITMAP_TYPE_PNG); } #endif private: - void setup () + void setup () override { auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); table->AddGrowableCol (1, 1); @@ -1040,7 +1103,7 @@ private: _reset_email->Enable(s); } - void config_changed () + void config_changed () override { auto config = Config::instance (); @@ -1124,20 +1187,20 @@ public: #endif {} - wxString GetName () const + wxString GetName () const override { return _("Cover Sheet"); } #ifdef DCPOMATIC_OSX - wxBitmap GetLargeIcon () const + wxBitmap GetLargeIcon () const override { return wxBitmap(bitmap_path("cover_sheet"), wxBITMAP_TYPE_PNG); } #endif private: - void setup () + void setup () override { _cover_sheet = new wxTextCtrl (_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (-1, 200), wxTE_MULTILINE); _panel->GetSizer()->Add (_cover_sheet, 0, wxEXPAND | wxALL, _border); @@ -1149,7 +1212,7 @@ private: _reset_cover_sheet->Bind (wxEVT_BUTTON, boost::bind (&CoverSheetPage::reset_cover_sheet, this)); } - void config_changed () + void config_changed () override { checked_set (_cover_sheet, Config::instance()->cover_sheet()); } @@ -1183,20 +1246,20 @@ public: : Page (panel_size, border) {} - wxString GetName () const + wxString GetName () const override { return _("Identifiers"); } #ifdef DCPOMATIC_OSX - wxBitmap GetLargeIcon () const + wxBitmap GetLargeIcon () const override { return wxBitmap(bitmap_path("identifiers"), wxBITMAP_TYPE_PNG); } #endif private: - void setup () + void setup () override { auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); table->AddGrowableCol (1, 1); @@ -1241,7 +1304,7 @@ private: _j2k_comment->Bind (wxEVT_TEXT, boost::bind(&IdentifiersPage::j2k_comment_changed, this)); } - void config_changed () + void config_changed () override { auto config = Config::instance (); checked_set (_issuer, config->dcp_issuer ()); @@ -1301,13 +1364,13 @@ public: : Page (panel_size, border) {} - wxString GetName () const + wxString GetName () const override { return _("Advanced"); } #ifdef DCPOMATIC_OSX - wxBitmap GetLargeIcon () const + wxBitmap GetLargeIcon () const override { return wxBitmap(bitmap_path("advanced"), wxBITMAP_TYPE_PNG); } @@ -1325,7 +1388,7 @@ private: table->Add (m, 0, flags, DCPOMATIC_SIZER_Y_GAP); } - void setup () + void setup () override { auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); table->AddGrowableCol (1, 1); @@ -1357,10 +1420,11 @@ private: _allow_any_container = new CheckBox (_panel, _("Allow full-frame and non-standard container ratios")); table->Add (_allow_any_container, 1, wxEXPAND | wxALL); - table->AddSpacer (0); - restart = add_label_to_sizer (table, _panel, _("(restart DCP-o-matic to see all ratios)"), false); restart->SetFont (font); + + _allow_96khz_audio = new CheckBox (_panel, _("Allow creation of DCPs with 96kHz audio")); + table->Add (_allow_96khz_audio, 1, wxEXPAND | wxALL); table->AddSpacer (0); _show_experimental_audio_processors = new CheckBox (_panel, _("Show experimental audio processors")); @@ -1465,6 +1529,7 @@ private: _video_display_mode->Bind (wxEVT_CHOICE, boost::bind(&AdvancedPage::video_display_mode_changed, this)); _allow_any_dcp_frame_rate->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::allow_any_dcp_frame_rate_changed, this)); _allow_any_container->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::allow_any_container_changed, this)); + _allow_96khz_audio->Bind (wxEVT_CHECKBOX, boost::bind(&AdvancedPage::allow_96khz_audio_changed, this)); _show_experimental_audio_processors->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::show_experimental_audio_processors_changed, this)); _only_servers_encode->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::only_servers_encode_changed, this)); _frames_in_memory_multiplier->Bind (wxEVT_SPINCTRL, boost::bind(&AdvancedPage::frames_in_memory_multiplier_changed, this)); @@ -1485,7 +1550,7 @@ private: #endif } - void config_changed () + void config_changed () override { auto config = Config::instance (); @@ -1500,6 +1565,7 @@ private: } checked_set (_allow_any_dcp_frame_rate, config->allow_any_dcp_frame_rate ()); checked_set (_allow_any_container, config->allow_any_container ()); + checked_set (_allow_96khz_audio, config->allow_96khz_audio()); checked_set (_show_experimental_audio_processors, config->show_experimental_audio_processors ()); checked_set (_only_servers_encode, config->only_servers_encode ()); checked_set (_log_general, config->log_types() & LogEntry::TYPE_GENERAL); @@ -1547,6 +1613,11 @@ private: Config::instance()->set_allow_any_container(_allow_any_container->GetValue()); } + void allow_96khz_audio_changed () + { + Config::instance()->set_allow_96hhz_audio(_allow_96khz_audio->GetValue()); + } + void show_experimental_audio_processors_changed () { Config::instance()->set_show_experimental_audio_processors(_show_experimental_audio_processors->GetValue()); @@ -1615,6 +1686,7 @@ private: wxSpinCtrl* _frames_in_memory_multiplier = nullptr; wxCheckBox* _allow_any_dcp_frame_rate = nullptr; wxCheckBox* _allow_any_container = nullptr; + wxCheckBox* _allow_96khz_audio = nullptr; wxCheckBox* _show_experimental_audio_processors = nullptr; wxCheckBox* _only_servers_encode = nullptr; NameFormatEditor* _dcp_metadata_filename_format = nullptr;