#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"
_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));
}
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")));
}
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->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 ();
_hints->start ();
}
+void
+HintsDialog::film_content_change (ChangeType type)
+{
+ film_change (type);
+}
+
void
HintsDialog::update ()
{