Use territory details from template.

1 files changed, 0 insertions, 29 deletions

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;
 };