X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fkdm_dialog.cc;h=6ef630eff39f5a29cb39a88ed7cb8952e8698d26;hb=9e4c091e6ef0f79fab10664e95240de2f14e5702;hp=0febdf38efa5b3b9f0fc30b025f6c19bb9b09f55;hpb=0b45af42b5a30c3a71d2e1de491843d125e46793;p=dcpomatic.git diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index 0febdf38e..6ef630eff 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-2014 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 @@ -20,13 +20,17 @@ #include #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" -#ifdef __WXMSW__ +#ifdef DCPOMATIC_USE_OWN_DIR_PICKER #include "dir_picker_ctrl.h" #else #include @@ -36,20 +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); - add_label_to_sizer (vertical, this, "Make KDMs for"); + /* Font for sub-headings */ + wxFont subheading_font (*wxNORMAL_FONT); + subheading_font.SetWeight (wxFONTWEIGHT_BOLD); - wxBoxSizer* targets = new wxBoxSizer (wxHORIZONTAL); + + /* 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"); @@ -63,68 +77,152 @@ 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, 0, 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, 0, 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, 0, 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, 0, 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, 0, 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, 0, 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); - add_label_to_sizer (table, this, "From"); - _from_date = new wxDatePickerCtrl (this, wxID_ANY); + + /* 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); + 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"); - _until_date = new wxDatePickerCtrl (this, wxID_ANY); + + add_label_to_sizer (table, this, _("Until"), true); + 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); - add_label_to_sizer (table, this, "Write to"); + vertical->Add (table, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP); + -#ifdef __WXMSW__ - _folder = new DirPickerCtrl (this); + /* 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 *) libdcp::KDM::MODIFIED_TRANSITIONAL_1)); + if (!film->interop ()) { + _type->Append ("DCI Any", ((void *) libdcp::KDM::DCI_ANY)); + _type->Append ("DCI Specific", ((void *) libdcp::KDM::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, wxDD_DIR_MUST_EXIST); + _folder = new wxDirPickerCtrl (this, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1)); #endif + _folder->SetPath (wxStandardPaths::Get().GetDocumentsDir()); + table->Add (_folder, 1, wxEXPAND); + + _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 */ - wxSizer* buttons = CreateSeparatedButtonSizer (wxOK); + 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); } - _targets->Connect (wxID_ANY, wxEVT_COMMAND_TREE_SEL_CHANGED, wxCommandEventHandler (KDMDialog::targets_selection_changed), 0, this); + _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)); + _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)); + + _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)); - _add_cinema->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (KDMDialog::add_cinema_clicked), 0, this); - _edit_cinema->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (KDMDialog::edit_cinema_clicked), 0, this); - _remove_cinema->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (KDMDialog::remove_cinema_clicked), 0, 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)); - _add_screen->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (KDMDialog::add_screen_clicked), 0, this); - _edit_screen->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (KDMDialog::edit_screen_clicked), 0, this); - _remove_screen->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (KDMDialog::remove_screen_clicked), 0, 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 > > @@ -161,17 +259,12 @@ KDMDialog::selected_screens () const return c; } -void -KDMDialog::targets_selection_changed (wxCommandEvent &) -{ - setup_sensitivity (); -} - void 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); @@ -179,6 +272,11 @@ KDMDialog::setup_sensitivity () _add_screen->Enable (sc); _edit_screen->Enable (ss); _remove_screen->Enable (ss); + + wxButton* ok = dynamic_cast (FindWindowById (wxID_OK)); + ok->Enable ((selected_cinemas().size() > 0 || selected_screens().size() > 0) && sd); + + _folder->Enable (_write_to->GetValue ()); } void @@ -186,7 +284,8 @@ KDMDialog::add_cinema (shared_ptr c) { _cinemas[_targets->AppendItem (_root, std_to_wx (c->name))] = c; - for (list >::iterator i = c->screens.begin(); i != c->screens.end(); ++i) { + list > sc = c->screens (); + for (list >::iterator i = sc.begin(); i != sc.end(); ++i) { add_screen (c, *i); } } @@ -207,7 +306,7 @@ KDMDialog::add_screen (shared_ptr c, shared_ptr s) } void -KDMDialog::add_cinema_clicked (wxCommandEvent &) +KDMDialog::add_cinema_clicked () { CinemaDialog* d = new CinemaDialog (this, "Add Cinema"); d->ShowModal (); @@ -216,13 +315,11 @@ KDMDialog::add_cinema_clicked (wxCommandEvent &) Config::instance()->add_cinema (c); add_cinema (c); - Config::instance()->write (); - d->Destroy (); } void -KDMDialog::edit_cinema_clicked (wxCommandEvent &) +KDMDialog::edit_cinema_clicked () { if (selected_cinemas().size() != 1) { return; @@ -237,13 +334,13 @@ KDMDialog::edit_cinema_clicked (wxCommandEvent &) c.second->email = d->email (); _targets->SetItemText (c.first, std_to_wx (d->name())); - Config::instance()->write (); + Config::instance()->changed (); d->Destroy (); } void -KDMDialog::remove_cinema_clicked (wxCommandEvent &) +KDMDialog::remove_cinema_clicked () { if (selected_cinemas().size() != 1) { return; @@ -253,12 +350,10 @@ KDMDialog::remove_cinema_clicked (wxCommandEvent &) Config::instance()->remove_cinema (c.second); _targets->Delete (c.first); - - Config::instance()->write (); } void -KDMDialog::add_screen_clicked (wxCommandEvent &) +KDMDialog::add_screen_clicked () { if (selected_cinemas().size() != 1) { return; @@ -267,19 +362,21 @@ KDMDialog::add_screen_clicked (wxCommandEvent &) shared_ptr c = selected_cinemas().front().second; ScreenDialog* d = new ScreenDialog (this, "Add Screen"); - d->ShowModal (); + if (d->ShowModal () != wxID_OK) { + return; + } - shared_ptr s (new Screen (d->name())); - c->screens.push_back (s); + shared_ptr s (new Screen (d->name(), d->certificate())); + c->add_screen (s); add_screen (c, s); - Config::instance()->write (); + Config::instance()->changed (); d->Destroy (); } void -KDMDialog::edit_screen_clicked (wxCommandEvent &) +KDMDialog::edit_screen_clicked () { if (selected_screens().size() != 1) { return; @@ -287,19 +384,20 @@ KDMDialog::edit_screen_clicked (wxCommandEvent &) pair > s = selected_screens().front(); - ScreenDialog* d = new ScreenDialog (this, "Edit screen", s.second->name); + 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 (); + Config::instance()->changed (); d->Destroy (); } void -KDMDialog::remove_screen_clicked (wxCommandEvent &) +KDMDialog::remove_screen_clicked () { if (selected_screens().size() != 1) { return; @@ -308,18 +406,21 @@ KDMDialog::remove_screen_clicked (wxCommandEvent &) pair > s = selected_screens().front(); map >::iterator i = _cinemas.begin (); - while (i != _cinemas.end() && find (i->second->screens.begin(), i->second->screens.end(), s.second) == i->second->screens.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()) { return; } - i->second->screens.remove (s.second); + i->second->remove_screen (s.second); _targets->Delete (s.first); - Config::instance()->write (); + Config::instance()->changed (); } list > @@ -329,7 +430,8 @@ KDMDialog::screens () const list > > cinemas = selected_cinemas (); for (list > >::iterator i = cinemas.begin(); i != cinemas.end(); ++i) { - for (list >::iterator j = i->second->screens.begin(); j != i->second->screens.end(); ++j) { + list > sc = i->second->screens (); + for (list >::const_iterator j = sc.begin(); j != sc.end(); ++j) { s.push_back (*j); } } @@ -368,8 +470,91 @@ KDMDialog::until () const return posix_time (_until_date, _until_time); } -string +boost::filesystem::path +KDMDialog::cpl () const +{ + int const item = _cpl->GetSelection (); + assert (item >= 0); + return _cpls[item].cpl_file; +} + +boost::filesystem::path KDMDialog::directory () const { return wx_to_std (_folder->GetPath ()); } + +bool +KDMDialog::write_to () const +{ + return _write_to->GetValue (); +} + +dcp::Formulation +KDMDialog::formulation () const +{ + return (dcp::KDM::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 (this, _("Select CPL XML file"), wxEmptyString, wxEmptyString, "*.xml"); + if (d.ShowModal() == wxID_CANCEL) { + return; + } + + boost::filesystem::path cpl_file (wx_to_std (d.GetPath ())); + boost::filesystem::path dcp_dir = cpl_file.parent_path (); + + /* 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 (); +}