Add KDM directory configuration in player.

[dcpomatic.git] / src / wx / player_config_dialog.cc

diff --git a/src/wx/player_config_dialog.cc b/src/wx/player_config_dialog.cc
index eba23164ff3c51b760be93ed4bc28af69cb8bfb7..a34f0bd3b4a897a78c544051a5a75391c33653dd 100644 (file)
--- a/src/wx/player_config_dialog.cc
+++ b/src/wx/player_config_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -26,15 +26,14 @@
 #include "wx_util.h"
 #include "editable_list.h"
 #include "filter_dialog.h"
-#include "dir_picker_ctrl.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_move_dialog.h"
 #include "config_dialog.h"
 #include "lib/config.h"
 #include "lib/ratio.h"
@@ -86,7 +85,127 @@ private:
                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));
+               _player_mode = new wxChoice (_panel, wxID_ANY);
+               _player_mode->Append (_("window"));
+               _player_mode->Append (_("full screen"));
+               _player_mode->Append (_("full screen with controls on other monitor"));
+               table->Add (_player_mode, wxGBPosition(r, 1));
+               ++r;
+
+               add_label_to_sizer (table, _panel, _("Dual-screen displays"), true, wxGBPosition(r, 0));
+               _image_display = new wxChoice (_panel, wxID_ANY);
+               _image_display->Append (_("Image on primary, controls on secondary"));
+               _image_display->Append (_("Image on secondary, controls on primary"));
+               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));
+               ++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));
+               ++r;
+
+               _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));
        }
+
+       void config_changed ()
+       {
+               GeneralPage::config_changed ();
+
+               Config* config = Config::instance ();
+
+               switch (config->player_mode()) {
+               case Config::PLAYER_MODE_WINDOW:
+                       checked_set (_player_mode, 0);
+                       break;
+               case Config::PLAYER_MODE_FULL:
+                       checked_set (_player_mode, 1);
+                       break;
+               case Config::PLAYER_MODE_DUAL:
+                       checked_set (_player_mode, 2);
+                       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_dcp_directory()) {
+                       checked_set (_dcp_directory, *config->player_dcp_directory());
+               }
+               if (config->player_kdm_directory()) {
+                       checked_set (_kdm_directory, *config->player_kdm_directory());
+               }
+       }
+
+private:
+       void player_mode_changed ()
+       {
+               switch (_player_mode->GetSelection()) {
+               case 0:
+                       Config::instance()->set_player_mode(Config::PLAYER_MODE_WINDOW);
+                       break;
+               case 1:
+                       Config::instance()->set_player_mode(Config::PLAYER_MODE_FULL);
+                       break;
+               case 2:
+                       Config::instance()->set_player_mode(Config::PLAYER_MODE_DUAL);
+                       break;
+               }
+       }
+
+       void image_display_changed ()
+       {
+               Config::instance()->set_image_display(_image_display->GetSelection());
+       }
+
+       void respect_kdm_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()));
+       }
+
+       void kdm_directory_changed ()
+       {
+               Config::instance()->set_player_kdm_directory(wx_to_std(_kdm_directory->GetPath()));
+       }
+
+       wxChoice* _player_mode;
+       wxChoice* _image_display;
+       wxCheckBox* _respect_kdm;
+       FilePickerCtrl* _log_file;
+       wxDirPickerCtrl* _dcp_directory;
+       wxDirPickerCtrl* _kdm_directory;
 };
 
 wxPreferencesEditor*
@@ -107,6 +226,6 @@ create_player_config_dialog ()
 #endif
 
        e->AddPage (new PlayerGeneralPage (ps, border));
-       e->AddPage (new KeysPage (ps, border, false));
+       e->AddPage (new KeysPage (ps, border));
        return e;
 }