Support buttons.

[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 62b216b11c248e7545f0aaa2d3f86d2cd84c31cc..254a84c8a6180be875d733f3788f182952f7a056 100644 (file)
--- a/src/wx/player_config_dialog.cc
+++ b/src/wx/player_config_dialog.cc
@@ -35,6 +35,7 @@
 #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"
@@ -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;
 
@@ -115,6 +116,11 @@ private:
                _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));
@@ -123,6 +129,7 @@ private:
                _log_file->Bind (wxEVT_FILEPICKER_CHANGED, bind(&PlayerGeneralPage::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));
 #endif
        }
 
@@ -151,6 +158,9 @@ private:
                }
 #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
        }
 
@@ -190,6 +200,11 @@ private:
        {
                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;
@@ -198,6 +213,7 @@ private:
        FilePickerCtrl* _log_file;
 #ifdef DCPOMATIC_VARIANT_SWAROOP
        wxTextCtrl* _kdm_server_url;
+       FilePickerCtrl* _lock_file;
 #endif
 };
 
@@ -415,7 +431,7 @@ private:
                        );
                _panel->GetSizer()->Add(_monitor_list, 1, wxEXPAND | wxALL, _border);
 
-               wxButton* get = new wxButton(_panel, wxID_ANY, _("Read current devices"));
+               Button* get = new wxButton(_panel, _("Read current devices"));
                _panel->GetSizer()->Add(get, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_GAP);
                get->Bind(wxEVT_BUTTON, bind(&DevicesPage::get_clicked, this));
        }