X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Flanguage_tag_dialog.h;h=0675ed88a247214bffbbd8c62f6d8bc54a524dfd;hb=b9a1ad3df5f9d85fb7439efd93fede72b9b078af;hp=705359d6bed045c4fcb9a07c568db1cedb91bee5;hpb=e519feaca11005d330e7b8403b948d4ad9cc3ae8;p=dcpomatic.git

diff --git a/src/wx/language_tag_dialog.h b/src/wx/language_tag_dialog.h
index 705359d6b..0675ed88a 100644
--- a/src/wx/language_tag_dialog.h
+++ b/src/wx/language_tag_dialog.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -31,62 +31,23 @@ DCPOMATIC_ENABLE_WARNINGS
 
 
 class wxListCtrl;
-class LanguageSubtagPanel;
 
 
 class LanguageTagDialog : public wxDialog
 {
 public:
-	class Subtag
-	{
-	public:
-		Subtag (dcp::LanguageTag::SubtagType type_, boost::optional<dcp::LanguageTag::SubtagData> subtag_)
-			: type (type_)
-			, subtag (subtag_)
-		{}
-
-		dcp::LanguageTag::SubtagType type;
-		boost::optional<dcp::LanguageTag::SubtagData> subtag;
-		std::string last_search;
-	};
-
 	LanguageTagDialog (wxWindow* parent, dcp::LanguageTag tag = dcp::LanguageTag("en"));
 
 	dcp::LanguageTag get () const;
 	void set (dcp::LanguageTag tag);
 
 private:
+	void add_language ();
+	void populate_list ();
 
-	std::string subtag_type_name (dcp::LanguageTag::SubtagType type);
-	void search_changed (std::string search);
-	void add_to_current_tag (dcp::LanguageTag::SubtagType type, boost::optional<dcp::LanguageTag::SubtagData> subtag);
-	void remove_from_current_tag ();
-	void current_tag_selection_changed ();
-	void chosen_subtag_changed (boost::optional<dcp::LanguageTag::SubtagData> selection);
-	void setup_sensitivity ();
-
-	std::vector<Subtag> _current_tag_subtags;
-	wxListCtrl* _current_tag_list;
-	LanguageSubtagPanel* _choose_subtag_panel;
-	wxButton* _add_script;
-	wxButton* _add_region;
-	wxButton* _add_variant;
-	wxButton* _add_external;
-	wxButton* _remove;
+	std::vector<dcp::LanguageTag> _presets;
+	std::vector<dcp::LanguageTag> _custom;
+	wxListCtrl* _list;
 };
 
-
-
-class RegionSubtagDialog : public wxDialog
-{
-public:
-	RegionSubtagDialog (wxWindow* parent, dcp::LanguageTag::RegionSubtag region);
-
-	boost::optional<dcp::LanguageTag::RegionSubtag> get () const;
-
-private:
-	LanguageSubtagPanel* _panel;
-};
-
-
 #endif