Include subscribers / supporters in git.

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

diff --git a/src/wx/interop_metadata_dialog.cc b/src/wx/interop_metadata_dialog.cc
index 186e9bbcdefa9f8baf44ef538a40ddfc0f65cf48..61aa2349867426cdb6ba334d53af71bbd7b84e5a 100644 (file)
--- a/src/wx/interop_metadata_dialog.cc
+++ b/src/wx/interop_metadata_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2020-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,48 +18,42 @@
 
 */
 
-#include "interop_metadata_dialog.h"
+
 #include "editable_list.h"
+#include "interop_metadata_dialog.h"
+#include "language_tag_widget.h"
 #include "rating_dialog.h"
 #include "lib/film.h"
 #include <dcp/types.h>
 #include <wx/gbsizer.h>
 
+
 using std::string;
 using std::vector;
-using boost::weak_ptr;
-using boost::shared_ptr;
+using std::weak_ptr;
+using std::shared_ptr;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
 
 
-static string
-column (dcp::Rating r, int c)
+InteropMetadataDialog::InteropMetadataDialog (wxWindow* parent, weak_ptr<Film> film)
+       : MetadataDialog (parent, film)
 {
-       if (c == 0) {
-               return r.agency;
-       }
 
-       return r.label;
 }
 
-InteropMetadataDialog::InteropMetadataDialog (wxWindow* parent, weak_ptr<Film> film)
-       : wxDialog (parent, wxID_ANY, _("Metadata"))
-       , _film (film)
+void
+InteropMetadataDialog::setup_standard (wxPanel* panel, wxSizer* sizer)
 {
-       wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-       SetSizer (overall_sizer);
-
-       wxFlexGridSizer* sizer = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-       sizer->AddGrowableCol (1, 1);
+       MetadataDialog::setup_standard (panel, sizer);
 
        {
                int flags = wxALIGN_TOP | wxLEFT | wxRIGHT | wxTOP;
 #ifdef __WXOSX__
                flags |= wxALIGN_RIGHT;
 #endif
-               wxStaticText* m = create_label (this, _("Ratings"), true);
+               auto m = create_label (panel, _("Ratings"), true);
                sizer->Add (m, 0, flags, DCPOMATIC_SIZER_GAP);
        }
 
@@ -67,61 +61,49 @@ InteropMetadataDialog::InteropMetadataDialog (wxWindow* parent, weak_ptr<Film> f
        columns.push_back (EditableListColumn(_("Agency"), 200, true));
        columns.push_back (EditableListColumn(_("Label"), 50, true));
        _ratings = new EditableList<dcp::Rating, RatingDialog> (
-               this,
+               panel,
                columns,
                boost::bind(&InteropMetadataDialog::ratings, this),
                boost::bind(&InteropMetadataDialog::set_ratings, this, _1),
-               boost::bind(&column, _1, _2),
+               [](dcp::Rating r, int c) {
+                       if (c == 0) {
+                               return r.agency;
+                       }
+                       return r.label;
+               },
                true,
                false
                );
        sizer->Add (_ratings, 1, wxEXPAND);
 
-       add_label_to_sizer (sizer, this, _("Content version"), true);
-       _content_version = new wxTextCtrl (this, wxID_ANY);
+       add_label_to_sizer (sizer, panel, _("Content version"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL);
+       _content_version = new wxTextCtrl (panel, wxID_ANY);
        sizer->Add (_content_version, 1, wxEXPAND);
 
-       shared_ptr<Film> f = _film.lock();
-       DCPOMATIC_ASSERT (f);
-       vector<string> cv = f->content_versions();
+       auto cv = film()->content_versions();
        _content_version->SetValue (std_to_wx(cv.empty() ? "" : cv[0]));
 
-       overall_sizer->Add (sizer, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
-
-       wxSizer* buttons = CreateSeparatedButtonSizer (wxCLOSE);
-       if (buttons) {
-               overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
-       }
-
-       overall_sizer->Layout ();
-       overall_sizer->SetSizeHints (this);
-
        _content_version->Bind (wxEVT_TEXT, boost::bind(&InteropMetadataDialog::content_version_changed, this));
        _content_version->SetFocus ();
 }
 
+
 vector<dcp::Rating>
 InteropMetadataDialog::ratings () const
 {
-       shared_ptr<Film> film = _film.lock ();
-       DCPOMATIC_ASSERT (film);
-       return film->ratings ();
+       return film()->ratings ();
 }
 
+
 void
 InteropMetadataDialog::set_ratings (vector<dcp::Rating> r)
 {
-       shared_ptr<Film> film = _film.lock ();
-       DCPOMATIC_ASSERT (film);
-       film->set_ratings (r);
+       film()->set_ratings (r);
 }
 
+
 void
 InteropMetadataDialog::content_version_changed ()
 {
-       shared_ptr<Film> film = _film.lock ();
-       DCPOMATIC_ASSERT (film);
-       vector<string> cv;
-       cv.push_back (wx_to_std(_content_version->GetValue()));
-       film->set_content_versions (cv);
+       film()->set_content_versions ({ wx_to_std(_content_version->GetValue()) });
 }