Inherit SMPTEMetadataDialog from a base class.

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

diff --git a/src/wx/smpte_metadata_dialog.cc b/src/wx/smpte_metadata_dialog.cc
index 470e9317e8073a26a61ac77d66bc523d47b55af4..a2e9d355adf5bab34c8e6c432ff76b1434707f13 100644 (file)
--- a/src/wx/smpte_metadata_dialog.cc
+++ b/src/wx/smpte_metadata_dialog.cc
@@ -28,7 +28,6 @@
 #include "lib/film.h"
 #include <dcp/types.h>
 #include <wx/gbsizer.h>
-#include <wx/notebook.h>
 #include <wx/spinctrl.h>
 
 
@@ -42,13 +41,6 @@ using namespace boost::placeholders;
 #endif
 
 
-static string
-additional_subtitle_language_column (dcp::LanguageTag r, int)
-{
-       return r.to_string();
-}
-
-
 static string
 ratings_column (dcp::Rating r, int c)
 {
@@ -67,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(
@@ -83,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__
@@ -113,22 +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);
+       MetadataDialog::setup_advanced (panel, sizer);
 
        _enable_release_territory = new wxCheckBox (panel, wxID_ANY, _("Release territory"));
        sizer->Add (_enable_release_territory, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
@@ -197,34 +169,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"));
@@ -234,7 +192,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));
@@ -248,8 +205,6 @@ SMPTEMetadataDialog::SMPTEMetadataDialog (wxWindow* parent, weak_ptr<Film> weak_
        _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);
@@ -261,7 +216,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 ();
 }
@@ -367,13 +321,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 ()
 {