X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fplayer_config_dialog.cc;h=20ddde99202ce1321b6429580a7dbdb670f771b8;hb=b843703d61a386c7300359f07fc3128c11e3eb18;hp=254a84c8a6180be875d733f3788f182952f7a056;hpb=8b2a3f31b6b4238d8534549f495e7276174ddfba;p=dcpomatic.git diff --git a/src/wx/player_config_dialog.cc b/src/wx/player_config_dialog.cc index 254a84c8a..20ddde992 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. @@ -36,6 +36,7 @@ #include "nag_dialog.h" #include "monitor_dialog.h" #include "check_box.h" +#include "static_text.h" #include "lib/config.h" #include "lib/ratio.h" #include "lib/filter.h" @@ -102,13 +103,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 +138,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 +173,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 +219,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 +257,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 +363,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 @@ -325,6 +384,125 @@ private: #endif }; +/** @class PlayerAdvancedPage + * @brief Advanced page of the preferences dialog for the player. + */ +class PlayerAdvancedPage : public StockPage +{ +public: + PlayerAdvancedPage (wxSize panel_size, int border) + : StockPage (Kind_Advanced, panel_size, border) + , _log_general (0) + , _log_warning (0) + , _log_error (0) + , _log_timing (0) + , _log_debug_decode (0) + {} + +private: + void add_top_aligned_label_to_sizer (wxSizer* table, wxWindow* parent, wxString text) + { + int flags = wxALIGN_TOP | wxTOP | wxLEFT; +#ifdef __WXOSX__ + flags |= wxALIGN_RIGHT; + text += wxT (":"); +#endif + wxStaticText* m = new StaticText (parent, text); + table->Add (m, 0, flags, DCPOMATIC_SIZER_Y_GAP); + } + + void setup () + { + 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); + + { + add_top_aligned_label_to_sizer (table, _panel, _("Log")); + wxBoxSizer* t = new wxBoxSizer (wxVERTICAL); + _log_general = new CheckBox (_panel, _("General")); + t->Add (_log_general, 1, wxEXPAND | wxALL); + _log_warning = new CheckBox (_panel, _("Warnings")); + t->Add (_log_warning, 1, wxEXPAND | wxALL); + _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 CheckBox (_panel, S_("Config|Timing")); + t->Add (_log_timing, 1, wxEXPAND | wxALL); + _log_debug_decode = new CheckBox (_panel, _("Debug")); + t->Add (_log_debug_decode, 1, wxEXPAND | wxALL); + table->Add (t, 0, wxALL, 6); + } + +#ifdef DCPOMATIC_WINDOWS + _win32_console = new CheckBox (_panel, _("Open console window")); + table->Add (_win32_console, 1, wxEXPAND | wxALL); + table->AddSpacer (0); +#endif + + _log_general->Bind (wxEVT_CHECKBOX, boost::bind (&PlayerAdvancedPage::log_changed, this)); + _log_warning->Bind (wxEVT_CHECKBOX, boost::bind (&PlayerAdvancedPage::log_changed, this)); + _log_error->Bind (wxEVT_CHECKBOX, boost::bind (&PlayerAdvancedPage::log_changed, this)); + _log_timing->Bind (wxEVT_CHECKBOX, boost::bind (&PlayerAdvancedPage::log_changed, this)); + _log_debug_decode->Bind (wxEVT_CHECKBOX, boost::bind (&PlayerAdvancedPage::log_changed, this)); +#ifdef DCPOMATIC_WINDOWS + _win32_console->Bind (wxEVT_CHECKBOX, boost::bind (&PlayerAdvancedPage::win32_console_changed, this)); +#endif + } + + void config_changed () + { + Config* config = Config::instance (); + + checked_set (_log_general, config->log_types() & LogEntry::TYPE_GENERAL); + checked_set (_log_warning, config->log_types() & LogEntry::TYPE_WARNING); + checked_set (_log_error, config->log_types() & LogEntry::TYPE_ERROR); + checked_set (_log_timing, config->log_types() & LogEntry::TYPE_TIMING); + checked_set (_log_debug_decode, config->log_types() & LogEntry::TYPE_DEBUG_DECODE); +#ifdef DCPOMATIC_WINDOWS + checked_set (_win32_console, config->win32_console()); +#endif + } + + void log_changed () + { + int types = 0; + if (_log_general->GetValue ()) { + types |= LogEntry::TYPE_GENERAL; + } + if (_log_warning->GetValue ()) { + types |= LogEntry::TYPE_WARNING; + } + if (_log_error->GetValue ()) { + types |= LogEntry::TYPE_ERROR; + } + if (_log_timing->GetValue ()) { + types |= LogEntry::TYPE_TIMING; + } + if (_log_debug_decode->GetValue ()) { + types |= LogEntry::TYPE_DEBUG_DECODE; + } + Config::instance()->set_log_types (types); + } + +#ifdef DCPOMATIC_WINDOWS + void win32_console_changed () + { + Config::instance()->set_win32_console (_win32_console->GetValue ()); + } +#endif + + wxCheckBox* _log_general; + wxCheckBox* _log_warning; + wxCheckBox* _log_error; + wxCheckBox* _log_timing; + wxCheckBox* _log_debug_decode; +#ifdef DCPOMATIC_WINDOWS + wxCheckBox* _win32_console; +#endif +}; + + #ifdef DCPOMATIC_VARIANT_SWAROOP class WatermarkPage : public StandardPage { @@ -338,6 +516,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 +596,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 +620,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); - Button* get = new wxButton(_panel, _("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)); } @@ -497,5 +690,6 @@ create_player_config_dialog () e->AddPage (new WatermarkPage(ps, border)); e->AddPage (new DevicesPage(ps, border)); #endif + e->AddPage (new PlayerAdvancedPage(ps, border)); return e; }