X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fplayer_config_dialog.cc;h=34eee2871cbca4d74d984ee468c17bf664e37ab6;hb=d9e6b138e84e7a8504075b8581cca4d0fabfbc40;hp=ca65711a7d05c8adf4711214ad4e43e8f642756d;hpb=9c1bb2e5ca7c80c4e26b1b2e41159aa171360a94;p=dcpomatic.git diff --git a/src/wx/player_config_dialog.cc b/src/wx/player_config_dialog.cc index ca65711a7..34eee2871 100644 --- a/src/wx/player_config_dialog.cc +++ b/src/wx/player_config_dialog.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2018 Carl Hetherington + Copyright (C) 2012-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -102,13 +102,32 @@ private: table->Add (_image_display, wxGBPosition(r, 1)); ++r; + add_label_to_sizer (table, _panel, _("Video display mode"), true, wxGBPosition(r, 0)); + _video_display_mode = new wxChoice (_panel, wxID_ANY); + _video_display_mode->Append (_("Simple (safer)")); + _video_display_mode->Append (_("OpenGL (faster)")); + table->Add (_video_display_mode, wxGBPosition(r, 1)); + ++r; + + wxStaticText* restart = add_label_to_sizer (table, _panel, _("(restart DCP-o-matic to change display mode)"), false, wxGBPosition(r, 0)); + wxFont font = restart->GetFont(); + font.SetStyle (wxFONTSTYLE_ITALIC); + font.SetPointSize (font.GetPointSize() - 1); + restart->SetFont (font); + ++r; + _respect_kdm = new CheckBox (_panel, _("Respect KDM validity periods")); table->Add (_respect_kdm, wxGBPosition(r, 0), wxGBSpan(1, 2)); ++r; - add_label_to_sizer (table, _panel, _("Log file"), true, wxGBPosition (r, 0)); - _log_file = new FilePickerCtrl (_panel, _("Select log file"), "*", true); - table->Add (_log_file, wxGBPosition (r, 1)); + add_label_to_sizer (table, _panel, _("Activity log file"), true, wxGBPosition (r, 0)); + _activity_log_file = new FilePickerCtrl (_panel, _("Select activity log file"), "*", true, true); + table->Add (_activity_log_file, wxGBPosition(r, 1)); + ++r; + + add_label_to_sizer (table, _panel, _("Debug log file"), true, wxGBPosition (r, 0)); + _debug_log_file = new FilePickerCtrl (_panel, _("Select debug log file"), "*", true, true); + table->Add (_debug_log_file, wxGBPosition(r, 1)); ++r; #ifdef DCPOMATIC_VARIANT_SWAROOP @@ -118,15 +137,17 @@ private: ++r; add_label_to_sizer (table, _panel, _("Lock file"), true, wxGBPosition(r, 0)); - _lock_file = new FilePickerCtrl (_panel, _("Select lock file"), "*", true); + _lock_file = new FilePickerCtrl (_panel, _("Select lock file"), "*", true, true); table->Add (_lock_file, wxGBPosition (r, 1)); ++r; #endif _player_mode->Bind (wxEVT_CHOICE, bind(&PlayerGeneralPage::player_mode_changed, this)); _image_display->Bind (wxEVT_CHOICE, bind(&PlayerGeneralPage::image_display_changed, this)); + _video_display_mode->Bind (wxEVT_CHOICE, bind(&PlayerGeneralPage::video_display_mode_changed, this)); _respect_kdm->Bind (wxEVT_CHECKBOX, bind(&PlayerGeneralPage::respect_kdm_changed, this)); - _log_file->Bind (wxEVT_FILEPICKER_CHANGED, bind(&PlayerGeneralPage::log_file_changed, this)); + _activity_log_file->Bind (wxEVT_FILEPICKER_CHANGED, bind(&PlayerGeneralPage::activity_log_file_changed, this)); + _debug_log_file->Bind (wxEVT_FILEPICKER_CHANGED, bind(&PlayerGeneralPage::debug_log_file_changed, this)); #ifdef DCPOMATIC_VARIANT_SWAROOP _kdm_server_url->Bind (wxEVT_TEXT, bind(&PlayerGeneralPage::kdm_server_url_changed, this)); _lock_file->Bind (wxEVT_FILEPICKER_CHANGED, bind(&PlayerGeneralPage::lock_file_changed, this)); @@ -151,10 +172,22 @@ private: break; } + switch (config->video_view_type()) { + case Config::VIDEO_VIEW_SIMPLE: + checked_set (_video_display_mode, 0); + break; + case Config::VIDEO_VIEW_OPENGL: + checked_set (_video_display_mode, 1); + break; + } + checked_set (_image_display, config->image_display()); checked_set (_respect_kdm, config->respect_kdm_validity_periods()); - if (config->player_log_file()) { - checked_set (_log_file, *config->player_log_file()); + if (config->player_activity_log_file()) { + checked_set (_activity_log_file, *config->player_activity_log_file()); + } + if (config->player_debug_log_file()) { + checked_set (_debug_log_file, *config->player_debug_log_file()); } #ifdef DCPOMATIC_VARIANT_SWAROOP checked_set (_kdm_server_url, config->kdm_server_url()); @@ -185,14 +218,28 @@ private: Config::instance()->set_image_display(_image_display->GetSelection()); } + void video_display_mode_changed () + { + if (_video_display_mode->GetSelection() == 0) { + Config::instance()->set_video_view_type (Config::VIDEO_VIEW_SIMPLE); + } else { + Config::instance()->set_video_view_type (Config::VIDEO_VIEW_OPENGL); + } + } + void respect_kdm_changed () { Config::instance()->set_respect_kdm_validity_periods(_respect_kdm->GetValue()); } - void log_file_changed () + void activity_log_file_changed () { - Config::instance()->set_player_log_file(wx_to_std(_log_file->GetPath())); + Config::instance()->set_player_activity_log_file(wx_to_std(_activity_log_file->GetPath())); + } + + void debug_log_file_changed () + { + Config::instance()->set_player_debug_log_file(wx_to_std(_debug_log_file->GetPath())); } #ifdef DCPOMATIC_VARIANT_SWAROOP @@ -209,8 +256,10 @@ private: wxChoice* _player_mode; wxChoice* _image_display; + wxChoice* _video_display_mode; wxCheckBox* _respect_kdm; - FilePickerCtrl* _log_file; + FilePickerCtrl* _activity_log_file; + FilePickerCtrl* _debug_log_file; #ifdef DCPOMATIC_VARIANT_SWAROOP wxTextCtrl* _kdm_server_url; FilePickerCtrl* _lock_file; @@ -313,7 +362,16 @@ private: #ifdef DCPOMATIC_VARIANT_SWAROOP void background_image_changed () { - Config::instance()->set_player_background_image(wx_to_std(_background_image->GetPath())); + boost::filesystem::path const f = wx_to_std(_background_image->GetPath()); + if (!boost::filesystem::is_regular_file(f) || !wxImage::CanRead(std_to_wx(f.string()))) { + error_dialog (0, _("Could not load image file.")); + if (Config::instance()->player_background_image()) { + checked_set (_background_image, *Config::instance()->player_background_image()); + } + return; + } + + Config::instance()->set_player_background_image(f); } #endif @@ -338,6 +396,14 @@ public: return _("Watermark"); } +#ifdef DCPOMATIC_OSX + wxBitmap GetLargeIcon () const + { + /* XXX: this icon doesn't exist; this is just to make the swaroop variant build on OS X */ + return wxBitmap ("watermark", wxBITMAP_TYPE_PNG_RESOURCE); + } +#endif + private: void setup () { @@ -410,15 +476,23 @@ public: return _("Devices"); } +#ifdef DCPOMATIC_OSX + wxBitmap GetLargeIcon () const + { + /* XXX: this icon doesn't exist; this is just to make the swaroop variant build on OS X */ + return wxBitmap ("devices", wxBITMAP_TYPE_PNG_RESOURCE); + } +#endif + private: void setup () { - vector columns; - columns.push_back(wx_to_std(_("Manufacturer ID"))); - columns.push_back(wx_to_std(_("Product code"))); - columns.push_back(wx_to_std(_("Serial"))); - columns.push_back(wx_to_std(_("Manufacture week"))); - columns.push_back(wx_to_std(_("Manufacture year"))); + vector columns; + columns.push_back(EditableListColumn(wx_to_std(_("Manufacturer ID")))); + columns.push_back(EditableListColumn(wx_to_std(_("Product code")))); + columns.push_back(EditableListColumn(wx_to_std(_("Serial")))); + columns.push_back(EditableListColumn(wx_to_std(_("Manufacture week")))); + columns.push_back(EditableListColumn(wx_to_std(_("Manufacture year")))); _monitor_list = new EditableList ( _panel, columns, @@ -426,12 +500,11 @@ private: boost::bind (&Config::set_required_monitors, Config::instance(), _1), boost::bind (&DevicesPage::monitor_column, this, _1, _2), true, - true, - 100 + true ); _panel->GetSizer()->Add(_monitor_list, 1, wxEXPAND | wxALL, _border); - wxButton* get = new wxButton(_panel, wxID_ANY, _("Read current devices")); + wxButton* get = new Button(_panel, _("Read current devices")); _panel->GetSizer()->Add(get, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_GAP); get->Bind(wxEVT_BUTTON, bind(&DevicesPage::get_clicked, this)); }