X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffull_config_dialog.cc;h=fe80aeae09520ada1115fdcdc5fe983cdb756794;hb=5932cc8c99ff9704deab0eb309101ed00c4f570d;hp=fff0d2035289f91e774e0d2d10e36311027d13ce;hpb=186654cc20ef302abed1a2ddfa01fc1fa3af81fa;p=dcpomatic.git diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc index fff0d2035..fe80aeae0 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 @@ -128,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)); @@ -159,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 () @@ -182,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()); @@ -235,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(); @@ -285,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 @@ -379,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)); @@ -414,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 () @@ -444,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 () @@ -507,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; @@ -527,14 +488,13 @@ private: 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 @@ -556,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, @@ -590,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 @@ -612,6 +572,9 @@ 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); @@ -639,6 +602,7 @@ private: _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)); @@ -650,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 ()); @@ -657,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())); @@ -682,6 +652,7 @@ private: Config::instance()->set_tms_password (_tms_password->get()); } + CheckBox* _upload; wxChoice* _tms_protocol; wxTextCtrl* _tms_ip; wxTextCtrl* _tms_path; @@ -695,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 @@ -825,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 {} @@ -866,7 +837,7 @@ private: table->Add (_from, 1, wxEXPAND | wxALL); vector columns; - columns.push_back (EditableListColumn(wx_to_std(_("Address")))); + columns.push_back (EditableListColumn(_("Address"))); add_label_to_sizer (table, _panel, _("CC addresses"), true); _cc = new EditableList ( _panel, @@ -946,15 +917,15 @@ private: 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 {} @@ -998,7 +969,7 @@ private: table->Add (_to, 1, wxEXPAND | wxALL); vector columns; - columns.push_back (EditableListColumn(wx_to_std(_("Address")))); + columns.push_back (EditableListColumn(_("Address"))); add_label_to_sizer (table, _panel, _("CC addresses"), true); _cc = new EditableList ( _panel, @@ -1116,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 {} @@ -1181,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); + _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); + _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); + _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); + _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); + _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); + _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) @@ -1201,8 +1287,23 @@ public: , _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) { @@ -1245,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); @@ -1317,6 +1418,12 @@ private: 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); } @@ -1345,6 +1452,9 @@ private: _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 @@ -1374,6 +1484,9 @@ private: 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()); @@ -1453,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); } @@ -1479,6 +1601,9 @@ private: 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 @@ -1511,6 +1636,7 @@ create_full_config_dialog () 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; }