Basic release notes support (#2282).

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

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 78543919f1d08cd910ed3494826eb17f9c2e2534..6f55b1771b88f2bbbc352520aa7c7deae10005b7 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -24,88 +24,90 @@
  */
 
 
  */
 
 

-#include "wx/standard_controls.h"
-#include "wx/film_viewer.h"
-#include "wx/film_editor.h"
-#include "wx/job_manager_view.h"
-#include "wx/full_config_dialog.h"
-#include "wx/wx_util.h"
-#include "wx/film_name_location_dialog.h"
-#include "wx/wx_signal_manager.h"
-#include "wx/recreate_chain_dialog.h"

 #include "wx/about_dialog.h"
 #include "wx/about_dialog.h"

-#include "wx/kdm_dialog.h"
-#include "wx/dkdm_dialog.h"
-#include "wx/self_dkdm_dialog.h"
-#include "wx/servers_list_dialog.h"
-#include "wx/hints_dialog.h"
-#include "wx/update_dialog.h"

 #include "wx/content_panel.h"
 #include "wx/content_panel.h"

-#include "wx/report_problem_dialog.h"
-#include "wx/video_waveform_dialog.h"
-#include "wx/system_information_dialog.h"
-#include "wx/save_template_dialog.h"
-#include "wx/templates_dialog.h"
-#include "wx/nag_dialog.h"
+#include "wx/dkdm_dialog.h"

 #include "wx/export_subtitles_dialog.h"
 #include "wx/export_video_file_dialog.h"
 #include "wx/export_subtitles_dialog.h"
 #include "wx/export_video_file_dialog.h"

-#include "wx/paste_dialog.h"
+#include "wx/film_editor.h"
+#include "wx/film_name_location_dialog.h"
+#include "wx/film_viewer.h"

 #include "wx/focus_manager.h"
 #include "wx/focus_manager.h"

+#include "wx/full_config_dialog.h"
+#include "wx/hints_dialog.h"

 #include "wx/html_dialog.h"
 #include "wx/html_dialog.h"

-#include "wx/send_i18n_dialog.h"

 #include "wx/i18n_hook.h"
 #include "wx/i18n_hook.h"

-#include "lib/film.h"
+#include "wx/job_manager_view.h"
+#include "wx/kdm_dialog.h"
+#include "wx/nag_dialog.h"
+#include "wx/paste_dialog.h"
+#include "wx/recreate_chain_dialog.h"
+#include "wx/report_problem_dialog.h"
+#include "wx/save_template_dialog.h"
+#include "wx/self_dkdm_dialog.h"
+#include "wx/send_i18n_dialog.h"
+#include "wx/servers_list_dialog.h"
+#include "wx/standard_controls.h"
+#include "wx/system_information_dialog.h"
+#include "wx/templates_dialog.h"
+#include "wx/update_dialog.h"
+#include "wx/video_waveform_dialog.h"
+#include "wx/wx_signal_manager.h"
+#include "wx/wx_util.h"

 #include "lib/analytics.h"
 #include "lib/analytics.h"

-#include "lib/emailer.h"
+#include "lib/audio_content.h"
+#include "lib/check_content_job.h"
+#include "lib/cinema.h"
+#include "lib/compose.hpp"

 #include "lib/config.h"
 #include "lib/config.h"

-#include "lib/cross.h"
-#include "lib/util.h"
-#include "lib/video_content.h"

 #include "lib/content.h"
 #include "lib/content.h"

-#include "lib/version.h"
-#include "lib/signal_manager.h"
-#include "lib/log.h"
-#include "lib/screen.h"
-#include "lib/job_manager.h"
-#include "lib/exceptions.h"
-#include "lib/cinema.h"
-#include "lib/kdm_with_metadata.h"
-#include "lib/send_kdm_email_job.h"
-#include "lib/encode_server_finder.h"
-#include "lib/update_checker.h"
-#include "lib/cross.h"

 #include "lib/content_factory.h"
 #include "lib/content_factory.h"

-#include "lib/compose.hpp"
-#include "lib/dcpomatic_socket.h"
-#include "lib/hints.h"
+#include "lib/cross.h"
+#include "lib/cross.h"

 #include "lib/dcp_content.h"
 #include "lib/dcp_content.h"

-#include "lib/ffmpeg_encoder.h"
-#include "lib/transcode_job.h"
-#include "lib/dkdm_wrapper.h"
-#include "lib/audio_content.h"
-#include "lib/check_content_change_job.h"
-#include "lib/text_content.h"

 #include "lib/dcpomatic_log.h"
 #include "lib/dcpomatic_log.h"

+#include "lib/dcpomatic_socket.h"
+#include "lib/dkdm_wrapper.h"
+#include "lib/emailer.h"
+#include "lib/encode_server_finder.h"
+#include "lib/exceptions.h"
+#include "lib/ffmpeg_encoder.h"
+#include "lib/film.h"
+#include "lib/hints.h"
+#include "lib/job_manager.h"
+#include "lib/kdm_with_metadata.h"
+#include "lib/log.h"
+#include "lib/make_dcp.h"
+#include "lib/release_notes.h"
+#include "lib/screen.h"
+#include "lib/send_kdm_email_job.h"
+#include "lib/signal_manager.h"

 #include "lib/subtitle_encoder.h"
 #include "lib/subtitle_encoder.h"

-#include "lib/warnings.h"
+#include "lib/text_content.h"
+#include "lib/transcode_job.h"
+#include "lib/update_checker.h"
+#include "lib/util.h"
+#include "lib/version.h"
+#include "lib/video_content.h"

 #include <dcp/exceptions.h>
 #include <dcp/raw_convert.h>
 #include <dcp/exceptions.h>
 #include <dcp/raw_convert.h>

-DCPOMATIC_DISABLE_WARNINGS
-#include <wx/generic/aboutdlgg.h>
-#include <wx/stdpaths.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS

 #include <wx/cmdline.h>
 #include <wx/cmdline.h>

+#include <wx/generic/aboutdlgg.h>

 #include <wx/preferences.h>
 #include <wx/splash.h>
 #include <wx/preferences.h>
 #include <wx/splash.h>

+#include <wx/stdpaths.h>

 #include <wx/wxhtml.h>
 #include <wx/wxhtml.h>

-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS

 #ifdef __WXGTK__
 #include <X11/Xlib.h>
 #endif
 #ifdef __WXMSW__
 #include <shellapi.h>
 #endif
 #ifdef __WXGTK__
 #include <X11/Xlib.h>
 #endif
 #ifdef __WXMSW__
 #include <shellapi.h>
 #endif

-#include <boost/filesystem.hpp>

 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string.hpp>

+#include <boost/filesystem.hpp>

 #include <iostream>
 #include <fstream>
 /* This is OK as it's only used with DCPOMATIC_WINDOWS */
 #include <iostream>
 #include <fstream>
 /* This is OK as it's only used with DCPOMATIC_WINDOWS */


@@ -367,9 +369,8 @@ public:
 
                set_menu_sensitivity ();
 
 
                set_menu_sensitivity ();
 

-               _film_editor->FileChanged.connect (bind (&DOMFrame::file_changed, this, _1));

                _film_editor->content_panel()->SelectionChanged.connect (boost::bind (&DOMFrame::set_menu_sensitivity, this));
                _film_editor->content_panel()->SelectionChanged.connect (boost::bind (&DOMFrame::set_menu_sensitivity, this));

-               file_changed ("");
+               set_title ();

 
                JobManager::instance()->ActiveJobsChanged.connect (boost::bind (&DOMFrame::set_menu_sensitivity, this));
 
 
                JobManager::instance()->ActiveJobsChanged.connect (boost::bind (&DOMFrame::set_menu_sensitivity, this));
 


@@ -389,7 +390,7 @@ public:
 #else
                int accelerators = 6;
 #endif
 #else
                int accelerators = 6;
 #endif

-               auto accel = new wxAcceleratorEntry[accelerators];
+               std::vector<wxAcceleratorEntry> accel(accelerators);

                /* [Shortcut] Ctrl+A:Add file(s) to the film */
                accel[0].Set (wxACCEL_CTRL, static_cast<int>('A'), ID_add_file);
                /* [Shortcut] Delete:Remove selected content from film */
                /* [Shortcut] Ctrl+A:Add file(s) to the film */
                accel[0].Set (wxACCEL_CTRL, static_cast<int>('A'), ID_add_file);
                /* [Shortcut] Delete:Remove selected content from film */


@@ -411,9 +412,8 @@ public:
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::timeline_pressed, this), ID_timeline);
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::back_frame, this), ID_back_frame);
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::forward_frame, this), ID_forward_frame);
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::timeline_pressed, this), ID_timeline);
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::back_frame, this), ID_back_frame);
                Bind (wxEVT_MENU, boost::bind (&DOMFrame::forward_frame, this), ID_forward_frame);

