Merge master.

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

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index ce00cb13fbc30456acc71fce05a36af368d0b19b..f2aff9359a35412684f4262bbfe7afdd9c6aa110 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     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
@@ -29,6 +29,7 @@
 #include <wx/generic/aboutdlgg.h>
 #include <wx/stdpaths.h>
 #include <wx/cmdline.h>
+#include <wx/preferences.h>
 #include "wx/film_viewer.h"
 #include "wx/film_editor.h"
 #include "wx/job_manager_view.h"
@@ -81,6 +82,8 @@ static wxMenu* jobs_menu = 0;
 
 static void set_menu_sensitivity ();
 
+// #define DCPOMATIC_WINDOWS_CONSOLE 1
+
 class FilmChangedDialog
 {
 public:
@@ -112,7 +115,7 @@ private:
 };
 
 
-void
+static void
 maybe_save_then_delete_film ()
 {
        if (!film) {
@@ -133,6 +136,30 @@ maybe_save_then_delete_film ()
        film.reset ();
 }
 
+static void
+check_film_state_version (int v)
+{
+       if (v == 4) {
+               error_dialog (
+                       0,
+                       _("This film was created with an old version of DVD-o-matic and may not load correctly "
+                         "in this version.  Please check the film's settings carefully.")
+                       );
+       }
+}
+
+static void
+load_film (boost::filesystem::path file)
+{
+       film.reset (new Film (file));
+       list<string> const notes = film->read_metadata ();
+       check_film_state_version (film->state_version ());
+       for (list<string>::const_iterator i = notes.begin(); i != notes.end(); ++i) {
+               error_dialog (0, std_to_wx (*i));
+       }
+       film->log()->set_level (log_level);
+}
+
 #define ALWAYS                  0x0
 #define NEEDS_FILM              0x1
 #define NOT_DURING_DCP_CREATION 0x2
@@ -140,14 +167,14 @@ maybe_save_then_delete_film ()
 
 map<wxMenuItem*, int> menu_items;
        
-void
+static void
 add_item (wxMenu* menu, wxString text, int id, int sens)
 {
        wxMenuItem* item = menu->Append (id, text);
        menu_items.insert (make_pair (item, sens));
 }
 
-void
+static void
 set_menu_sensitivity ()
 {
        list<shared_ptr<Job> > jobs = JobManager::instance()->get ();
@@ -192,7 +219,7 @@ enum {
        ID_tools_check_for_updates
 };
 
-void
+static void
 setup_menu (wxMenuBar* m)
 {
        wxMenu* file = new wxMenu;
@@ -254,8 +281,9 @@ public:
                : wxFrame (NULL, -1, title)
                , _hints_dialog (0)
                , _servers_list_dialog (0)
+               , _config_dialog (0)
        {
-#ifdef DCPOMATIC_WINDOWS_CONSOLE               
+#if defined(DCPOMATIC_WINDOWS) && defined(DCPOMATIC_WINDOWS_CONSOLE)
                 AllocConsole();
                
                HANDLE handle_out = GetStdHandle(STD_OUTPUT_HANDLE);
@@ -324,17 +352,6 @@ public:
                overall_panel->SetSizer (main_sizer);
        }
 
-       void check_film_state_version (int v)
-       {
-               if (v == 4) {
-                       error_dialog (
-                               this,
-                               _("This film was created with an old version of DVD-o-matic and may not load correctly "
-                                 "in this version.  Please check the film's settings carefully.")
-                               );
-               }
-       }
-
 private:
 
        void set_film ()
@@ -414,10 +431,7 @@ private:
                if (r == wxID_OK) {
                        maybe_save_then_delete_film ();
                        try {
-                               film.reset (new Film (wx_to_std (c->GetPath ())));
-                               film->read_metadata ();
-                               check_film_state_version (film->state_version ());
-                               film->log()->set_level (log_level);
+                               load_film (wx_to_std (c->GetPath ()));
                                set_film ();
                        } catch (std::exception& e) {
                                wxString p = c->GetPath ();
@@ -443,15 +457,16 @@ private:
        
        void file_exit ()
        {
-               Close (true);
+               /* false here allows the close handler to veto the close request */
+               Close (false);
        }
 
        void edit_preferences ()
        {
-               ConfigDialog* d = new ConfigDialog (this);
-               d->ShowModal ();
-               d->Destroy ();
-               Config::instance()->write ();
+               if (!_config_dialog) {
+                       _config_dialog = create_config_dialog ();
+               }
+               _config_dialog->Show (this);
        }
 
        void jobs_make_dcp ()
@@ -590,6 +605,7 @@ private:
 
        HintsDialog* _hints_dialog;
        ServersListDialog* _servers_list_dialog;
+       wxPreferencesEditor* _config_dialog;
 };
 
 static const wxCmdLineEntryDesc command_line_description[] = {
@@ -600,6 +616,9 @@ static const wxCmdLineEntryDesc command_line_description[] = {
        { wxCMD_LINE_NONE, "", "", "", wxCmdLineParamType (0), 0 }
 };
 
+/** @class App
+ *  @brief The magic App class for wxWidgets.
+ */
 class App : public wxApp
 {
        bool OnInit ()
@@ -643,9 +662,7 @@ class App : public wxApp
 
                if (!film_to_load.empty() && boost::filesystem::is_directory (film_to_load)) {
                        try {
-                               film.reset (new Film (film_to_load));
-                               film->read_metadata ();
-                               film->log()->set_level (log_level);
+                               load_film (film_to_load);
                        } catch (exception& e) {
                                error_dialog (0, std_to_wx (String::compose (wx_to_std (_("Could not load film %1 (%2)")), film_to_load, e.what())));
                        }
@@ -674,7 +691,9 @@ class App : public wxApp
                _timer.reset (new wxTimer (this));
                _timer->Start (1000);
 
-               _frame->check_film_state_version (film->state_version ());
+               if (film) {
+                       check_film_state_version (film->state_version ());
+               }
 
                UpdateChecker::instance()->StateChanged.connect (boost::bind (&App::update_checker_state_changed, this));
                if (Config::instance()->check_for_updates ()) {
@@ -718,6 +737,17 @@ class App : public wxApp
                return true;
        }
 
+       bool OnExceptionInMainLoop ()
+       {
+               error_dialog (0, _("An unknown exception occurred.  Please report this problem to the DCP-o-matic author (carl@dcpomatic.com)."));
+               return false;
+       }
+               
+       void OnUnhandledException ()
+       {
+               error_dialog (0, _("An unknown exception occurred.  Please report this problem to the DCP-o-matic author (carl@dcpomatic.com)."));
+       }
+
        void idle ()
        {
                ui_signaller->ui_idle ();