X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;h=6c789632a2dff6e46c73f10fb91be54985dfe2b0;hp=6a94c4583dd5d5927b75e8de6ed403abebfa93c2;hb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;hpb=2bfbf1b834639984fcf5f850b72c4dca608ee60f diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 6a94c4583..6c789632a 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2012-2016 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 . */ @@ -41,6 +42,7 @@ #include "lib/config.h" #include "lib/util.h" #include "lib/video_content.h" +#include "lib/content.h" #include "lib/version.h" #include "lib/signal_manager.h" #include "lib/log.h" @@ -70,6 +72,7 @@ #endif #include #include +#include #include #include #include @@ -90,6 +93,8 @@ using std::list; using std::exception; using boost::shared_ptr; using boost::dynamic_pointer_cast; +using boost::optional; +using boost::make_shared; class FilmChangedDialog : public boost::noncopyable { @@ -102,7 +107,11 @@ public: /// TRANSLATORS: this is the heading for a dialog box, which tells the user that the current /// project (Film) has been changed since it was last saved. _("Film changed"), - wxYES_NO | wxYES_DEFAULT | wxICON_QUESTION + wxYES_NO | wxCANCEL | wxYES_DEFAULT | wxICON_QUESTION + ); + + _dialog->SetYesNoCancelLabels ( + _("Save film and close"), _("Close without saving film"), _("Don't close") ); } @@ -249,7 +258,7 @@ public: accel[0].Set (wxACCEL_CTRL, static_cast('A'), ID_add_file); accel[1].Set (wxACCEL_NORMAL, WXK_DELETE, ID_remove); Bind (wxEVT_MENU, boost::bind (&ContentPanel::add_file_clicked, _film_editor->content_panel()), ID_add_file); - Bind (wxEVT_MENU, boost::bind (&ContentPanel::remove_clicked, _film_editor->content_panel(), true), ID_remove); + Bind (wxEVT_MENU, boost::bind (&DOMFrame::remove_clicked, this, _1), ID_remove); wxAcceleratorTable accel_table (2, accel); SetAcceleratorTable (accel_table); @@ -259,9 +268,16 @@ public: UpdateChecker::instance()->StateChanged.connect (boost::bind (&DOMFrame::update_checker_state_changed, this)); } + void remove_clicked (wxCommandEvent& ev) + { + if (_film_editor->content_panel()->remove_clicked (true)) { + ev.Skip (); + } + } + void new_film (boost::filesystem::path path) { - shared_ptr film (new Film (path)); + shared_ptr film = make_shared (path); film->write_metadata (); film->set_name (path.filename().generic_string()); set_film (film); @@ -270,9 +286,7 @@ public: void load_film (boost::filesystem::path file) try { - maybe_save_then_delete_film (); - - shared_ptr film (new Film (file)); + shared_ptr film = make_shared (file); list const notes = film->read_metadata (); if (film->state_version() == 4) { @@ -346,8 +360,9 @@ private: return; } - maybe_save_then_delete_film (); - new_film (d->get_path ()); + if (maybe_save_then_delete_film ()) { + new_film (d->get_path ()); + } } d->Destroy (); @@ -372,7 +387,7 @@ private: } } - if (r == wxID_OK) { + if (r == wxID_OK && maybe_save_then_delete_film()) { load_film (wx_to_std (c->GetPath ())); } @@ -388,7 +403,7 @@ private: { vector history = Config::instance()->history (); int n = event.GetId() - ID_file_history; - if (n >= 0 && n < static_cast (history.size ())) { + if (n >= 0 && n < static_cast (history.size ()) && maybe_save_then_delete_film()) { load_film (history[n]); } } @@ -409,7 +424,19 @@ private: void tools_restore_default_preferences () { - Config::restore_defaults (); + wxMessageDialog* d = new wxMessageDialog ( + 0, + _("Are you sure you want to restore preferences to their defaults? This cannot be undone."), + _("Restore default preferences"), + wxYES_NO | wxYES_DEFAULT | wxICON_QUESTION + ); + + int const r = d->ShowModal (); + d->Destroy (); + + if (r == wxID_YES) { + Config::restore_defaults (); + } } void jobs_make_dcp () @@ -465,14 +492,14 @@ private: ); } else { JobManager::instance()->add ( - shared_ptr (new SendKDMEmailJob ( - _film->name(), - _film->dcp_name(), - d->from(), - d->until(), - CinemaKDMs::collect (screen_kdms), - _film->log() - )) + boost::make_shared ( + _film->name(), + _film->dcp_name(), + d->from(), + d->until(), + CinemaKDMs::collect (screen_kdms), + _film->log() + ) ); } } catch (dcp::NotEncryptedError& e) { @@ -539,20 +566,16 @@ private: return; } + optional kdm; try { - vector dkdms = Config::instance()->dkdms (); - dkdms.push_back ( - _film->make_kdm ( - Config::instance()->decryption_chain()->leaf(), - vector (), - d->cpl (), - dcp::LocalTime ("2012-01-01T01:00:00+00:00"), - dcp::LocalTime ("2112-01-01T01:00:00+00:00"), - dcp::MODIFIED_TRANSITIONAL_1 - ) + kdm = _film->make_kdm ( + Config::instance()->decryption_chain()->leaf(), + vector (), + d->cpl (), + dcp::LocalTime ("2012-01-01T01:00:00+00:00"), + dcp::LocalTime ("2112-01-01T01:00:00+00:00"), + dcp::MODIFIED_TRANSITIONAL_1 ); - - Config::instance()->set_dkdms (dkdms); } catch (dcp::NotEncryptedError& e) { error_dialog (this, _("CPL's content is not encrypted.")); } catch (exception& e) { @@ -561,22 +584,33 @@ private: error_dialog (this, _("An unknown exception occurred.")); } + if (kdm) { + if (d->internal ()) { + vector dkdms = Config::instance()->dkdms (); + dkdms.push_back (kdm.get()); + Config::instance()->set_dkdms (dkdms); + } else { + boost::filesystem::path path = d->directory() / (_film->dcp_name(false) + "_DKDM.xml"); + kdm->as_xml (path); + } + } + d->Destroy (); } void content_scale_to_fit_width () { - VideoContentList vc = _film_editor->content_panel()->selected_video (); - for (VideoContentList::iterator i = vc.begin(); i != vc.end(); ++i) { - (*i)->scale_and_crop_to_fit_width (); + ContentList vc = _film_editor->content_panel()->selected_video (); + for (ContentList::iterator i = vc.begin(); i != vc.end(); ++i) { + (*i)->video->scale_and_crop_to_fit_width (); } } void content_scale_to_fit_height () { - VideoContentList vc = _film_editor->content_panel()->selected_video (); - for (VideoContentList::iterator i = vc.begin(); i != vc.end(); ++i) { - (*i)->scale_and_crop_to_fit_height (); + ContentList vc = _film_editor->content_panel()->selected_video (); + for (ContentList::iterator i = vc.begin(); i != vc.end(); ++i) { + (*i)->video->scale_and_crop_to_fit_height (); } } @@ -693,13 +727,33 @@ private: return; } + if (_film && _film->dirty ()) { + + FilmChangedDialog* dialog = new FilmChangedDialog (_film->name ()); + int const r = dialog->run (); + delete dialog; + + switch (r) { + case wxID_NO: + /* Don't save and carry on to close */ + break; + case wxID_YES: + /* Save and carry on to close */ + _film->write_metadata (); + break; + case wxID_CANCEL: + /* Veto the event and stop */ + ev.Veto (); + return; + } + } + /* We don't want to hear about any more configuration changes, since they cause the File menu to be altered, which itself will be deleted around now (without, as far as I can see, any way for us to find out). */ _config_changed_connection.disconnect (); - maybe_save_then_delete_film (); ev.Skip (); } @@ -738,10 +792,13 @@ private: } } - void maybe_save_then_delete_film () + /** @return true if the operation that called this method + * should continue, false to abort it. + */ + bool maybe_save_then_delete_film () { if (!_film) { - return; + return true; } if (_film->dirty ()) { @@ -752,10 +809,13 @@ private: case wxID_YES: _film->write_metadata (); break; + case wxID_CANCEL: + return false; } } _film.reset (); + return true; } void add_item (wxMenu* menu, wxString text, int id, int sens)