X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fkdm_dialog.cc;h=72c1cd33f046ea40a4ef22520916fe79b9291796;hp=4334fd446ce99ae7dad7665fc4dc471072f2903c;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hpb=391d85619ac19a2a93696ddc35c222eb9bb5d9d6 diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index 4334fd446..72c1cd33f 100644 --- a/src/wx/kdm_dialog.cc +++ b/src/wx/kdm_dialog.cc @@ -1,40 +1,35 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ -#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 DCPOMATIC_USE_OWN_DIR_PICKER -#include "dir_picker_ctrl.h" -#else -#include -#endif +#include "screens_panel.h" +#include "kdm_timing_panel.h" +#include "kdm_output_panel.h" +#include "kdm_cpl_panel.h" +#include "lib/film.h" +#include "lib/screen.h" +#include +#include +#include +#include using std::string; using std::map; @@ -55,168 +50,54 @@ KDMDialog::KDMDialog (wxWindow* parent, boost::shared_ptr film) 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 | wxTOP | wxRIGHT, DCPOMATIC_SIZER_GAP); - - _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, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); - _edit_cinema = new wxButton (this, wxID_ANY, _("Edit Cinema...")); - 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 | wxALL, DCPOMATIC_BUTTON_STACK_GAP); - - _add_screen = new wxButton (this, wxID_ANY, _("Add Screen...")); - 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 | wxALL, DCPOMATIC_BUTTON_STACK_GAP); - _remove_screen = new wxButton (this, wxID_ANY, _("Remove Screen")); - target_buttons->Add (_remove_screen, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); - - targets->Add (target_buttons, 0, 0); - - vertical->Add (targets, 1, wxEXPAND); - + _screens = new ScreensPanel (this); + /* Hack to stop KDM dialogs that are taller than my laptop screen; this + really isn't the right way to fix it... + */ + _screens->SetMaxSize (wxSize (-1, 280)); + vertical->Add (_screens, 1, wxEXPAND); /* Sub-heading: Timing */ + /// TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix 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); - table->Add (_from_time, 1, wxEXPAND); - - 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, to); - table->Add (_until_time, 1, wxEXPAND); - - vertical->Add (table, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP); - + _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 */ - 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 (); - + _cpl = new KDMCPLPanel (this, film->cpls ()); + vertical->Add (_cpl); /* 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); + _output = new KDMOutputPanel (this, film->interop ()); + vertical->Add (_output, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP); - _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, 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 | wxTOP, DCPOMATIC_SIZER_GAP); + wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL); + if (buttons) { + vertical->Add (buttons, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_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) { - 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)); - _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)); - - _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)); + _screens->ScreensChanged.connect (boost::bind (&KDMDialog::setup_sensitivity, this)); + _timing->TimingChanged.connect (boost::bind (&KDMDialog::setup_sensitivity, this)); setup_sensitivity (); @@ -225,336 +106,58 @@ KDMDialog::KDMDialog (wxWindow* parent, boost::shared_ptr film) overall_sizer->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::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 ((selected_cinemas().size() > 0 || selected_screens().size() > 0) && sd); - - _folder->Enable (_write_to->GetValue ()); -} - -void -KDMDialog::add_cinema (shared_ptr c) -{ - _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); - } -} + _screens->setup_sensitivity (); + _output->setup_sensitivity (); -void -KDMDialog::add_screen (shared_ptr c, shared_ptr s) -{ - map >::const_iterator i = _cinemas.begin(); - while (i != _cinemas.end() && i->second != c) { - ++i; - } + bool const sd = _cpl->has_selected (); - if (i == _cinemas.end()) { - return; + wxButton* ok = dynamic_cast (FindWindowById (wxID_OK, this)); + if (ok) { + ok->Enable (!_screens->screens().empty() && _timing->valid() && sd); } - - _screens[_targets->AppendItem (i->first, std_to_wx (s->name))] = s; } -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); - - d->Destroy (); -} - -void -KDMDialog::edit_cinema_clicked () -{ - 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()->changed (); - - d->Destroy (); -} - -void -KDMDialog::remove_cinema_clicked () -{ - if (selected_cinemas().size() != 1) { - return; - } - - pair > c = selected_cinemas().front(); - - Config::instance()->remove_cinema (c.second); - _targets->Delete (c.first); -} - -void -KDMDialog::add_screen_clicked () -{ - 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; - } - - shared_ptr s (new Screen (d->name(), d->certificate())); - c->add_screen (s); - add_screen (c, s); - - Config::instance()->changed (); - - d->Destroy (); -} - -void -KDMDialog::edit_screen_clicked () -{ - if (selected_screens().size() != 1) { - 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()->changed (); - - d->Destroy (); -} - -void -KDMDialog::remove_screen_clicked () +boost::filesystem::path +KDMDialog::cpl () const { - if (selected_screens().size() != 1) { - return; - } - - pair > s = selected_screens().front(); - - map >::iterator i = _cinemas.begin (); - 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->remove_screen (s.second); - _targets->Delete (s.first); - - Config::instance()->changed (); + return _cpl->cpl (); } 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; + return _screens->screens (); } 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()) - ); + return _timing->from (); } boost::posix_time::ptime KDMDialog::until () const { - return posix_time (_until_date, _until_time); -} - -boost::filesystem::path -KDMDialog::cpl () const -{ - int const item = _cpl->GetSelection (); - assert (item >= 0); - return _cpls[item].cpl_file; + return _timing->until (); } boost::filesystem::path KDMDialog::directory () const { - return wx_to_std (_folder->GetPath ()); + return _output->directory (); } bool KDMDialog::write_to () const { - return _write_to->GetValue (); + return _output->write_to (); } 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 (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 (); + return _output->formulation (); }