Use territory details from template.

4 files changed, 2 insertions, 41 deletions

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 0508d0069..bbf0539e4 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -793,10 +793,6 @@ Config::write_config () const
 		/* [XML] DefaultAudioLanguage Default audio language to use for new films */
 		cxml::add_text_child(root, "DefaultAudioLanguage", _default_audio_language->to_string());
 	}
-	if (_default_territory) {
-		/* [XML] DefaultTerritory Default territory to use for new films */
-		cxml::add_text_child(root, "DefaultTerritory", _default_territory->subtag());
-	}
 	if (_default_kdm_directory) {
 		/* [XML:opt] DefaultKDMDirectory Default directory to write KDMs to. */
 		cxml::add_text_child(root, "DefaultKDMDirectory", _default_kdm_directory->string ());
diff --git a/src/lib/config.h b/src/lib/config.h
index d6a389cc9..397af2222 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -806,14 +806,6 @@ public:
 		maybe_set(_default_audio_language, boost::optional<dcp::LanguageTag>());
 	}
 
-	void set_default_territory(dcp::LanguageTag::RegionSubtag tag) {
-		maybe_set(_default_territory, tag);
-	}
-
-	void unset_default_territory() {
-		maybe_set(_default_territory, boost::optional<dcp::LanguageTag::RegionSubtag>());
-	}
-
 	void set_upload_after_make_dcp (bool u) {
 		maybe_set (_upload_after_make_dcp, u);
 	}
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 4ffbd8c26..4dff0bd76 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1989,6 +1989,8 @@ Film::use_template(optional<string> name)
 	_distributor = _template_film->_distributor;
 	_facility = _template_film->_facility;
 	_studio = _template_film->_studio;
+	_territory_type = _template_film->_territory_type;
+	_release_territory = _template_film->_release_territory;
 }
 
 pair<double, double>
diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index 49c24d2b0..955ea6493 100644
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -324,11 +324,6 @@ private:
 		_audio_language = new LanguageTagWidget(_panel, _("Default audio language to use for new DCPs"), Config::instance()->default_audio_language(), wxString("cmnr-Hant-"));
 		table->Add(_audio_language->sizer());
 
-		_enable_territory = new CheckBox(_panel, _("Default territory"));
-		table->Add(_enable_territory, 1, wxEXPAND | wxALIGN_CENTRE_VERTICAL);
-		_territory = new RegionSubtagWidget(_panel, _("Default territory to use for new DCPs"), Config::instance()->default_territory(), wxString("cmnr-Hant-"));
-		table->Add(_territory->sizer());
-
 		add_label_to_sizer (table, _panel, _("Default KDM directory"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 #ifdef DCPOMATIC_USE_OWN_PICKER
 		_kdm_directory = new DirPickerCtrl (_panel);
@@ -372,9 +367,6 @@ private:
 
 		_enable_audio_language->bind(&DefaultsPage::enable_audio_language_toggled, this);
 		_audio_language->Changed.connect(boost::bind(&DefaultsPage::audio_language_changed, this));
-
-		_enable_territory->bind(&DefaultsPage::enable_territory_toggled, this);
-		_territory->Changed.connect(boost::bind(&DefaultsPage::territory_changed, this));
 	}
 
 	void config_changed () override
@@ -389,9 +381,6 @@ private:
 		auto dal = config->default_audio_language();
 		checked_set(_enable_audio_language, static_cast<bool>(dal));
 		checked_set(_audio_language, dal ? dal : boost::none);
-		auto dt = config->default_territory();
-		checked_set(_enable_territory, static_cast<bool>(dt));
-		checked_set(_territory, dt ? dt : boost::none);
 
 		checked_set (_kdm_duration, config->default_kdm_duration().duration);
 		switch (config->default_kdm_duration().unit) {
@@ -483,25 +472,9 @@ private:
 		}
 	}
 
-	void enable_territory_toggled()
-	{
-		setup_sensitivity();
-		territory_changed();
-	}
-
-	void territory_changed()
-	{
-		if (_enable_territory->get()) {
-			Config::instance()->set_default_territory(_territory->get().get_value_or(dcp::LanguageTag::RegionSubtag("US")));
-		} else {
-			Config::instance()->unset_default_territory();
-		}
-	}
-
 	void setup_sensitivity ()
 	{
 		_audio_language->enable(_enable_audio_language->get());
-		_territory->enable(_enable_territory->get());
 	}
 
 	wxSpinCtrl* _audio_delay;
@@ -519,8 +492,6 @@ private:
 	CheckBox* _use_isdcf_name_by_default;
 	CheckBox* _enable_audio_language;
 	LanguageTagWidget* _audio_language;
-	CheckBox* _enable_territory;
-	RegionSubtagWidget* _territory;
 };