#include "name_format_editor.h"
#include "nag_dialog.h"
#include "monitor_dialog.h"
+#include "check_box.h"
#include "lib/config.h"
#include "lib/ratio.h"
#include "lib/filter.h"
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;
- 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));
- ++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));
- ++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, _("Activity log file"), true, wxGBPosition (r, 0));
+ _activity_log_file = new FilePickerCtrl (_panel, _("Select activity log file"), "*", true);
+ table->Add (_activity_log_file, 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;
-
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, _("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));
+ _activity_log_file->Bind (wxEVT_FILEPICKER_CHANGED, bind(&PlayerGeneralPage::activity_log_file_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));
+ _lock_file->Bind (wxEVT_FILEPICKER_CHANGED, bind(&PlayerGeneralPage::lock_file_changed, this));
#endif
}
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_dcp_directory()) {
- checked_set (_dcp_directory, *config->player_dcp_directory());
- }
- if (config->player_kdm_directory()) {
- checked_set (_kdm_directory, *config->player_kdm_directory());
+ if (config->player_activity_log_file()) {
+ checked_set (_activity_log_file, *config->player_activity_log_file());
}
#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());
+ if (config->player_lock_file()) {
+ checked_set (_lock_file, config->player_lock_file().get());
+ }
#endif
}
Config::instance()->set_respect_kdm_validity_periods(_respect_kdm->GetValue());
}
- void log_file_changed ()
+ void activity_log_file_changed ()
+ {
+ Config::instance()->set_player_activity_log_file(wx_to_std(_activity_log_file->GetPath()));
+ }
+
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+ void kdm_server_url_changed ()
+ {
+ Config::instance()->set_kdm_server_url(wx_to_std(_kdm_server_url->GetValue()));
+ }
+
+ void lock_file_changed ()
+ {
+ Config::instance()->set_player_lock_file(wx_to_std(_lock_file->GetPath()));
+ }
+#endif
+
+ wxChoice* _player_mode;
+ wxChoice* _image_display;
+ wxCheckBox* _respect_kdm;
+ FilePickerCtrl* _activity_log_file;
+#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
{
- Config::instance()->set_player_log_file(wx_to_std(_log_file->GetPath()));
+ return _("Locations");
}
- void dcp_directory_changed ()
+#ifdef DCPOMATIC_OSX
+ wxBitmap GetLargeIcon () const
{
- Config::instance()->set_player_dcp_directory(wx_to_std(_dcp_directory->GetPath()));
+ 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 ()
#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;
+ }
- void kdm_server_url_changed ()
- {
- Config::instance()->set_kdm_server_url(wx_to_std(_kdm_server_url->GetValue()));
+ Config::instance()->set_player_background_image(f);
}
#endif
- wxChoice* _player_mode;
- wxChoice* _image_display;
- wxCheckBox* _respect_kdm;
- FilePickerCtrl* _log_file;
- wxDirPickerCtrl* _dcp_directory;
+ wxDirPickerCtrl* _content_directory;
+ wxDirPickerCtrl* _playlist_directory;
wxDirPickerCtrl* _kdm_directory;
#ifdef DCPOMATIC_VARIANT_SWAROOP
FilePickerCtrl* _background_image;
- wxTextCtrl* _kdm_server_url;
#endif
};
);
_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));
}
int const border = 8;
#endif
- e->AddPage (new PlayerGeneralPage(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));
projects / dcpomatic.git / blobdiff