X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fkdm_dialog.cc;h=83648080871cab300bbb8a45322a34d0d8ad54a1;hb=e02afbbc64a6f615e450a3c68b8900588bd21fd0;hp=17d7bd2a1a73b676289d0e2c15803c4253494282;hpb=15fff8992c5c152c2ac195ab063fd02fbc89e025;p=dcpomatic.git diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index 17d7bd2a1..836480808 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 @@ -17,71 +17,60 @@ */ -#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" #include "wx_util.h" +#include "screens_panel.h" +#include "lib/cinema.h" +#include "lib/config.h" +#include "lib/film.h" +#include "lib/screen.h" +#include #ifdef DCPOMATIC_USE_OWN_DIR_PICKER #include "dir_picker_ctrl.h" #else #include #endif +#include +#include +#include +#include +#include +#include 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, boost::shared_ptr film) : wxDialog (parent, wxID_ANY, _("Make KDMs")) { + /* Main sizer */ wxBoxSizer* vertical = new wxBoxSizer (wxVERTICAL); - 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); - - _root = _targets->AddRoot ("Foo"); - - list > c = Config::instance()->cinemas (); - for (list >::iterator i = c.begin(); i != c.end(); ++i) { - add_cinema (*i); - } - _targets->ExpandAll (); + /* Font for sub-headings */ + wxFont subheading_font (*wxNORMAL_FONT); + subheading_font.SetWeight (wxFONTWEIGHT_BOLD); - wxBoxSizer* target_buttons = new wxBoxSizer (wxVERTICAL); + /* Sub-heading: Screens */ + wxStaticText* h = new wxStaticText (this, wxID_ANY, _("Screens")); + h->SetFont (subheading_font); + vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL); + _screens = new ScreensPanel (this); + vertical->Add (_screens, 1, wxEXPAND); - _add_cinema = new wxButton (this, wxID_ANY, _("Add Cinema...")); - target_buttons->Add (_add_cinema, 1, wxEXPAND, 6); - _edit_cinema = new wxButton (this, wxID_ANY, _("Edit Cinema...")); - target_buttons->Add (_edit_cinema, 1, wxEXPAND, 6); - _remove_cinema = new wxButton (this, wxID_ANY, _("Remove Cinema")); - target_buttons->Add (_remove_cinema, 1, wxEXPAND, 6); - - _add_screen = new wxButton (this, wxID_ANY, _("Add Screen...")); - target_buttons->Add (_add_screen, 1, wxEXPAND, 6); - _edit_screen = new wxButton (this, wxID_ANY, _("Edit Screen...")); - target_buttons->Add (_edit_screen, 1, wxEXPAND, 6); - _remove_screen = new wxButton (this, wxID_ANY, _("Remove Screen")); - target_buttons->Add (_remove_screen, 1, wxEXPAND, 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); - targets->Add (target_buttons, 0, 0, 6); - - vertical->Add (targets, 1, wxEXPAND | wxALL, 6); - - wxFlexGridSizer* table = new wxFlexGridSizer (3, 2, 6); + wxFlexGridSizer* table = new wxFlexGridSizer (3, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); add_label_to_sizer (table, this, _("From"), true); wxDateTime from; from.SetToCurrent (); @@ -99,344 +88,237 @@ KDMDialog::KDMDialog (wxWindow* parent, boost::shared_ptr film) _until_time = new wxTimePickerCtrl (this, wxID_ANY, to); table->Add (_until_time, 1, wxEXPAND); - vertical->Add (table, 0, wxEXPAND | wxALL, 6); - - _dcps = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_SINGLE_SEL); - wxListItem ip; - ip.SetId (0); - ip.SetText (_("DCP")); - ip.SetWidth (400); - _dcps->InsertColumn (0, ip); - vertical->Add (_dcps, 0, wxEXPAND | wxALL, 6); - - list dcps = film->dcps (); - for (list::const_iterator i = dcps.begin(); i != dcps.end(); ++i) { - wxListItem item; - int const n = _dcps->GetItemCount (); - item.SetId (n); - _dcps->InsertItem (item); - _dcps->SetItem (n, 0, std_to_wx (i->string ())); - - if (dcps.size() == 1 || i->string() == film->dcp_name ()) { - _dcps->SetItemState (n, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); - } + 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 = new wxFlexGridSizer (3, 2, 6); + 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 | wxALL, DCPOMATIC_SIZER_Y_GAP); } _write_to->SetValue (true); - _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)); - _edit_cinema->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KDMDialog::edit_cinema_clicked, this)); - _remove_cinema->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KDMDialog::remove_cinema_clicked, this)); + /* Bind */ - _add_screen->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KDMDialog::add_screen_clicked, this)); - _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)); + _screens->ScreensChanged.connect (boost::bind (&KDMDialog::setup_sensitivity, this)); - _dcps->Bind (wxEVT_COMMAND_LIST_ITEM_SELECTED, boost::bind (&KDMDialog::setup_sensitivity, this)); - _dcps->Bind (wxEVT_COMMAND_LIST_ITEM_DESELECTED, boost::bind (&KDMDialog::setup_sensitivity, 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 > > -KDMDialog::selected_cinemas () const +void +KDMDialog::setup_sensitivity () { - wxArrayTreeItemIds s; - _targets->GetSelections (s); - - list > > c; - for (size_t i = 0; i < s.GetCount(); ++i) { - map >::const_iterator j = _cinemas.find (s[i]); - if (j != _cinemas.end ()) { - c.push_back (make_pair (j->first, j->second)); - } - } + _screens->setup_sensitivity (); - return c; -} + bool const sd = _cpl->GetSelection() != -1; -list > > -KDMDialog::selected_screens () const -{ - wxArrayTreeItemIds s; - _targets->GetSelections (s); - - list > > c; - for (size_t i = 0; i < s.GetCount(); ++i) { - map >::const_iterator j = _screens.find (s[i]); - if (j != _screens.end ()) { - c.push_back (make_pair (j->first, j->second)); - } + wxButton* ok = dynamic_cast (FindWindowById (wxID_OK, this)); + if (ok) { + ok->Enable (!_screens->screens().empty() && sd); } - return c; + _folder->Enable (_write_to->GetValue ()); } -void -KDMDialog::setup_sensitivity () +boost::posix_time::ptime +KDMDialog::from () const { - bool const sc = selected_cinemas().size() == 1; - bool const ss = selected_screens().size() == 1; - bool const sd = _dcps->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED) != -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) && sd); - - _folder->Enable (_write_to->GetValue ()); + return posix_time (_from_date, _from_time); } -void -KDMDialog::add_cinema (shared_ptr c) +boost::posix_time::ptime +KDMDialog::posix_time (wxDatePickerCtrl* date_picker, wxTimePickerCtrl* time_picker) { - _cinemas[_targets->AppendItem (_root, std_to_wx (c->name))] = c; - - list > sc = c->screens (); - for (list >::iterator i = sc.begin(); i != sc.end(); ++i) { - add_screen (c, *i); - } + wxDateTime const date = date_picker->GetValue (); + wxDateTime const time = time_picker->GetValue (); + return boost::posix_time::ptime ( + boost::gregorian::date (date.GetYear(), date.GetMonth() + 1, date.GetDay()), + boost::posix_time::time_duration (time.GetHour(), time.GetMinute(), time.GetSecond()) + ); } -void -KDMDialog::add_screen (shared_ptr c, shared_ptr s) +boost::posix_time::ptime +KDMDialog::until () const { - map >::const_iterator i = _cinemas.begin(); - while (i != _cinemas.end() && i->second != c) { - ++i; - } - - if (i == _cinemas.end()) { - return; - } - - _screens[_targets->AppendItem (i->first, std_to_wx (s->name))] = s; + return posix_time (_until_date, _until_time); } -void -KDMDialog::add_cinema_clicked () +boost::filesystem::path +KDMDialog::cpl () const { - 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); - - Config::instance()->write (); - - d->Destroy (); + int const item = _cpl->GetSelection (); + DCPOMATIC_ASSERT (item >= 0); + return _cpls[item].cpl_file; } -void -KDMDialog::edit_cinema_clicked () +boost::filesystem::path +KDMDialog::directory () const { - if (selected_cinemas().size() != 1) { - return; - } - - 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 (); - - d->Destroy (); + return wx_to_std (_folder->GetPath ()); } -void -KDMDialog::remove_cinema_clicked () +bool +KDMDialog::write_to () const { - if (selected_cinemas().size() != 1) { - return; - } - - pair > c = selected_cinemas().front(); - - Config::instance()->remove_cinema (c.second); - _targets->Delete (c.first); + return _write_to->GetValue (); +} - Config::instance()->write (); +dcp::Formulation +KDMDialog::formulation () const +{ + return (dcp::Formulation) reinterpret_cast (_type->GetClientData (_type->GetSelection())); } void -KDMDialog::add_screen_clicked () +KDMDialog::update_cpl_choice () { - if (selected_cinemas().size() != 1) { - return; - } - - shared_ptr c = selected_cinemas().front().second; - - ScreenDialog* d = new ScreenDialog (this, "Add Screen"); - if (d->ShowModal () != wxID_OK) { - return; - } + _cpl->Clear (); - shared_ptr s (new Screen (d->name(), d->certificate())); - c->add_screen (s); - add_screen (c, s); + for (vector::const_iterator i = _cpls.begin(); i != _cpls.end(); ++i) { + _cpl->Append (std_to_wx (i->cpl_id)); - Config::instance()->write (); + if (_cpls.size() > 0) { + _cpl->SetSelection (0); + } + } - d->Destroy (); + update_cpl_summary (); } void -KDMDialog::edit_screen_clicked () +KDMDialog::update_cpl_summary () { - if (selected_screens().size() != 1) { + int const n = _cpl->GetSelection(); + if (n == wxNOT_FOUND) { return; } - 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 (); - - d->Destroy (); + _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::remove_screen_clicked () +KDMDialog::cpl_browse_clicked () { - if (selected_screens().size() != 1) { + wxFileDialog* d = new wxFileDialog (this, _("Select CPL XML file"), wxEmptyString, wxEmptyString, "*.xml"); + if (d->ShowModal() == wxID_CANCEL) { + d->Destroy (); return; } - pair > s = selected_screens().front(); + boost::filesystem::path cpl_file (wx_to_std (d->GetPath ())); + boost::filesystem::path dcp_dir = cpl_file.parent_path (); - map >::iterator i = _cinemas.begin (); - list > sc = i->second->screens (); - while (i != _cinemas.end() && find (sc.begin(), sc.end(), s.second) == sc.end()) { - ++i; - } + d->Destroy (); - if (i == _cinemas.end()) { + /* 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; } - i->second->remove_screen (s.second); - _targets->Delete (s.first); - - Config::instance()->write (); + update_cpl_choice (); + _cpl->SetSelection (_cpls.size() - 1); + update_cpl_summary (); } list > KDMDialog::screens () const { - list > s; - - list > > cinemas = selected_cinemas (); - for (list > >::iterator i = cinemas.begin(); i != cinemas.end(); ++i) { - list > sc = i->second->screens (); - for (list >::const_iterator j = sc.begin(); j != sc.end(); ++j) { - s.push_back (*j); - } - } - - list > > screens = selected_screens (); - for (list > >::iterator i = screens.begin(); i != screens.end(); ++i) { - s.push_back (i->second); - } - - s.sort (); - s.unique (); - - return s; -} - -boost::posix_time::ptime -KDMDialog::from () const -{ - return posix_time (_from_date, _from_time); -} - -boost::posix_time::ptime -KDMDialog::posix_time (wxDatePickerCtrl* date_picker, wxTimePickerCtrl* time_picker) -{ - wxDateTime const date = date_picker->GetValue (); - wxDateTime const time = time_picker->GetValue (); - return boost::posix_time::ptime ( - boost::gregorian::date (date.GetYear(), date.GetMonth() + 1, date.GetDay()), - boost::posix_time::time_duration (time.GetHour(), time.GetMinute(), time.GetSecond()) - ); -} - -boost::posix_time::ptime -KDMDialog::until () const -{ - return posix_time (_until_date, _until_time); -} - -boost::filesystem::path -KDMDialog::dcp () const -{ - int const item = _dcps->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - assert (item >= 0); - return wx_to_std (_dcps->GetItemText (item)); -} - -boost::filesystem::path -KDMDialog::directory () const -{ - return wx_to_std (_folder->GetPath ()); -} - -bool -KDMDialog::write_to () const -{ - return _write_to->GetValue (); + return _screens->screens (); }