-               wxAcceleratorTable accel_table (accelerators, accel);
+               wxAcceleratorTable accel_table (accelerators, accel.data());

                SetAcceleratorTable (accel_table);
                SetAcceleratorTable (accel_table);

-               delete[] accel;

        }
 
        void remove_accelerators ()
        }
 
        void remove_accelerators ()


@@ -459,7 +459,7 @@ public:
 
                set_film (film);
 
 
                set_film (film);
 

-               JobManager::instance()->add(shared_ptr<Job>(new CheckContentChangeJob(film)));
+               JobManager::instance()->add(make_shared<CheckContentJob>(film));

        }
        catch (FileNotFoundError& e) {
                auto const dir = e.file().parent_path();
        }
        catch (FileNotFoundError& e) {
                auto const dir = e.file().parent_path();


@@ -495,8 +495,10 @@ public:
                if (_film) {
                        _film->Change.connect (boost::bind (&DOMFrame::film_change, this, _1));
                        _film->Message.connect (boost::bind(&DOMFrame::film_message, this, _1));
                if (_film) {
                        _film->Change.connect (boost::bind (&DOMFrame::film_change, this, _1));
                        _film->Message.connect (boost::bind(&DOMFrame::film_message, this, _1));

+                       _film->DirtyChange.connect (boost::bind(&DOMFrame::set_title, this));

                        dcpomatic_log = _film->log ();
                }
                        dcpomatic_log = _film->log ();
                }

+               set_title ();

        }
 
        shared_ptr<Film> film () const {
        }
 
        shared_ptr<Film> film () const {


@@ -525,16 +527,6 @@ private:
                }
        }
 
                }
        }
 

