X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ffull_config_dialog.cc;h=8fc029f747c8388413e8a684101c22cb038d439b;hp=dc21b249d3e6cc275cc142fd7ebcd7adb06fb428;hb=96107588e0ddf383d21ff00b4d3febb313e43794;hpb=ea554f39cec595666a3d4552235ccca4e60305a5 diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc index dc21b249d..8fc029f74 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 (); @@ -153,7 +159,7 @@ private: checked_set (_analyse_ebur128, config->analyse_ebur128 ()); #endif checked_set (_automatic_audio_analysis, config->automatic_audio_analysis ()); - checked_set (_config_file, config->config_file()); + checked_set (_config_file, config->config_read_file()); checked_set (_cinemas_file, config->cinemas_file()); GeneralPage::config_changed (); @@ -198,7 +204,7 @@ private: { auto config = Config::instance(); boost::filesystem::path new_file = wx_to_std(_config_file->GetPath()); - if (new_file == config->config_file()) { + if (new_file == config->config_read_file()) { return; } bool copy_and_link = true; @@ -212,7 +218,7 @@ private: if (copy_and_link) { config->write (); - if (new_file != config->config_file()) { + if (new_file != config->config_read_file()) { config->copy_and_link (new_file); } } else { @@ -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); @@ -313,20 +319,55 @@ private: _standard = new wxChoice (_panel, wxID_ANY); table->Add (_standard); + table->Add (_enable_metadata["facility"] = new CheckBox (_panel, _("Default facility")), 0, wxALIGN_CENTRE_VERTICAL); + table->Add (_metadata["facility"] = new wxTextCtrl (_panel, wxID_ANY, wxT("")), 0, wxEXPAND); + + table->Add (_enable_metadata["studio"] = new CheckBox (_panel, _("Default studio")), 0, wxALIGN_CENTRE_VERTICAL); + table->Add (_metadata["studio"] = new wxTextCtrl (_panel, wxID_ANY, wxT("")), 0, wxEXPAND); + + table->Add (_enable_metadata["chain"] = new CheckBox (_panel, _("Default chain")), 0, wxALIGN_CENTRE_VERTICAL); + table->Add (_metadata["chain"] = new wxTextCtrl (_panel, wxID_ANY, wxT("")), 0, wxEXPAND); + + table->Add (_enable_metadata["distributor"] = new CheckBox (_panel, _("Default distributor")), 0, wxALIGN_CENTRE_VERTICAL); + table->Add (_metadata["distributor"] = new wxTextCtrl (_panel, wxID_ANY, wxT("")), 0, wxEXPAND); + add_label_to_sizer (table, _panel, _("Default KDM directory"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); #ifdef DCPOMATIC_USE_OWN_PICKER _kdm_directory = new DirPickerCtrl (_panel); #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); + + add_label_to_sizer (table, _panel, _("Default KDM duration"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); + _kdm_duration = new wxSpinCtrl (_panel); + _kdm_duration_unit = new wxChoice (_panel, wxID_ANY); + auto kdm_duration_sizer = new wxBoxSizer (wxHORIZONTAL); + kdm_duration_sizer->Add (_kdm_duration, 0, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP); + kdm_duration_sizer->Add (_kdm_duration_unit, 0, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP); + table->Add (kdm_duration_sizer, 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)); + _kdm_duration_unit->Append (_("days")); + _kdm_duration_unit->Append (_("weeks")); + _kdm_duration_unit->Append (_("months")); + _kdm_duration_unit->Append (_("years")); + + _kdm_duration->Bind (wxEVT_SPINCTRL, boost::bind(&DefaultsPage::kdm_duration_changed, this)); + _kdm_duration_unit->Bind (wxEVT_CHOICE, boost::bind(&DefaultsPage::kdm_duration_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())); @@ -352,9 +393,17 @@ private: _standard->Append (_("SMPTE")); _standard->Append (_("Interop")); _standard->Bind (wxEVT_CHOICE, boost::bind (&DefaultsPage::standard_changed, this)); + + for (auto const& i: _enable_metadata) { + i.second->Bind (wxEVT_CHECKBOX, boost::bind(&DefaultsPage::metadata_changed, this)); + } + + for (auto const& i: _metadata) { + i.second->Bind (wxEVT_TEXT, boost::bind(&DefaultsPage::metadata_changed, this)); + } } - void config_changed () + void config_changed () override { auto config = Config::instance (); @@ -375,11 +424,76 @@ 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())); checked_set (_audio_delay, config->default_audio_delay ()); checked_set (_standard, config->default_interop() ? 1 : 0); + + auto metadata = config->default_metadata(); + + for (auto const& i: metadata) { + _enable_metadata[i.first]->SetValue(true); + checked_set (_metadata[i.first], i.second); + } + + for (auto const& i: _enable_metadata) { + if (metadata.find(i.first) == metadata.end()) { + checked_set (i.second, false); + } + } + + for (auto const& i: _metadata) { + if (metadata.find(i.first) == metadata.end()) { + checked_set (i.second, wxT("")); + } + } + + checked_set (_kdm_duration, config->default_kdm_duration().duration); + switch (config->default_kdm_duration().unit) { + case RoughDuration::Unit::DAYS: + _kdm_duration->SetRange(1, 365); + checked_set (_kdm_duration_unit, 0); + break; + case RoughDuration::Unit::WEEKS: + _kdm_duration->SetRange(1, 52); + checked_set (_kdm_duration_unit, 1); + break; + case RoughDuration::Unit::MONTHS: + _kdm_duration->SetRange(1, 12); + checked_set (_kdm_duration_unit, 2); + break; + case RoughDuration::Unit::YEARS: + _kdm_duration->SetRange(1, 40); + checked_set (_kdm_duration_unit, 3); + break; + } + + setup_sensitivity (); + } + + void kdm_duration_changed () + { + auto config = Config::instance(); + auto duration = _kdm_duration->GetValue(); + RoughDuration::Unit unit = RoughDuration::Unit::DAYS; + switch (_kdm_duration_unit->GetSelection()) { + case 0: + unit = RoughDuration::Unit::DAYS; + break; + case 1: + unit = RoughDuration::Unit::WEEKS; + break; + case 2: + unit = RoughDuration::Unit::MONTHS; + break; + case 3: + unit = RoughDuration::Unit::YEARS; + break; + } + config->set_default_kdm_duration (RoughDuration(duration, unit)); } void j2k_bandwidth_changed () @@ -412,6 +526,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 ()); @@ -434,6 +558,25 @@ private: Config::instance()->set_default_interop (_standard->GetSelection() == 1); } + void metadata_changed () + { + map metadata; + for (auto const& i: _enable_metadata) { + if (i.second->GetValue()) { + metadata[i.first] = wx_to_std(_metadata[i.first]->GetValue()); + } + } + Config::instance()->set_default_metadata (metadata); + setup_sensitivity (); + } + + void setup_sensitivity () + { + for (auto const& i: _enable_metadata) { + _metadata[i.first]->Enable(i.second->GetValue()); + } + } + wxSpinCtrl* _j2k_bandwidth; wxSpinCtrl* _audio_delay; wxSpinCtrl* _still_length; @@ -444,10 +587,16 @@ private: wxDirPickerCtrl* _directory; wxDirPickerCtrl* _kdm_directory; #endif + KDMChoice* _kdm_type; + wxSpinCtrl* _kdm_duration; + wxChoice* _kdm_duration_unit; + wxCheckBox* _use_isdcf_name_by_default; wxChoice* _container; wxChoice* _dcp_content_type; wxChoice* _dcp_audio_channels; wxChoice* _standard; + map _enable_metadata; + map _metadata; }; @@ -458,20 +607,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); @@ -483,7 +632,9 @@ private: columns, boost::bind (&Config::servers, Config::instance()), boost::bind (&Config::set_servers, Config::instance(), _1), - boost::bind (&EncodingServersPage::server_column, this, _1) + boost::bind (&EncodingServersPage::server_column, this, _1), + false, + EditableListButton::NEW | EditableListButton::EDIT | EditableListButton::REMOVE ); _panel->GetSizer()->Add (_servers_list, 1, wxEXPAND | wxALL, _border); @@ -491,7 +642,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 (); @@ -519,20 +670,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); @@ -572,7 +723,7 @@ private: _tms_password->Changed.connect (boost::bind (&TMSPage::tms_password_changed, this)); } - void config_changed () + void config_changed () override { auto config = Config::instance (); @@ -630,20 +781,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); @@ -677,14 +828,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 (); @@ -746,11 +902,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; }; @@ -767,24 +953,24 @@ 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 { - wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); table->AddGrowableCol (1, 1); - _panel->GetSizer()->Add (table, 1, wxEXPAND | wxALL, _border); + _panel->GetSizer()->Add (table, 0, wxEXPAND | wxALL, _border); add_label_to_sizer (table, _panel, _("Subject"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); _subject = new wxTextCtrl (_panel, wxID_ANY); @@ -804,7 +990,10 @@ private: bind (&Config::set_kdm_cc, Config::instance(), _1), [] (string s, int) { return s; - }); + }, + true, + EditableListButton::NEW | EditableListButton::EDIT | EditableListButton::REMOVE + ); table->Add (_cc, 1, wxEXPAND | wxALL); add_label_to_sizer (table, _panel, _("BCC address"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); @@ -826,9 +1015,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 ()); @@ -889,24 +1078,24 @@ 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); - _panel->GetSizer()->Add (table, 1, wxEXPAND | wxALL, _border); + _panel->GetSizer()->Add (table, 0, wxEXPAND | wxALL, _border); _enable_message_box = new CheckBox (_panel, _("Message box")); table->Add (_enable_message_box, 1, wxEXPAND | wxALL); @@ -938,7 +1127,10 @@ private: bind (&Config::set_notification_cc, Config::instance(), _1), [] (string s, int) { return s; - }); + }, + true, + EditableListButton::NEW | EditableListButton::EDIT | EditableListButton::REMOVE + ); table->Add (_cc, 1, wxEXPAND | wxALL); add_label_to_sizer (table, _panel, _("BCC address"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); @@ -963,10 +1155,10 @@ private: _email->Bind (wxEVT_TEXT, boost::bind (&NotificationsPage::notification_email_changed, this)); _reset_email->Bind (wxEVT_BUTTON, boost::bind (&NotificationsPage::reset_email, this)); - update_sensitivity (); + setup_sensitivity (); } - void update_sensitivity () + void setup_sensitivity () { bool const s = _enable_email->GetValue(); _subject->Enable(s); @@ -978,7 +1170,7 @@ private: _reset_email->Enable(s); } - void config_changed () + void config_changed () override { auto config = Config::instance (); @@ -990,7 +1182,7 @@ private: checked_set (_bcc, config->notification_bcc ()); checked_set (_email, Config::instance()->notification_email ()); - update_sensitivity (); + setup_sensitivity (); } void notification_subject_changed () @@ -1033,7 +1225,7 @@ private: void type_changed (wxCheckBox* b, Config::Notification n) { Config::instance()->set_notification(n, b->GetValue()); - update_sensitivity (); + setup_sensitivity (); } wxCheckBox* _enable_message_box; @@ -1062,20 +1254,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); @@ -1087,7 +1279,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()); } @@ -1121,20 +1313,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); @@ -1179,7 +1371,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 ()); @@ -1239,13 +1431,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); } @@ -1263,7 +1455,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); @@ -1290,23 +1482,25 @@ private: table->AddSpacer (0); _allow_any_dcp_frame_rate = new CheckBox (_panel, _("Allow any DCP frame rate")); - table->Add (_allow_any_dcp_frame_rate, 1, wxEXPAND | wxALL); + table->Add (_allow_any_dcp_frame_rate, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_GAP); table->AddSpacer (0); _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); + table->Add (_allow_any_container, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_GAP); + restart = new StaticText (_panel, _("(restart DCP-o-matic to see all ratios)")); + table->Add (restart, 1, wxEXPAND | wxALL | wxALIGN_CENTRE_VERTICAL); restart->SetFont (font); + + _allow_96khz_audio = new CheckBox (_panel, _("Allow creation of DCPs with 96kHz audio")); + table->Add (_allow_96khz_audio, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_GAP); table->AddSpacer (0); _show_experimental_audio_processors = new CheckBox (_panel, _("Show experimental audio processors")); - table->Add (_show_experimental_audio_processors, 1, wxEXPAND | wxALL); + table->Add (_show_experimental_audio_processors, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_GAP); table->AddSpacer (0); _only_servers_encode = new CheckBox (_panel, _("Only servers encode")); - table->Add (_only_servers_encode, 1, wxEXPAND | wxALL); + table->Add (_only_servers_encode, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_GAP); table->AddSpacer (0); { @@ -1318,7 +1512,14 @@ private: } { - add_top_aligned_label_to_sizer (table, _panel, _("DCP metadata filename format")); + auto format = create_label (_panel, _("DCP metadata filename format"), true); +#ifdef DCPOMATIC_OSX + auto align = new wxBoxSizer (wxHORIZONTAL); + align->Add (format, 0, wxTOP, 2); + table->Add (align, 0, wxALIGN_RIGHT | wxRIGHT, DCPOMATIC_SIZER_GAP - 2); +#else + table->Add (format, 0, wxTOP | wxLEFT | wxRIGHT | wxALIGN_TOP, DCPOMATIC_SIZER_GAP); +#endif dcp::NameFormat::Map titles; titles['t'] = wx_to_std (_("type (cpl/pkl)")); dcp::NameFormat::Map examples; @@ -1330,7 +1531,14 @@ private: } { - add_top_aligned_label_to_sizer (table, _panel, _("DCP asset filename format")); + auto format = create_label (_panel, _("DCP asset filename format"), true); +#ifdef DCPOMATIC_OSX + auto align = new wxBoxSizer (wxHORIZONTAL); + align->Add (format, 0, wxTOP, 2); + table->Add (align, 0, wxALIGN_RIGHT | wxRIGHT, DCPOMATIC_SIZER_GAP - 2); +#else + table->Add (format, 0, wxTOP | wxLEFT | wxRIGHT | wxALIGN_TOP, DCPOMATIC_SIZER_GAP); +#endif dcp::NameFormat::Map titles; titles['t'] = wx_to_std (_("type (j2c/pcm/sub)")); titles['r'] = wx_to_std (_("reel number")); @@ -1349,7 +1557,7 @@ private: { add_top_aligned_label_to_sizer (table, _panel, _("Log")); - auto t = new wxBoxSizer (wxVERTICAL); + auto t = new wxFlexGridSizer (2); _log_general = new CheckBox (_panel, _("General")); t->Add (_log_general, 1, wxEXPAND | wxALL); _log_warning = new CheckBox (_panel, _("Warnings")); @@ -1383,10 +1591,13 @@ private: _maximum_j2k_bandwidth->SetRange (1, 1000); _maximum_j2k_bandwidth->Bind (wxEVT_SPINCTRL, boost::bind (&AdvancedPage::maximum_j2k_bandwidth_changed, this)); _video_display_mode->Append (_("Simple (safer)")); +#if wxCHECK_VERSION(3, 1, 0) _video_display_mode->Append (_("OpenGL (faster)")); +#endif _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)); @@ -1407,7 +1618,7 @@ private: #endif } - void config_changed () + void config_changed () override { auto config = Config::instance (); @@ -1422,6 +1633,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); @@ -1469,6 +1681,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()); @@ -1537,6 +1754,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; @@ -1567,7 +1785,7 @@ create_full_config_dialog () the containing window doesn't shrink too much when we select those panels. This is obviously an unpleasant hack. */ - wxSize ps = wxSize (700, -1); + wxSize ps = wxSize (750, -1); int const border = 16; #else wxSize ps = wxSize (-1, -1);