No-op; fix GPL address and use the explicit-program-name version.

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

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 6a94c4583dd5d5927b75e8de6ed403abebfa93c2..acdae692dad4a61b7fe0286c24bf5fec920c9741 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"
@@ -249,7 +251,7 @@ public:
                accel[0].Set (wxACCEL_CTRL, static_cast<int>('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,6 +261,13 @@ 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> film (new Film (path));
@@ -409,7 +418,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 ()
@@ -566,17 +587,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 ();
                }
        }
 
@@ -693,13 +714,45 @@ private:
                        return;
                }
 
+               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 ();
+
+                       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 ();
        }