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 ();
{
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;
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 {
_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);
_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 ()
checked_set (_dcp_audio_channels, locale_convert<string> (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 ()
Config::instance()->set_default_interop (_standard->GetSelection() == 1);
}
+ void metadata_changed ()
+ {
+ map<string, string> 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;
wxChoice* _dcp_content_type;
wxChoice* _dcp_audio_channels;
wxChoice* _standard;
+ map<string, CheckBox*> _enable_metadata;
+ map<string, wxTextCtrl*> _metadata;
};
_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);
}
_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);
checked_set (_bcc, config->notification_bcc ());
checked_set (_email, Config::instance()->notification_email ());
- update_sensitivity ();
+ setup_sensitivity ();
}
void notification_subject_changed ()
void type_changed (wxCheckBox* b, Config::Notification n)
{
Config::instance()->set_notification(n, b->GetValue());
- update_sensitivity ();
+ setup_sensitivity ();
}
wxCheckBox* _enable_message_box;
}
{
- 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;
}
{
- 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"));
projects / dcpomatic.git / blobdiff