X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffull_config_dialog.cc;h=8e176b4d6fa319c92aa311357b7947c8864777f5;hb=9c1bb2e5ca7c80c4e26b1b2e41159aa171360a94;hp=15e2c4c04b273bc5e1609c5bcf633d2c8d6ac356;hpb=aae000e8a37a494bf20ba0e5dd219ad9f78c6286;p=dcpomatic.git diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc index 15e2c4c04..8e176b4d6 100644 --- a/src/wx/full_config_dialog.cc +++ b/src/wx/full_config_dialog.cc @@ -36,6 +36,8 @@ #include "nag_dialog.h" #include "config_move_dialog.h" #include "config_dialog.h" +#include "static_text.h" +#include "check_box.h" #include "lib/config.h" #include "lib/ratio.h" #include "lib/filter.h" @@ -85,6 +87,11 @@ private: 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)); @@ -103,17 +110,19 @@ private: 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); table->Add (_cinemas_file, wxGBPosition (r, 1)); + wxButton* export_cinemas = new wxButton (_panel, wxID_ANY, _("Export...")); + table->Add (export_cinemas, wxGBPosition (r, 2)); ++r; add_play_sound_controls (table, r); #ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG - _analyse_ebur128 = new wxCheckBox (_panel, wxID_ANY, _("Find integrated loudness, true peak and loudness range when analysing audio")); + _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)); ++r; #endif - _automatic_audio_analysis = new wxCheckBox (_panel, wxID_ANY, _("Automatically analyse content audio")); + _automatic_audio_analysis = new CheckBox (_panel, _("Automatically analyse content audio")); table->Add (_automatic_audio_analysis, wxGBPosition (r, 0), wxGBSpan (1, 2)); ++r; @@ -136,10 +145,15 @@ private: _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); _server_encoding_threads->Bind (wxEVT_SPINCTRL, boost::bind (&FullGeneralPage::server_encoding_threads_changed, this)); + export_cinemas->Bind (wxEVT_BUTTON, boost::bind (&FullGeneralPage::export_cinemas_file, this)); #ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG _analyse_ebur128->Bind (wxEVT_CHECKBOX, boost::bind (&FullGeneralPage::analyse_ebur128_changed, this)); @@ -154,6 +168,14 @@ private: { 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 @@ -168,6 +190,28 @@ private: GeneralPage::config_changed (); } + void export_cinemas_file () + { + wxFileDialog* d = new wxFileDialog ( + _panel, _("Select Cinemas File"), wxEmptyString, wxEmptyString, wxT ("XML files (*.xml)|*.xml"), + wxFD_SAVE | wxFD_OVERWRITE_PROMPT + ); + + if (d->ShowModal () == wxID_OK) { + boost::filesystem::copy_file (Config::instance()->cinemas_file(), wx_to_std(d->GetPath())); + } + 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 () @@ -232,6 +276,7 @@ private: 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; @@ -338,7 +383,7 @@ private: table->Add (_kdm_directory, 1, wxEXPAND); - _upload_after_make_dcp = new wxCheckBox (_panel, wxID_ANY, _("Default to enabling upload of DCP to TMS")); + _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); @@ -542,7 +587,7 @@ public: private: void setup () { - _use_any_servers = new wxCheckBox (_panel, wxID_ANY, _("Search network for servers")); + _use_any_servers = new CheckBox (_panel, _("Search network for servers")); _panel->GetSizer()->Add (_use_any_servers, 0, wxALL, _border); vector columns; @@ -689,12 +734,7 @@ class EmailPage : public StandardPage { public: EmailPage (wxSize panel_size, int border) -#ifdef DCPOMATIC_OSX - /* We have to force both width and height of this one */ - : StandardPage (wxSize (480, 128), border) -#else : StandardPage (panel_size, border) -#endif {} wxString GetName () const @@ -785,7 +825,7 @@ public: KDMEmailPage (wxSize panel_size, int border) #ifdef DCPOMATIC_OSX /* We have to force both width and height of this one */ - : StandardPage (wxSize (480, 128), border) + : StandardPage (wxSize (panel_size.GetWidth(), 128), border) #else : StandardPage (panel_size, border) #endif @@ -899,6 +939,281 @@ 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 username"), 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 wxTextCtrl (_panel, wxID_ANY); + table->Add (_barco_password, 1, wxEXPAND | wxALL); + + add_label_to_sizer (table, _panel, _("certificates.christiedigital.com username"), 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 wxTextCtrl (_panel, wxID_ANY); + table->Add (_christie_password, 1, wxEXPAND | wxALL); + + _barco_username->Bind (wxEVT_TEXT, boost::bind(&AccountsPage::barco_username_changed, this)); + _barco_password->Bind (wxEVT_TEXT, boost::bind(&AccountsPage::barco_password_changed, this)); + _christie_username->Bind (wxEVT_TEXT, boost::bind(&AccountsPage::christie_username_changed, this)); + _christie_password->Bind (wxEVT_TEXT, boost::bind(&AccountsPage::christie_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("")); + } + + 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 () + { + wxString const s = _barco_password->GetValue(); + if (!s.IsEmpty()) { + Config::instance()->set_barco_password (wx_to_std(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 () + { + wxString const s = _christie_password->GetValue(); + if (!s.IsEmpty()) { + Config::instance()->set_christie_password (wx_to_std(s)); + } else { + Config::instance()->unset_christie_password (); + } + } + +private: + wxTextCtrl* _barco_username; + wxTextCtrl* _barco_password; + wxTextCtrl* _christie_username; + wxTextCtrl* _christie_password; +}; + + +class NotificationsPage : public StandardPage +{ +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) +#else + : StandardPage (panel_size, border) +#endif + {} + + wxString GetName () const + { + return _("Notifications"); + } + +#ifdef DCPOMATIC_OSX + wxBitmap GetLargeIcon () const + { + return wxBitmap ("notifications", 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); + _panel->GetSizer()->Add (table, 1, wxEXPAND | wxALL, _border); + + _enable_message_box = new CheckBox (_panel, _("Message box")); + table->Add (_enable_message_box, 1, wxEXPAND | wxALL); + table->AddSpacer (0); + + _enable_email = new CheckBox (_panel, _("Email")); + table->Add (_enable_email, 1, wxEXPAND | wxALL); + table->AddSpacer (0); + + add_label_to_sizer (table, _panel, _("Subject"), true); + _subject = new wxTextCtrl (_panel, wxID_ANY); + table->Add (_subject, 1, wxEXPAND | wxALL); + + add_label_to_sizer (table, _panel, _("From address"), true); + _from = new wxTextCtrl (_panel, wxID_ANY); + table->Add (_from, 1, wxEXPAND | wxALL); + + add_label_to_sizer (table, _panel, _("To address"), true); + _to = new wxTextCtrl (_panel, wxID_ANY); + table->Add (_to, 1, wxEXPAND | wxALL); + + vector columns; + columns.push_back (wx_to_std (_("Address"))); + add_label_to_sizer (table, _panel, _("CC addresses"), true); + _cc = new EditableList ( + _panel, + columns, + bind (&Config::notification_cc, Config::instance()), + bind (&Config::set_notification_cc, Config::instance(), _1), + bind (&column, _1) + ); + table->Add (_cc, 1, wxEXPAND | wxALL); + + add_label_to_sizer (table, _panel, _("BCC address"), true); + _bcc = new wxTextCtrl (_panel, wxID_ANY); + table->Add (_bcc, 1, wxEXPAND | wxALL); + + _email = new wxTextCtrl (_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (-1, 200), wxTE_MULTILINE); + _panel->GetSizer()->Add (_email, 0, wxEXPAND | wxALL, _border); + + _reset_email = new wxButton (_panel, wxID_ANY, _("Reset to default subject and text")); + _panel->GetSizer()->Add (_reset_email, 0, wxEXPAND | wxALL, _border); + + _cc->layout (); + + _enable_message_box->Bind (wxEVT_CHECKBOX, boost::bind (&NotificationsPage::type_changed, this, _enable_message_box, Config::MESSAGE_BOX)); + _enable_email->Bind (wxEVT_CHECKBOX, boost::bind (&NotificationsPage::type_changed, this, _enable_email, Config::EMAIL)); + + _subject->Bind (wxEVT_TEXT, boost::bind (&NotificationsPage::notification_subject_changed, this)); + _from->Bind (wxEVT_TEXT, boost::bind (&NotificationsPage::notification_from_changed, this)); + _to->Bind (wxEVT_TEXT, boost::bind (&NotificationsPage::notification_to_changed, this)); + _bcc->Bind (wxEVT_TEXT, boost::bind (&NotificationsPage::notification_bcc_changed, this)); + _email->Bind (wxEVT_TEXT, boost::bind (&NotificationsPage::notification_email_changed, this)); + _reset_email->Bind (wxEVT_BUTTON, boost::bind (&NotificationsPage::reset_email, this)); + + update_sensitivity (); + } + + void update_sensitivity () + { + bool const s = _enable_email->GetValue(); + _subject->Enable(s); + _from->Enable(s); + _to->Enable(s); + _cc->Enable(s); + _bcc->Enable(s); + _email->Enable(s); + _reset_email->Enable(s); + } + + void config_changed () + { + Config* config = Config::instance (); + + checked_set (_enable_message_box, config->notification(Config::MESSAGE_BOX)); + checked_set (_enable_email, config->notification(Config::EMAIL)); + checked_set (_subject, config->notification_subject ()); + checked_set (_from, config->notification_from ()); + checked_set (_to, config->notification_to ()); + checked_set (_bcc, config->notification_bcc ()); + checked_set (_email, Config::instance()->notification_email ()); + + update_sensitivity (); + } + + void notification_subject_changed () + { + Config::instance()->set_notification_subject (wx_to_std (_subject->GetValue ())); + } + + void notification_from_changed () + { + Config::instance()->set_notification_from (wx_to_std (_from->GetValue ())); + } + + void notification_to_changed () + { + Config::instance()->set_notification_to (wx_to_std (_to->GetValue ())); + } + + void notification_bcc_changed () + { + Config::instance()->set_notification_bcc (wx_to_std (_bcc->GetValue ())); + } + + void notification_email_changed () + { + if (_email->GetValue().IsEmpty ()) { + /* Sometimes we get sent an erroneous notification that the email + is empty; I don't know why. + */ + return; + } + Config::instance()->set_notification_email (wx_to_std (_email->GetValue ())); + } + + void reset_email () + { + Config::instance()->reset_notification_email (); + checked_set (_email, Config::instance()->notification_email ()); + } + + void type_changed (wxCheckBox* b, Config::Notification n) + { + Config::instance()->set_notification(n, b->GetValue()); + update_sensitivity (); + } + + wxCheckBox* _enable_message_box; + wxCheckBox* _enable_email; + + wxTextCtrl* _subject; + wxTextCtrl* _from; + wxTextCtrl* _to; + EditableList* _cc; + wxTextCtrl* _bcc; + wxTextCtrl* _email; + wxButton* _reset_email; +}; + class CoverSheetPage : public StandardPage { public: @@ -906,7 +1221,7 @@ public: CoverSheetPage (wxSize panel_size, int border) #ifdef DCPOMATIC_OSX /* We have to force both width and height of this one */ - : StandardPage (wxSize (480, 128), border) + : StandardPage (wxSize (panel_size.GetWidth(), 128), border) #else : StandardPage (panel_size, border) #endif @@ -974,6 +1289,7 @@ public: : StockPage (Kind_Advanced, panel_size, border) , _maximum_j2k_bandwidth (0) , _allow_any_dcp_frame_rate (0) + , _allow_any_container (0) , _only_servers_encode (0) , _log_general (0) , _log_warning (0) @@ -992,7 +1308,7 @@ private: flags |= wxALIGN_RIGHT; text += wxT (":"); #endif - wxStaticText* m = new wxStaticText (parent, wxID_ANY, text); + wxStaticText* m = new StaticText (parent, text); table->Add (m, 0, flags, DCPOMATIC_SIZER_Y_GAP); } @@ -1011,11 +1327,22 @@ private: table->Add (s, 1); } - _allow_any_dcp_frame_rate = new wxCheckBox (_panel, wxID_ANY, _("Allow any DCP frame rate")); + _allow_any_dcp_frame_rate = new CheckBox (_panel, _("Allow any DCP frame rate")); table->Add (_allow_any_dcp_frame_rate, 1, wxEXPAND | wxALL); table->AddSpacer (0); - _only_servers_encode = new wxCheckBox (_panel, wxID_ANY, _("Only servers encode")); + _allow_any_container = new CheckBox (_panel, _("Allow non-standard container ratios")); + table->Add (_allow_any_container, 1, wxEXPAND | wxALL); + table->AddSpacer (0); + + wxStaticText* restart = add_label_to_sizer (table, _panel, _("(restart DCP-o-matic to see all ratios)"), false); + wxFont font = restart->GetFont(); + font.SetStyle (wxFONTSTYLE_ITALIC); + font.SetPointSize (font.GetPointSize() - 1); + restart->SetFont (font); + table->AddSpacer (0); + + _only_servers_encode = new CheckBox (_panel, _("Only servers encode")); table->Add (_only_servers_encode, 1, wxEXPAND | wxALL); table->AddSpacer (0); @@ -1060,26 +1387,26 @@ private: { add_top_aligned_label_to_sizer (table, _panel, _("Log")); wxBoxSizer* t = new wxBoxSizer (wxVERTICAL); - _log_general = new wxCheckBox (_panel, wxID_ANY, _("General")); + _log_general = new CheckBox (_panel, _("General")); t->Add (_log_general, 1, wxEXPAND | wxALL); - _log_warning = new wxCheckBox (_panel, wxID_ANY, _("Warnings")); + _log_warning = new CheckBox (_panel, _("Warnings")); t->Add (_log_warning, 1, wxEXPAND | wxALL); - _log_error = new wxCheckBox (_panel, wxID_ANY, _("Errors")); + _log_error = new CheckBox (_panel, _("Errors")); t->Add (_log_error, 1, wxEXPAND | wxALL); /// TRANSLATORS: translate the word "Timing" here; do not include the "Config|" prefix - _log_timing = new wxCheckBox (_panel, wxID_ANY, S_("Config|Timing")); + _log_timing = new CheckBox (_panel, S_("Config|Timing")); t->Add (_log_timing, 1, wxEXPAND | wxALL); - _log_debug_decode = new wxCheckBox (_panel, wxID_ANY, _("Debug: decode")); + _log_debug_decode = new CheckBox (_panel, _("Debug: decode")); t->Add (_log_debug_decode, 1, wxEXPAND | wxALL); - _log_debug_encode = new wxCheckBox (_panel, wxID_ANY, _("Debug: encode")); + _log_debug_encode = new CheckBox (_panel, _("Debug: encode")); t->Add (_log_debug_encode, 1, wxEXPAND | wxALL); - _log_debug_email = new wxCheckBox (_panel, wxID_ANY, _("Debug: email sending")); + _log_debug_email = new CheckBox (_panel, _("Debug: email sending")); t->Add (_log_debug_email, 1, wxEXPAND | wxALL); table->Add (t, 0, wxALL, 6); } #ifdef DCPOMATIC_WINDOWS - _win32_console = new wxCheckBox (_panel, wxID_ANY, _("Open console window")); + _win32_console = new CheckBox (_panel, _("Open console window")); table->Add (_win32_console, 1, wxEXPAND | wxALL); table->AddSpacer (0); #endif @@ -1087,6 +1414,7 @@ private: _maximum_j2k_bandwidth->SetRange (1, 1000); _maximum_j2k_bandwidth->Bind (wxEVT_SPINCTRL, boost::bind (&AdvancedPage::maximum_j2k_bandwidth_changed, this)); _allow_any_dcp_frame_rate->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::allow_any_dcp_frame_rate_changed, this)); + _allow_any_container->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::allow_any_container_changed, this)); _only_servers_encode->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::only_servers_encode_changed, this)); _frames_in_memory_multiplier->Bind (wxEVT_SPINCTRL, boost::bind(&AdvancedPage::frames_in_memory_multiplier_changed, this)); _dcp_metadata_filename_format->Changed.connect (boost::bind (&AdvancedPage::dcp_metadata_filename_format_changed, this)); @@ -1109,6 +1437,7 @@ private: checked_set (_maximum_j2k_bandwidth, config->maximum_j2k_bandwidth() / 1000000); checked_set (_allow_any_dcp_frame_rate, config->allow_any_dcp_frame_rate ()); + checked_set (_allow_any_container, config->allow_any_container ()); checked_set (_only_servers_encode, config->only_servers_encode ()); checked_set (_log_general, config->log_types() & LogEntry::TYPE_GENERAL); checked_set (_log_warning, config->log_types() & LogEntry::TYPE_WARNING); @@ -1138,6 +1467,11 @@ private: Config::instance()->set_allow_any_dcp_frame_rate (_allow_any_dcp_frame_rate->GetValue ()); } + void allow_any_container_changed () + { + Config::instance()->set_allow_any_container (_allow_any_container->GetValue ()); + } + void only_servers_encode_changed () { Config::instance()->set_only_servers_encode (_only_servers_encode->GetValue ()); @@ -1190,6 +1524,7 @@ private: wxSpinCtrl* _maximum_j2k_bandwidth; wxSpinCtrl* _frames_in_memory_multiplier; wxCheckBox* _allow_any_dcp_frame_rate; + wxCheckBox* _allow_any_container; wxCheckBox* _only_servers_encode; NameFormatEditor* _dcp_metadata_filename_format; NameFormatEditor* _dcp_asset_filename_format; @@ -1215,7 +1550,7 @@ create_full_config_dialog () the containing window doesn't shrink too much when we select those panels. This is obviously an unpleasant hack. */ - wxSize ps = wxSize (520, -1); + wxSize ps = wxSize (600, -1); int const border = 16; #else wxSize ps = wxSize (-1, -1); @@ -1229,6 +1564,8 @@ create_full_config_dialog () 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)); return e;