X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fisdcf_metadata_dialog.cc;h=ea390c1bbf47002d16dac3ecdd38d190e40a4c1d;hb=4b8b74ae8ae721f2fbf317f1d7ce5be6048ae1b0;hp=2fde930c6b8fd04e58ceeaa020384dc28fe3a37d;hpb=a6696b9a58c14d81f0ae30482051c2cd47a004db;p=dcpomatic.git diff --git a/src/wx/isdcf_metadata_dialog.cc b/src/wx/isdcf_metadata_dialog.cc index 2fde930c6..ea390c1bb 100644 --- a/src/wx/isdcf_metadata_dialog.cc +++ b/src/wx/isdcf_metadata_dialog.cc @@ -32,63 +32,15 @@ using std::shared_ptr; * @param dm Initial ISDCF metadata. * @param threed true if the film is in 3D. */ -ISDCFMetadataDialog::ISDCFMetadataDialog (wxWindow* parent, ISDCFMetadata dm, bool threed) +ISDCFMetadataDialog::ISDCFMetadataDialog (wxWindow* parent, ISDCFMetadata dm) : TableDialog (parent, _("ISDCF name"), 2, 1, true) { - add (_("Content version"), true); - _content_version = add (new wxSpinCtrl (this, wxID_ANY)); - - add (_("Territory (e.g. UK)"), true); - _territory = add (new wxTextCtrl (this, wxID_ANY)); - - add (_("Rating (e.g. 15)"), true); - _rating = add (new wxTextCtrl (this, wxID_ANY)); - - add (_("Studio (e.g. TCF)"), true); - _studio = add (new wxTextCtrl (this, wxID_ANY)); - - add (_("Facility (e.g. DLA)"), true); - _facility = add (new wxTextCtrl (this, wxID_ANY)); - - _temp_version = add (new CheckBox(this, _("Temp version"))); - add_spacer (); - - _pre_release = add (new CheckBox(this, _("Pre-release"))); - add_spacer (); - - _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 CheckBox(this, _("2D version of content available in 3D"))); - add_spacer (); - - if (threed) { - _two_d_version_of_three_d->Enable (false); - } - add (_("Mastered luminance (e.g. 14fl)"), true); _mastered_luminance = add (new wxTextCtrl (this, wxID_ANY)); - _content_version->SetRange (1, 1024); - - _content_version->SetValue (dm.content_version); - _territory->SetValue (std_to_wx (dm.territory)); - _rating->SetValue (std_to_wx (dm.rating)); - _studio->SetValue (std_to_wx (dm.studio)); - _facility->SetValue (std_to_wx (dm.facility)); - _temp_version->SetValue (dm.temp_version); - _pre_release->SetValue (dm.pre_release); - _red_band->SetValue (dm.red_band); - _chain->SetValue (std_to_wx (dm.chain)); - _two_d_version_of_three_d->SetValue (dm.two_d_version_of_three_d); _mastered_luminance->SetValue (std_to_wx (dm.mastered_luminance)); layout (); - - _content_version->SetFocus (); } @@ -97,16 +49,6 @@ ISDCFMetadataDialog::isdcf_metadata () const { ISDCFMetadata dm; - dm.content_version = _content_version->GetValue (); - dm.territory = wx_to_std (_territory->GetValue ()); - dm.rating = wx_to_std (_rating->GetValue ()); - dm.studio = wx_to_std (_studio->GetValue ()); - dm.facility = wx_to_std (_facility->GetValue ()); - dm.temp_version = _temp_version->GetValue (); - dm.pre_release = _pre_release->GetValue (); - dm.red_band = _red_band->GetValue (); - dm.chain = wx_to_std (_chain->GetValue ()); - dm.two_d_version_of_three_d = _two_d_version_of_three_d->GetValue (); dm.mastered_luminance = wx_to_std (_mastered_luminance->GetValue ()); return dm;