-       void file_changed (boost::filesystem::path f)
-       {
-               auto s = wx_to_std(_("DCP-o-matic"));
-               if (!f.empty ()) {
-                       s += " - " + f.string ();
-               }
-
-               SetTitle (std_to_wx (s));
-       }
-

        void file_new ()
        {
                auto d = new FilmNameLocationDialog (this, _("New Film"), true);
        void file_new ()
        {
                auto d = new FilmNameLocationDialog (this, _("New Film"), true);


@@ -816,7 +808,7 @@ private:
                           a long time, and crashes/power failures are moderately likely.
                        */
                        _film->write_metadata ();
                           a long time, and crashes/power failures are moderately likely.
                        */
                        _film->write_metadata ();

-                       _film->make_dcp (TranscodeJob::ChangedBehaviour::EXAMINE_THEN_STOP);
+                       make_dcp (_film, TranscodeJob::ChangedBehaviour::EXAMINE_THEN_STOP);

                } catch (BadSettingError& e) {
                        error_dialog (this, wxString::Format (_("Bad setting for %s."), std_to_wx(e.setting()).data()), std_to_wx(e.what()));
                } catch (std::exception& e) {
                } catch (BadSettingError& e) {
                        error_dialog (this, wxString::Format (_("Bad setting for %s."), std_to_wx(e.setting()).data()), std_to_wx(e.what()));
                } catch (std::exception& e) {


@@ -1452,7 +1444,7 @@ private:
 
                int pos = _history_position;
 
 
                int pos = _history_position;
 

-               /* Clear out non-existant history items before we re-build the menu */
+               /* Clear out non-existent history items before we re-build the menu */

                Config::instance()->clean_history ();
                auto history = Config::instance()->history();
 
                Config::instance()->clean_history ();
                auto history = Config::instance()->history();
 


@@ -1534,6 +1526,21 @@ private:
                d->Destroy();
        }
 
                d->Destroy();
        }
 

