_container = new wxChoice (_panel, wxID_ANY);
table->Add (_container);
- add_label_to_sizer (table, _panel, _("Default scale-to"), true);
- _scale_to = new wxChoice (_panel, wxID_ANY);
- table->Add (_scale_to);
-
add_label_to_sizer (table, _panel, _("Default content type"), true);
_dcp_content_type = new wxChoice (_panel, wxID_ANY);
table->Add (_dcp_content_type);
table->Add (_kdm_directory, 1, wxEXPAND);
- _upload_after_make_dcp = new CheckBox (_panel, _("Default to enabling upload of DCP to TMS"));
- table->Add (_upload_after_make_dcp, 1, wxEXPAND);
-
_still_length->SetRange (1, 3600);
_still_length->Bind (wxEVT_SPINCTRL, boost::bind (&DefaultsPage::still_length_changed, this));
_container->Bind (wxEVT_CHOICE, boost::bind (&DefaultsPage::container_changed, this));
- _scale_to->Append (_("Guess from content"));
-
- BOOST_FOREACH (Ratio const * i, Ratio::all()) {
- _scale_to->Append (std_to_wx(i->image_nickname()));
- }
-
- _scale_to->Bind (wxEVT_CHOICE, boost::bind (&DefaultsPage::scale_to_changed, this));
-
BOOST_FOREACH (DCPContentType const * i, DCPContentType::all()) {
_dcp_content_type->Append (std_to_wx (i->pretty_name ()));
}
_standard->Append (_("SMPTE"));
_standard->Append (_("Interop"));
_standard->Bind (wxEVT_CHOICE, boost::bind (&DefaultsPage::standard_changed, this));
-
- _upload_after_make_dcp->Bind (wxEVT_CHECKBOX, boost::bind (&DefaultsPage::upload_after_make_dcp_changed, this));
}
void config_changed ()
}
}
- vector<Ratio const *> ratios = Ratio::all ();
- for (size_t i = 0; i < ratios.size(); ++i) {
- if (ratios[i] == config->default_scale_to ()) {
- _scale_to->SetSelection (i + 1);
- }
- }
-
- if (!config->default_scale_to()) {
- _scale_to->SetSelection (0);
- }
-
vector<DCPContentType const *> const ct = DCPContentType::all ();
for (size_t i = 0; i < ct.size(); ++i) {
if (ct[i] == config->default_dcp_content_type ()) {
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);
- checked_set (_upload_after_make_dcp, config->default_upload_after_make_dcp());
}
void j2k_bandwidth_changed ()
Config::instance()->set_default_container (ratio[_container->GetSelection()]);
}
- void scale_to_changed ()
- {
- int const s = _scale_to->GetSelection ();
- if (s == 0) {
- Config::instance()->set_default_scale_to (0);
- } else {
- vector<Ratio const *> ratio = Ratio::all ();
- Config::instance()->set_default_scale_to (ratio[s - 1]);
- }
- }
-
void dcp_content_type_changed ()
{
vector<DCPContentType const *> ct = DCPContentType::all ();
Config::instance()->set_default_interop (_standard->GetSelection() == 1);
}
- void upload_after_make_dcp_changed ()
- {
- Config::instance()->set_default_upload_after_make_dcp (_upload_after_make_dcp->GetValue ());
- }
-
wxSpinCtrl* _j2k_bandwidth;
wxSpinCtrl* _audio_delay;
wxButton* _isdcf_metadata_button;
wxDirPickerCtrl* _kdm_directory;
#endif
wxChoice* _container;
- wxChoice* _scale_to;
wxChoice* _dcp_content_type;
wxChoice* _dcp_audio_channels;
wxChoice* _standard;
- wxCheckBox* _upload_after_make_dcp;
};
class EncodingServersPage : public StandardPage
private:
void setup ()
{
+ _upload = new CheckBox (_panel, _("Upload DCP to TMS after creation"));
+ _panel->GetSizer()->Add (_upload, 0, wxALL | wxEXPAND, _border);
+
wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
table->AddGrowableCol (1, 1);
_panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border);
_tms_protocol->Append (_("SCP (for AAM and Doremi)"));
_tms_protocol->Append (_("FTP (for Dolby)"));
+ _upload->Bind (wxEVT_CHECKBOX, boost::bind(&TMSPage::upload_changed, this));
_tms_protocol->Bind (wxEVT_CHOICE, boost::bind (&TMSPage::tms_protocol_changed, this));
_tms_ip->Bind (wxEVT_TEXT, boost::bind (&TMSPage::tms_ip_changed, this));
_tms_path->Bind (wxEVT_TEXT, boost::bind (&TMSPage::tms_path_changed, this));
{
Config* config = Config::instance ();
+ checked_set (_upload, config->upload_after_make_dcp());
checked_set (_tms_protocol, config->tms_protocol ());
checked_set (_tms_ip, config->tms_ip ());
checked_set (_tms_path, config->tms_path ());
checked_set (_tms_password, config->tms_password ());
}
+ void upload_changed ()
+ {
+ Config::instance()->set_upload_after_make_dcp (_upload->GetValue());
+ }
+
void tms_protocol_changed ()
{
Config::instance()->set_tms_protocol(static_cast<FileTransferProtocol>(_tms_protocol->GetSelection()));
Config::instance()->set_tms_password (_tms_password->get());
}
+ CheckBox* _upload;
wxChoice* _tms_protocol;
wxTextCtrl* _tms_ip;
wxTextCtrl* _tms_path;
wxButton* _reset_email;
};
-class AccountsPage : public StandardPage
-{
-public:
- AccountsPage (wxSize panel_size, int border)
- : StandardPage (panel_size, border)
- {}
-
- wxString GetName () const
- {
- return _("Accounts");
- }
-
-#ifdef DCPOMATIC_OSX
- wxBitmap GetLargeIcon () const
- {
- return wxBitmap ("accounts", wxBITMAP_TYPE_PNG_RESOURCE);
- }
-#endif
-
- void setup ()
- {
- wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
- table->AddGrowableCol (1, 1);
- _panel->GetSizer()->Add (table, 1, wxEXPAND | wxALL, _border);
-
- add_label_to_sizer (table, _panel, _("certificates.barco.com user name"), true);
- _barco_username = new wxTextCtrl (_panel, wxID_ANY);
- table->Add (_barco_username, 1, wxEXPAND | wxALL);
-
- add_label_to_sizer (table, _panel, _("certificates.barco.com password"), true);
- _barco_password = new PasswordEntry (_panel);
- table->Add (_barco_password->get_panel(), 1, wxEXPAND | wxALL);
-
- add_label_to_sizer (table, _panel, _("certificates.christiedigital.com user name"), true);
- _christie_username = new wxTextCtrl (_panel, wxID_ANY);
- table->Add (_christie_username, 1, wxEXPAND | wxALL);
-
- add_label_to_sizer (table, _panel, _("certificates.christiedigital.com password"), true);
- _christie_password = new PasswordEntry (_panel);
- table->Add (_christie_password->get_panel(), 1, wxEXPAND | wxALL);
-
- add_label_to_sizer (table, _panel, _("GDC user name"), true);
- _gdc_username = new wxTextCtrl (_panel, wxID_ANY);
- table->Add (_gdc_username, 1, wxEXPAND | wxALL);
-
- add_label_to_sizer (table, _panel, _("GDC password"), true);
- _gdc_password = new PasswordEntry (_panel);
- table->Add (_gdc_password->get_panel(), 1, wxEXPAND | wxALL);
-
- _barco_username->Bind (wxEVT_TEXT, boost::bind(&AccountsPage::barco_username_changed, this));
- _barco_password->Changed.connect (boost::bind(&AccountsPage::barco_password_changed, this));
- _christie_username->Bind (wxEVT_TEXT, boost::bind(&AccountsPage::christie_username_changed, this));
- _christie_password->Changed.connect (boost::bind(&AccountsPage::christie_password_changed, this));
- _gdc_username->Bind (wxEVT_TEXT, boost::bind(&AccountsPage::gdc_username_changed, this));
- _gdc_password->Changed.connect (boost::bind(&AccountsPage::gdc_password_changed, this));
- }
-
- void config_changed ()
- {
- Config* config = Config::instance ();
-
- checked_set (_barco_username, config->barco_username().get_value_or(""));
- checked_set (_barco_password, config->barco_password().get_value_or(""));
- checked_set (_christie_username, config->christie_username().get_value_or(""));
- checked_set (_christie_password, config->christie_password().get_value_or(""));
- checked_set (_gdc_username, config->gdc_username().get_value_or(""));
- checked_set (_gdc_password, config->gdc_password().get_value_or(""));
- }
-
- void barco_username_changed ()
- {
- wxString const s = _barco_username->GetValue();
- if (!s.IsEmpty()) {
- Config::instance()->set_barco_username (wx_to_std(s));
- } else {
- Config::instance()->unset_barco_username ();
- }
- }
-
- void barco_password_changed ()
- {
- string const s = _barco_password->get();
- if (!s.empty()) {
- Config::instance()->set_barco_password(s);
- } else {
- Config::instance()->unset_barco_password();
- }
- }
-
- void christie_username_changed ()
- {
- wxString const s = _christie_username->GetValue();
- if (!s.IsEmpty()) {
- Config::instance()->set_christie_username (wx_to_std(s));
- } else {
- Config::instance()->unset_christie_username ();
- }
- }
-
- void christie_password_changed ()
- {
- string const s = _christie_password->get();
- if (!s.empty()) {
- Config::instance()->set_christie_password(s);
- } else {
- Config::instance()->unset_christie_password();
- }
- }
-
- void gdc_username_changed ()
- {
- wxString const s = _gdc_username->GetValue();
- if (!s.IsEmpty()) {
- Config::instance()->set_gdc_username (wx_to_std(s));
- } else {
- Config::instance()->unset_gdc_username ();
- }
- }
-
- void gdc_password_changed ()
- {
- string const s = _gdc_password->get();
- if (!s.empty()) {
- Config::instance()->set_gdc_password(s);
- } else {
- Config::instance()->unset_gdc_password();
- }
- }
-
-private:
- wxTextCtrl* _barco_username;
- PasswordEntry* _barco_password;
- wxTextCtrl* _christie_username;
- PasswordEntry* _christie_password;
- wxTextCtrl* _gdc_username;
- PasswordEntry* _gdc_password;
-};
-
-
class NotificationsPage : public StandardPage
{
public:
, _log_warning (0)
, _log_error (0)
, _log_timing (0)
- , _log_debug_decode (0)
+ , _log_debug_threed (0)
, _log_debug_encode (0)
, _log_debug_email (0)
{}
table->Add (_allow_any_dcp_frame_rate, 1, wxEXPAND | wxALL);
table->AddSpacer (0);
- _allow_any_container = new CheckBox (_panel, _("Allow non-standard container ratios"));
+ _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);
/// TRANSLATORS: translate the word "Timing" here; do not include the "Config|" prefix
_log_timing = new CheckBox (_panel, S_("Config|Timing"));
t->Add (_log_timing, 1, wxEXPAND | wxALL);
- _log_debug_decode = new CheckBox (_panel, _("Debug: decode"));
- t->Add (_log_debug_decode, 1, wxEXPAND | wxALL);
+ _log_debug_threed = new CheckBox (_panel, _("Debug: 3D"));
+ t->Add (_log_debug_threed, 1, wxEXPAND | wxALL);
_log_debug_encode = new CheckBox (_panel, _("Debug: encode"));
t->Add (_log_debug_encode, 1, wxEXPAND | wxALL);
_log_debug_email = new CheckBox (_panel, _("Debug: email sending"));
_log_warning->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
_log_error->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
_log_timing->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
- _log_debug_decode->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
+ _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));
#ifdef DCPOMATIC_WINDOWS
checked_set (_log_warning, config->log_types() & LogEntry::TYPE_WARNING);
checked_set (_log_error, config->log_types() & LogEntry::TYPE_ERROR);
checked_set (_log_timing, config->log_types() & LogEntry::TYPE_TIMING);
- checked_set (_log_debug_decode, config->log_types() & LogEntry::TYPE_DEBUG_DECODE);
+ 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 (_frames_in_memory_multiplier, config->frames_in_memory_multiplier());
if (_log_timing->GetValue ()) {
types |= LogEntry::TYPE_TIMING;
}
- if (_log_debug_decode->GetValue ()) {
- types |= LogEntry::TYPE_DEBUG_DECODE;
+ if (_log_debug_threed->GetValue ()) {
+ types |= LogEntry::TYPE_DEBUG_THREED;
}
if (_log_debug_encode->GetValue ()) {
types |= LogEntry::TYPE_DEBUG_ENCODE;
wxCheckBox* _log_warning;
wxCheckBox* _log_error;
wxCheckBox* _log_timing;
- wxCheckBox* _log_debug_decode;
+ wxCheckBox* _log_debug_threed;
wxCheckBox* _log_debug_encode;
wxCheckBox* _log_debug_email;
#ifdef DCPOMATIC_WINDOWS
e->AddPage (new TMSPage (ps, border));
e->AddPage (new EmailPage (ps, border));
e->AddPage (new KDMEmailPage (ps, border));
- e->AddPage (new AccountsPage (ps, border));
e->AddPage (new NotificationsPage (ps, border));
e->AddPage (new CoverSheetPage (ps, border));
e->AddPage (new AdvancedPage (ps, border));
projects / dcpomatic.git / blobdiff