Add FilmViewer::time_until_next_frame.

[dcpomatic.git] / src / wx / hints_dialog.cc

diff --git a/src/wx/hints_dialog.cc b/src/wx/hints_dialog.cc
index 1938e7cc4b0f45d55f842297c8ae5bfd7627d93d..cb0de450a73ad7d141941536c003f4f057cfddf7 100644 (file)
--- a/src/wx/hints_dialog.cc
+++ b/src/wx/hints_dialog.cc
@@ -20,6 +20,8 @@
 
 #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"
@@ -38,20 +40,21 @@ using boost::dynamic_pointer_cast;
 HintsDialog::HintsDialog (wxWindow* parent, boost::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));
        }
@@ -61,7 +64,7 @@ HintsDialog::HintsDialog (wxWindow* parent, boost::weak_ptr<Film> film, bool ok)
        if (ok) {
                buttons->SetAffirmativeButton (new wxButton (this, wxID_OK));
        } else {
-               buttons->SetAffirmativeButton (new wxButton (this, wxID_OK, _("Make DCP anyway")));
+               buttons->SetAffirmativeButton (new wxButton (this, wxID_OK, _("Make DCP")));
                buttons->SetNegativeButton (new wxButton (this, wxID_CANCEL, _("Go back")));
        }
 
@@ -75,21 +78,20 @@ HintsDialog::HintsDialog (wxWindow* parent, boost::weak_ptr<Film> film, bool ok)
 
        boost::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->ContentChanged.connect (boost::bind (&HintsDialog::film_changed, this));
+               _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 ();
 
@@ -103,15 +105,32 @@ 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)
+{
+       film_change (type);
+}
+
 void
 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) {
@@ -144,6 +163,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 ();