+       void set_title ()
+       {
+               auto s = wx_to_std(_("DCP-o-matic"));
+               if (_film) {
+                       if (_film->directory()) {
+                               s += " - " + _film->directory()->string();
+                       }
+                       if (_film->dirty()) {
+                               s += " *";
+                       }
+               }
+
+               SetTitle (std_to_wx(s));
+       }
+

        FilmEditor* _film_editor;
        std::shared_ptr<FilmViewer> _film_viewer;
        StandardControls* _controls;
        FilmEditor* _film_editor;
        std::shared_ptr<FilmViewer> _film_viewer;
        StandardControls* _controls;


@@ -1585,7 +1592,7 @@ public:
 
 private:
 
 
 private:
 

-       bool OnInit ()
+       bool OnInit () override

        {
                try {
                        wxInitAllImageHandlers ();
        {
                try {
                        wxInitAllImageHandlers ();


@@ -1680,6 +1687,14 @@ private:
                        if (Config::instance()->check_for_updates ()) {
                                UpdateChecker::instance()->run ();
                        }
                        if (Config::instance()->check_for_updates ()) {
                                UpdateChecker::instance()->run ();
                        }

+
+                       auto release_notes = find_release_notes();
+                       if (release_notes) {
+                               auto notes = new HTMLDialog(nullptr, _("Release notes"), std_to_wx(*release_notes), true);
+                               notes->Centre();
+                               notes->ShowModal();
+                               notes->Destroy();
+                       }

                }
                catch (exception& e)
                {
                }
                catch (exception& e)
                {


@@ -1693,13 +1708,13 @@ private:
                return true;
        }
 
                return true;
        }
 

-       void OnInitCmdLine (wxCmdLineParser& parser)
+       void OnInitCmdLine (wxCmdLineParser& parser) override

        {
                parser.SetDesc (command_line_description);
                parser.SetSwitchChars (wxT ("-"));
        }
 
        {
                parser.SetDesc (command_line_description);
                parser.SetSwitchChars (wxT ("-"));
        }
 

-       bool OnCmdLineParsed (wxCmdLineParser& parser)
+       bool OnCmdLineParsed (wxCmdLineParser& parser) override

        {
                if (parser.Found (wxT("version"))) {
                        cout << "dcpomatic version " << dcpomatic_version << " " << dcpomatic_git_commit << "\n";
        {
                if (parser.Found (wxT("version"))) {
                        cout << "dcpomatic version " << dcpomatic_version << " " << dcpomatic_git_commit << "\n";


@@ -1769,14 +1784,14 @@ private:
        }
 
        /* An unhandled exception has occurred inside the main event loop */
        }
 
        /* An unhandled exception has occurred inside the main event loop */

-       bool OnExceptionInMainLoop ()
+       bool OnExceptionInMainLoop () override

        {
                report_exception ();
                /* This will terminate the program */
                return false;
        }
 
        {
                report_exception ();
                /* This will terminate the program */
                return false;
        }
 

-       void OnUnhandledException ()
+       void OnUnhandledException () override

        {
                report_exception ();
        }
        {
                report_exception ();
        }