#include <wx/filepicker.h>
#include <RtAudio.h>
#include <boost/filesystem.hpp>
-#include <boost/foreach.hpp>
#include <iostream>
using std::vector;
using std::make_pair;
using std::map;
using boost::bind;
-using boost::shared_ptr;
+using std::shared_ptr;
using boost::function;
using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
using dcp::locale_convert;
class FullGeneralPage : public GeneralPage
int r = 0;
add_language_controls (table, r);
- add_label_to_sizer (table, _panel, _("Interface complexity"), true, wxGBPosition(r, 0));
- _interface_complexity = new wxChoice (_panel, wxID_ANY);
- table->Add (_interface_complexity, wxGBPosition (r, 1));
- ++r;
-
add_label_to_sizer (table, _panel, _("Number of threads DCP-o-matic should use"), true, wxGBPosition (r, 0));
_master_encoding_threads = new wxSpinCtrl (_panel);
table->Add (_master_encoding_threads, wxGBPosition (r, 1));
add_update_controls (table, r);
- wxFlexGridSizer* bottom_table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
- bottom_table->AddGrowableCol (1, 1);
-
- add_label_to_sizer (bottom_table, _panel, _("Issuer"), true);
- _issuer = new wxTextCtrl (_panel, wxID_ANY);
- _issuer->SetToolTip (_("This will be written to the DCP's XML files as the <Issuer>. If it is blank, a default value mentioning DCP-o-matic will be used."));
- bottom_table->Add (_issuer, 1, wxALL | wxEXPAND);
-
- add_label_to_sizer (bottom_table, _panel, _("Creator"), true);
- _creator = new wxTextCtrl (_panel, wxID_ANY);
- _creator->SetToolTip (_("This will be written to the DCP's XML files as the <Creator>. If it is blank, a default value mentioning DCP-o-matic will be used."));
- bottom_table->Add (_creator, 1, wxALL | wxEXPAND);
-
- add_label_to_sizer (bottom_table, _panel, _("Company name"), true);
- _company_name = new wxTextCtrl (_panel, wxID_ANY);
- _company_name->SetToolTip (_("This will be written to the DCP's MXF files as the 'company name'. If it is blank, a default value mentioning libdcp (an internal DCP-o-matic library) will be used."));
- bottom_table->Add (_company_name, 1, wxALL | wxEXPAND);
-
- add_label_to_sizer (bottom_table, _panel, _("Product name"), true);
- _product_name = new wxTextCtrl (_panel, wxID_ANY);
- _product_name->SetToolTip (_("This will be written to the DCP's MXF files as the 'product name'. If it is blank, a default value mentioning libdcp (an internal DCP-o-matic library) will be used."));
- bottom_table->Add (_product_name, 1, wxALL | wxEXPAND);
-
- add_label_to_sizer (bottom_table, _panel, _("Product version"), true);
- _product_version = new wxTextCtrl (_panel, wxID_ANY);
- _product_version->SetToolTip (_("This will be written to the DCP's MXF files as the 'product version'. If it is blank, a default value mentioning libdcp (an internal DCP-o-matic library) will be used."));
- bottom_table->Add (_product_version, 1, wxALL | wxEXPAND);
-
- add_label_to_sizer (bottom_table, _panel, _("JPEG2000 comment"), true);
- _j2k_comment = new wxTextCtrl (_panel, wxID_ANY);
- _j2k_comment->SetToolTip (_("This will be written to the DCP's JPEG2000 data as a comment. If it is blank, a default value mentioning libdcp (an internal DCP-o-matic library) will be used."));
- bottom_table->Add (_j2k_comment, 1, wxALL | wxEXPAND);
-
- table->Add (bottom_table, wxGBPosition (r, 0), wxGBSpan (2, 2), wxEXPAND);
- ++r;
-
_config_file->Bind (wxEVT_FILEPICKER_CHANGED, boost::bind (&FullGeneralPage::config_file_changed, this));
_cinemas_file->Bind (wxEVT_FILEPICKER_CHANGED, boost::bind (&FullGeneralPage::cinemas_file_changed, this));
- _interface_complexity->Append (_("Simple"));
- _interface_complexity->Append (_("Full"));
- _interface_complexity->Bind (wxEVT_CHOICE, boost::bind(&FullGeneralPage::interface_complexity_changed, this));
-
_master_encoding_threads->SetRange (1, 128);
_master_encoding_threads->Bind (wxEVT_SPINCTRL, boost::bind (&FullGeneralPage::master_encoding_threads_changed, this));
_server_encoding_threads->SetRange (1, 128);
_analyse_ebur128->Bind (wxEVT_CHECKBOX, boost::bind (&FullGeneralPage::analyse_ebur128_changed, this));
#endif
_automatic_audio_analysis->Bind (wxEVT_CHECKBOX, boost::bind (&FullGeneralPage::automatic_audio_analysis_changed, this));
-
- _issuer->Bind (wxEVT_TEXT, boost::bind (&FullGeneralPage::issuer_changed, this));
- _creator->Bind (wxEVT_TEXT, boost::bind (&FullGeneralPage::creator_changed, this));
- _company_name->Bind (wxEVT_TEXT, boost::bind (&FullGeneralPage::company_name_changed, this));
- _product_name->Bind (wxEVT_TEXT, boost::bind (&FullGeneralPage::product_name_changed, this));
- _product_version->Bind (wxEVT_TEXT, boost::bind (&FullGeneralPage::product_version_changed, this));
- _j2k_comment->Bind (wxEVT_TEXT, boost::bind (&FullGeneralPage::j2k_comment_changed, this));
}
void config_changed ()
{
Config* config = Config::instance ();
- switch (config->interface_complexity()) {
- case Config::INTERFACE_SIMPLE:
- checked_set (_interface_complexity, 0);
- break;
- case Config::INTERFACE_FULL:
- checked_set (_interface_complexity, 1);
- break;
- }
checked_set (_master_encoding_threads, config->master_encoding_threads ());
checked_set (_server_encoding_threads, config->server_encoding_threads ());
#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
checked_set (_analyse_ebur128, config->analyse_ebur128 ());
#endif
checked_set (_automatic_audio_analysis, config->automatic_audio_analysis ());
- checked_set (_issuer, config->dcp_issuer ());
- checked_set (_creator, config->dcp_creator ());
- checked_set (_company_name, config->dcp_company_name ());
- checked_set (_product_name, config->dcp_product_name ());
- checked_set (_product_version, config->dcp_product_version ());
- checked_set (_j2k_comment, config->dcp_j2k_comment ());
checked_set (_config_file, config->config_file());
checked_set (_cinemas_file, config->cinemas_file());
d->Destroy ();
}
- void interface_complexity_changed ()
- {
- if (_interface_complexity->GetSelection() == 0) {
- Config::instance()->set_interface_complexity (Config::INTERFACE_SIMPLE);
- } else {
- Config::instance()->set_interface_complexity (Config::INTERFACE_FULL);
- }
- }
-
-
#ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
void analyse_ebur128_changed ()
{
Config::instance()->set_server_encoding_threads (_server_encoding_threads->GetValue ());
}
- void issuer_changed ()
- {
- Config::instance()->set_dcp_issuer (wx_to_std (_issuer->GetValue ()));
- }
-
- void creator_changed ()
- {
- Config::instance()->set_dcp_creator (wx_to_std (_creator->GetValue ()));
- }
-
- void company_name_changed ()
- {
- Config::instance()->set_dcp_company_name (wx_to_std(_company_name->GetValue()));
- }
-
- void product_name_changed ()
- {
- Config::instance()->set_dcp_product_name (wx_to_std(_product_name->GetValue()));
- }
-
- void product_version_changed ()
- {
- Config::instance()->set_dcp_product_version (wx_to_std(_product_version->GetValue()));
- }
-
- void j2k_comment_changed ()
- {
- Config::instance()->set_dcp_j2k_comment (wx_to_std(_j2k_comment->GetValue()));
- }
-
void config_file_changed ()
{
Config* config = Config::instance();
Config::instance()->set_cinemas_file (wx_to_std (_cinemas_file->GetPath ()));
}
- wxChoice* _interface_complexity;
wxSpinCtrl* _master_encoding_threads;
wxSpinCtrl* _server_encoding_threads;
FilePickerCtrl* _config_file;
wxCheckBox* _analyse_ebur128;
#endif
wxCheckBox* _automatic_audio_analysis;
- wxTextCtrl* _issuer;
- wxTextCtrl* _creator;
- wxTextCtrl* _company_name;
- wxTextCtrl* _product_name;
- wxTextCtrl* _product_version;
- wxTextCtrl* _j2k_comment;
};
-class DefaultsPage : public StandardPage
+class DefaultsPage : public Page
{
public:
DefaultsPage (wxSize panel_size, int border)
- : StandardPage (panel_size, border)
+ : Page (panel_size, border)
{}
wxString GetName () const
_panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border);
{
- add_label_to_sizer (table, _panel, _("Default duration of still images"), true);
+ add_label_to_sizer (table, _panel, _("Default duration of still images"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
_still_length = new wxSpinCtrl (_panel);
s->Add (_still_length);
- add_label_to_sizer (s, _panel, _("s"), false);
+ add_label_to_sizer (s, _panel, _("s"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
table->Add (s, 1);
}
- add_label_to_sizer (table, _panel, _("Default directory for new films"), true);
+ add_label_to_sizer (table, _panel, _("Default directory for new films"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
#ifdef DCPOMATIC_USE_OWN_PICKER
_directory = new DirPickerCtrl (_panel);
#else
#endif
table->Add (_directory, 1, wxEXPAND);
- add_label_to_sizer (table, _panel, _("Default ISDCF name details"), true);
+ add_label_to_sizer (table, _panel, _("Default ISDCF name details"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
_isdcf_metadata_button = new Button (_panel, _("Edit..."));
table->Add (_isdcf_metadata_button);
- add_label_to_sizer (table, _panel, _("Default container"), true);
+ add_label_to_sizer (table, _panel, _("Default container"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
_container = new wxChoice (_panel, wxID_ANY);
table->Add (_container);
- add_label_to_sizer (table, _panel, _("Default content type"), true);
+ add_label_to_sizer (table, _panel, _("Default content type"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
_dcp_content_type = new wxChoice (_panel, wxID_ANY);
table->Add (_dcp_content_type);
- add_label_to_sizer (table, _panel, _("Default DCP audio channels"), true);
+ add_label_to_sizer (table, _panel, _("Default DCP audio channels"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
_dcp_audio_channels = new wxChoice (_panel, wxID_ANY);
table->Add (_dcp_audio_channels);
{
- add_label_to_sizer (table, _panel, _("Default JPEG2000 bandwidth"), true);
+ add_label_to_sizer (table, _panel, _("Default JPEG2000 bandwidth"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
_j2k_bandwidth = new wxSpinCtrl (_panel);
s->Add (_j2k_bandwidth);
- add_label_to_sizer (s, _panel, _("Mbit/s"), false);
+ add_label_to_sizer (s, _panel, _("Mbit/s"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
table->Add (s, 1);
}
{
- add_label_to_sizer (table, _panel, _("Default audio delay"), true);
+ add_label_to_sizer (table, _panel, _("Default audio delay"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
_audio_delay = new wxSpinCtrl (_panel);
s->Add (_audio_delay);
- add_label_to_sizer (s, _panel, _("ms"), false);
+ add_label_to_sizer (s, _panel, _("ms"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
table->Add (s, 1);
}
- add_label_to_sizer (table, _panel, _("Default standard"), true);
+ add_label_to_sizer (table, _panel, _("Default standard"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
_standard = new wxChoice (_panel, wxID_ANY);
table->Add (_standard);
- add_label_to_sizer (table, _panel, _("Default KDM directory"), true);
+ 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
_isdcf_metadata_button->Bind (wxEVT_BUTTON, boost::bind (&DefaultsPage::edit_isdcf_metadata_clicked, this));
- BOOST_FOREACH (Ratio const * i, Ratio::containers()) {
+ for (auto i: Ratio::containers()) {
_container->Append (std_to_wx(i->container_nickname()));
}
_container->Bind (wxEVT_CHOICE, boost::bind (&DefaultsPage::container_changed, this));
- BOOST_FOREACH (DCPContentType const * i, DCPContentType::all()) {
+ for (auto i: DCPContentType::all()) {
_dcp_content_type->Append (std_to_wx (i->pretty_name ()));
}
wxChoice* _standard;
};
-class EncodingServersPage : public StandardPage
+class EncodingServersPage : public Page
{
public:
EncodingServersPage (wxSize panel_size, int border)
- : StandardPage (panel_size, border)
+ : Page (panel_size, border)
{}
wxString GetName () const
_panel->GetSizer()->Add (_use_any_servers, 0, wxALL, _border);
vector<EditableListColumn> columns;
- columns.push_back (EditableListColumn(wx_to_std(_("IP address / host name"))));
+ columns.push_back (EditableListColumn(_("IP address / host name")));
_servers_list = new EditableList<string, ServerDialog> (
_panel,
columns,
EditableList<string, ServerDialog>* _servers_list;
};
-class TMSPage : public StandardPage
+class TMSPage : public Page
{
public:
TMSPage (wxSize panel_size, int border)
- : StandardPage (panel_size, border)
+ : Page (panel_size, border)
{}
wxString GetName () const
table->AddGrowableCol (1, 1);
_panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border);
- add_label_to_sizer (table, _panel, _("Protocol"), true);
+ add_label_to_sizer (table, _panel, _("Protocol"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
_tms_protocol = new wxChoice (_panel, wxID_ANY);
table->Add (_tms_protocol, 1, wxEXPAND);
- add_label_to_sizer (table, _panel, _("IP address"), true);
+ add_label_to_sizer (table, _panel, _("IP address"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
_tms_ip = new wxTextCtrl (_panel, wxID_ANY);
table->Add (_tms_ip, 1, wxEXPAND);
- add_label_to_sizer (table, _panel, _("Target path"), true);
+ add_label_to_sizer (table, _panel, _("Target path"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
_tms_path = new wxTextCtrl (_panel, wxID_ANY);
table->Add (_tms_path, 1, wxEXPAND);
- add_label_to_sizer (table, _panel, _("User name"), true);
+ add_label_to_sizer (table, _panel, _("User name"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
_tms_user = new wxTextCtrl (_panel, wxID_ANY);
table->Add (_tms_user, 1, wxEXPAND);
- add_label_to_sizer (table, _panel, _("Password"), true);
+ add_label_to_sizer (table, _panel, _("Password"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
_tms_password = new PasswordEntry (_panel);
table->Add (_tms_password->get_panel(), 1, wxEXPAND);
return s;
}
-class EmailPage : public StandardPage
+class EmailPage : public Page
{
public:
EmailPage (wxSize panel_size, int border)
- : StandardPage (panel_size, border)
+ : Page (panel_size, border)
{}
wxString GetName () const
table->AddGrowableCol (1, 1);
_panel->GetSizer()->Add (table, 1, wxEXPAND | wxALL, _border);
- add_label_to_sizer (table, _panel, _("Outgoing mail server"), true);
+ add_label_to_sizer (table, _panel, _("Outgoing mail server"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
{
wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
_server = new wxTextCtrl (_panel, wxID_ANY);
s->Add (_server, 1, wxEXPAND | wxALL);
- add_label_to_sizer (s, _panel, _("port"), false);
+ add_label_to_sizer (s, _panel, _("port"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
_port = new wxSpinCtrl (_panel, wxID_ANY);
_port->SetRange (0, 65535);
s->Add (_port);
- add_label_to_sizer (s, _panel, _("protocol"), false);
+ add_label_to_sizer (s, _panel, _("protocol"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
_protocol = new wxChoice (_panel, wxID_ANY);
/* Make sure this matches the switches in config_changed and port_changed below */
_protocol->Append (_("Auto"));
table->Add (s, 1, wxEXPAND | wxALL);
}
- add_label_to_sizer (table, _panel, _("User name"), true);
+ add_label_to_sizer (table, _panel, _("User name"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
_user = new wxTextCtrl (_panel, wxID_ANY);
table->Add (_user, 1, wxEXPAND | wxALL);
- add_label_to_sizer (table, _panel, _("Password"), true);
+ add_label_to_sizer (table, _panel, _("Password"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
_password = new PasswordEntry (_panel);
table->Add (_password->get_panel(), 1, wxEXPAND | wxALL);
PasswordEntry* _password;
};
-class KDMEmailPage : public StandardPage
+class KDMEmailPage : public Page
{
public:
KDMEmailPage (wxSize panel_size, int border)
#ifdef DCPOMATIC_OSX
/* We have to force both width and height of this one */
- : StandardPage (wxSize (panel_size.GetWidth(), 128), border)
+ : Page (wxSize (panel_size.GetWidth(), 128), border)
#else
- : StandardPage (panel_size, border)
+ : Page (panel_size, border)
#endif
{}
table->AddGrowableCol (1, 1);
_panel->GetSizer()->Add (table, 1, wxEXPAND | wxALL, _border);
- add_label_to_sizer (table, _panel, _("Subject"), true);
+ add_label_to_sizer (table, _panel, _("Subject"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
_subject = new wxTextCtrl (_panel, wxID_ANY);
table->Add (_subject, 1, wxEXPAND | wxALL);
- add_label_to_sizer (table, _panel, _("From address"), true);
+ add_label_to_sizer (table, _panel, _("From address"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
_from = new wxTextCtrl (_panel, wxID_ANY);
table->Add (_from, 1, wxEXPAND | wxALL);
vector<EditableListColumn> columns;
- columns.push_back (EditableListColumn(wx_to_std(_("Address"))));
- add_label_to_sizer (table, _panel, _("CC addresses"), true);
+ columns.push_back (EditableListColumn(_("Address")));
+ add_label_to_sizer (table, _panel, _("CC addresses"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
_cc = new EditableList<string, EmailDialog> (
_panel,
columns,
);
table->Add (_cc, 1, wxEXPAND | wxALL);
- add_label_to_sizer (table, _panel, _("BCC address"), true);
+ add_label_to_sizer (table, _panel, _("BCC address"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
_bcc = new wxTextCtrl (_panel, wxID_ANY);
table->Add (_bcc, 1, wxEXPAND | wxALL);
wxButton* _reset_email;
};
-class NotificationsPage : public StandardPage
+class NotificationsPage : public Page
{
public:
NotificationsPage (wxSize panel_size, int border)
#ifdef DCPOMATIC_OSX
/* We have to force both width and height of this one */
- : StandardPage (wxSize (panel_size.GetWidth(), 128), border)
+ : Page (wxSize (panel_size.GetWidth(), 128), border)
#else
- : StandardPage (panel_size, border)
+ : Page (panel_size, border)
#endif
{}
table->Add (_enable_email, 1, wxEXPAND | wxALL);
table->AddSpacer (0);
- add_label_to_sizer (table, _panel, _("Subject"), true);
+ add_label_to_sizer (table, _panel, _("Subject"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
_subject = new wxTextCtrl (_panel, wxID_ANY);
table->Add (_subject, 1, wxEXPAND | wxALL);
- add_label_to_sizer (table, _panel, _("From address"), true);
+ add_label_to_sizer (table, _panel, _("From address"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
_from = new wxTextCtrl (_panel, wxID_ANY);
table->Add (_from, 1, wxEXPAND | wxALL);
- add_label_to_sizer (table, _panel, _("To address"), true);
+ add_label_to_sizer (table, _panel, _("To address"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
_to = new wxTextCtrl (_panel, wxID_ANY);
table->Add (_to, 1, wxEXPAND | wxALL);
vector<EditableListColumn> columns;
- columns.push_back (EditableListColumn(wx_to_std(_("Address"))));
- add_label_to_sizer (table, _panel, _("CC addresses"), true);
+ columns.push_back (EditableListColumn(_("Address")));
+ add_label_to_sizer (table, _panel, _("CC addresses"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
_cc = new EditableList<string, EmailDialog> (
_panel,
columns,
);
table->Add (_cc, 1, wxEXPAND | wxALL);
- add_label_to_sizer (table, _panel, _("BCC address"), true);
+ add_label_to_sizer (table, _panel, _("BCC address"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
_bcc = new wxTextCtrl (_panel, wxID_ANY);
table->Add (_bcc, 1, wxEXPAND | wxALL);
wxButton* _reset_email;
};
-class CoverSheetPage : public StandardPage
+class CoverSheetPage : public Page
{
public:
CoverSheetPage (wxSize panel_size, int border)
#ifdef DCPOMATIC_OSX
/* We have to force both width and height of this one */
- : StandardPage (wxSize (panel_size.GetWidth(), 128), border)
+ : Page (wxSize (panel_size.GetWidth(), 128), border)
#else
- : StandardPage (panel_size, border)
+ : Page (panel_size, border)
#endif
{}
};
+class IdentifiersPage : public Page
+{
+public:
+ IdentifiersPage (wxSize panel_size, int border)
+ : Page (panel_size, border)
+ {}
+
+ wxString GetName () const
+ {
+ return _("Identifiers");
+ }
+
+#ifdef DCPOMATIC_OSX
+ wxBitmap GetLargeIcon () const
+ {
+ return wxBitmap ("identifiers", wxBITMAP_TYPE_PNG_RESOURCE);
+ }
+#endif
+
+private:
+ void setup ()
+ {
+ wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+ table->AddGrowableCol (1, 1);
+
+ add_label_to_sizer (table, _panel, _("Issuer"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
+ _issuer = new wxTextCtrl (_panel, wxID_ANY);
+ _issuer->SetToolTip (_("This will be written to the DCP's XML files as the <Issuer>. If it is blank, a default value mentioning DCP-o-matic will be used."));
+ table->Add (_issuer, 1, wxALL | wxEXPAND);
+
+ add_label_to_sizer (table, _panel, _("Creator"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
+ _creator = new wxTextCtrl (_panel, wxID_ANY);
+ _creator->SetToolTip (_("This will be written to the DCP's XML files as the <Creator>. If it is blank, a default value mentioning DCP-o-matic will be used."));
+ table->Add (_creator, 1, wxALL | wxEXPAND);
+
+ add_label_to_sizer (table, _panel, _("Company name"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
+ _company_name = new wxTextCtrl (_panel, wxID_ANY);
+ _company_name->SetToolTip (_("This will be written to the DCP's MXF files as the 'company name'. If it is blank, a default value mentioning libdcp (an internal DCP-o-matic library) will be used."));
+ table->Add (_company_name, 1, wxALL | wxEXPAND);
+
+ add_label_to_sizer (table, _panel, _("Product name"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
+ _product_name = new wxTextCtrl (_panel, wxID_ANY);
+ _product_name->SetToolTip (_("This will be written to the DCP's MXF files as the 'product name'. If it is blank, a default value mentioning libdcp (an internal DCP-o-matic library) will be used."));
+ table->Add (_product_name, 1, wxALL | wxEXPAND);
+
+ add_label_to_sizer (table, _panel, _("Product version"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
+ _product_version = new wxTextCtrl (_panel, wxID_ANY);
+ _product_version->SetToolTip (_("This will be written to the DCP's MXF files as the 'product version'. If it is blank, a default value mentioning libdcp (an internal DCP-o-matic library) will be used."));
+ table->Add (_product_version, 1, wxALL | wxEXPAND);
+
+ add_label_to_sizer (table, _panel, _("JPEG2000 comment"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
+ _j2k_comment = new wxTextCtrl (_panel, wxID_ANY);
+ _j2k_comment->SetToolTip (_("This will be written to the DCP's JPEG2000 data as a comment. If it is blank, a default value mentioning libdcp (an internal DCP-o-matic library) will be used."));
+ table->Add (_j2k_comment, 1, wxALL | wxEXPAND);
+
+ _panel->GetSizer()->Add (table, 0, wxEXPAND | wxALL, _border);
+
+ _issuer->Bind (wxEVT_TEXT, boost::bind(&IdentifiersPage::issuer_changed, this));
+ _creator->Bind (wxEVT_TEXT, boost::bind(&IdentifiersPage::creator_changed, this));
+ _company_name->Bind (wxEVT_TEXT, boost::bind(&IdentifiersPage::company_name_changed, this));
+ _product_name->Bind (wxEVT_TEXT, boost::bind(&IdentifiersPage::product_name_changed, this));
+ _product_version->Bind (wxEVT_TEXT, boost::bind(&IdentifiersPage::product_version_changed, this));
+ _j2k_comment->Bind (wxEVT_TEXT, boost::bind(&IdentifiersPage::j2k_comment_changed, this));
+ }
+
+ void config_changed ()
+ {
+ Config* config = Config::instance ();
+ checked_set (_issuer, config->dcp_issuer ());
+ checked_set (_creator, config->dcp_creator ());
+ checked_set (_company_name, config->dcp_company_name ());
+ checked_set (_product_name, config->dcp_product_name ());
+ checked_set (_product_version, config->dcp_product_version ());
+ checked_set (_j2k_comment, config->dcp_j2k_comment ());
+ }
+
+ void issuer_changed ()
+ {
+ Config::instance()->set_dcp_issuer (wx_to_std (_issuer->GetValue ()));
+ }
+
+ void creator_changed ()
+ {
+ Config::instance()->set_dcp_creator (wx_to_std (_creator->GetValue ()));
+ }
+
+ void company_name_changed ()
+ {
+ Config::instance()->set_dcp_company_name (wx_to_std(_company_name->GetValue()));
+ }
+
+ void product_name_changed ()
+ {
+ Config::instance()->set_dcp_product_name (wx_to_std(_product_name->GetValue()));
+ }
+
+ void product_version_changed ()
+ {
+ Config::instance()->set_dcp_product_version (wx_to_std(_product_version->GetValue()));
+ }
+
+ void j2k_comment_changed ()
+ {
+ Config::instance()->set_dcp_j2k_comment (wx_to_std(_j2k_comment->GetValue()));
+ }
+
+ wxTextCtrl* _issuer;
+ wxTextCtrl* _creator;
+ wxTextCtrl* _company_name;
+ wxTextCtrl* _product_name;
+ wxTextCtrl* _product_version;
+ wxTextCtrl* _j2k_comment;
+};
+
+
/** @class AdvancedPage
* @brief Advanced page of the preferences dialog.
*/
-class AdvancedPage : public StockPage
+class AdvancedPage : public Page
{
public:
AdvancedPage (wxSize panel_size, int border)
- : StockPage (Kind_Advanced, panel_size, border)
+ : Page (panel_size, border)
, _maximum_j2k_bandwidth (0)
, _allow_any_dcp_frame_rate (0)
, _allow_any_container (0)
, _log_debug_threed (0)
, _log_debug_encode (0)
, _log_debug_email (0)
+ , _log_debug_video_view (0)
+ , _log_debug_player (0)
+ , _log_debug_audio_analysis (0)
{}
+ wxString GetName () const
+ {
+ return _("Advanced");
+ }
+
+#ifdef DCPOMATIC_OSX
+ wxBitmap GetLargeIcon () const
+ {
+ return wxBitmap ("advanced", wxBITMAP_TYPE_PNG_RESOURCE);
+ }
+#endif
+
private:
void add_top_aligned_label_to_sizer (wxSizer* table, wxWindow* parent, wxString text)
{
_panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border);
{
- add_label_to_sizer (table, _panel, _("Maximum JPEG2000 bandwidth"), true);
+ add_label_to_sizer (table, _panel, _("Maximum JPEG2000 bandwidth"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
_maximum_j2k_bandwidth = new wxSpinCtrl (_panel);
s->Add (_maximum_j2k_bandwidth, 1);
table->Add (s, 1);
}
- add_label_to_sizer (table, _panel, _("Video display mode"), true);
+ add_label_to_sizer (table, _panel, _("Video display mode"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
_video_display_mode = new wxChoice (_panel, wxID_ANY);
table->Add (_video_display_mode);
table->AddSpacer (0);
{
- add_label_to_sizer (table, _panel, _("Maximum number of frames to store per thread"), true);
+ add_label_to_sizer (table, _panel, _("Maximum number of frames to store per thread"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
_frames_in_memory_multiplier = new wxSpinCtrl (_panel);
s->Add (_frames_in_memory_multiplier, 1);
t->Add (_log_debug_encode, 1, wxEXPAND | wxALL);
_log_debug_email = new CheckBox (_panel, _("Debug: email sending"));
t->Add (_log_debug_email, 1, wxEXPAND | wxALL);
+ _log_debug_video_view = new CheckBox (_panel, _("Debug: video view"));
+ t->Add (_log_debug_video_view, 1, wxEXPAND | wxALL);
+ _log_debug_player = new CheckBox (_panel, _("Debug: player"));
+ t->Add (_log_debug_player, 1, wxEXPAND | wxALL);
+ _log_debug_audio_analysis = new CheckBox (_panel, _("Debug: audio analysis"));
+ t->Add (_log_debug_audio_analysis, 1, wxEXPAND | wxALL);
table->Add (t, 0, wxALL, 6);
}
_log_debug_threed->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
_log_debug_encode->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
_log_debug_email->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
+ _log_debug_video_view->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
+ _log_debug_player->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
+ _log_debug_audio_analysis->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
#ifdef DCPOMATIC_WINDOWS
_win32_console->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::win32_console_changed, this));
#endif
checked_set (_log_debug_threed, config->log_types() & LogEntry::TYPE_DEBUG_THREED);
checked_set (_log_debug_encode, config->log_types() & LogEntry::TYPE_DEBUG_ENCODE);
checked_set (_log_debug_email, config->log_types() & LogEntry::TYPE_DEBUG_EMAIL);
+ checked_set (_log_debug_video_view, config->log_types() & LogEntry::TYPE_DEBUG_VIDEO_VIEW);
+ checked_set (_log_debug_player, config->log_types() & LogEntry::TYPE_DEBUG_PLAYER);
+ checked_set (_log_debug_audio_analysis, config->log_types() & LogEntry::TYPE_DEBUG_AUDIO_ANALYSIS);
checked_set (_frames_in_memory_multiplier, config->frames_in_memory_multiplier());
#ifdef DCPOMATIC_WINDOWS
checked_set (_win32_console, config->win32_console());
if (_log_debug_email->GetValue ()) {
types |= LogEntry::TYPE_DEBUG_EMAIL;
}
+ if (_log_debug_video_view->GetValue()) {
+ types |= LogEntry::TYPE_DEBUG_VIDEO_VIEW;
+ }
+ if (_log_debug_player->GetValue()) {
+ types |= LogEntry::TYPE_DEBUG_PLAYER;
+ }
+ if (_log_debug_audio_analysis->GetValue()) {
+ types |= LogEntry::TYPE_DEBUG_AUDIO_ANALYSIS;
+ }
Config::instance()->set_log_types (types);
}
wxCheckBox* _log_debug_threed;
wxCheckBox* _log_debug_encode;
wxCheckBox* _log_debug_email;
+ wxCheckBox* _log_debug_video_view;
+ wxCheckBox* _log_debug_player;
+ wxCheckBox* _log_debug_audio_analysis;
#ifdef DCPOMATIC_WINDOWS
wxCheckBox* _win32_console;
#endif
e->AddPage (new KDMEmailPage (ps, border));
e->AddPage (new NotificationsPage (ps, border));
e->AddPage (new CoverSheetPage (ps, border));
+ e->AddPage (new IdentifiersPage (ps, border));
e->AddPage (new AdvancedPage (ps, border));
return e;
}
projects / dcpomatic.git / blobdiff