X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ffull_config_dialog.cc;h=2d4ac3fdf9f98c233772be37f20ebbf73e45015e;hp=f6dd783bd9f5baaff64d40107c93cdd0a48b2426;hb=3ee5431c7e270d7bf706fcf7530a6eb2c78480c3;hpb=a9dde34b8772ef8b985af067e2ff709be4e3cab6 diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc index f6dd783bd..2d4ac3fdf 100644 --- a/src/wx/full_config_dialog.cc +++ b/src/wx/full_config_dialog.cc @@ -71,6 +71,9 @@ using boost::bind; using boost::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 @@ -105,19 +108,17 @@ private: ++r; add_label_to_sizer (table, _panel, _("Configuration file"), true, wxGBPosition (r, 0)); - _config_file = new FilePickerCtrl (_panel, _("Select configuration file"), "*.xml", true); + _config_file = new FilePickerCtrl (_panel, _("Select configuration file"), "*.xml", true, true); table->Add (_config_file, wxGBPosition (r, 1)); ++r; add_label_to_sizer (table, _panel, _("Cinema and screen database file"), true, wxGBPosition (r, 0)); - _cinemas_file = new FilePickerCtrl (_panel, _("Select cinema and screen database file"), "*.xml", true); + _cinemas_file = new FilePickerCtrl (_panel, _("Select cinema and screen database file"), "*.xml", true, true); table->Add (_cinemas_file, wxGBPosition (r, 1)); Button* export_cinemas = new Button (_panel, _("Export...")); table->Add (export_cinemas, wxGBPosition (r, 2)); ++r; - add_play_sound_controls (table, r); - #ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG _analyse_ebur128 = new CheckBox (_panel, _("Find integrated loudness, true peak and loudness range when analysing audio")); table->Add (_analyse_ebur128, wxGBPosition (r, 0), wxGBSpan (1, 2)); @@ -130,20 +131,6 @@ private: 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); - bottom_table->Add (_issuer, 1, wxALL | wxEXPAND); - - add_label_to_sizer (bottom_table, _panel, _("Creator"), true); - _creator = new wxTextCtrl (_panel, wxID_ANY); - bottom_table->Add (_creator, 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)); @@ -161,9 +148,6 @@ private: _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)); } void config_changed () @@ -184,8 +168,6 @@ private: 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 (_config_file, config->config_file()); checked_set (_cinemas_file, config->cinemas_file()); @@ -237,16 +219,6 @@ private: 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 config_file_changed () { Config* config = Config::instance(); @@ -287,15 +259,13 @@ private: wxCheckBox* _analyse_ebur128; #endif wxCheckBox* _automatic_audio_analysis; - wxTextCtrl* _issuer; - wxTextCtrl* _creator; }; -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 @@ -318,15 +288,15 @@ private: _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 @@ -334,49 +304,45 @@ private: #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 scale-to"), true); - _scale_to = new wxChoice (_panel, wxID_ANY); - table->Add (_scale_to); - - 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 @@ -385,9 +351,6 @@ private: 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)); @@ -402,14 +365,6 @@ private: _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 ())); } @@ -428,8 +383,6 @@ private: _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 () @@ -443,17 +396,6 @@ private: } } - vector 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 const ct = DCPContentType::all (); for (size_t i = 0; i < ct.size(); ++i) { if (ct[i] == config->default_dcp_content_type ()) { @@ -469,7 +411,6 @@ private: checked_set (_dcp_audio_channels, locale_convert (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 () @@ -521,17 +462,6 @@ private: 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 = Ratio::all (); - Config::instance()->set_default_scale_to (ratio[s - 1]); - } - } - void dcp_content_type_changed () { vector ct = DCPContentType::all (); @@ -543,11 +473,6 @@ private: 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; @@ -560,18 +485,16 @@ private: 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 +class EncodingServersPage : public Page { public: EncodingServersPage (wxSize panel_size, int border) - : StandardPage (panel_size, border) + : Page (panel_size, border) {} wxString GetName () const @@ -593,7 +516,7 @@ private: _panel->GetSizer()->Add (_use_any_servers, 0, wxALL, _border); vector columns; - columns.push_back (EditableListColumn(wx_to_std(_("IP address / host name")))); + columns.push_back (EditableListColumn(_("IP address / host name"))); _servers_list = new EditableList ( _panel, columns, @@ -627,11 +550,11 @@ private: EditableList* _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 @@ -649,33 +572,37 @@ public: 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); - 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); _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)); @@ -687,6 +614,7 @@ private: { 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 ()); @@ -694,6 +622,11 @@ private: 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(_tms_protocol->GetSelection())); @@ -719,6 +652,7 @@ private: Config::instance()->set_tms_password (_tms_password->get()); } + CheckBox* _upload; wxChoice* _tms_protocol; wxTextCtrl* _tms_ip; wxTextCtrl* _tms_path; @@ -732,11 +666,11 @@ column (string s) 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 @@ -758,16 +692,16 @@ private: 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")); @@ -778,11 +712,11 @@ private: 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); @@ -862,16 +796,16 @@ private: 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 {} @@ -894,17 +828,17 @@ private: 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 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 ( _panel, columns, @@ -914,7 +848,7 @@ private: ); 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); @@ -983,154 +917,15 @@ private: 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 +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 {} @@ -1161,21 +956,21 @@ private: 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 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 ( _panel, columns, @@ -1185,7 +980,7 @@ private: ); 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); @@ -1292,16 +1087,16 @@ private: 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 {} @@ -1357,14 +1152,129 @@ private: }; +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 . 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 . 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) @@ -1374,11 +1284,26 @@ 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) + , _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) { @@ -1398,7 +1323,7 @@ private: _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); @@ -1406,7 +1331,7 @@ private: 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); @@ -1421,7 +1346,7 @@ private: 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); @@ -1438,7 +1363,7 @@ private: 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); @@ -1487,12 +1412,18 @@ private: /// 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")); 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); } @@ -1518,9 +1449,12 @@ private: _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)); + _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 @@ -1547,9 +1481,12 @@ private: 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 (_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()); @@ -1620,8 +1557,8 @@ private: 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; @@ -1629,6 +1566,15 @@ private: 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); } @@ -1652,9 +1598,12 @@ private: 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; + wxCheckBox* _log_debug_video_view; + wxCheckBox* _log_debug_player; + wxCheckBox* _log_debug_audio_analysis; #ifdef DCPOMATIC_WINDOWS wxCheckBox* _win32_console; #endif @@ -1678,15 +1627,16 @@ create_full_config_dialog () #endif e->AddPage (new FullGeneralPage (ps, border)); + e->AddPage (new SoundPage (ps, border)); e->AddPage (new DefaultsPage (ps, border)); e->AddPage (new EncodingServersPage (ps, border)); e->AddPage (new KeysPage (ps, border)); 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 IdentifiersPage (ps, border)); e->AddPage (new AdvancedPage (ps, border)); return e; }