X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fkdm_dialog.cc;h=50c3b6848929487637f00b9398c7b86e4ab8b4ad;hb=22917c031a262ce6e90252a65d6f70a340fafbed;hp=0febdf38efa5b3b9f0fc30b025f6c19bb9b09f55;hpb=0b45af42b5a30c3a71d2e1de491843d125e46793;p=dcpomatic.git diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index 0febdf38e..50c3b6848 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,359 +17,236 @@ */ -#include -#include -#include -#include "lib/cinema.h" -#include "lib/config.h" #include "kdm_dialog.h" #include "cinema_dialog.h" #include "screen_dialog.h" #include "wx_util.h" -#ifdef __WXMSW__ -#include "dir_picker_ctrl.h" -#else -#include -#endif +#include "screens_panel.h" +#include "kdm_timing_panel.h" +#include "kdm_output_panel.h" +#include "lib/cinema.h" +#include "lib/config.h" +#include "lib/film.h" +#include "lib/screen.h" +#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) +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"); - - 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 (); - - wxBoxSizer* target_buttons = new wxBoxSizer (wxVERTICAL); - - _add_cinema = new wxButton (this, wxID_ANY, _("Add Cinema...")); - target_buttons->Add (_add_cinema, 1, 0, 6); - _edit_cinema = new wxButton (this, wxID_ANY, _("Edit Cinema...")); - target_buttons->Add (_edit_cinema, 1, 0, 6); - _remove_cinema = new wxButton (this, wxID_ANY, _("Remove Cinema")); - target_buttons->Add (_remove_cinema, 1, 0, 6); - - _add_screen = new wxButton (this, wxID_ANY, _("Add Screen...")); - target_buttons->Add (_add_screen, 1, 0, 6); - _edit_screen = new wxButton (this, wxID_ANY, _("Edit Screen...")); - target_buttons->Add (_edit_screen, 1, 0, 6); - _remove_screen = new wxButton (this, wxID_ANY, _("Remove Screen")); - target_buttons->Add (_remove_screen, 1, 0, 6); - - targets->Add (target_buttons, 0, 0, 6); - - vertical->Add (targets, 1, wxEXPAND | wxALL, 6); - - wxFlexGridSizer* table = new wxFlexGridSizer (3, 2, 6); - add_label_to_sizer (table, this, "From"); - _from_date = new wxDatePickerCtrl (this, wxID_ANY); - table->Add (_from_date, 1, wxEXPAND); - _from_time = new wxTimePickerCtrl (this, wxID_ANY); - table->Add (_from_time, 1, wxEXPAND); - - add_label_to_sizer (table, this, "Until"); - _until_date = new wxDatePickerCtrl (this, wxID_ANY); - table->Add (_until_date, 1, wxEXPAND); - _until_time = new wxTimePickerCtrl (this, wxID_ANY); - table->Add (_until_time, 1, wxEXPAND); - - add_label_to_sizer (table, this, "Write to"); - -#ifdef __WXMSW__ - _folder = new DirPickerCtrl (this); -#else - _folder = new wxDirPickerCtrl (this, wxDD_DIR_MUST_EXIST); -#endif - - table->Add (_folder, 1, wxEXPAND); - - vertical->Add (table, 0, wxEXPAND | wxALL, 6); - - wxSizer* buttons = CreateSeparatedButtonSizer (wxOK); + /* 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); + _screens = new ScreensPanel (this); + vertical->Add (_screens, 1, wxEXPAND); + + /* 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); + _timing = new KDMTimingPanel (this); + vertical->Add (_timing); + + /* 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 */ + wxFlexGridSizer* 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); + _output = new KDMOutputPanel (this, film->interop ()); + vertical->Add (_output, 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); } - _targets->Connect (wxID_ANY, wxEVT_COMMAND_TREE_SEL_CHANGED, wxCommandEventHandler (KDMDialog::targets_selection_changed), 0, this); + /* Bind */ - _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); + _screens->ScreensChanged.connect (boost::bind (&KDMDialog::setup_sensitivity, 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); + _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)); setup_sensitivity (); - - SetSizer (vertical); - vertical->Layout (); - vertical->SetSizeHints (this); -} - -list > > -KDMDialog::selected_cinemas () const -{ - 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)); - } - } - - return c; -} - -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)); - } - } - return c; -} - -void -KDMDialog::targets_selection_changed (wxCommandEvent &) -{ - setup_sensitivity (); + SetSizer (overall_sizer); + overall_sizer->Layout (); + overall_sizer->SetSizeHints (this); } void KDMDialog::setup_sensitivity () { - bool const sc = selected_cinemas().size() == 1; - bool const ss = selected_screens().size() == 1; - - _edit_cinema->Enable (sc); - _remove_cinema->Enable (sc); - - _add_screen->Enable (sc); - _edit_screen->Enable (ss); - _remove_screen->Enable (ss); -} + _screens->setup_sensitivity (); + _output->setup_sensitivity (); -void -KDMDialog::add_cinema (shared_ptr c) -{ - _cinemas[_targets->AppendItem (_root, std_to_wx (c->name))] = c; + bool const sd = _cpl->GetSelection() != -1; - for (list >::iterator i = c->screens.begin(); i != c->screens.end(); ++i) { - add_screen (c, *i); + wxButton* ok = dynamic_cast (FindWindowById (wxID_OK, this)); + if (ok) { + ok->Enable (!_screens->screens().empty() && sd); } } -void -KDMDialog::add_screen (shared_ptr c, shared_ptr s) +boost::filesystem::path +KDMDialog::cpl () 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; -} - -void -KDMDialog::add_cinema_clicked (wxCommandEvent &) -{ - 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 (wxCommandEvent &) +KDMDialog::update_cpl_choice () { - 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 (); + _cpl->Clear (); - c.second->name = d->name (); - c.second->email = d->email (); - _targets->SetItemText (c.first, std_to_wx (d->name())); - - Config::instance()->write (); - - d->Destroy (); -} + for (vector::const_iterator i = _cpls.begin(); i != _cpls.end(); ++i) { + _cpl->Append (std_to_wx (i->cpl_id)); -void -KDMDialog::remove_cinema_clicked (wxCommandEvent &) -{ - if (selected_cinemas().size() != 1) { - return; + if (_cpls.size() > 0) { + _cpl->SetSelection (0); + } } - pair > c = selected_cinemas().front(); - - Config::instance()->remove_cinema (c.second); - _targets->Delete (c.first); - - Config::instance()->write (); + update_cpl_summary (); } void -KDMDialog::add_screen_clicked (wxCommandEvent &) +KDMDialog::update_cpl_summary () { - if (selected_cinemas().size() != 1) { + int const n = _cpl->GetSelection(); + if (n == wxNOT_FOUND) { return; } - shared_ptr c = selected_cinemas().front().second; - - ScreenDialog* d = new ScreenDialog (this, "Add Screen"); - d->ShowModal (); - - shared_ptr s (new Screen (d->name())); - c->screens.push_back (s); - add_screen (c, s); - - 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::edit_screen_clicked (wxCommandEvent &) +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(); - - ScreenDialog* d = new ScreenDialog (this, "Edit screen", s.second->name); - d->ShowModal (); - - s.second->name = d->name (); - _targets->SetItemText (s.first, std_to_wx (d->name())); - - Config::instance()->write (); + boost::filesystem::path cpl_file (wx_to_std (d->GetPath ())); + boost::filesystem::path dcp_dir = cpl_file.parent_path (); d->Destroy (); -} -void -KDMDialog::remove_screen_clicked (wxCommandEvent &) -{ - if (selected_screens().size() != 1) { + /* 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; } - 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; - } - - if (i == _cinemas.end()) { - return; - } - - i->second->screens.remove (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) { - for (list >::iterator j = i->second->screens.begin(); j != i->second->screens.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; + return _screens->screens (); } boost::posix_time::ptime KDMDialog::from () const { - return posix_time (_from_date, _from_time); + return _timing->from (); } boost::posix_time::ptime -KDMDialog::posix_time (wxDatePickerCtrl* date_picker, wxTimePickerCtrl* time_picker) +KDMDialog::until () const { - 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()) - ); + return _timing->until (); } -boost::posix_time::ptime -KDMDialog::until () const +boost::filesystem::path +KDMDialog::directory () const { - return posix_time (_until_date, _until_time); + return _output->directory (); } -string -KDMDialog::directory () const +bool +KDMDialog::write_to () const +{ + return _output->write_to (); +} + +dcp::Formulation +KDMDialog::formulation () const { - return wx_to_std (_folder->GetPath ()); + return _output->formulation (); }