X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fkdm_dialog.cc;h=50c3b6848929487637f00b9398c7b86e4ab8b4ad;hb=22917c031a262ce6e90252a65d6f70a340fafbed;hp=6ef630eff39f5a29cb39a88ed7cb8952e8698d26;hpb=9e4c091e6ef0f79fab10664e95240de2f14e5702;p=dcpomatic.git diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index 6ef630eff..50c3b6848 100644 --- a/src/wx/kdm_dialog.cc +++ b/src/wx/kdm_dialog.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 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,24 +17,21 @@ */ -#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 "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; @@ -55,77 +52,25 @@ 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); + 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); - - 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); @@ -136,7 +81,7 @@ KDMDialog::KDMDialog (wxWindow* parent, boost::shared_ptr film) vertical->Add (s, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP + 2); /* CPL details */ - table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + 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); @@ -147,46 +92,16 @@ KDMDialog::KDMDialog (wxWindow* parent, boost::shared_ptr film) _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, 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); + _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 */ @@ -195,29 +110,16 @@ KDMDialog::KDMDialog (wxWindow* parent, boost::shared_ptr film) wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL); if (buttons) { - overall_sizer->Add (buttons, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_Y_GAP); + overall_sizer->Add (buttons, 0, wxEXPAND | wxALL, 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)); + _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)); - setup_sensitivity (); SetSizer (overall_sizer); @@ -225,282 +127,33 @@ 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); - } -} - -void -KDMDialog::add_screen (shared_ptr c, shared_ptr s) -{ - 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 () -{ - 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); -} + _screens->setup_sensitivity (); + _output->setup_sensitivity (); -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 () -{ - 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 (); -} - -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); - } - } + bool const sd = _cpl->GetSelection() != -1; - list > > screens = selected_screens (); - for (list > >::iterator i = screens.begin(); i != screens.end(); ++i) { - s.push_back (i->second); + wxButton* ok = dynamic_cast (FindWindowById (wxID_OK, this)); + if (ok) { + ok->Enable (!_screens->screens().empty() && sd); } - - 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::cpl () const { int const item = _cpl->GetSelection (); - assert (item >= 0); + DCPOMATIC_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)); @@ -528,14 +181,17 @@ KDMDialog::update_cpl_summary () void KDMDialog::cpl_browse_clicked () { - wxFileDialog d (this, _("Select CPL XML file"), wxEmptyString, wxEmptyString, "*.xml"); - if (d.ShowModal() == wxID_CANCEL) { + 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 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); @@ -553,8 +209,44 @@ KDMDialog::cpl_browse_clicked () 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 (); +} + +boost::posix_time::ptime +KDMDialog::from () const +{ + return _timing->from (); +} + +boost::posix_time::ptime +KDMDialog::until () const +{ + return _timing->until (); +} + +boost::filesystem::path +KDMDialog::directory () const +{ + return _output->directory (); +} + +bool +KDMDialog::write_to () const +{ + return _output->write_to (); +} + +dcp::Formulation +KDMDialog::formulation () const +{ + return _output->formulation (); +}