swaroop: required monitors checks.

5 files changed, 191 insertions, 7 deletions

diff --git a/src/wx/editable_list.h b/src/wx/editable_list.h
index 681588215..eb06f4cf8 100644
--- a/src/wx/editable_list.h
+++ b/src/wx/editable_list.h
@@ -41,7 +41,8 @@ public:
 		boost::function<void (std::vector<T>)> set,
 		boost::function<std::string (T, int)> column,
 		bool can_edit = true,
-		bool title = true
+		bool title = true,
+		int column_width = 200
 		)
 		: wxPanel (parent)
 		, _get (get)
@@ -57,13 +58,13 @@ public:
 		if (title) {
 			style |= wxLC_NO_HEADER;
 		}
-		_list = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize (columns.size() * 200, 100), style);
+		_list = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize (columns.size() * column_width, 100), style);
 
 		for (size_t i = 0; i < columns.size(); ++i) {
 			wxListItem ip;
 			ip.SetId (i);
 			ip.SetText (std_to_wx (columns[i]));
-			ip.SetWidth (200);
+			ip.SetWidth (column_width);
 			_list->InsertColumn (i, ip);
 		}
 
diff --git a/src/wx/monitor_dialog.cc b/src/wx/monitor_dialog.cc
new file mode 100644
index 000000000..d247bc88b
--- /dev/null
+++ b/src/wx/monitor_dialog.cc
@@ -0,0 +1,68 @@
+/*
+    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "monitor_dialog.h"
+#include "wx_util.h"
+#include "lib/encode_server.h"
+#include <dcp/locale_convert.h>
+
+using std::string;
+using dcp::locale_convert;
+using boost::shared_ptr;
+using boost::optional;
+
+MonitorDialog::MonitorDialog (wxWindow* parent)
+	: TableDialog (parent, _("Device"), 2, 1, true)
+{
+	add (_("Manufacturer ID"), true);
+	_manufacturer_id = add (new wxTextCtrl(this, wxID_ANY, wxT("")));
+	add (_("Manufacturer product code"), true);
+	_manufacturer_product_code = add (new wxTextCtrl(this, wxID_ANY, wxT("")));
+	add (_("Serial number"), true);
+	_serial_number = add (new wxTextCtrl(this, wxID_ANY, wxT("")));
+	add (_("Week of manufacture"), true);
+	_week_of_manufacture = add (new wxTextCtrl(this, wxID_ANY, wxT("")));
+	add (_("Year of manufacture"), true);
+	_year_of_manufacture = add (new wxTextCtrl(this, wxID_ANY, wxT("")));
+
+	layout ();
+}
+
+void
+MonitorDialog::set (Monitor monitor)
+{
+	_manufacturer_id->SetValue (std_to_wx(monitor.manufacturer_id));
+	_manufacturer_product_code->SetValue (std_to_wx(locale_convert<string>(monitor.manufacturer_product_code)));
+	_serial_number->SetValue (std_to_wx(locale_convert<string>(monitor.serial_number)));
+	_week_of_manufacture->SetValue (std_to_wx(locale_convert<string>(monitor.week_of_manufacture)));
+	_year_of_manufacture->SetValue (std_to_wx(locale_convert<string>(monitor.year_of_manufacture)));
+}
+
+optional<Monitor>
+MonitorDialog::get () const
+{
+	Monitor m;
+	m.manufacturer_id = wx_to_std (_manufacturer_id->GetValue());
+	m.manufacturer_product_code = locale_convert<uint16_t>(wx_to_std(_manufacturer_product_code->GetValue()));
+	m.serial_number = locale_convert<uint32_t>(wx_to_std(_serial_number->GetValue()));
+	m.week_of_manufacture = locale_convert<uint8_t>(wx_to_std(_week_of_manufacture->GetValue()));
+	m.year_of_manufacture = locale_convert<uint8_t>(wx_to_std (_year_of_manufacture->GetValue()));
+	return m;
+}
diff --git a/src/wx/monitor_dialog.h b/src/wx/monitor_dialog.h
new file mode 100644
index 000000000..00804f47d
--- /dev/null
+++ b/src/wx/monitor_dialog.h
@@ -0,0 +1,39 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "table_dialog.h"
+#include "lib/edid.h"
+#include <boost/optional.hpp>
+
+class MonitorDialog : public TableDialog
+{
+public:
+	explicit MonitorDialog (wxWindow *);
+
+	void set (Monitor);
+	boost::optional<Monitor> get () const;
+
+private:
+	wxTextCtrl* _manufacturer_id;
+	wxTextCtrl* _manufacturer_product_code;
+	wxTextCtrl* _serial_number;
+	wxTextCtrl* _week_of_manufacture;
+	wxTextCtrl* _year_of_manufacture;
+};
diff --git a/src/wx/player_config_dialog.cc b/src/wx/player_config_dialog.cc
index c588c9065..29b30f8a7 100644
--- a/src/wx/player_config_dialog.cc
+++ b/src/wx/player_config_dialog.cc
@@ -34,7 +34,7 @@
 #include "email_dialog.h"
 #include "name_format_editor.h"
 #include "nag_dialog.h"
-#include "config_dialog.h"
+#include "monitor_dialog.h"
 #include "lib/config.h"
 #include "lib/ratio.h"
 #include "lib/filter.h"
@@ -318,6 +318,80 @@ private:
 	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<string> 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<Monitor, MonitorDialog> (
+			_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<string>(m.manufacturer_product_code);
+		case 2:
+			return locale_convert<string>(m.serial_number);
+		case 3:
+			return locale_convert<string>(m.week_of_manufacture);
+		case 4:
+			return locale_convert<string>(m.year_of_manufacture);
+		default:
+			DCPOMATIC_ASSERT(false);
+		}
+
+		return "";
+	}
+
+	void config_changed ()
+	{
+		_monitor_list->refresh ();
+	}
+
+private:
+	EditableList<Monitor, MonitorDialog>* _monitor_list;
+};
+
 #endif
 
 wxPreferencesEditor*
@@ -337,10 +411,11 @@ 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(ps, border));
+	e->AddPage (new KeysPage(ps, border));
 #ifdef DCPOMATIC_VARIANT_SWAROOP
-	e->AddPage (new WatermarkPage (ps, border));
+	e->AddPage (new WatermarkPage(ps, border));
+	e->AddPage (new DevicesPage(ps, border));
 #endif
 	return e;
 }
diff --git a/src/wx/wscript b/src/wx/wscript
index ad0292a47..5207608bb 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -84,6 +84,7 @@ sources = """
           key_dialog.cc
           make_chain_dialog.cc
           message_dialog.cc
+          monitor_dialog.cc
           move_to_dialog.cc
           nag_dialog.cc
           name_format_editor.cc