X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffull_config_dialog.cc;h=974635a8b407f6f6cd0ee2096740a55a0b420e8d;hb=08d14b3aac137152a3aeb58c170b1b69bd0dd9eb;hp=1ea07404aa989108cdd40207f37553ead8a5f045;hpb=ccc093b159c61e811e24f427860b72343185681e;p=dcpomatic.git diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc index 1ea07404a..974635a8b 100644 --- a/src/wx/full_config_dialog.cc +++ b/src/wx/full_config_dialog.cc @@ -85,6 +85,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)); @@ -138,6 +143,10 @@ 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); @@ -157,6 +166,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 @@ -179,11 +196,23 @@ private: ); if (d->ShowModal () == wxID_OK) { - boost::filesystem::copy_file (Config::instance()->cinemas_file(), path_from_file_dialog (d, "xml")); + optional path = path_from_file_dialog (d, "xml"); + if (path) { + boost::filesystem::copy_file (Config::instance()->cinemas_file(), *path); + } } 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 () @@ -248,6 +277,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; @@ -910,6 +940,111 @@ 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: @@ -1155,6 +1290,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) @@ -1196,6 +1332,17 @@ private: table->Add (_allow_any_dcp_frame_rate, 1, wxEXPAND | wxALL); table->AddSpacer (0); + _allow_any_container = new wxCheckBox (_panel, wxID_ANY, _("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 wxCheckBox (_panel, wxID_ANY, _("Only servers encode")); table->Add (_only_servers_encode, 1, wxEXPAND | wxALL); table->AddSpacer (0); @@ -1268,6 +1415,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)); @@ -1290,6 +1438,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); @@ -1319,6 +1468,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 ()); @@ -1371,6 +1525,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; @@ -1410,6 +1565,7 @@ 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));