X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fplayer_config_dialog.cc;h=802ab6b3bcb7ee40ee3d68818db43eabaa5ab221;hb=92933c13e9233149e4e80244d92da81b70072214;hp=006318b6bab8bda18aa019c29a89ef5059e24e96;hpb=2538ac5a15b56880438018c8ab17d8571fe76812;p=dcpomatic.git diff --git a/src/wx/player_config_dialog.cc b/src/wx/player_config_dialog.cc index 006318b6b..802ab6b3b 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. @@ -28,13 +28,13 @@ #include "filter_dialog.h" #include "file_picker_ctrl.h" #include "dir_picker_ctrl.h" -#include "isdcf_metadata_dialog.h" #include "server_dialog.h" #include "make_chain_dialog.h" #include "email_dialog.h" #include "name_format_editor.h" #include "nag_dialog.h" -#include "config_dialog.h" +#include "check_box.h" +#include "static_text.h" #include "lib/config.h" #include "lib/ratio.h" #include "lib/filter.h" @@ -52,7 +52,6 @@ #include #include #include -#include #include using std::vector; @@ -63,9 +62,12 @@ using std::pair; using std::make_pair; using std::map; using boost::bind; -using boost::shared_ptr; -using boost::function; +using std::shared_ptr; +using std::function; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using dcp::locale_convert; class PlayerGeneralPage : public GeneralPage @@ -83,7 +85,6 @@ private: int r = 0; add_language_controls (table, r); - add_play_sound_controls (table, r); add_update_controls (table, r); add_label_to_sizer (table, _panel, _("Start player as"), true, wxGBPosition(r, 0)); @@ -101,47 +102,40 @@ private: table->Add (_image_display, wxGBPosition(r, 1)); ++r; - _respect_kdm = new wxCheckBox (_panel, wxID_ANY, _("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, _("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; - add_label_to_sizer (table, _panel, _("DCP directory"), true, wxGBPosition (r, 0)); - _dcp_directory = new wxDirPickerCtrl (_panel, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1)); - table->Add (_dcp_directory, wxGBPosition (r, 1)); + 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; - add_label_to_sizer (table, _panel, _("KDM directory"), true, wxGBPosition (r, 0)); - _kdm_directory = new wxDirPickerCtrl (_panel, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1)); - table->Add (_kdm_directory, wxGBPosition (r, 1)); + _respect_kdm = new CheckBox (_panel, _("Respect KDM validity periods")); + table->Add (_respect_kdm, wxGBPosition(r, 0), wxGBSpan(1, 2)); ++r; -#ifdef DCPOMATIC_VARIANT_SWAROOP - add_label_to_sizer (table, _panel, _("Background image"), true, wxGBPosition (r, 0)); - _background_image = new FilePickerCtrl (_panel, _("Select image file"), "*.png;*.jpg;*.jpeg;*.tif;*.tiff", true); - table->Add (_background_image, 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"), "*", false, true); + table->Add (_activity_log_file, wxGBPosition(r, 1)); ++r; - add_label_to_sizer (table, _panel, _("KDM server URL"), true, wxGBPosition(r, 0)); - _kdm_server_url = new wxTextCtrl (_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(400, -1)); - table->Add (_kdm_server_url, wxGBPosition (r, 1)); + add_label_to_sizer (table, _panel, _("Debug log file"), true, wxGBPosition (r, 0)); + _debug_log_file = new FilePickerCtrl (_panel, _("Select debug log file"), "*", false, true); + table->Add (_debug_log_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)); - _dcp_directory->Bind (wxEVT_DIRPICKER_CHANGED, bind(&PlayerGeneralPage::dcp_directory_changed, this)); - _kdm_directory->Bind (wxEVT_DIRPICKER_CHANGED, bind(&PlayerGeneralPage::kdm_directory_changed, this)); -#ifdef DCPOMATIC_VARIANT_SWAROOP - _background_image->Bind (wxEVT_FILEPICKER_CHANGED, bind(&PlayerGeneralPage::background_image_changed, this)); - _kdm_server_url->Bind (wxEVT_TEXT, bind(&PlayerGeneralPage::kdm_server_url_changed, this)); -#endif + _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)); } void config_changed () @@ -162,23 +156,23 @@ 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_dcp_directory()) { - checked_set (_dcp_directory, *config->player_dcp_directory()); + if (config->player_debug_log_file()) { + checked_set (_debug_log_file, *config->player_debug_log_file()); } - if (config->player_kdm_directory()) { - checked_set (_kdm_directory, *config->player_kdm_directory()); - } -#ifdef DCPOMATIC_VARIANT_SWAROOP - if (config->player_background_image()) { - checked_set (_background_image, *config->player_background_image()); - } - checked_set (_kdm_server_url, config->kdm_server_url()); -#endif } private: @@ -202,128 +196,165 @@ private: Config::instance()->set_image_display(_image_display->GetSelection()); } - void respect_kdm_changed () + void video_display_mode_changed () { - Config::instance()->set_respect_kdm_validity_periods(_respect_kdm->GetValue()); - } - - void log_file_changed () - { - Config::instance()->set_player_log_file(wx_to_std(_log_file->GetPath())); - } - - void dcp_directory_changed () - { - Config::instance()->set_player_dcp_directory(wx_to_std(_dcp_directory->GetPath())); + 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 kdm_directory_changed () + void respect_kdm_changed () { - Config::instance()->set_player_kdm_directory(wx_to_std(_kdm_directory->GetPath())); + Config::instance()->set_respect_kdm_validity_periods(_respect_kdm->GetValue()); } -#ifdef DCPOMATIC_VARIANT_SWAROOP - void background_image_changed () + void activity_log_file_changed () { - Config::instance()->set_player_background_image(wx_to_std(_background_image->GetPath())); + Config::instance()->set_player_activity_log_file(wx_to_std(_activity_log_file->GetPath())); } - void kdm_server_url_changed () + void debug_log_file_changed () { - Config::instance()->set_kdm_server_url(wx_to_std(_kdm_server_url->GetValue())); + Config::instance()->set_player_debug_log_file(wx_to_std(_debug_log_file->GetPath())); } -#endif wxChoice* _player_mode; wxChoice* _image_display; + wxChoice* _video_display_mode; wxCheckBox* _respect_kdm; - FilePickerCtrl* _log_file; - wxDirPickerCtrl* _dcp_directory; - wxDirPickerCtrl* _kdm_directory; -#ifdef DCPOMATIC_VARIANT_SWAROOP - FilePickerCtrl* _background_image; - wxTextCtrl* _kdm_server_url; -#endif + FilePickerCtrl* _activity_log_file; + FilePickerCtrl* _debug_log_file; }; -#ifdef DCPOMATIC_VARIANT_SWAROOP -class WatermarkPage : public StandardPage + +/** @class PlayerAdvancedPage + * @brief Advanced page of the preferences dialog for the player. + */ +class PlayerAdvancedPage : public Page { public: - WatermarkPage (wxSize panel_size, int border) - : StandardPage (panel_size, border) + PlayerAdvancedPage (wxSize panel_size, int border) + : Page (panel_size, border) + , _log_general (0) + , _log_warning (0) + , _log_error (0) + , _log_timing (0) {} wxString GetName () const { - return _("Watermark"); + return _("Advanced"); } +#ifdef DCPOMATIC_OSX + wxBitmap GetLargeIcon () const + { + return wxBitmap ("advanced", wxBITMAP_TYPE_PNG_RESOURCE); + } +#endif + 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 () { - wxGridBagSizer* table = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + 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); - int r = 0; - - add_label_to_sizer (table, _panel, _("Theatre name"), true, wxGBPosition(r, 0)); - _theatre = new wxTextCtrl (_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(300, -1)); - table->Add (_theatre, wxGBPosition(r, 1), wxGBSpan(1, 2)); - ++r; - - add_label_to_sizer (table, _panel, _("Period"), true, wxGBPosition(r, 0)); - _period = new wxSpinCtrl (_panel, wxID_ANY); - _period->SetRange (1, 60); - table->Add (_period, wxGBPosition(r, 1)); - add_label_to_sizer (table, _panel, _("minutes"), false, wxGBPosition(r, 2)); - ++r; + { + 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); + table->Add (t, 0, wxALL, 6); + } - add_label_to_sizer (table, _panel, _("Duration"), true, wxGBPosition(r, 0)); - _duration = new wxSpinCtrl (_panel, wxID_ANY); - _duration->SetRange (1, 200); - table->Add (_duration, wxGBPosition(r, 1)); - add_label_to_sizer (table, _panel, _("milliseconds"), false, wxGBPosition(r, 2)); - ++r; +#ifdef DCPOMATIC_WINDOWS + _win32_console = new CheckBox (_panel, _("Open console window")); + table->Add (_win32_console, 1, wxEXPAND | wxALL); + table->AddSpacer (0); +#endif - _theatre->Bind (wxEVT_TEXT, bind(&WatermarkPage::theatre_changed, this)); - _duration->Bind (wxEVT_SPINCTRL, bind(&WatermarkPage::duration_changed, this)); - _period->Bind (wxEVT_SPINCTRL, bind(&WatermarkPage::period_changed, this)); + _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)); +#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 (_theatre, config->player_watermark_theatre()); - checked_set (_duration, config->player_watermark_duration()); - checked_set (_period, config->player_watermark_period()); - } - void theatre_changed () - { - Config::instance()->set_player_watermark_theatre(wx_to_std(_theatre->GetValue())); + 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); +#ifdef DCPOMATIC_WINDOWS + checked_set (_win32_console, config->win32_console()); +#endif } - void period_changed () + void log_changed () { - Config::instance()->set_player_watermark_period(_period->GetValue()); + 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; + } + Config::instance()->set_log_types (types); } - void duration_changed () +#ifdef DCPOMATIC_WINDOWS + void win32_console_changed () { - Config::instance()->set_player_watermark_duration(_duration->GetValue()); + Config::instance()->set_win32_console (_win32_console->GetValue ()); } +#endif - wxTextCtrl* _theatre; - wxSpinCtrl* _period; - wxSpinCtrl* _duration; -}; + wxCheckBox* _log_general; + wxCheckBox* _log_warning; + wxCheckBox* _log_error; + wxCheckBox* _log_timing; +#ifdef DCPOMATIC_WINDOWS + wxCheckBox* _win32_console; #endif +}; + wxPreferencesEditor* create_player_config_dialog () { - wxPreferencesEditor* e = new wxPreferencesEditor (); + wxPreferencesEditor* e = new wxPreferencesEditor (_("DCP-o-matic Player Preferences")); #ifdef DCPOMATIC_OSX /* Width that we force some of the config panels to be on OSX so that @@ -337,10 +368,10 @@ create_player_config_dialog () int const border = 8; #endif - e->AddPage (new PlayerGeneralPage (ps, border)); - e->AddPage (new KeysPage (ps, border)); -#ifdef DCPOMATIC_VARIANT_SWAROOP - e->AddPage (new WatermarkPage (ps, border)); -#endif + e->AddPage (new PlayerGeneralPage(wxSize(-1, 500), border)); + e->AddPage (new SoundPage(ps, border)); + e->AddPage (new LocationsPage(ps, border)); + e->AddPage (new KeysPage(ps, border)); + e->AddPage (new PlayerAdvancedPage(ps, border)); return e; }