Use release territory from Interop/SMPTE metadata instead of ISDCF metadata dialogue.
[dcpomatic.git] / src / wx / smpte_metadata_dialog.cc
index 3c35a5c7298c356e3211ceaf72c5a898bbb9bc2f..857be282c8ba75a0917d11185047672c89f6d81a 100644 (file)
@@ -28,7 +28,6 @@
 #include "lib/film.h"
 #include <dcp/types.h>
 #include <wx/gbsizer.h>
-#include <wx/notebook.h>
 #include <wx/spinctrl.h>
 
 
@@ -60,13 +59,10 @@ content_versions_column (string v, int)
 }
 
 
-wxPanel *
-SMPTEMetadataDialog::main_panel (wxWindow* parent)
+void
+SMPTEMetadataDialog::setup_standard (wxPanel* panel, wxSizer* sizer)
 {
-       auto panel = new wxPanel (parent, wxID_ANY);
-
-       auto sizer = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-       sizer->AddGrowableCol (1, 1);
+       MetadataDialog::setup_standard (panel, sizer);
 
        add_label_to_sizer (sizer, panel, _("Title language"), true, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL);
        _name_language = new LanguageTagWidget(
@@ -76,14 +72,6 @@ SMPTEMetadataDialog::main_panel (wxWindow* parent)
                );
        sizer->Add (_name_language->sizer(), 0, wxEXPAND);
 
-       add_label_to_sizer (sizer, panel, _("Audio language"), true, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL);
-       _audio_language = new LanguageTagWidget(
-               panel,
-               _("The main language that is spoken in the film's soundtrack"),
-               film()->audio_language()
-               );
-       sizer->Add (_audio_language->sizer(), 0, wxEXPAND);
-
        {
                int flags = wxALIGN_TOP | wxRIGHT | wxTOP;
 #ifdef __WXOSX__
@@ -106,33 +94,13 @@ SMPTEMetadataDialog::main_panel (wxWindow* parent)
                false
                );
        sizer->Add (_ratings, 1, wxEXPAND);
-
-       auto overall_sizer = new wxBoxSizer (wxVERTICAL);
-       overall_sizer->Add (sizer, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
-       panel->SetSizer (overall_sizer);
-
-       return panel;
 }
 
 
-wxPanel *
-SMPTEMetadataDialog::advanced_panel (wxWindow* parent)
+void
+SMPTEMetadataDialog::setup_advanced (wxPanel* panel, wxSizer* sizer)
 {
-       auto panel = new wxPanel (parent, wxID_ANY);
-
-       auto sizer = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-       sizer->AddGrowableCol (1, 1);
-
-       _enable_release_territory = new wxCheckBox (panel, wxID_ANY, _("Release territory"));
-       sizer->Add (_enable_release_territory, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
-       {
-               auto s = new wxBoxSizer (wxHORIZONTAL);
-               _release_territory_text = new wxStaticText (panel, wxID_ANY, wxT(""));
-               s->Add (_release_territory_text, 1, wxLEFT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
-               _edit_release_territory = new Button (panel, _("Edit..."));
-               s->Add (_edit_release_territory, 0, wxLEFT, DCPOMATIC_SIZER_GAP);
-               sizer->Add (s, 0, wxEXPAND);
-       }
+       MetadataDialog::setup_advanced (panel, sizer);
 
        add_label_to_sizer (sizer, panel, _("Version number"), true, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL);
        _version_number = new wxSpinCtrl (panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 1, 1000);
@@ -190,34 +158,20 @@ SMPTEMetadataDialog::advanced_panel (wxWindow* parent)
                false
                );
        sizer->Add (_content_versions, 1, wxEXPAND);
-
-       auto overall_sizer = new wxBoxSizer (wxVERTICAL);
-       overall_sizer->Add (sizer, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
-       panel->SetSizer (overall_sizer);
-
-       return panel;
 }
 
 
 SMPTEMetadataDialog::SMPTEMetadataDialog (wxWindow* parent, weak_ptr<Film> weak_film)
-       : wxDialog (parent, wxID_ANY, _("Metadata"))
-       , WeakFilm (weak_film)
+       : MetadataDialog (parent, weak_film)
 {
-       auto notebook = new wxNotebook (this, wxID_ANY);
-       notebook->AddPage (main_panel(notebook), _("Standard"));
-       notebook->AddPage (advanced_panel(notebook), _("Advanced"));
 
-       auto overall_sizer = new wxBoxSizer (wxVERTICAL);
-       overall_sizer->Add (notebook, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
+}
 
-       auto buttons = CreateSeparatedButtonSizer (wxCLOSE);
-       if (buttons) {
-               overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
-       }
 
-       SetSizer (overall_sizer);
-       overall_sizer->Layout ();
-       overall_sizer->SetSizeHints (this);
+void
+SMPTEMetadataDialog::setup ()
+{
+       MetadataDialog::setup ();
 
        _status->Append (_("Temporary"));
        _status->Append (_("Pre-release"));
@@ -227,8 +181,6 @@ SMPTEMetadataDialog::SMPTEMetadataDialog (wxWindow* parent, weak_ptr<Film> weak_
        _luminance_unit->Append (_("foot lambert"));
 
        _name_language->Changed.connect (boost::bind(&SMPTEMetadataDialog::name_language_changed, this, _1));
-       _audio_language->Changed.connect (boost::bind(&SMPTEMetadataDialog::audio_language_changed, this, _1));
-       _edit_release_territory->Bind (wxEVT_BUTTON, boost::bind(&SMPTEMetadataDialog::edit_release_territory, this));
        _version_number->Bind (wxEVT_SPINCTRL, boost::bind(&SMPTEMetadataDialog::version_number_changed, this));
        _status->Bind (wxEVT_CHOICE, boost::bind(&SMPTEMetadataDialog::status_changed, this));
        _enable_chain->Bind (wxEVT_CHECKBOX, boost::bind(&SMPTEMetadataDialog::enable_chain_changed, this));
@@ -239,14 +191,8 @@ SMPTEMetadataDialog::SMPTEMetadataDialog (wxWindow* parent, weak_ptr<Film> weak_
        _facility->Bind (wxEVT_TEXT, boost::bind(&SMPTEMetadataDialog::facility_changed, this));
        _luminance_value->Bind (wxEVT_SPINCTRLDOUBLE, boost::bind(&SMPTEMetadataDialog::luminance_changed, this));
        _luminance_unit->Bind (wxEVT_CHOICE, boost::bind(&SMPTEMetadataDialog::luminance_changed, this));
-       _enable_release_territory->Bind (wxEVT_CHECKBOX, boost::bind(&SMPTEMetadataDialog::enable_release_territory_changed, this));
-
-       _version_number->SetFocus ();
-
-       _film_changed_connection = film()->Change.connect(boost::bind(&SMPTEMetadataDialog::film_changed, this, _1, _2));
 
        film_changed (ChangeType::DONE, Film::Property::NAME_LANGUAGE);
-       film_changed (ChangeType::DONE, Film::Property::RELEASE_TERRITORY);
        film_changed (ChangeType::DONE, Film::Property::VERSION_NUMBER);
        film_changed (ChangeType::DONE, Film::Property::STATUS);
        film_changed (ChangeType::DONE, Film::Property::CHAIN);
@@ -254,7 +200,6 @@ SMPTEMetadataDialog::SMPTEMetadataDialog (wxWindow* parent, weak_ptr<Film> weak_
        film_changed (ChangeType::DONE, Film::Property::FACILITY);
        film_changed (ChangeType::DONE, Film::Property::CONTENT_VERSIONS);
        film_changed (ChangeType::DONE, Film::Property::LUMINANCE);
-       film_changed (ChangeType::DONE, Film::Property::SUBTITLE_LANGUAGES);
 
        setup_sensitivity ();
 }
@@ -263,19 +208,14 @@ SMPTEMetadataDialog::SMPTEMetadataDialog (wxWindow* parent, weak_ptr<Film> weak_
 void
 SMPTEMetadataDialog::film_changed (ChangeType type, Film::Property property)
 {
+       MetadataDialog::film_changed (type, property);
+
        if (type != ChangeType::DONE || film()->interop()) {
                return;
        }
 
        if (property == Film::Property::NAME_LANGUAGE) {
                _name_language->set (film()->name_language());
-       } else if (property == Film::Property::RELEASE_TERRITORY) {
-               auto rt = film()->release_territory();
-               checked_set (_enable_release_territory, static_cast<bool>(rt));
-               if (rt) {
-                       _release_territory = *rt;
-                       checked_set (_release_territory_text, std_to_wx(*dcp::LanguageTag::get_subtag_description(*_release_territory)));
-               }
        } else if (property == Film::Property::VERSION_NUMBER) {
                checked_set (_version_number, film()->version_number());
        } else if (property == Film::Property::STATUS) {
@@ -360,28 +300,6 @@ SMPTEMetadataDialog::name_language_changed (dcp::LanguageTag tag)
 }
 
 
-void
-SMPTEMetadataDialog::audio_language_changed (dcp::LanguageTag tag)
-{
-       film()->set_audio_language (tag);
-}
-
-
-void
-SMPTEMetadataDialog::edit_release_territory ()
-{
-       DCPOMATIC_ASSERT (film()->release_territory());
-       auto d = new RegionSubtagDialog(this, *film()->release_territory());
-       d->ShowModal ();
-       auto tag = d->get();
-       if (tag) {
-               _release_territory = *tag;
-               film()->set_release_territory(*tag);
-       }
-       d->Destroy ();
-}
-
-
 void
 SMPTEMetadataDialog::version_number_changed ()
 {
@@ -449,11 +367,7 @@ SMPTEMetadataDialog::luminance_changed ()
 void
 SMPTEMetadataDialog::setup_sensitivity ()
 {
-       {
-               auto const enabled = _enable_release_territory->GetValue();
-               _release_territory_text->Enable (enabled);
-               _edit_release_territory->Enable (enabled);
-       }
+       MetadataDialog::setup_sensitivity ();
 
        _chain->Enable (_enable_chain->GetValue());
        _distributor->Enable (_enable_distributor->GetValue());
@@ -461,18 +375,6 @@ SMPTEMetadataDialog::setup_sensitivity ()
 }
 
 
-void
-SMPTEMetadataDialog::enable_release_territory_changed ()
-{
-       setup_sensitivity ();
-       if (_enable_release_territory->GetValue()) {
-               film()->set_release_territory (_release_territory.get_value_or(dcp::LanguageTag::RegionSubtag("US")));
-       } else {
-               film()->set_release_territory ();
-       }
-}
-
-
 void
 SMPTEMetadataDialog::enable_chain_changed ()
 {