/* Sub-heading: Timing */
- h = new wxStaticText (this, wxID_ANY, _("Timing"));
+ h = new wxStaticText (this, wxID_ANY, S_("KDM|Timing"));
h->SetFont (subheading_font);
vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2);
table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, 0);
+ add_label_to_sizer (table, this, _("KDM type"), true);
+ _type = new wxChoice (this, wxID_ANY);
+ _type->Append ("Modified Transitional 1", ((void *) dcp::MODIFIED_TRANSITIONAL_1));
+ if (!film->interop ()) {
+ _type->Append ("DCI Any", ((void *) dcp::DCI_ANY));
+ _type->Append ("DCI Specific", ((void *) dcp::DCI_SPECIFIC));
+ }
+ table->Add (_type, 1, wxEXPAND);
+ _type->SetSelection (0);
+
_write_to = new wxRadioButton (this, wxID_ANY, _("Write to"));
table->Add (_write_to, 1, wxEXPAND);
KDMDialog::add_cinema_clicked ()
{
CinemaDialog* d = new CinemaDialog (this, "Add Cinema");
- d->ShowModal ();
-
- shared_ptr<Cinema> c (new Cinema (d->name(), d->email()));
- Config::instance()->add_cinema (c);
- add_cinema (c);
+ if (d->ShowModal () == wxID_OK) {
+ shared_ptr<Cinema> c (new Cinema (d->name(), d->email()));
+ Config::instance()->add_cinema (c);
+ add_cinema (c);
+ }
d->Destroy ();
}
pair<wxTreeItemId, shared_ptr<Cinema> > c = selected_cinemas().front();
CinemaDialog* d = new CinemaDialog (this, "Edit cinema", c.second->name, c.second->email);
- d->ShowModal ();
-
- c.second->name = d->name ();
- c.second->email = d->email ();
- _targets->SetItemText (c.first, std_to_wx (d->name()));
-
- Config::instance()->changed ();
+ if (d->ShowModal () == wxID_OK) {
+ c.second->name = d->name ();
+ c.second->email = d->email ();
+ _targets->SetItemText (c.first, std_to_wx (d->name()));
+ Config::instance()->changed ();
+ }
d->Destroy ();
}
pair<wxTreeItemId, shared_ptr<Screen> > s = selected_screens().front();
ScreenDialog* d = new ScreenDialog (this, "Edit screen", s.second->name, s.second->certificate);
- d->ShowModal ();
-
- s.second->name = d->name ();
- s.second->certificate = d->certificate ();
- _targets->SetItemText (s.first, std_to_wx (d->name()));
-
- Config::instance()->changed ();
+ if (d->ShowModal () == wxID_OK) {
+ s.second->name = d->name ();
+ s.second->certificate = d->certificate ();
+ _targets->SetItemText (s.first, std_to_wx (d->name()));
+ Config::instance()->changed ();
+ }
d->Destroy ();
}
KDMDialog::cpl () const
{
int const item = _cpl->GetSelection ();
- assert (item >= 0);
+ DCPOMATIC_ASSERT (item >= 0);
return _cpls[item].cpl_file;
}
return _write_to->GetValue ();
}
+dcp::Formulation
+KDMDialog::formulation () const
+{
+ return (dcp::Formulation) reinterpret_cast<intptr_t> (_type->GetClientData (_type->GetSelection()));
+}
+
void
KDMDialog::update_cpl_choice ()
{
void
KDMDialog::cpl_browse_clicked ()
{
- wxFileDialog d (this, _("Select CPL XML file"), wxEmptyString, wxEmptyString, "*.xml");
- if (d.ShowModal() == wxID_CANCEL) {
+ wxFileDialog* d = new wxFileDialog (this, _("Select CPL XML file"), wxEmptyString, wxEmptyString, "*.xml");
+ if (d->ShowModal() == wxID_CANCEL) {
+ d->Destroy ();
return;
}
- boost::filesystem::path cpl_file (wx_to_std (d.GetPath ()));
+ boost::filesystem::path cpl_file (wx_to_std (d->GetPath ()));
boost::filesystem::path dcp_dir = cpl_file.parent_path ();
+ d->Destroy ();
+
/* XXX: hack alert */
cxml::Document cpl_document ("CompositionPlaylist");
cpl_document.read_file (cpl_file);