X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdci_metadata_dialog.cc;h=700e1b154b10377a5557f60d9178c5b48b659422;hb=54d5424caa2ccc2746d67b847898bb18dbcd692c;hp=2862228e4e145bc1b25cdc6299647c08332d2a25;hpb=bd453939da140ea994282e1c167ea5f8d02e2d94;p=dcpomatic.git

diff --git a/src/wx/dci_metadata_dialog.cc b/src/wx/dci_metadata_dialog.cc
index 2862228e4..700e1b154 100644
--- a/src/wx/dci_metadata_dialog.cc
+++ b/src/wx/dci_metadata_dialog.cc
@@ -19,6 +19,7 @@
 
 #include <wx/wx.h>
 #include <wx/sizer.h>
+#include <wx/spinctrl.h>
 #include "lib/film.h"
 #include "dci_metadata_dialog.h"
 #include "wx_util.h"
@@ -26,39 +27,35 @@
 using boost::shared_ptr;
 
 DCIMetadataDialog::DCIMetadataDialog (wxWindow* parent, DCIMetadata dm)
-	: wxDialog (parent, wxID_ANY, _("DCI name"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+	: TableDialog (parent, _("DCI name"), 2, true)
 {
-	wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-	table->AddGrowableCol (1, 1);
+	add (_("Content version"), true);
+	_content_version = add (new wxSpinCtrl (this, wxID_ANY));
 
-	add_label_to_sizer (table, this, _("Audio Language (e.g. EN)"), true);
-	_audio_language = new wxTextCtrl (this, wxID_ANY);
-	table->Add (_audio_language, 1, wxEXPAND);
+	add (_("Audio Language (e.g. EN)"), true);
+	_audio_language = add (new wxTextCtrl (this, wxID_ANY));
 
-	add_label_to_sizer (table, this, _("Subtitle Language (e.g. FR)"), true);
-	_subtitle_language = new wxTextCtrl (this, wxID_ANY);
-	table->Add (_subtitle_language, 1, wxEXPAND);
+	add (_("Subtitle Language (e.g. FR)"), true);
+	_subtitle_language = add (new wxTextCtrl (this, wxID_ANY));
 	
-	add_label_to_sizer (table, this, _("Territory (e.g. UK)"), true);
-	_territory = new wxTextCtrl (this, wxID_ANY);
-	table->Add (_territory, 1, wxEXPAND);
+	add (_("Territory (e.g. UK)"), true);
+	_territory = add (new wxTextCtrl (this, wxID_ANY));
 
-	add_label_to_sizer (table, this, _("Rating (e.g. 15)"), true);
-	_rating = new wxTextCtrl (this, wxID_ANY);
-	table->Add (_rating, 1, wxEXPAND);
+	add (_("Rating (e.g. 15)"), true);
+	_rating = add (new wxTextCtrl (this, wxID_ANY));
 
-	add_label_to_sizer (table, this, _("Studio (e.g. TCF)"), true);
-	_studio = new wxTextCtrl (this, wxID_ANY);
-	table->Add (_studio, 1, wxEXPAND);
+	add (_("Studio (e.g. TCF)"), true);
+	_studio = add (new wxTextCtrl (this, wxID_ANY));
 
-	add_label_to_sizer (table, this, _("Facility (e.g. DLA)"), true);
-	_facility = new wxTextCtrl (this, wxID_ANY);
-	table->Add (_facility, 1, wxEXPAND);
+	add (_("Facility (e.g. DLA)"), true);
+	_facility = add (new wxTextCtrl (this, wxID_ANY));
 
-	add_label_to_sizer (table, this, _("Package Type (e.g. OV)"), true);
-	_package_type = new wxTextCtrl (this, wxID_ANY);
-	table->Add (_package_type, 1, wxEXPAND);
+	add (_("Package Type (e.g. OV)"), true);
+	_package_type = add (new wxTextCtrl (this, wxID_ANY));
 
+	_content_version->SetRange (1, 1024);
+
+	_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));
@@ -67,17 +64,7 @@ DCIMetadataDialog::DCIMetadataDialog (wxWindow* parent, DCIMetadata dm)
 	_facility->SetValue (std_to_wx (dm.facility));
 	_package_type->SetValue (std_to_wx (dm.package_type));
 
-	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-	overall_sizer->Add (table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
-	
-	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
-	if (buttons) {
-		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
-	}
-	
-	SetSizer (overall_sizer);
-	overall_sizer->Layout ();
-	overall_sizer->SetSizeHints (this);
+	layout ();
 }
 
 DCIMetadata
@@ -85,6 +72,7 @@ DCIMetadataDialog::dci_metadata () const
 {
 	DCIMetadata dm;
 
+	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 ());