Add preference for default KDM duration (#2224).

2 files changed, 91 insertions, 8 deletions

diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index b14c642c8..a9618ce38 100644
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -343,6 +343,14 @@ private:
 		_kdm_type = new KDMChoice (_panel);
 		table->Add (_kdm_type, 1, wxEXPAND);
 
+		add_label_to_sizer (table, _panel, _("Default KDM duration"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
+		_kdm_duration = new wxSpinCtrl (_panel);
+		_kdm_duration_unit = new wxChoice (_panel, wxID_ANY);
+		auto kdm_duration_sizer = new wxBoxSizer (wxHORIZONTAL);
+		kdm_duration_sizer->Add (_kdm_duration, 0, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP);
+		kdm_duration_sizer->Add (_kdm_duration_unit, 0, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP);
+		table->Add (kdm_duration_sizer, 1, wxEXPAND);
+
 		table->Add (_use_isdcf_name_by_default = new CheckBox(_panel, _("Use ISDCF name by default")), 0, wxALIGN_CENTRE_VERTICAL);
 
 		_still_length->SetRange (1, 3600);
@@ -351,6 +359,13 @@ private:
 		_directory->Bind (wxEVT_DIRPICKER_CHANGED, boost::bind (&DefaultsPage::directory_changed, this));
 		_kdm_directory->Bind (wxEVT_DIRPICKER_CHANGED, boost::bind (&DefaultsPage::kdm_directory_changed, this));
 		_kdm_type->Bind (wxEVT_CHOICE, boost::bind(&DefaultsPage::kdm_type_changed, this));
+		_kdm_duration_unit->Append (_("days"));
+		_kdm_duration_unit->Append (_("weeks"));
+		_kdm_duration_unit->Append (_("months"));
+		_kdm_duration_unit->Append (_("years"));
+
+		_kdm_duration->Bind (wxEVT_SPINCTRL, boost::bind(&DefaultsPage::kdm_duration_changed, this));
+		_kdm_duration_unit->Bind (wxEVT_CHOICE, boost::bind(&DefaultsPage::kdm_duration_changed, this));
 
 		_use_isdcf_name_by_default->Bind (wxEVT_CHECKBOX, boost::bind(&DefaultsPage::use_isdcf_name_by_default_changed, this));
 
@@ -436,9 +451,51 @@ private:
 			}
 		}
 
+		checked_set (_kdm_duration, config->default_kdm_duration().duration);
+		switch (config->default_kdm_duration().unit) {
+			case RoughDuration::Unit::DAYS:
+				_kdm_duration->SetRange(1, 365);
+				checked_set (_kdm_duration_unit, 0);
+				break;
+			case RoughDuration::Unit::WEEKS:
+				_kdm_duration->SetRange(1, 52);
+				checked_set (_kdm_duration_unit, 1);
+				break;
+			case RoughDuration::Unit::MONTHS:
+				_kdm_duration->SetRange(1, 12);
+				checked_set (_kdm_duration_unit, 2);
+				break;
+			case RoughDuration::Unit::YEARS:
+				_kdm_duration->SetRange(1, 40);
+				checked_set (_kdm_duration_unit, 3);
+				break;
+		}
+
 		setup_sensitivity ();
 	}
 
