#include "lib/colour_conversion.h"
#include "lib/log.h"
#include "lib/util.h"
+#include "lib/cross.h"
+#include "lib/exceptions.h"
#include "config_dialog.h"
#include "wx_util.h"
#include "editable_list.h"
_issuer = new wxTextCtrl (panel, wxID_ANY);
table->Add (_issuer, 1, wxEXPAND);
- 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);
_isdcf_metadata_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DefaultsPage::edit_isdcf_metadata_clicked, this, parent));
- vector<Ratio const *> ratio = Ratio::all ();
- int n = 0;
- for (vector<Ratio const *>::iterator i = ratio.begin(); i != ratio.end(); ++i) {
- _scale->Append (std_to_wx ((*i)->nickname ()));
- if (*i == config->default_scale ()) {
- _scale->SetSelection (n);
+ vector<VideoContentScale> scales = VideoContentScale::all ();
+ for (size_t i = 0; i < scales.size(); ++i) {
+ _scale->Append (std_to_wx (scales[i].name ()));
+ if (scales[i] == config->default_scale ()) {
+ _scale->SetSelection (i);
}
- _container->Append (std_to_wx ((*i)->nickname ()));
- if (*i == config->default_container ()) {
- _container->SetSelection (n);
+ }
+
+ vector<Ratio const *> ratios = Ratio::all ();
+ for (size_t i = 0; i < ratios.size(); ++i) {
+ _container->Append (std_to_wx (ratios[i]->nickname ()));
+ if (ratios[i] == config->default_container ()) {
+ _container->SetSelection (i);
}
- ++n;
}
_scale->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DefaultsPage::scale_changed, this));
_container->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DefaultsPage::container_changed, this));
vector<DCPContentType const *> const ct = DCPContentType::all ();
- n = 0;
- for (vector<DCPContentType const *>::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);
+ for (size_t i = 0; i < ct.size(); ++i) {
+ _dcp_content_type->Append (std_to_wx (ct[i]->pretty_name ()));
+ if (ct[i] == config->default_dcp_content_type ()) {
+ _dcp_content_type->SetSelection (i);
}
- ++n;
}
_dcp_content_type->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DefaultsPage::dcp_content_type_changed, this));
_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->SetValue (std_to_wx (config->dcp_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));
return panel;
}
void scale_changed ()
{
- vector<Ratio const *> ratio = Ratio::all ();
- Config::instance()->set_default_scale (ratio[_scale->GetSelection()]);
+ vector<VideoContentScale> scale = VideoContentScale::all ();
+ Config::instance()->set_default_scale (scale[_scale->GetSelection()]);
}
void container_changed ()
void issuer_changed ()
{
- dcp::XMLMetadata m = Config::instance()->dcp_metadata ();
- m.issuer = wx_to_std (_issuer->GetValue ());
- Config::instance()->set_dcp_metadata (m);
- }
-
- void creator_changed ()
- {
- dcp::XMLMetadata m = Config::instance()->dcp_metadata ();
- m.creator = wx_to_std (_creator->GetValue ());
- Config::instance()->set_dcp_metadata (m);
+ Config::instance()->set_dcp_issuer (wx_to_std (_issuer->GetValue ()));
}
wxSpinCtrl* _j2k_bandwidth;
wxChoice* _container;
wxChoice* _dcp_content_type;
wxTextCtrl* _issuer;
- wxTextCtrl* _creator;
};
class EncodingServersPage : public wxPreferencesPage, public Page
s->Add (_load_decryption_private_key, 0, wxLEFT, DCPOMATIC_SIZER_X_GAP);
table->Add (s, 0);
}
+
+ _export_decryption_certificate = new wxButton (_panel, wxID_ANY, _("Export DCP decryption certificate..."));
+ table->Add (_export_decryption_certificate);
+ table->AddSpacer (0);
_add_certificate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KeysPage::add_certificate, this));
_remove_certificate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KeysPage::remove_certificate, this));
_load_signer_private_key->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KeysPage::load_signer_private_key, this));
_load_decryption_certificate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KeysPage::load_decryption_certificate, this));
_load_decryption_private_key->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KeysPage::load_decryption_private_key, this));
+ _export_decryption_certificate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KeysPage::export_decryption_certificate, this));
_signer.reset (new dcp::Signer (*Config::instance()->signer().get ()));
if (d->ShowModal() == wxID_OK) {
try {
- shared_ptr<dcp::Certificate> c (new dcp::Certificate (dcp::file_to_string (wx_to_std (d->GetPath ()))));
+ dcp::Certificate c (dcp::file_to_string (wx_to_std (d->GetPath ())));
_signer->certificates().add (c);
Config::instance()->set_signer (_signer);
update_certificate_list ();
wxListItem item;
item.SetId (n);
_certificates->InsertItem (item);
- _certificates->SetItem (n, 1, std_to_wx ((*i)->thumbprint ()));
+ _certificates->SetItem (n, 1, std_to_wx (i->thumbprint ()));
if (n == 0) {
_certificates->SetItem (n, 0, _("Root"));
_decryption_private_key->SetLabel (std_to_wx (dcp::private_key_fingerprint (Config::instance()->decryption_private_key())));
}
+ 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_certificate().certificate (true);
+ fwrite (s.c_str(), 1, s.length(), f);
+ fclose (f);
+ }
+ d->Destroy ();
+ }
+
wxPanel* _panel;
wxListCtrl* _certificates;
wxButton* _add_certificate;
wxButton* _load_decryption_certificate;
wxStaticText* _decryption_private_key;
wxButton* _load_decryption_private_key;
+ wxButton* _export_decryption_certificate;
shared_ptr<dcp::Signer> _signer;
};
add_label_to_sizer (table, panel, _("CC address"), true);
_kdm_cc = new wxTextCtrl (panel, wxID_ANY);
table->Add (_kdm_cc, 1, wxEXPAND | wxALL);
+
+ 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);
- s->Add (_kdm_email, 1.5, wxEXPAND | wxALL, _border);
+ s->Add (_kdm_email, 1, wxEXPAND | wxALL, _border);
_reset_kdm_email = new wxButton (panel, wxID_ANY, _("Reset to default text"));
s->Add (_reset_kdm_email, 0, wxEXPAND | wxALL, _border);
_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->SetValue (std_to_wx (config->kdm_bcc ()));
+ _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));
{
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 ()
{
wxTextCtrl* _kdm_subject;
wxTextCtrl* _kdm_from;
wxTextCtrl* _kdm_cc;
+ wxTextCtrl* _kdm_bcc;
wxTextCtrl* _kdm_email;
wxButton* _reset_kdm_email;
};
+/** @class AdvancedPage
+ * @brief Advanced page of the preferences dialog.
+ */
class AdvancedPage : public wxStockPreferencesPage, public Page
{
public:
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"));
- table->AddSpacer (0);
- table->Add (_log_error, 1, wxEXPAND | wxALL);
- _log_timing = new wxCheckBox (panel, wxID_ANY, S_("Config|Timing"));
- table->AddSpacer (0);
- table->Add (_log_timing, 1, wxEXPAND | wxALL);
+ int flags = wxALIGN_TOP | wxLEFT | wxRIGHT | wxEXPAND | wxALL;
+#ifdef __WXOSX__
+ flags |= wxALIGN_RIGHT;
+ t += wxT (":");
+#endif
+ wxStaticText* m = new wxStaticText (panel, wxID_ANY, _("Log"));
+ table->Add (m, 0, flags, 6);
+
+ {
+ 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);
+ table->Add (t, 0, wxALL, 6);
+ }
Config* config = Config::instance ();
projects / dcpomatic.git / blobdiff