/*
- Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
+
#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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/richtext/richtextctrl.h>
-#include <boost/foreach.hpp>
+LIBDCP_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);
+ auto 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"));
+ auto 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));
+ b->bind(&HintsDialog::shut_up, this, _1);
}
- wxStdDialogButtonSizer* buttons = CreateStdDialogButtonSizer (0);
+ auto buttons = CreateStdDialogButtonSizer (0);
sizer->Add (CreateSeparatedSizer(buttons), wxSizerFlags().Expand().DoubleBorder());
+ wxButton* default_button = nullptr;
if (ok) {
- buttons->SetAffirmativeButton (new wxButton (this, wxID_OK));
+ default_button = new wxButton(this, wxID_OK);
+ buttons->SetAffirmativeButton(default_button);
} else {
- buttons->SetAffirmativeButton (new wxButton (this, wxID_OK, _("Make DCP")));
+ default_button = new wxButton(this, wxID_OK, _("Make DCP"));
+ buttons->SetAffirmativeButton(default_button);
buttons->SetNegativeButton (new wxButton (this, wxID_CANCEL, _("Go back")));
}
buttons->Realize ();
+ default_button->SetFocus();
+
SetSizer (sizer);
sizer->Layout ();
sizer->SetSizeHints (this);
_text->GetCaret()->Hide ();
- boost::shared_ptr<Film> locked_film = _film.lock ();
+ auto 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 (ChangeType::DONE);
}
+
void
-HintsDialog::film_changed ()
+HintsDialog::film_change (ChangeType type)
{
+ if (type != ChangeType::DONE) {
+ return;
+ }
+
_text->Clear ();
_current.clear ();
- boost::shared_ptr<Film> film = _film.lock ();
+ auto film = _film.lock ();
if (!film) {
return;
}
Layout ();
_gauge->SetValue (0);
update ();
+ _finished = false;
+
+ _hints.reset (new Hints (_film));
+ _hints_hint_connection = _hints->Hint.connect(bind(&HintsDialog::hint, this, _1));
+ _hints_progress_connection = _hints->Progress.connect(bind(&HintsDialog::progress, this, _1));
+ _hints_pulse_connection = _hints->Pulse.connect(bind(&HintsDialog::pulse, this));
+ _hints_finished_connection = _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
{
_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 ();
}
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 ();
projects / dcpomatic.git / blobdiff