X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;h=6f55b1771b88f2bbbc352520aa7c7deae10005b7;hp=1ea9ab63b3da1715224035bc7c46bdabf1f8869f;hb=f706bbb9afd10472e81a051cd5db601d6404377c;hpb=3c29aa6531a4046a8db72dcac81189eb8893233c

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 1ea9ab63b..6f55b1771 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -56,7 +56,7 @@
 #include "wx/wx_util.h"
 #include "lib/analytics.h"
 #include "lib/audio_content.h"
-#include "lib/check_content_change_job.h"
+#include "lib/check_content_job.h"
 #include "lib/cinema.h"
 #include "lib/compose.hpp"
 #include "lib/config.h"
@@ -78,6 +78,7 @@
 #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"
@@ -368,9 +369,8 @@ public:
 
 		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));
-		file_changed ("");
+		set_title ();
 
 		JobManager::instance()->ActiveJobsChanged.connect (boost::bind (&DOMFrame::set_menu_sensitivity, this));
 
@@ -390,7 +390,7 @@ public:
 #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 */
@@ -412,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);
-		wxAcceleratorTable accel_table (accelerators, accel);
+		wxAcceleratorTable accel_table (accelerators, accel.data());
 		SetAcceleratorTable (accel_table);
-		delete[] accel;
 	}
 
 	void remove_accelerators ()
@@ -460,7 +459,7 @@ public:
 
 		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();
@@ -496,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));
+			_film->DirtyChange.connect (boost::bind(&DOMFrame::set_title, this));
 			dcpomatic_log = _film->log ();
 		}
+		set_title ();
 	}
 
 	shared_ptr<Film> film () const {
@@ -526,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);
@@ -1535,6 +1526,21 @@ private:
 		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;
@@ -1681,6 +1687,14 @@ private:
 			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)
 		{