C++11 tidying.

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

diff --git a/src/wx/hints_dialog.h b/src/wx/hints_dialog.h
index 72530c0bd7262425b102fc6933c36afa7cef9245..37d36459cab6a734af0755f8e7bec4e9a6d463f3 100644 (file)
--- a/src/wx/hints_dialog.h
+++ b/src/wx/hints_dialog.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,24 +18,46 @@
 
 */
 
+
+#include "lib/change_signaller.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
-#include <boost/weak_ptr.hpp>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
+
 class wxRichTextCtrl;
 class Film;
+class Hints;
 
 class HintsDialog : public wxDialog
 {
 public:
-       HintsDialog (wxWindow* parent, boost::weak_ptr<Film>);
+       HintsDialog (wxWindow* parent, std::weak_ptr<Film>, bool ok);
 
 private:
-       void film_changed ();
-
-       boost::weak_ptr<Film> _film;
+       void film_change (ChangeType);
+       void film_content_change (ChangeType type);
+       void shut_up (wxCommandEvent& ev);
+       void update ();
+       void hint (std::string text);
+       void pulse ();
+       void finished ();
+       void progress (std::string m);
+
+       std::weak_ptr<Film> _film;
+       wxGauge* _gauge;
+       wxStaticText* _gauge_message;
        wxRichTextCtrl* _text;
-
-       boost::signals2::scoped_connection _film_changed_connection;
-       boost::signals2::scoped_connection _film_content_changed_connection;
+       boost::scoped_ptr<Hints> _hints;
+       std::list<std::string> _current;
+       bool _finished;
+
+       boost::signals2::scoped_connection _film_change_connection;
+       boost::signals2::scoped_connection _film_content_change_connection;
+       boost::signals2::scoped_connection _hints_hint_connection;
+       boost::signals2::scoped_connection _hints_progress_connection;
+       boost::signals2::scoped_connection _hints_pulse_connection;
+       boost::signals2::scoped_connection _hints_finished_connection;
 };