X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fkdm_dialog.cc;h=72c1cd33f046ea40a4ef22520916fe79b9291796;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hp=83648080871cab300bbb8a45322a34d0d8ad54a1;hpb=e02afbbc64a6f615e450a3c68b8900588bd21fd0;p=dcpomatic.git diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index 836480808..72c1cd33f 100644 --- a/src/wx/kdm_dialog.cc +++ b/src/wx/kdm_dialog.cc @@ -1,41 +1,33 @@ /* 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 "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 "kdm_timing_panel.h" +#include "kdm_output_panel.h" +#include "kdm_cpl_panel.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 @@ -63,122 +55,49 @@ KDMDialog::KDMDialog (wxWindow* parent, boost::shared_ptr film) h->SetFont (subheading_font); vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL); _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); + _output = new KDMOutputPanel (this, film->interop ()); + vertical->Add (_output, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP); - 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)); + wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL); + if (buttons) { + vertical->Add (buttons, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP); } - 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, 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); /* 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 | wxALL, DCPOMATIC_SIZER_Y_GAP); - } - - _write_to->SetValue (true); - /* Bind */ _screens->ScreensChanged.connect (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)); + _timing->TimingChanged.connect (boost::bind (&KDMDialog::setup_sensitivity, this)); setup_sensitivity (); @@ -191,134 +110,54 @@ void KDMDialog::setup_sensitivity () { _screens->setup_sensitivity (); + _output->setup_sensitivity (); - bool const sd = _cpl->GetSelection() != -1; + bool const sd = _cpl->has_selected (); wxButton* ok = dynamic_cast (FindWindowById (wxID_OK, this)); if (ok) { - ok->Enable (!_screens->screens().empty() && sd); + ok->Enable (!_screens->screens().empty() && _timing->valid() && sd); } - - _folder->Enable (_write_to->GetValue ()); } -boost::posix_time::ptime -KDMDialog::from () const +boost::filesystem::path +KDMDialog::cpl () const { - return posix_time (_from_date, _from_time); + return _cpl->cpl (); } -boost::posix_time::ptime -KDMDialog::posix_time (wxDatePickerCtrl* date_picker, wxTimePickerCtrl* time_picker) +list > +KDMDialog::screens () 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 _screens->screens (); } boost::posix_time::ptime -KDMDialog::until () const +KDMDialog::from () const { - return posix_time (_until_date, _until_time); + return _timing->from (); } -boost::filesystem::path -KDMDialog::cpl () const +boost::posix_time::ptime +KDMDialog::until () const { - int const item = _cpl->GetSelection (); - DCPOMATIC_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 = 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 (); -} - -list > -KDMDialog::screens () const -{ - return _screens->screens (); + return _output->formulation (); }