X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fmetadata_dialog.h;h=5b4efb8c92ac0734aa4c9fc01c345572cce4fdb1;hb=6a35581ef83d48a799208081bcf006de895ddfb4;hp=591ef3db44b3d0db62f814d8019fd326ec9f0623;hpb=0bbbe85d4a206900b19bc7849a45f63cd8858e89;p=dcpomatic.git

diff --git a/src/wx/metadata_dialog.h b/src/wx/metadata_dialog.h
index 591ef3db4..5b4efb8c9 100644
--- a/src/wx/metadata_dialog.h
+++ b/src/wx/metadata_dialog.h
@@ -25,18 +25,23 @@
 
 #include "editable_list.h"
 #include "lib/change_signaller.h"
-#include "lib/film.h"
+#include "lib/film_property.h"
 #include "lib/weak_film.h"
+#include <dcp/rating.h>
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
 LIBDCP_ENABLE_WARNINGS
+#include <unordered_map>
 
 
 class Button;
+class CheckBox;
+class Choice;
+class LanguageTagWidget;
 class RatingDialog;
+class RegionSubtagWidget;
 class wxSpinCtrlDouble;
-class LanguageTagWidget;
 
 
 class MetadataDialog : public wxDialog, public WeakFilm
@@ -49,14 +54,15 @@ public:
 protected:
 	virtual void setup_standard (wxPanel*, wxSizer*);
 	virtual void setup_advanced (wxPanel*, wxSizer*);
-	virtual void film_changed (ChangeType type, Film::Property property);
+	virtual void film_changed(ChangeType type, FilmProperty property);
 	virtual void setup_sensitivity ();
 
 	EditableList<dcp::Rating, RatingDialog>* _ratings;
+	std::unordered_map<std::string, std::string> _rating_system_agency_to_name;
 
 private:
 	void sign_language_video_language_changed ();
-	void edit_release_territory ();
+	void release_territory_changed(boost::optional<dcp::LanguageTag::RegionSubtag> tag);
 	void enable_release_territory_changed ();
 	void facility_changed ();
 	void enable_facility_changed ();
@@ -72,29 +78,30 @@ private:
 	void luminance_changed ();
 	std::vector<dcp::Rating> ratings () const;
 	void set_ratings (std::vector<dcp::Rating> r);
+	void territory_type_changed();
 
-	wxCheckBox* _enable_release_territory;
+	CheckBox* _enable_release_territory;
 	/** The current release territory displayed in the UI; since we can't easily convert
 	 *  the string in _release_territory_text to a RegionSubtag we just store the RegionSubtag
 	 *  alongside.
 	 */
-	boost::optional<dcp::LanguageTag::RegionSubtag> _release_territory;
-	wxStaticText* _release_territory_text;
-	Button* _edit_release_territory;
+	boost::optional<dcp::LanguageTag::RegionSubtag> _release_territory_copy;
+	RegionSubtagWidget* _release_territory;
+	Choice* _territory_type;
 	LanguageTagWidget* _sign_language_video_language = nullptr;
-	wxCheckBox* _enable_facility;
+	CheckBox* _enable_facility;
 	wxTextCtrl* _facility;
-	wxCheckBox* _enable_chain;
+	CheckBox* _enable_chain;
 	wxTextCtrl* _chain;
-	wxCheckBox* _enable_studio;
+	CheckBox* _enable_studio;
 	wxTextCtrl* _studio;
-	wxCheckBox* _temp_version;
-	wxCheckBox* _pre_release;
-	wxCheckBox* _red_band;
-	wxCheckBox* _two_d_version_of_three_d;
-	wxCheckBox* _enable_luminance;
+	CheckBox* _temp_version;
+	CheckBox* _pre_release;
+	CheckBox* _red_band;
+	CheckBox* _two_d_version_of_three_d;
+	CheckBox* _enable_luminance;
 	wxSpinCtrlDouble* _luminance_value;
-	wxChoice* _luminance_unit;
+	Choice* _luminance_unit;
 
 	boost::signals2::scoped_connection _film_changed_connection;
 };