Fix incorrectly-sized timeline toolbar icons on macOS (#1927).

[dcpomatic.git] / src / wx / smpte_metadata_dialog.h

diff --git a/src/wx/smpte_metadata_dialog.h b/src/wx/smpte_metadata_dialog.h
index 171507acf5ddf14742a5db297d853a6adb65b091..83c1ab39cde3feeceb5005f72f089e7fba2b972c 100644 (file)
--- a/src/wx/smpte_metadata_dialog.h
+++ b/src/wx/smpte_metadata_dialog.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2019-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2019-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,8 +18,9 @@
 
 */
 
+
 #include "editable_list.h"
-#include "language_tag_dialog.h"
+#include "full_language_tag_dialog.h"
 #include "lib/film.h"
 #include "lib/weak_film.h"
 #include <dcp/language_tag.h>
@@ -32,6 +33,7 @@ class Film;
 class RatingDialog;
 class ContentVersionDialog;
 class LanguageTagWidget;
+class LanguageTagDialog;
 
 
 class SMPTEMetadataDialog : public wxDialog, public WeakFilm
@@ -40,16 +42,14 @@ public:
        SMPTEMetadataDialog (wxWindow* parent, std::weak_ptr<Film> film);
 
 private:
+       wxPanel* main_panel (wxWindow* parent);
+       wxPanel* advanced_panel (wxWindow* parent);
        std::vector<dcp::Rating> ratings () const;
        void set_ratings (std::vector<dcp::Rating> r);
        std::vector<std::string> content_versions () const;
        void set_content_versions (std::vector<std::string> v);
        void name_language_changed (dcp::LanguageTag tag);
        void audio_language_changed (dcp::LanguageTag tag);
-       void enable_main_subtitle_changed ();
-       void main_subtitle_language_changed (dcp::LanguageTag tag);
-       std::vector<dcp::LanguageTag> additional_subtitle_languages ();
-       void set_additional_subtitle_languages (std::vector<dcp::LanguageTag> languages);
        void edit_release_territory ();
        void version_number_changed ();
        void status_changed ();
@@ -59,17 +59,28 @@ private:
        void luminance_changed ();
        void film_changed (ChangeType type, Film::Property property);
        void setup_sensitivity ();
+       void enable_release_territory_changed ();
+       void enable_chain_changed ();
+       void enable_distributor_changed ();
+       void enable_facility_changed ();
 
        LanguageTagWidget* _name_language;
        LanguageTagWidget* _audio_language;
-       wxCheckBox* _enable_main_subtitle_language;
-       LanguageTagWidget* _main_subtitle_language;
-       EditableList<dcp::LanguageTag, LanguageTagDialog>* _additional_subtitle_languages;
-       wxStaticText* _release_territory;
+       wxCheckBox* _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;
        wxSpinCtrl* _version_number;
        wxChoice* _status;
+       wxCheckBox* _enable_chain;
        wxTextCtrl* _chain;
+       wxCheckBox* _enable_distributor;
        wxTextCtrl* _distributor;
+       wxCheckBox* _enable_facility;
        wxTextCtrl* _facility;
        wxSpinCtrlDouble* _luminance_value;
        wxChoice* _luminance_unit;