X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fkdm_dialog.cc;h=67e1a99515527b3b3dc7a0d6dcaf4942d2b0328e;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=02b91a1e2aa3e30b4fa479230b7b74d8b0cd02de;hpb=877227c50d5f48f0de5d64352d11afc2e0db696f;p=dcpomatic.git diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index 02b91a1e2..67e1a9951 100644 --- a/src/wx/kdm_dialog.cc +++ b/src/wx/kdm_dialog.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington 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 @@ -21,8 +21,11 @@ #include #include #include +#include +#include #include "lib/cinema.h" #include "lib/config.h" +#include "lib/film.h" #include "kdm_dialog.h" #include "cinema_dialog.h" #include "screen_dialog.h" @@ -37,17 +40,30 @@ using std::string; using std::map; using std::list; using std::pair; +using std::cout; +using std::vector; using std::make_pair; using boost::shared_ptr; -KDMDialog::KDMDialog (wxWindow* parent) +KDMDialog::KDMDialog (wxWindow* parent, boost::shared_ptr film) : wxDialog (parent, wxID_ANY, _("Make KDMs")) { + /* Main sizer */ wxBoxSizer* vertical = new wxBoxSizer (wxVERTICAL); + + /* Font for sub-headings */ + wxFont subheading_font (*wxNORMAL_FONT); + subheading_font.SetWeight (wxFONTWEIGHT_BOLD); + + + /* Sub-heading: Screens */ + wxStaticText* h = new wxStaticText (this, wxID_ANY, _("Screens")); + h->SetFont (subheading_font); + vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL); + wxBoxSizer* targets = new wxBoxSizer (wxHORIZONTAL); - _targets = new wxTreeCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_HIDE_ROOT | wxTR_MULTIPLE | wxTR_HAS_BUTTONS); - targets->Add (_targets, 1, wxEXPAND | wxALL, 6); + targets->Add (_targets, 1, wxEXPAND | wxTOP | wxRIGHT, DCPOMATIC_SIZER_GAP); _root = _targets->AddRoot ("Foo"); @@ -61,61 +77,131 @@ KDMDialog::KDMDialog (wxWindow* parent) wxBoxSizer* target_buttons = new wxBoxSizer (wxVERTICAL); _add_cinema = new wxButton (this, wxID_ANY, _("Add Cinema...")); - target_buttons->Add (_add_cinema, 1, wxEXPAND, 6); + target_buttons->Add (_add_cinema, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); _edit_cinema = new wxButton (this, wxID_ANY, _("Edit Cinema...")); - target_buttons->Add (_edit_cinema, 1, wxEXPAND, 6); + target_buttons->Add (_edit_cinema, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); _remove_cinema = new wxButton (this, wxID_ANY, _("Remove Cinema")); - target_buttons->Add (_remove_cinema, 1, wxEXPAND, 6); - + target_buttons->Add (_remove_cinema, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); + _add_screen = new wxButton (this, wxID_ANY, _("Add Screen...")); - target_buttons->Add (_add_screen, 1, wxEXPAND, 6); + target_buttons->Add (_add_screen, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); _edit_screen = new wxButton (this, wxID_ANY, _("Edit Screen...")); - target_buttons->Add (_edit_screen, 1, wxEXPAND, 6); + target_buttons->Add (_edit_screen, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); _remove_screen = new wxButton (this, wxID_ANY, _("Remove Screen")); - target_buttons->Add (_remove_screen, 1, wxEXPAND, 6); + target_buttons->Add (_remove_screen, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); - targets->Add (target_buttons, 0, 0, 6); + targets->Add (target_buttons, 0, 0); - vertical->Add (targets, 1, wxEXPAND | wxALL, 6); + vertical->Add (targets, 1, wxEXPAND); - wxFlexGridSizer* table = new wxFlexGridSizer (3, 2, 6); + + /* Sub-heading: 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); + + wxFlexGridSizer* table = new wxFlexGridSizer (3, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); add_label_to_sizer (table, this, _("From"), true); - _from_date = new wxDatePickerCtrl (this, wxID_ANY); + wxDateTime from; + from.SetToCurrent (); + _from_date = new wxDatePickerCtrl (this, wxID_ANY, from); table->Add (_from_date, 1, wxEXPAND); - _from_time = new wxTimePickerCtrl (this, wxID_ANY); + _from_time = new wxTimePickerCtrl (this, wxID_ANY, from); table->Add (_from_time, 1, wxEXPAND); - + add_label_to_sizer (table, this, _("Until"), true); - _until_date = new wxDatePickerCtrl (this, wxID_ANY); + wxDateTime to = from; + /* 1 week from now */ + to.Add (wxDateSpan (0, 0, 1, 0)); + _until_date = new wxDatePickerCtrl (this, wxID_ANY, to); table->Add (_until_date, 1, wxEXPAND); - _until_time = new wxTimePickerCtrl (this, wxID_ANY); + _until_time = new wxTimePickerCtrl (this, wxID_ANY, to); table->Add (_until_time, 1, wxEXPAND); + vertical->Add (table, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP); + + + /* Sub-heading: CPL */ + h = new wxStaticText (this, wxID_ANY, _("CPL")); + h->SetFont (subheading_font); + vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); + + /* CPL choice */ + wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + add_label_to_sizer (s, this, _("CPL"), true); + _cpl = new wxChoice (this, wxID_ANY); + s->Add (_cpl, 1, wxEXPAND); + _cpl_browse = new wxButton (this, wxID_ANY, _("Browse...")); + s->Add (_cpl_browse, 0); + vertical->Add (s, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP + 2); + + /* CPL details */ + table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + add_label_to_sizer (table, this, _("DCP directory"), true); + _dcp_directory = new wxStaticText (this, wxID_ANY, ""); + table->Add (_dcp_directory); + add_label_to_sizer (table, this, _("CPL ID"), true); + _cpl_id = new wxStaticText (this, wxID_ANY, ""); + table->Add (_cpl_id); + add_label_to_sizer (table, this, _("CPL annotation text"), true); + _cpl_annotation_text = new wxStaticText (this, wxID_ANY, ""); + table->Add (_cpl_annotation_text); + vertical->Add (table, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP + 2); + + _cpls = film->cpls (); + update_cpl_choice (); + + + /* Sub-heading: Output */ + h = new wxStaticText (this, wxID_ANY, _("Output")); + 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); #ifdef DCPOMATIC_USE_OWN_DIR_PICKER - _folder = new DirPickerCtrl (this); -#else - _folder = new wxDirPickerCtrl (this, wxID_ANY); + _folder = new DirPickerCtrl (this); +#else + _folder = new wxDirPickerCtrl (this, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1)); #endif _folder->SetPath (wxStandardPaths::Get().GetDocumentsDir()); - + table->Add (_folder, 1, wxEXPAND); - table->AddSpacer (0); _email = new wxRadioButton (this, wxID_ANY, _("Send by email")); table->Add (_email, 1, wxEXPAND); table->AddSpacer (0); - - vertical->Add (table, 0, wxEXPAND | wxALL, 6); + + vertical->Add (table, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP); + + /* Make an overall sizer to get a nice border, and put some buttons in */ + + wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL); + overall_sizer->Add (vertical, 0, wxEXPAND | wxTOP | wxLEFT | wxRIGHT, DCPOMATIC_DIALOG_BORDER); wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL); if (buttons) { - vertical->Add (buttons, wxSizerFlags().Expand().DoubleBorder()); + overall_sizer->Add (buttons, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_Y_GAP); } + _write_to->SetValue (true); + + /* Bind */ + _targets->Bind (wxEVT_COMMAND_TREE_SEL_CHANGED, boost::bind (&KDMDialog::setup_sensitivity, this)); _add_cinema->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KDMDialog::add_cinema_clicked, this)); @@ -126,14 +212,17 @@ KDMDialog::KDMDialog (wxWindow* parent) _edit_screen->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KDMDialog::edit_screen_clicked, this)); _remove_screen->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KDMDialog::remove_screen_clicked, this)); + _cpl->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&KDMDialog::update_cpl_summary, this)); + _cpl_browse->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KDMDialog::cpl_browse_clicked, this)); + _write_to->Bind (wxEVT_COMMAND_RADIOBUTTON_SELECTED, boost::bind (&KDMDialog::setup_sensitivity, this)); _email->Bind (wxEVT_COMMAND_RADIOBUTTON_SELECTED, boost::bind (&KDMDialog::setup_sensitivity, this)); setup_sensitivity (); - - SetSizer (vertical); - vertical->Layout (); - vertical->SetSizeHints (this); + + SetSizer (overall_sizer); + overall_sizer->Layout (); + overall_sizer->SetSizeHints (this); } list > > @@ -175,16 +264,19 @@ KDMDialog::setup_sensitivity () { bool const sc = selected_cinemas().size() == 1; bool const ss = selected_screens().size() == 1; - + bool const sd = _cpl->GetSelection() != -1; + _edit_cinema->Enable (sc); _remove_cinema->Enable (sc); - + _add_screen->Enable (sc); _edit_screen->Enable (ss); _remove_screen->Enable (ss); - wxButton* ok = dynamic_cast (FindWindowById (wxID_OK)); - ok->Enable (sc || ss); + wxButton* ok = dynamic_cast (FindWindowById (wxID_OK, this)); + if (ok) { + ok->Enable ((selected_cinemas().size() > 0 || selected_screens().size() > 0) && sd); + } _folder->Enable (_write_to->GetValue ()); } @@ -219,14 +311,12 @@ void KDMDialog::add_cinema_clicked () { CinemaDialog* d = new CinemaDialog (this, "Add Cinema"); - d->ShowModal (); - - shared_ptr c (new Cinema (d->name(), d->email())); - Config::instance()->add_cinema (c); - add_cinema (c); + if (d->ShowModal () == wxID_OK) { + shared_ptr c (new Cinema (d->name(), d->email())); + Config::instance()->add_cinema (c); + add_cinema (c); + } - Config::instance()->write (); - d->Destroy (); } @@ -238,17 +328,16 @@ KDMDialog::edit_cinema_clicked () } pair > 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()->write (); + CinemaDialog* d = new CinemaDialog (this, "Edit cinema", c.second->name, c.second->email); + 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 (); + d->Destroy (); } void @@ -262,8 +351,6 @@ KDMDialog::remove_cinema_clicked () Config::instance()->remove_cinema (c.second); _targets->Delete (c.first); - - Config::instance()->write (); } void @@ -274,7 +361,7 @@ KDMDialog::add_screen_clicked () } shared_ptr c = selected_cinemas().front().second; - + ScreenDialog* d = new ScreenDialog (this, "Add Screen"); if (d->ShowModal () != wxID_OK) { return; @@ -284,7 +371,7 @@ KDMDialog::add_screen_clicked () c->add_screen (s); add_screen (c, s); - Config::instance()->write (); + Config::instance()->changed (); d->Destroy (); } @@ -297,15 +384,14 @@ KDMDialog::edit_screen_clicked () } pair > 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()->write (); + ScreenDialog* d = new ScreenDialog (this, "Edit screen", s.second->name, s.second->certificate); + 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 (); } @@ -320,9 +406,11 @@ KDMDialog::remove_screen_clicked () pair > s = selected_screens().front(); map >::iterator i = _cinemas.begin (); - list > sc = i->second->screens (); - while (i != _cinemas.end() && find (sc.begin(), sc.end(), s.second) == sc.end()) { - ++i; + while (i != _cinemas.end ()) { + list > sc = i->second->screens (); + if (find (sc.begin(), sc.end(), s.second) != sc.end ()) { + break; + } } if (i == _cinemas.end()) { @@ -332,7 +420,7 @@ KDMDialog::remove_screen_clicked () i->second->remove_screen (s.second); _targets->Delete (s.first); - Config::instance()->write (); + Config::instance()->changed (); } list > @@ -382,7 +470,15 @@ KDMDialog::until () const return posix_time (_until_date, _until_time); } -string +boost::filesystem::path +KDMDialog::cpl () const +{ + int const item = _cpl->GetSelection (); + DCPOMATIC_ASSERT (item >= 0); + return _cpls[item].cpl_file; +} + +boost::filesystem::path KDMDialog::directory () const { return wx_to_std (_folder->GetPath ()); @@ -393,3 +489,75 @@ KDMDialog::write_to () const { return _write_to->GetValue (); } + +dcp::Formulation +KDMDialog::formulation () const +{ + return (dcp::Formulation) reinterpret_cast (_type->GetClientData (_type->GetSelection())); +} + +void +KDMDialog::update_cpl_choice () +{ + _cpl->Clear (); + + for (vector::const_iterator i = _cpls.begin(); i != _cpls.end(); ++i) { + _cpl->Append (std_to_wx (i->cpl_id)); + + if (_cpls.size() > 0) { + _cpl->SetSelection (0); + } + } + + update_cpl_summary (); +} + +void +KDMDialog::update_cpl_summary () +{ + int const n = _cpl->GetSelection(); + if (n == wxNOT_FOUND) { + return; + } + + _dcp_directory->SetLabel (std_to_wx (_cpls[n].dcp_directory)); + _cpl_id->SetLabel (std_to_wx (_cpls[n].cpl_id)); + _cpl_annotation_text->SetLabel (std_to_wx (_cpls[n].cpl_annotation_text)); +} + +void +KDMDialog::cpl_browse_clicked () +{ + 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 dcp_dir = cpl_file.parent_path (); + + d->Destroy (); + + /* XXX: hack alert */ + cxml::Document cpl_document ("CompositionPlaylist"); + cpl_document.read_file (cpl_file); + + try { + _cpls.push_back ( + CPLSummary ( + dcp_dir.filename().string(), + cpl_document.string_child("Id").substr (9), + cpl_document.string_child ("ContentTitleText"), + cpl_file + ) + ); + } catch (cxml::Error) { + error_dialog (this, _("This is not a valid CPL file")); + return; + } + + update_cpl_choice (); + _cpl->SetSelection (_cpls.size() - 1); + update_cpl_summary (); +}