X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffull_config_dialog.cc;h=aa7ddecc14adb30924de4dbe2400625b3c1edc82;hb=89d4090c;hp=e9573b4d3703b1927026c5107c1d167eff5dd3a0;hpb=3d7ba8b8dfaea91594aed7cf9fb6661aaf4e38b0;p=dcpomatic.git diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc index e9573b4d3..aa7ddecc1 100644 --- a/src/wx/full_config_dialog.cc +++ b/src/wx/full_config_dialog.cc @@ -153,7 +153,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 +198,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 +212,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 { @@ -251,7 +251,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const { - return wxBitmap ("defaults", wxBITMAP_TYPE_PNG_RESOURCE); + return wxBitmap(bitmap_path("defaults"), wxBITMAP_TYPE_PNG); } #endif @@ -313,6 +313,18 @@ 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); @@ -352,6 +364,14 @@ 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 () @@ -380,6 +400,27 @@ private: 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("")); + } + } + + setup_sensitivity (); } void j2k_bandwidth_changed () @@ -434,6 +475,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; @@ -448,6 +508,8 @@ private: wxChoice* _dcp_content_type; wxChoice* _dcp_audio_channels; wxChoice* _standard; + map _enable_metadata; + map _metadata; }; @@ -466,7 +528,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const { - return wxBitmap ("servers", wxBITMAP_TYPE_PNG_RESOURCE); + return wxBitmap(bitmap_path("servers"), wxBITMAP_TYPE_PNG); } #endif @@ -527,7 +589,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const { - return wxBitmap ("tms", wxBITMAP_TYPE_PNG_RESOURCE); + return wxBitmap(bitmap_path("tms"), wxBITMAP_TYPE_PNG); } #endif @@ -638,7 +700,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const { - return wxBitmap ("email", wxBITMAP_TYPE_PNG_RESOURCE); + return wxBitmap(bitmap_path("email"), wxBITMAP_TYPE_PNG); } #endif @@ -665,7 +727,7 @@ private: _protocol->Append (_("Plain")); _protocol->Append (_("STARTTLS")); _protocol->Append (_("SSL")); - s->Add (_protocol); + s->Add (_protocol, 1, wxALIGN_CENTER_VERTICAL); table->Add (s, 1, wxEXPAND | wxALL); } @@ -775,7 +837,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const { - return wxBitmap ("kdm_email", wxBITMAP_TYPE_PNG_RESOURCE); + return wxBitmap(bitmap_path("kdm_email"), wxBITMAP_TYPE_PNG); } #endif @@ -897,7 +959,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const { - return wxBitmap ("notifications", wxBITMAP_TYPE_PNG_RESOURCE); + return wxBitmap(bitmap_path("notifications"), wxBITMAP_TYPE_PNG); } #endif @@ -963,10 +1025,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); @@ -990,7 +1052,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 +1095,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; @@ -1070,7 +1132,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const { - return wxBitmap ("cover_sheet", wxBITMAP_TYPE_PNG_RESOURCE); + return wxBitmap(bitmap_path("cover_sheet"), wxBITMAP_TYPE_PNG); } #endif @@ -1129,7 +1191,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const { - return wxBitmap ("identifiers", wxBITMAP_TYPE_PNG_RESOURCE); + return wxBitmap(bitmap_path("identifiers"), wxBITMAP_TYPE_PNG); } #endif @@ -1247,7 +1309,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const { - return wxBitmap ("advanced", wxBITMAP_TYPE_PNG_RESOURCE); + return wxBitmap(bitmap_path("advanced"), wxBITMAP_TYPE_PNG); } #endif @@ -1295,10 +1357,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")); @@ -1318,7 +1381,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 | 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 +1400,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 | 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")); @@ -1383,10 +1460,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)); @@ -1422,6 +1502,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 +1550,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 +1623,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 +1654,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);