+2015-08-04 Carl Hetherington <cth@carlh.net>
+
+ * Disable "2D version of 3D content" ISDCF metadata
+ checkbutton with 3D content (part of #652).
+
2015-07-30 c.hetherington <cth@carlh.net>
* Allow recreation of the certificate chain and key
{
_three_d = t;
signal_changed (THREE_D);
+
+ if (_three_d && _isdcf_metadata.two_d_version_of_three_d) {
+ _isdcf_metadata.two_d_version_of_three_d = false;
+ signal_changed (ISDCF_METADATA);
+ }
}
void
void edit_isdcf_metadata_clicked ()
{
- ISDCFMetadataDialog* d = new ISDCFMetadataDialog (_panel, Config::instance()->default_isdcf_metadata ());
+ ISDCFMetadataDialog* d = new ISDCFMetadataDialog (_panel, Config::instance()->default_isdcf_metadata (), false);
d->ShowModal ();
Config::instance()->set_default_isdcf_metadata (d->isdcf_metadata ());
d->Destroy ();
return;
}
- ISDCFMetadataDialog* d = new ISDCFMetadataDialog (_panel, _film->isdcf_metadata ());
+ ISDCFMetadataDialog* d = new ISDCFMetadataDialog (_panel, _film->isdcf_metadata (), _film->three_d ());
d->ShowModal ();
_film->set_isdcf_metadata (d->isdcf_metadata ());
d->Destroy ();
/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
*/
+#include "isdcf_metadata_dialog.h"
+#include "wx_util.h"
+#include "lib/film.h"
#include <wx/wx.h>
#include <wx/sizer.h>
#include <wx/spinctrl.h>
-#include "lib/film.h"
-#include "isdcf_metadata_dialog.h"
-#include "wx_util.h"
using boost::shared_ptr;
-ISDCFMetadataDialog::ISDCFMetadataDialog (wxWindow* parent, ISDCFMetadata dm)
+/** @param threed true if the film is in 3D */
+ISDCFMetadataDialog::ISDCFMetadataDialog (wxWindow* parent, ISDCFMetadata dm, bool threed)
: TableDialog (parent, _("ISDCF name"), 2, true)
{
add (_("Content version"), true);
_two_d_version_of_three_d = add (new wxCheckBox (this, wxID_ANY, _("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));
/*
- Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
*/
+#include "table_dialog.h"
+#include "lib/isdcf_metadata.h"
#include <wx/textctrl.h>
#include <boost/shared_ptr.hpp>
-#include "lib/isdcf_metadata.h"
-#include "table_dialog.h"
class wxSpinCtrl;
class Film;
class ISDCFMetadataDialog : public TableDialog
{
public:
- ISDCFMetadataDialog (wxWindow *, ISDCFMetadata);
+ ISDCFMetadataDialog (wxWindow *, ISDCFMetadata, bool threed);
ISDCFMetadata isdcf_metadata () const;