X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fisdcf_metadata_dialog.cc;h=2dcd85d3a287fa5b8ee398e0cfb2510601362e8f;hp=ee7d4ae70c82309b587723d6cae1c331fa3ffabe;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hpb=67a68bd971ebe1b35daa3f75873b4ccb53c00ba0

diff --git a/src/wx/isdcf_metadata_dialog.cc b/src/wx/isdcf_metadata_dialog.cc
index ee7d4ae70..2dcd85d3a 100644
--- a/src/wx/isdcf_metadata_dialog.cc
+++ b/src/wx/isdcf_metadata_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -20,12 +20,13 @@
 
 #include "isdcf_metadata_dialog.h"
 #include "wx_util.h"
+#include "check_box.h"
 #include "lib/film.h"
 #include <wx/wx.h>
 #include <wx/sizer.h>
 #include <wx/spinctrl.h>
 
-using boost::shared_ptr;
+using std::shared_ptr;
 
 /** @param parent Parent window.
  *  @param dm Initial ISDCF metadata.
@@ -40,9 +41,6 @@ ISDCFMetadataDialog::ISDCFMetadataDialog (wxWindow* parent, ISDCFMetadata dm, bo
 	add (_("Audio Language (e.g. EN)"), true);
 	_audio_language = add (new wxTextCtrl (this, wxID_ANY));
 
-	add (_("Subtitle Language (e.g. FR)"), true);
-	_subtitle_language = add (new wxTextCtrl (this, wxID_ANY));
-
 	add (_("Territory (e.g. UK)"), true);
 	_territory = add (new wxTextCtrl (this, wxID_ANY));
 
@@ -55,19 +53,19 @@ ISDCFMetadataDialog::ISDCFMetadataDialog (wxWindow* parent, ISDCFMetadata dm, bo
 	add (_("Facility (e.g. DLA)"), true);
 	_facility = add (new wxTextCtrl (this, wxID_ANY));
 
-	_temp_version = add (new wxCheckBox (this, wxID_ANY, _("Temp version")));
+	_temp_version = add (new CheckBox(this, _("Temp version")));
 	add_spacer ();
 
-	_pre_release = add (new wxCheckBox (this, wxID_ANY, _("Pre-release")));
+	_pre_release = add (new CheckBox(this, _("Pre-release")));
 	add_spacer ();
 
-	_red_band = add (new wxCheckBox (this, wxID_ANY, _("Red band")));
+	_red_band = add (new CheckBox(this, _("Red band")));
 	add_spacer ();
 
 	add (_("Chain"), true);
 	_chain = add (new wxTextCtrl (this, wxID_ANY));
 
-	_two_d_version_of_three_d = add (new wxCheckBox (this, wxID_ANY, _("2D version of content available in 3D")));
+	_two_d_version_of_three_d = add (new CheckBox(this, _("2D version of content available in 3D")));
 	add_spacer ();
 
 	if (threed) {
@@ -81,7 +79,6 @@ ISDCFMetadataDialog::ISDCFMetadataDialog (wxWindow* parent, ISDCFMetadata dm, bo
 
 	_content_version->SetValue (dm.content_version);
 	_audio_language->SetValue (std_to_wx (dm.audio_language));
-	_subtitle_language->SetValue (std_to_wx (dm.subtitle_language));
 	_territory->SetValue (std_to_wx (dm.territory));
 	_rating->SetValue (std_to_wx (dm.rating));
 	_studio->SetValue (std_to_wx (dm.studio));
@@ -94,8 +91,11 @@ ISDCFMetadataDialog::ISDCFMetadataDialog (wxWindow* parent, ISDCFMetadata dm, bo
 	_mastered_luminance->SetValue (std_to_wx (dm.mastered_luminance));
 
 	layout ();
+
+	_content_version->SetFocus ();
 }
 
+
 ISDCFMetadata
 ISDCFMetadataDialog::isdcf_metadata () const
 {
@@ -103,7 +103,6 @@ ISDCFMetadataDialog::isdcf_metadata () const
 
 	dm.content_version = _content_version->GetValue ();
 	dm.audio_language = wx_to_std (_audio_language->GetValue ());
-	dm.subtitle_language = wx_to_std (_subtitle_language->GetValue ());
 	dm.territory = wx_to_std (_territory->GetValue ());
 	dm.rating = wx_to_std (_rating->GetValue ());
 	dm.studio = wx_to_std (_studio->GetValue ());