X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fplayer_config_dialog.cc;h=ca65711a7d05c8adf4711214ad4e43e8f642756d;hb=9c1bb2e5ca7c80c4e26b1b2e41159aa171360a94;hp=a34f0bd3b4a897a78c544051a5a75391c33653dd;hpb=8414829693900c3d6362a4f15d677bb7e1462c3e;p=dcpomatic.git diff --git a/src/wx/player_config_dialog.cc b/src/wx/player_config_dialog.cc index a34f0bd3b..ca65711a7 100644 --- a/src/wx/player_config_dialog.cc +++ b/src/wx/player_config_dialog.cc @@ -34,7 +34,8 @@ #include "email_dialog.h" #include "name_format_editor.h" #include "nag_dialog.h" -#include "config_dialog.h" +#include "monitor_dialog.h" +#include "check_box.h" #include "lib/config.h" #include "lib/ratio.h" #include "lib/filter.h" @@ -101,7 +102,7 @@ private: table->Add (_image_display, wxGBPosition(r, 1)); ++r; - _respect_kdm = new wxCheckBox (_panel, wxID_ANY, _("Respect KDM validity periods")); + _respect_kdm = new CheckBox (_panel, _("Respect KDM validity periods")); table->Add (_respect_kdm, wxGBPosition(r, 0), wxGBSpan(1, 2)); ++r; @@ -110,22 +111,26 @@ private: table->Add (_log_file, 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)); +#ifdef DCPOMATIC_VARIANT_SWAROOP + 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)); ++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)); + add_label_to_sizer (table, _panel, _("Lock file"), true, wxGBPosition(r, 0)); + _lock_file = new FilePickerCtrl (_panel, _("Select lock file"), "*", 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)); _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 + _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)); +#endif } void config_changed () @@ -151,12 +156,12 @@ private: if (config->player_log_file()) { checked_set (_log_file, *config->player_log_file()); } - if (config->player_dcp_directory()) { - checked_set (_dcp_directory, *config->player_dcp_directory()); - } - if (config->player_kdm_directory()) { - checked_set (_kdm_directory, *config->player_kdm_directory()); +#ifdef DCPOMATIC_VARIANT_SWAROOP + checked_set (_kdm_server_url, config->kdm_server_url()); + if (config->player_lock_file()) { + checked_set (_lock_file, config->player_lock_file().get()); } +#endif } private: @@ -190,24 +195,284 @@ private: Config::instance()->set_player_log_file(wx_to_std(_log_file->GetPath())); } - void dcp_directory_changed () +#ifdef DCPOMATIC_VARIANT_SWAROOP + void kdm_server_url_changed () { - Config::instance()->set_player_dcp_directory(wx_to_std(_dcp_directory->GetPath())); + Config::instance()->set_kdm_server_url(wx_to_std(_kdm_server_url->GetValue())); } - void kdm_directory_changed () + void lock_file_changed () { - Config::instance()->set_player_kdm_directory(wx_to_std(_kdm_directory->GetPath())); + Config::instance()->set_player_lock_file(wx_to_std(_lock_file->GetPath())); } +#endif wxChoice* _player_mode; wxChoice* _image_display; wxCheckBox* _respect_kdm; FilePickerCtrl* _log_file; - wxDirPickerCtrl* _dcp_directory; +#ifdef DCPOMATIC_VARIANT_SWAROOP + wxTextCtrl* _kdm_server_url; + FilePickerCtrl* _lock_file; +#endif +}; + +class LocationsPage : public StandardPage +{ +public: + LocationsPage (wxSize panel_size, int border) + : StandardPage (panel_size, border) + {} + + wxString GetName () const + { + return _("Locations"); + } + +#ifdef DCPOMATIC_OSX + wxBitmap GetLargeIcon () const + { + return wxBitmap ("locations", wxBITMAP_TYPE_PNG_RESOURCE); + } +#endif + +private: + void setup () + { + + int r = 0; + + wxGridBagSizer* table = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + _panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border); + + add_label_to_sizer (table, _panel, _("Content directory"), true, wxGBPosition (r, 0)); + _content_directory = new wxDirPickerCtrl (_panel, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1)); + table->Add (_content_directory, wxGBPosition (r, 1)); + ++r; + + add_label_to_sizer (table, _panel, _("Playlist directory"), true, wxGBPosition (r, 0)); + _playlist_directory = new wxDirPickerCtrl (_panel, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1)); + table->Add (_playlist_directory, wxGBPosition (r, 1)); + ++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)); + ++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)); + ++r; +#endif + + _content_directory->Bind (wxEVT_DIRPICKER_CHANGED, bind(&LocationsPage::content_directory_changed, this)); + _playlist_directory->Bind (wxEVT_DIRPICKER_CHANGED, bind(&LocationsPage::playlist_directory_changed, this)); + _kdm_directory->Bind (wxEVT_DIRPICKER_CHANGED, bind(&LocationsPage::kdm_directory_changed, this)); +#ifdef DCPOMATIC_VARIANT_SWAROOP + _background_image->Bind (wxEVT_FILEPICKER_CHANGED, bind(&LocationsPage::background_image_changed, this)); +#endif + } + + void config_changed () + { + Config* config = Config::instance (); + + if (config->player_content_directory()) { + checked_set (_content_directory, *config->player_content_directory()); + } + if (config->player_playlist_directory()) { + checked_set (_playlist_directory, *config->player_playlist_directory()); + } + 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()); + } +#endif + } + + void content_directory_changed () + { + Config::instance()->set_player_content_directory(wx_to_std(_content_directory->GetPath())); + } + + void playlist_directory_changed () + { + Config::instance()->set_player_playlist_directory(wx_to_std(_playlist_directory->GetPath())); + } + + void kdm_directory_changed () + { + Config::instance()->set_player_kdm_directory(wx_to_std(_kdm_directory->GetPath())); + } + +#ifdef DCPOMATIC_VARIANT_SWAROOP + void background_image_changed () + { + Config::instance()->set_player_background_image(wx_to_std(_background_image->GetPath())); + } +#endif + + wxDirPickerCtrl* _content_directory; + wxDirPickerCtrl* _playlist_directory; wxDirPickerCtrl* _kdm_directory; +#ifdef DCPOMATIC_VARIANT_SWAROOP + FilePickerCtrl* _background_image; +#endif +}; + +#ifdef DCPOMATIC_VARIANT_SWAROOP +class WatermarkPage : public StandardPage +{ +public: + WatermarkPage (wxSize panel_size, int border) + : StandardPage (panel_size, border) + {} + + wxString GetName () const + { + return _("Watermark"); + } + +private: + void setup () + { + wxGridBagSizer* table = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + _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_label_to_sizer (table, _panel, _("Duration"), true, wxGBPosition(r, 0)); + _duration = new wxSpinCtrl (_panel, wxID_ANY); + _duration->SetRange (100, 5000); + table->Add (_duration, wxGBPosition(r, 1)); + add_label_to_sizer (table, _panel, _("milliseconds"), false, wxGBPosition(r, 2)); + ++r; + + _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)); + } + + 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())); + } + + void period_changed () + { + Config::instance()->set_player_watermark_period(_period->GetValue()); + } + + void duration_changed () + { + Config::instance()->set_player_watermark_duration(_duration->GetValue()); + } + + wxTextCtrl* _theatre; + wxSpinCtrl* _period; + wxSpinCtrl* _duration; +}; + +class DevicesPage : public StandardPage +{ +public: + DevicesPage (wxSize panel_size, int border) + : StandardPage (panel_size, border) + {} + + wxString GetName () const + { + return _("Devices"); + } + +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"))); + _monitor_list = new EditableList ( + _panel, + columns, + boost::bind (&Config::required_monitors, Config::instance()), + boost::bind (&Config::set_required_monitors, Config::instance(), _1), + boost::bind (&DevicesPage::monitor_column, this, _1, _2), + true, + true, + 100 + ); + _panel->GetSizer()->Add(_monitor_list, 1, wxEXPAND | wxALL, _border); + + wxButton* get = new wxButton(_panel, wxID_ANY, _("Read current devices")); + _panel->GetSizer()->Add(get, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_GAP); + get->Bind(wxEVT_BUTTON, bind(&DevicesPage::get_clicked, this)); + } + + void get_clicked () + { + Config::instance()->set_required_monitors(get_monitors()); + _monitor_list->refresh (); + } + + string monitor_column (Monitor m, int c) + { + switch (c) { + case 0: + return m.manufacturer_id; + case 1: + return locale_convert(m.manufacturer_product_code); + case 2: + return locale_convert(m.serial_number); + case 3: + return locale_convert(m.week_of_manufacture); + case 4: + return locale_convert(m.year_of_manufacture); + default: + DCPOMATIC_ASSERT(false); + } + + return ""; + } + + void config_changed () + { + _monitor_list->refresh (); + } + +private: + EditableList* _monitor_list; }; +#endif + wxPreferencesEditor* create_player_config_dialog () { @@ -225,7 +490,12 @@ create_player_config_dialog () int const border = 8; #endif - e->AddPage (new PlayerGeneralPage (ps, border)); - e->AddPage (new KeysPage (ps, border)); + e->AddPage (new PlayerGeneralPage(wxSize(-1, 500), border)); + e->AddPage (new LocationsPage(ps, border)); + e->AddPage (new KeysPage(ps, border)); +#ifdef DCPOMATIC_VARIANT_SWAROOP + e->AddPage (new WatermarkPage(ps, border)); + e->AddPage (new DevicesPage(ps, border)); +#endif return e; }