Use save/don't save/abort operation in more cases (#847).

[dcpomatic.git] / src / tools / dcpomatic.cc

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index f336f0a854ee1672b12278f18c090e7fcc6d7cc7..799124ee8f816042f420714787bf874e4e49aed3 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
-    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 <http://www.gnu.org/licenses/>.
 
 */
 
@@ -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"
@@ -102,7 +104,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")
                        );
        }
 
@@ -277,8 +283,6 @@ public:
        void load_film (boost::filesystem::path file)
        try
        {
-               maybe_save_then_delete_film ();
-
                shared_ptr<Film> film (new Film (file));
                list<string> const notes = film->read_metadata ();
 
@@ -353,8 +357,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 ();
@@ -379,7 +384,7 @@ private:
                        }
                }
 
-               if (r == wxID_OK) {
+               if (r == wxID_OK && maybe_save_then_delete_film()) {
                        load_film (wx_to_std (c->GetPath ()));
                }
 
@@ -395,7 +400,7 @@ private:
        {
                vector<boost::filesystem::path> history = Config::instance()->history ();
                int n = event.GetId() - ID_file_history;
-               if (n >= 0 && n < static_cast<int> (history.size ())) {
+               if (n >= 0 && n < static_cast<int> (history.size ()) && maybe_save_then_delete_film()) {
                        load_film (history[n]);
                }
        }
@@ -585,17 +590,17 @@ private:
 
        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 ();
                }
        }
 
@@ -714,21 +719,9 @@ private:
 
                if (_film && _film->dirty ()) {
 
-                       wxMessageDialog* dialog = new wxMessageDialog (
-                               0,
-                               wxString::Format (_("Save changes to film \"%s\" before closing?"), std_to_wx (_film->name()).data()),
-                               /// 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 | wxCANCEL | wxYES_DEFAULT | wxICON_QUESTION
-                               );
-
-                       dialog->SetYesNoCancelLabels (
-                               _("Save film and close"), _("Close without saving film"), _("Don't close")
-                               );
-
-                       int const r = dialog->ShowModal ();
-                       dialog->Destroy ();
+                       FilmChangedDialog* dialog = new FilmChangedDialog (_film->name ());
+                       int const r = dialog->run ();
+                       delete dialog;
 
                        switch (r) {
                        case wxID_NO:
@@ -789,10 +782,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 ()) {
@@ -803,10 +799,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)