Cleanup of various dialogs by inherting TableDialog.

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

diff --git a/src/wx/dci_metadata_dialog.cc b/src/wx/dci_metadata_dialog.cc
index c5682e19ebd94e773d97439beb9e5f8bd03d8a5b..700e1b154b10377a5557f60d9178c5b48b659422 100644 (file)
--- a/src/wx/dci_metadata_dialog.cc
+++ b/src/wx/dci_metadata_dialog.cc
@@ -17,47 +17,45 @@
 
 */
 
+#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"
-#include "film.h"
 
 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, 6, 6);
-       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)");
-       _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)");
-       _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)");
-       _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)");
-       _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)");
-       _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)");
-       _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)");
-       _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));
@@ -66,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, 6);
-       
-       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
@@ -84,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 ());