+	void kdm_duration_changed ()
+	{
+		auto config = Config::instance();
+		auto duration = _kdm_duration->GetValue();
+		RoughDuration::Unit unit = RoughDuration::Unit::DAYS;
+		switch (_kdm_duration_unit->GetSelection()) {
+		case 0:
+			unit = RoughDuration::Unit::DAYS;
+			break;
+		case 1:
+			unit = RoughDuration::Unit::WEEKS;
+			break;
+		case 2:
+			unit = RoughDuration::Unit::MONTHS;
+			break;
+		case 3:
+			unit = RoughDuration::Unit::YEARS;
+			break;
+		}
+		config->set_default_kdm_duration (RoughDuration(duration, unit));
+	}
+
 	void j2k_bandwidth_changed ()
 	{
 		Config::instance()->set_default_j2k_bandwidth (_j2k_bandwidth->GetValue() * 1000000);
@@ -531,6 +588,8 @@ private:
 	wxDirPickerCtrl* _kdm_directory;
 #endif
 	KDMChoice* _kdm_type;
+	wxSpinCtrl* _kdm_duration;
+	wxChoice* _kdm_duration_unit;
 	wxCheckBox* _use_isdcf_name_by_default;
 	wxChoice* _container;
 	wxChoice* _dcp_content_type;
diff --git a/src/wx/kdm_timing_panel.cc b/src/wx/kdm_timing_panel.cc
index c5ecd1f1f..0fd00de93 100644
--- a/src/wx/kdm_timing_panel.cc
+++ b/src/wx/kdm_timing_panel.cc
@@ -18,35 +18,39 @@
 
 */
 
+
 #include "kdm_timing_panel.h"
 #include "static_text.h"
 #include "time_picker.h"
 #include "wx_util.h"
+#include "lib/config.h"
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/datectrl.h>
 #include <wx/dateevt.h>
 LIBDCP_ENABLE_WARNINGS
 
+
 using std::cout;
 using boost::bind;
 
+
 KDMTimingPanel::KDMTimingPanel (wxWindow* parent)
 	: wxPanel (parent, wxID_ANY)
 {
-	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
+	auto overall_sizer = new wxBoxSizer (wxVERTICAL);
 
 #ifdef __WXGTK3__
 	/* wxDatePickerCtrl is too small with the GTK3 backend so we need to make it bigger with some fudge factors */
 	wxClientDC dc (parent);
-	wxSize size = dc.GetTextExtent (wxT("99/99/9999"));
+	auto size = dc.GetTextExtent(wxT("99/99/9999"));
 	size.SetWidth (size.GetWidth() * 1.75);
 	size.SetHeight (-1);
 #else
-	wxSize size = wxDefaultSize;
+	auto size = wxDefaultSize;
 #endif
 
-	wxSizer* table = new wxBoxSizer (wxHORIZONTAL);
+	auto table = new wxBoxSizer (wxHORIZONTAL);
 	add_label_to_sizer (table, this, _("From"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 	wxDateTime from;
 	from.SetToCurrent ();
@@ -67,9 +71,24 @@ KDMTimingPanel::KDMTimingPanel (wxWindow* parent)
 	table->Add (_from_time, 0, wxALIGN_CENTER_VERTICAL);
 
 	add_label_to_sizer (table, this, _("until"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
-	wxDateTime to = from;
-	/* 1 week from now */
-	to.Add (wxDateSpan (0, 0, 1, 0));
+	auto to = from;
+
+	auto const duration = Config::instance()->default_kdm_duration();
+	switch (duration.unit) {
+	case RoughDuration::Unit::DAYS:
+		to.Add(wxDateSpan(0, 0, 0, duration.duration));
+		break;
+	case RoughDuration::Unit::WEEKS:
+		to.Add(wxDateSpan(0, 0, duration.duration, 0));
+		break;
+	case RoughDuration::Unit::MONTHS:
+		to.Add(wxDateSpan(0, duration.duration, 0, 0));
+		break;
+	case RoughDuration::Unit::YEARS:
+		to.Add(wxDateSpan(duration.duration, 0, 0, 0));
+		break;
+	}
+
 	_until_date = new wxDatePickerCtrl (this, wxID_ANY, to, wxDefaultPosition, size);
 #ifdef DCPOMATIC_OSX
 	/* Hack to tweak alignment, which I can't get right by "proper" means for some reason */
@@ -110,34 +129,39 @@ KDMTimingPanel::KDMTimingPanel (wxWindow* parent)
 	SetSizer (overall_sizer);
 }
 
+
 boost::posix_time::ptime
 KDMTimingPanel::from () const
 {
 	return posix_time (_from_date, _from_time);
 }
 
+
 boost::posix_time::ptime
 KDMTimingPanel::posix_time (wxDatePickerCtrl* date_picker, TimePicker* time_picker)
 {
-	wxDateTime const date = date_picker->GetValue ();
+	auto const date = date_picker->GetValue ();
 	return boost::posix_time::ptime (
 		boost::gregorian::date (date.GetYear(), date.GetMonth() + 1, date.GetDay()),
 		boost::posix_time::time_duration (time_picker->hours(), time_picker->minutes(), 0)
 		);
 }
 
+
 boost::posix_time::ptime
 KDMTimingPanel::until () const
 {
 	return posix_time (_until_date, _until_time);
 }
 
+
 bool
 KDMTimingPanel::valid () const
 {
 	return until() > from();
 }
 
+
 void
 KDMTimingPanel::changed () const
 {