X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fhints_dialog.cc;h=2c6bac14a0ae0013525eda7c25187176c0c90bd0;hb=a5d004b0773f633401528392fc28e66d70e13ac8;hp=3872ea8ae2a281772df3ee667b4fecbf075b67a7;hpb=6c7489e5d778d3e71065d88a094a7383ba2c117d;p=dcpomatic.git

diff --git a/src/wx/hints_dialog.cc b/src/wx/hints_dialog.cc
index 3872ea8ae..2c6bac14a 100644
--- a/src/wx/hints_dialog.cc
+++ b/src/wx/hints_dialog.cc
@@ -20,38 +20,46 @@
 
 #include "hints_dialog.h"
 #include "wx_util.h"
+#include "static_text.h"
+#include "check_box.h"
 #include "lib/film.h"
 #include "lib/hints.h"
 #include "lib/config.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/richtext/richtextctrl.h>
-#include <boost/foreach.hpp>
+DCPOMATIC_ENABLE_WARNINGS
 
 using std::max;
 using std::vector;
 using std::string;
 using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 using boost::bind;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
-HintsDialog::HintsDialog (wxWindow* parent, boost::weak_ptr<Film> film, bool ok)
+HintsDialog::HintsDialog (wxWindow* parent, std::weak_ptr<Film> film, bool ok)
 	: wxDialog (parent, wxID_ANY, _("Hints"))
 	, _film (film)
-	, _hints (new Hints (film))
+	, _hints (0)
+	, _finished (false)
 {
 	wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
 
 	_gauge = new wxGauge (this, wxID_ANY, 100);
 	sizer->Add (_gauge, 0, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
-	_gauge_message = new wxStaticText (this, wxID_ANY, wxT(""));
+	_gauge_message = new StaticText (this, wxT(""));
 	sizer->Add (_gauge_message, 0, wxALL | wxEXPAND, DCPOMATIC_SIZER_GAP);
 
 	_text = new wxRichTextCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (400, 300), wxRE_READONLY);
 	sizer->Add (_text, 1, wxEXPAND | wxALL, 6);
 
 	if (!ok) {
-		wxCheckBox* b = new wxCheckBox (this, wxID_ANY, _("Don't show hints again"));
+		wxCheckBox* b = new CheckBox (this, _("Don't show hints again"));
 		sizer->Add (b, 0, wxALL, 6);
 		b->Bind (wxEVT_CHECKBOX, bind (&HintsDialog::shut_up, this, _1));
 	}
@@ -73,27 +81,26 @@ HintsDialog::HintsDialog (wxWindow* parent, boost::weak_ptr<Film> film, bool ok)
 
 	_text->GetCaret()->Hide ();
 
-	boost::shared_ptr<Film> locked_film = _film.lock ();
+	std::shared_ptr<Film> locked_film = _film.lock ();
 	if (locked_film) {
-		_film_changed_connection = locked_film->Changed.connect (boost::bind (&HintsDialog::film_changed, this));
-		_film_content_changed_connection = locked_film->ContentChange.connect (boost::bind (&HintsDialog::film_content_change, this, _1));
+		_film_change_connection = locked_film->Change.connect (boost::bind (&HintsDialog::film_change, this, _1));
+		_film_content_change_connection = locked_film->ContentChange.connect (boost::bind (&HintsDialog::film_content_change, this, _1));
 	}
 
-	_hints->Hint.connect (bind (&HintsDialog::hint, this, _1));
-	_hints->Progress.connect (bind (&HintsDialog::progress, this, _1));
-	_hints->Pulse.connect (bind (&HintsDialog::pulse, this));
-	_hints->Finished.connect (bind (&HintsDialog::finished, this));
-
-	film_changed ();
+	film_change (CHANGE_TYPE_DONE);
 }
 
 void
-HintsDialog::film_changed ()
+HintsDialog::film_change (ChangeType type)
 {
+	if (type != CHANGE_TYPE_DONE) {
+		return;
+	}
+
 	_text->Clear ();
 	_current.clear ();
 
-	boost::shared_ptr<Film> film = _film.lock ();
+	std::shared_ptr<Film> film = _film.lock ();
 	if (!film) {
 		return;
 	}
@@ -103,15 +110,20 @@ HintsDialog::film_changed ()
 	Layout ();
 	_gauge->SetValue (0);
 	update ();
+	_finished = false;
+
+	_hints.reset (new Hints (_film));
+	_hints->Hint.connect (bind (&HintsDialog::hint, this, _1));
+	_hints->Progress.connect (bind (&HintsDialog::progress, this, _1));
+	_hints->Pulse.connect (bind (&HintsDialog::pulse, this));
+	_hints->Finished.connect (bind (&HintsDialog::finished, this));
 	_hints->start ();
 }
 
 void
 HintsDialog::film_content_change (ChangeType type)
 {
-	if (type == CHANGE_TYPE_DONE) {
-		film_changed ();
-	}
+	film_change (type);
 }
 
 void
@@ -119,10 +131,14 @@ HintsDialog::update ()
 {
 	_text->Clear ();
 	if (_current.empty ()) {
-		_text->WriteText (_("There are no hints: everything looks good!"));
+		if (_finished) {
+			_text->WriteText (_("There are no hints: everything looks good!"));
+		} else {
+			_text->WriteText (_("There are no hints yet: project check in progress."));
+		}
 	} else {
 		_text->BeginStandardBullet (N_("standard/circle"), 1, 50);
-		BOOST_FOREACH (string i, _current) {
+		for (auto i: _current) {
 			_text->WriteText (std_to_wx (i));
 			_text->Newline ();
 		}
@@ -152,6 +168,14 @@ HintsDialog::pulse ()
 void
 HintsDialog::finished ()
 {
+	try {
+		_hints->rethrow ();
+	} catch (std::exception& e) {
+		error_dialog (this, wxString::Format(_("A problem occurred when looking for hints (%s)"), std_to_wx(e.what())));
+	}
+
+	_finished = true;
+	update ();
 	_gauge->Hide ();
 	_gauge_message->Hide ();
 	Layout ();