X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffull_config_dialog.cc;h=ba596162ec6c432dabe10838e8122c1dfe5b80e2;hb=da822af56c5e4acab361b8531fb75a1dcb4b110e;hp=0f99d85d806d917ee51d5e29ad89f25367292fc8;hpb=8a2eeb8c00db2809b8b3fa848d628cf0cd7cb411;p=dcpomatic.git diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc index 0f99d85d8..ba596162e 100644 --- a/src/wx/full_config_dialog.cc +++ b/src/wx/full_config_dialog.cc @@ -144,9 +144,9 @@ private: 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)); + _analyse_ebur128->bind(&FullGeneralPage::analyse_ebur128_changed, this); #endif - _automatic_audio_analysis->Bind (wxEVT_CHECKBOX, boost::bind (&FullGeneralPage::automatic_audio_analysis_changed, this)); + _automatic_audio_analysis->bind(&FullGeneralPage::automatic_audio_analysis_changed, this); } void config_changed () override @@ -236,9 +236,9 @@ private: FilePickerCtrl* _config_file; FilePickerCtrl* _cinemas_file; #ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG - wxCheckBox* _analyse_ebur128; + CheckBox* _analyse_ebur128; #endif - wxCheckBox* _automatic_audio_analysis; + CheckBox* _automatic_audio_analysis; }; @@ -257,7 +257,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const override { - return wxBitmap(bitmap_path("defaults.png"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("defaults"), wxBITMAP_TYPE_PNG); } #endif @@ -285,10 +285,6 @@ private: #endif table->Add (_directory, 1, wxEXPAND); - 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 content type"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); _dcp_content_type = new wxChoice (_panel, wxID_ANY); table->Add (_dcp_content_type); @@ -367,13 +363,7 @@ private: _kdm_duration->Bind (wxEVT_SPINCTRL, boost::bind(&DefaultsPage::kdm_duration_changed, this)); _kdm_duration_unit->Bind (wxEVT_CHOICE, boost::bind(&DefaultsPage::kdm_duration_changed, this)); - _use_isdcf_name_by_default->Bind (wxEVT_CHECKBOX, boost::bind(&DefaultsPage::use_isdcf_name_by_default_changed, this)); - - for (auto i: Ratio::containers()) { - _container->Append (std_to_wx(i->container_nickname())); - } - - _container->Bind (wxEVT_CHOICE, boost::bind (&DefaultsPage::container_changed, this)); + _use_isdcf_name_by_default->bind(&DefaultsPage::use_isdcf_name_by_default_changed, this); for (auto i: DCPContentType::all()) { _dcp_content_type->Append (std_to_wx (i->pretty_name ())); @@ -395,7 +385,7 @@ private: _standard->Bind (wxEVT_CHOICE, boost::bind (&DefaultsPage::standard_changed, this)); for (auto const& i: _enable_metadata) { - i.second->Bind (wxEVT_CHECKBOX, boost::bind(&DefaultsPage::metadata_changed, this)); + i.second->bind(&DefaultsPage::metadata_changed, this); } for (auto const& i: _metadata) { @@ -407,13 +397,6 @@ private: { auto config = Config::instance (); - auto containers = Ratio::containers (); - for (size_t i = 0; i < containers.size(); ++i) { - if (containers[i] == config->default_container()) { - _container->SetSelection (i); - } - } - auto const ct = DCPContentType::all (); for (size_t i = 0; i < ct.size(); ++i) { if (ct[i] == config->default_dcp_content_type()) { @@ -541,12 +524,6 @@ private: Config::instance()->set_default_still_length (_still_length->GetValue ()); } - void container_changed () - { - auto ratio = Ratio::containers (); - Config::instance()->set_default_container (ratio[_container->GetSelection()]); - } - void dcp_content_type_changed () { auto ct = DCPContentType::all (); @@ -590,8 +567,7 @@ private: KDMChoice* _kdm_type; wxSpinCtrl* _kdm_duration; wxChoice* _kdm_duration_unit; - wxCheckBox* _use_isdcf_name_by_default; - wxChoice* _container; + CheckBox* _use_isdcf_name_by_default; wxChoice* _dcp_content_type; wxChoice* _dcp_audio_channels; wxChoice* _standard; @@ -615,7 +591,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const override { - return wxBitmap(bitmap_path("servers.png"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("servers"), wxBITMAP_TYPE_PNG); } #endif @@ -633,13 +609,13 @@ private: boost::bind (&Config::servers, Config::instance()), boost::bind (&Config::set_servers, Config::instance(), _1), boost::bind (&EncodingServersPage::server_column, this, _1), - false, + EditableListTitle::INVISIBLE, EditableListButton::NEW | EditableListButton::EDIT | EditableListButton::REMOVE ); _panel->GetSizer()->Add (_servers_list, 1, wxEXPAND | wxALL, _border); - _use_any_servers->Bind (wxEVT_CHECKBOX, boost::bind(&EncodingServersPage::use_any_servers_changed, this)); + _use_any_servers->bind(&EncodingServersPage::use_any_servers_changed, this); } void config_changed () override @@ -658,7 +634,7 @@ private: return s; } - wxCheckBox* _use_any_servers; + CheckBox* _use_any_servers; EditableList* _servers_list; }; @@ -678,7 +654,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const override { - return wxBitmap(bitmap_path("tms.png"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("tms"), wxBITMAP_TYPE_PNG); } #endif @@ -696,6 +672,10 @@ private: _tms_protocol = new wxChoice (_panel, wxID_ANY); table->Add (_tms_protocol, 1, wxEXPAND); + _tms_passive = new CheckBox(_panel, _("Passive mode")); + table->Add(_tms_passive, 1, wxEXPAND); + table->AddSpacer(0); + 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); @@ -715,8 +695,10 @@ 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)); + _upload->bind(&TMSPage::upload_changed, this); _tms_protocol->Bind (wxEVT_CHOICE, boost::bind (&TMSPage::tms_protocol_changed, this)); + _tms_passive->bind(&TMSPage::tms_passive_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)); _tms_user->Bind (wxEVT_TEXT, boost::bind (&TMSPage::tms_user_changed, this)); @@ -729,10 +711,13 @@ private: checked_set (_upload, config->upload_after_make_dcp()); checked_set (_tms_protocol, static_cast(config->tms_protocol())); + checked_set(_tms_passive, config->tms_protocol() == FileTransferProtocol::FTP && config->tms_passive()); checked_set (_tms_ip, config->tms_ip ()); checked_set (_tms_path, config->tms_path ()); checked_set (_tms_user, config->tms_user ()); checked_set (_tms_password, config->tms_password ()); + + _tms_passive->Enable(config->tms_protocol() == FileTransferProtocol::FTP); } void upload_changed () @@ -745,6 +730,11 @@ private: Config::instance()->set_tms_protocol(static_cast(_tms_protocol->GetSelection())); } + void tms_passive_changed() + { + Config::instance()->set_tms_passive(_tms_passive->get()); + } + void tms_ip_changed () { Config::instance()->set_tms_ip (wx_to_std (_tms_ip->GetValue ())); @@ -766,6 +756,7 @@ private: } CheckBox* _upload; + CheckBox* _tms_passive; wxChoice* _tms_protocol; wxTextCtrl* _tms_ip; wxTextCtrl* _tms_path; @@ -789,7 +780,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const override { - return wxBitmap(bitmap_path("email.png"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("email"), wxBITMAP_TYPE_PNG); } #endif @@ -961,7 +952,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const override { - return wxBitmap(bitmap_path("kdm_email.png"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("kdm_email"), wxBITMAP_TYPE_PNG); } #endif @@ -991,7 +982,7 @@ private: [] (string s, int) { return s; }, - true, + EditableListTitle::VISIBLE, EditableListButton::NEW | EditableListButton::EDIT | EditableListButton::REMOVE ); table->Add (_cc, 1, wxEXPAND | wxALL); @@ -1086,7 +1077,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const override { - return wxBitmap(bitmap_path("notifications.png"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("notifications"), wxBITMAP_TYPE_PNG); } #endif @@ -1128,7 +1119,7 @@ private: [] (string s, int) { return s; }, - true, + EditableListTitle::VISIBLE, EditableListButton::NEW | EditableListButton::EDIT | EditableListButton::REMOVE ); table->Add (_cc, 1, wxEXPAND | wxALL); @@ -1145,8 +1136,8 @@ private: _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)); + _enable_message_box->bind(&NotificationsPage::type_changed, this, _enable_message_box, Config::MESSAGE_BOX); + _enable_email->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)); @@ -1222,14 +1213,14 @@ private: checked_set (_email, Config::instance()->notification_email()); } - void type_changed (wxCheckBox* b, Config::Notification n) + void type_changed (CheckBox* b, Config::Notification n) { Config::instance()->set_notification(n, b->GetValue()); setup_sensitivity (); } - wxCheckBox* _enable_message_box; - wxCheckBox* _enable_email; + CheckBox* _enable_message_box; + CheckBox* _enable_email; wxTextCtrl* _subject; wxTextCtrl* _from; @@ -1262,7 +1253,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const override { - return wxBitmap(bitmap_path("cover_sheet.png"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("cover_sheet"), wxBITMAP_TYPE_PNG); } #endif @@ -1321,7 +1312,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const override { - return wxBitmap(bitmap_path("identifiers.png"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("identifiers"), wxBITMAP_TYPE_PNG); } #endif @@ -1439,7 +1430,7 @@ public: #ifdef DCPOMATIC_OSX wxBitmap GetLargeIcon () const override { - return wxBitmap(bitmap_path("advanced.png"), wxBITMAP_TYPE_PNG); + return wxBitmap(icon_path("advanced"), wxBITMAP_TYPE_PNG); } #endif @@ -1599,27 +1590,27 @@ private: _video_display_mode->Append (_("OpenGL (faster)")); #endif _video_display_mode->Bind (wxEVT_CHOICE, boost::bind(&AdvancedPage::video_display_mode_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)); - _allow_96khz_audio->Bind (wxEVT_CHECKBOX, boost::bind(&AdvancedPage::allow_96khz_audio_changed, this)); - _use_all_audio_channels->Bind(wxEVT_CHECKBOX, boost::bind(&AdvancedPage::use_all_channels_changed, this)); - _show_experimental_audio_processors->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::show_experimental_audio_processors_changed, this)); - _only_servers_encode->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::only_servers_encode_changed, this)); + _allow_any_dcp_frame_rate->bind(&AdvancedPage::allow_any_dcp_frame_rate_changed, this); + _allow_any_container->bind(&AdvancedPage::allow_any_container_changed, this); + _allow_96khz_audio->bind(&AdvancedPage::allow_96khz_audio_changed, this); + _use_all_audio_channels->bind(&AdvancedPage::use_all_channels_changed, this); + _show_experimental_audio_processors->bind(&AdvancedPage::show_experimental_audio_processors_changed, this); + _only_servers_encode->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)); _dcp_asset_filename_format->Changed.connect (boost::bind (&AdvancedPage::dcp_asset_filename_format_changed, this)); - _log_general->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this)); - _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_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)); + _log_general->bind(&AdvancedPage::log_changed, this); + _log_warning->bind(&AdvancedPage::log_changed, this); + _log_error->bind(&AdvancedPage::log_changed, this); + _log_timing->bind(&AdvancedPage::log_changed, this); + _log_debug_threed->bind(&AdvancedPage::log_changed, this); + _log_debug_encode->bind(&AdvancedPage::log_changed, this); + _log_debug_email->bind(&AdvancedPage::log_changed, this); + _log_debug_video_view->bind(&AdvancedPage::log_changed, this); + _log_debug_player->bind(&AdvancedPage::log_changed, this); + _log_debug_audio_analysis->bind(&AdvancedPage::log_changed, this); #ifdef DCPOMATIC_WINDOWS - _win32_console->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::win32_console_changed, this)); + _win32_console->bind(&AdvancedPage::win32_console_changed, this); #endif } @@ -1763,26 +1754,26 @@ private: wxSpinCtrl* _maximum_j2k_bandwidth = nullptr; wxChoice* _video_display_mode = nullptr; wxSpinCtrl* _frames_in_memory_multiplier = nullptr; - wxCheckBox* _allow_any_dcp_frame_rate = nullptr; - wxCheckBox* _allow_any_container = nullptr; - wxCheckBox* _allow_96khz_audio = nullptr; - wxCheckBox* _use_all_audio_channels = nullptr; - wxCheckBox* _show_experimental_audio_processors = nullptr; - wxCheckBox* _only_servers_encode = nullptr; + CheckBox* _allow_any_dcp_frame_rate = nullptr; + CheckBox* _allow_any_container = nullptr; + CheckBox* _allow_96khz_audio = nullptr; + CheckBox* _use_all_audio_channels = nullptr; + CheckBox* _show_experimental_audio_processors = nullptr; + CheckBox* _only_servers_encode = nullptr; NameFormatEditor* _dcp_metadata_filename_format = nullptr; NameFormatEditor* _dcp_asset_filename_format = nullptr; - wxCheckBox* _log_general = nullptr; - wxCheckBox* _log_warning = nullptr; - wxCheckBox* _log_error = nullptr; - wxCheckBox* _log_timing = nullptr; - wxCheckBox* _log_debug_threed = nullptr; - wxCheckBox* _log_debug_encode = nullptr; - wxCheckBox* _log_debug_email = nullptr; - wxCheckBox* _log_debug_video_view = nullptr; - wxCheckBox* _log_debug_player = nullptr; - wxCheckBox* _log_debug_audio_analysis = nullptr; + CheckBox* _log_general = nullptr; + CheckBox* _log_warning = nullptr; + CheckBox* _log_error = nullptr; + CheckBox* _log_timing = nullptr; + CheckBox* _log_debug_threed = nullptr; + CheckBox* _log_debug_encode = nullptr; + CheckBox* _log_debug_email = nullptr; + CheckBox* _log_debug_video_view = nullptr; + CheckBox* _log_debug_player = nullptr; + CheckBox* _log_debug_audio_analysis = nullptr; #ifdef DCPOMATIC_WINDOWS - wxCheckBox* _win32_console = nullptr; + CheckBox* _win32_console = nullptr; #endif };