projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some simple-video-view tidy-ups.
[dcpomatic.git]
/
src
/
wx
/
hints_dialog.h
diff --git
a/src/wx/hints_dialog.h
b/src/wx/hints_dialog.h
index 72530c0bd7262425b102fc6933c36afa7cef9245..1fac9d11e63afa43ac33d65d52bc30e4089be00b 100644
(file)
--- a/
src/wx/hints_dialog.h
+++ b/
src/wx/hints_dialog.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-201
5
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
8
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,24
+18,38
@@
*/
*/
+#include "lib/types.h"
#include <wx/wx.h>
#include <boost/weak_ptr.hpp>
#include <boost/signals2.hpp>
class wxRichTextCtrl;
class Film;
#include <wx/wx.h>
#include <boost/weak_ptr.hpp>
#include <boost/signals2.hpp>
class wxRichTextCtrl;
class Film;
+class Hints;
class HintsDialog : public wxDialog
{
public:
class HintsDialog : public wxDialog
{
public:
- HintsDialog (wxWindow* parent, boost::weak_ptr<Film>);
+ HintsDialog (wxWindow* parent, boost::weak_ptr<Film>
, bool ok
);
private:
private:
- void film_changed ();
+ 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);
boost::weak_ptr<Film> _film;
boost::weak_ptr<Film> _film;
+ wxGauge* _gauge;
+ wxStaticText* _gauge_message;
wxRichTextCtrl* _text;
wxRichTextCtrl* _text;
+ boost::scoped_ptr<Hints> _hints;
+ std::list<std::string> _current;
+ bool _finished;
- boost::signals2::scoped_connection _film_change
d
_connection;
- boost::signals2::scoped_connection _film_content_change
d
_connection;
+ boost::signals2::scoped_connection _film_change_connection;
+ boost::signals2::scoped_connection _film_content_change_connection;
};
};