#include "server_dialog.h"
#include "make_chain_dialog.h"
#include "email_dialog.h"
+#include "name_format_editor.h"
#include "lib/config.h"
#include "lib/ratio.h"
#include "lib/filter.h"
#include "lib/dcp_content_type.h"
#include "lib/log.h"
#include "lib/util.h"
-#include "lib/raw_convert.h"
#include "lib/cross.h"
#include "lib/exceptions.h"
+#include <dcp/raw_convert.h>
#include <dcp/exceptions.h>
#include <dcp/certificate_chain.h>
-#include <dcp/raw_convert.h>
#include <wx/stdpaths.h>
#include <wx/preferences.h>
#include <wx/spinctrl.h>
using boost::shared_ptr;
using boost::function;
using boost::optional;
+using dcp::raw_convert;
class Page
{
++r;
_button_sizer = new wxBoxSizer (wxHORIZONTAL);
- _remake_certificates = new wxButton (this, wxID_ANY, _("Re-make certificates and key..."));
+ _remake_certificates = new wxButton (this, wxID_ANY, _("Re-make certificates\nand key..."));
_button_sizer->Add (_remake_certificates, 1, wxRIGHT, border);
table->Add (_button_sizer, wxGBPosition (r, 0), wxGBSpan (1, 4));
++r;
void add_button (wxWindow* button)
{
- _button_sizer->Add (button);
+ _button_sizer->Add (button, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_X_GAP);
_sizer->Layout ();
}
_panel->GetSizer()->Add (_decryption);
- _export_decryption_certificate = new wxButton (_decryption, wxID_ANY, _("Export DCP decryption certificate..."));
+ _export_decryption_certificate = new wxButton (_decryption, wxID_ANY, _("Export DCP decryption\ncertificate..."));
_decryption->add_button (_export_decryption_certificate);
+ _export_decryption_chain = new wxButton (_decryption, wxID_ANY, _("Export DCP decryption\nchain..."));
+ _decryption->add_button (_export_decryption_chain);
_export_decryption_certificate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KeysPage::export_decryption_certificate, this));
+ _export_decryption_chain->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KeysPage::export_decryption_chain, this));
}
void export_decryption_certificate ()
d->Destroy ();
}
+ void export_decryption_chain ()
+ {
+ wxFileDialog* d = new wxFileDialog (
+ _panel, _("Select Chain 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_chain()->chain();
+ fwrite (s.c_str(), 1, s.length(), f);
+ fclose (f);
+ }
+ d->Destroy ();
+ }
+
void config_changed ()
{
_signer->config_changed ();
CertificateChainEditor* _signer;
CertificateChainEditor* _decryption;
wxButton* _export_decryption_certificate;
+ wxButton* _export_decryption_chain;
};
class TMSPage : public StandardPage
{}
private:
+ void add_top_aligned_label_to_sizer (wxSizer* table, wxWindow* parent, wxString text)
+ {
+ int flags = wxALIGN_TOP | wxTOP | wxLEFT;
+#ifdef __WXOSX__
+ flags |= wxALIGN_RIGHT;
+ text += wxT (":");
+#endif
+ wxStaticText* m = new wxStaticText (parent, wxID_ANY, text);
+ table->Add (m, 0, flags, DCPOMATIC_SIZER_Y_GAP);
+ }
+
void setup ()
{
wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
table->Add (_only_servers_encode, 1, wxEXPAND | wxALL);
table->AddSpacer (0);
-#ifdef __WXOSX__
- wxStaticText* m = new wxStaticText (_panel, wxID_ANY, _("Log:"));
- table->Add (m, 0, wxALIGN_TOP | wxLEFT | wxRIGHT | wxEXPAND | wxALL | wxALIGN_RIGHT, 6);
-#else
- wxStaticText* m = new wxStaticText (_panel, wxID_ANY, _("Log"));
- table->Add (m, 0, wxALIGN_TOP | wxLEFT | wxRIGHT | wxEXPAND | wxALL, 6);
-#endif
+ {
+ add_top_aligned_label_to_sizer (table, _panel, _("DCP metadata filename format"));
+ dcp::NameFormat::Map titles;
+ titles['t'] = "type (cpl/pkl)";
+ titles['i'] = "unique ID";
+ titles['c'] = "content filename";
+ dcp::NameFormat::Map examples;
+ examples['t'] = "cpl";
+ examples['i'] = "eb1c112c-ca3c-4ae6-9263-c6714ff05d64";
+ examples['c'] = "myfile.mp4";
+ _dcp_metadata_filename_format = new NameFormatEditor (_panel, Config::instance()->dcp_metadata_filename_format(), titles, examples);
+ table->Add (_dcp_metadata_filename_format->panel(), 1, wxEXPAND | wxALL);
+ }
{
+ add_top_aligned_label_to_sizer (table, _panel, _("DCP asset filename format"));
+ dcp::NameFormat::Map titles;
+ titles['t'] = "type (j2c/pcm/sub)";
+ titles['i'] = "unique ID";
+ titles['r'] = "reel number";
+ titles['n'] = "number of reels";
+ titles['c'] = "content filename";
+ dcp::NameFormat::Map examples;
+ examples['t'] = "j2c";
+ examples['i'] = "eb1c112c-ca3c-4ae6-9263-c6714ff05d64";
+ examples['r'] = "1";
+ examples['n'] = "4";
+ examples['c'] = "myfile.mp4";
+ _dcp_asset_filename_format = new NameFormatEditor (_panel, Config::instance()->dcp_asset_filename_format(), titles, examples);
+ table->Add (_dcp_asset_filename_format->panel(), 1, wxEXPAND | wxALL);
+ }
+
+ {
+ add_top_aligned_label_to_sizer (table, _panel, _("Log"));
wxBoxSizer* t = new wxBoxSizer (wxVERTICAL);
_log_general = new wxCheckBox (_panel, wxID_ANY, _("General"));
t->Add (_log_general, 1, wxEXPAND | wxALL);
_maximum_j2k_bandwidth->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&AdvancedPage::maximum_j2k_bandwidth_changed, this));
_allow_any_dcp_frame_rate->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::allow_any_dcp_frame_rate_changed, this));
_only_servers_encode->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::only_servers_encode_changed, this));
+ _dcp_metadata_filename_format->Changed.connect (boost::bind (&AdvancedPage::dcp_metadata_filename_format_changed, this));
+ _dcp_asset_filename_format->Changed.connect (boost::bind (&AdvancedPage::dcp_asset_filename_format_changed, this));
_log_general->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::log_changed, this));
_log_warning->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::log_changed, this));
_log_error->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AdvancedPage::log_changed, this));
Config::instance()->set_only_servers_encode (_only_servers_encode->GetValue ());
}
+ void dcp_metadata_filename_format_changed ()
+ {
+ Config::instance()->set_dcp_metadata_filename_format (_dcp_metadata_filename_format->get ());
+ }
+
+ void dcp_asset_filename_format_changed ()
+ {
+ Config::instance()->set_dcp_asset_filename_format (_dcp_asset_filename_format->get ());
+ }
+
void log_changed ()
{
int types = 0;
wxSpinCtrl* _maximum_j2k_bandwidth;
wxCheckBox* _allow_any_dcp_frame_rate;
wxCheckBox* _only_servers_encode;
+ NameFormatEditor* _dcp_metadata_filename_format;
+ NameFormatEditor* _dcp_asset_filename_format;
wxCheckBox* _log_general;
wxCheckBox* _log_warning;
wxCheckBox* _log_error;
projects / dcpomatic.git / blobdiff